优化出院结算判断

pom.xml

@@ -10,7 +10,7 @@
     </parent>
     <groupId>thyyxxk</groupId>
     <artifactId>web-server</artifactId>
-    <version>2</version>
+    <version>1</version>
     <name>web-server</name>
     <description>server for yibao-web</description>
     <properties>

src/main/java/thyyxxk/webserver/controller/medicalinsurance/SiInjuryController.java

@@ -139,6 +139,14 @@ public class SiInjuryController {
             return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, resultVo.getMessage());
         }
         YbSettleFee settleFee = resultVo.getData();
+
+//        根据结算单手动出院
+//        YbSettleFee settleFee = new YbSettleFee();
+//        settleFee.setTotalCost("7587.41");
+//        settleFee.setTczf("7313.08");
+//        settleFee.setLedgerSn(1);
+//        settleFee.setXjzf("144.33");
+
         if (p.getMidSetl()) {
             settleFee.setZjdzDatetime(p.getZjdzDatetime());
         }

src/main/java/thyyxxk/webserver/dao/his/yibao/DismissDao.java

@@ -97,7 +97,7 @@ public interface DismissDao {
     @Delete("delete zy_tmp_settle_select_detail where inpatient_no=#{patNo} and admiss_times=#{times}")
     void deleteTemporaryTable(@Param("patNo") String patNo, @Param("times") Integer times);
 
-    @Select("select top 1 date_2 from zy_receipt where inpatient_no=#{patNo} and admiss_times=#{times} and ledger_sn>0 order by ledger_sn desc")
+    @Select("select top 1 date_1 from zy_receipt where inpatient_no=#{patNo} and admiss_times=#{times} and ledger_sn>1 order by ledger_sn desc")
     Date selectAccountDate(@Param("patNo") String patNo, @Param("times") int times);
 
     @Select("select admiss_date from ${table} where inpatient_no=#{patNo} and admiss_times=#{times}")

src/main/java/thyyxxk/webserver/service/yibao/DismissService.java

@@ -183,7 +183,6 @@ public class DismissService {
             exception.setMessage("此患者有未结账的费用。");
             throw new BizException(exception);
         }
-//        dao.recountDeposit(patNo, times, ledgerSn);
         Date begntime = getBegntime(patNo, times, "zy_actpatient");
         dismissFeeAnalyse(patNo, times, ledgerSn, begntime, tmpendtime);
 
@@ -206,20 +205,6 @@ public class DismissService {
             }
         }
 
-//        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);
         if (null == medinfo) {