Browse Source

出院床位费计算

lighter 3 năm trước cách đây
mục cha
commit
278a6a9d97

+ 2 - 1
src/main/java/thyyxxk/webserver/dao/his/yibao/DismissDao.java

@@ -413,7 +413,8 @@ public interface DismissDao {
 
     @Select("select b.bill_item_zy as code,sum(a.charge_amount) as name from zy_detail_charge a, zd_charge_item b " +
             "where a.inpatient_no=#{patNo} and a.admiss_times=#{times} and a.charge_status!='1' and b.bill_item_zy " +
-            "in ('003') and a.charge_code_mx not in ('017623','011062') and a.charge_code=b.code group by b.bill_item_zy")
+            "in ('003') and a.charge_code_mx not in ('017623','011062','010437','010435','011193') " +
+            "and a.charge_code=b.code group by b.bill_item_zy")
     List<PureCodeName> selectChargeQuantities(@Param("patNo") String patNo,
                                               @Param("times") int times);
 }

+ 13 - 13
src/main/java/thyyxxk/webserver/service/yibao/DismissService.java

@@ -192,19 +192,19 @@ public class DismissService {
             throw new BizException(exception);
         }
 
-        if (!param.getMidSetl()) {
-            int inhospdays = dao.selectInhospdays(param.getAdmissDate(), endtime);
-            List<PureCodeName> charges = dao.selectChargeQuantities(patNo, times);
-            for (PureCodeName item : charges) {
-                if (item.getCode().equals("003")) {
-                    if (DecimalUtil.compare(item.getName(), String.valueOf(inhospdays)) != 0) {
-                        ExceptionEnum exception = ExceptionEnum.LOGICAL_ERROR;
-                        exception.setMessage("此患者床位费收取数量与住院天数不一致。");
-                        throw new BizException(exception);
-                    }
-                }
-            }
-        }
+//        if (!param.getMidSetl()) {
+//            int inhospdays = dao.selectInhospdays(param.getAdmissDate(), endtime);
+//            List<PureCodeName> charges = dao.selectChargeQuantities(patNo, times);
+//            for (PureCodeName item : charges) {
+//                if (item.getCode().equals("003")) {
+//                    if (DecimalUtil.compare(item.getName(), String.valueOf(inhospdays)) != 0) {
+//                        ExceptionEnum exception = ExceptionEnum.LOGICAL_ERROR;
+//                        exception.setMessage("此患者床位费收取数量与住院天数不一致。");
+//                        throw new BizException(exception);
+//                    }
+//                }
+//            }
+//        }
 
         dao.deleteTemporaryTable(patNo, times);
         PureCodeName medinfo = dao.selectMdtrtId(patNo, times, ledgerSn);