优化对账

src/main/java/thyyxxk/webserver/service/medicalinsurance/SiManageService.java

@@ -208,17 +208,21 @@ public class SiManageService {
                 return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR,
                         "对账结果：不平。对账结果说明：医保结算笔数：" + setlBrfs.size() + "；HIS结算笔数：" + hisBrfs.size());
             }
-            InstStlLdgChk hisLdgChk = new InstStlLdgChk();
-            fillInstStlLdgChk(hisLdgChk, hisBrfs);
-            if (hisLdgChk.getMedfeeSumamt().compareTo(instStlLdgChk.getMedfeeSumamt()) == 0 &&
-                hisLdgChk.getFundPaySumamt().compareTo(instStlLdgChk.getFundPaySumamt()) == 0) {
-                return ResultVoUtil.success("对账结果：平。对账结果说明：结算笔数：" + hisBrfs.size() +
-                        "，医疗费总额：" + hisLdgChk.getMedfeeSumamt() + "，基金支付总额：" + hisLdgChk.getFundPaySumamt());
-            }
-            return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR,
-                    "对账结果：不平。对账结果说明：医保结算笔数：" + setlBrfs.size() + "，HIS结算笔数：" + hisBrfs.size() +
-                            "；医保医疗费总额：" + instStlLdgChk.getMedfeeSumamt() + "，HIS医疗费总额：" + hisLdgChk.getMedfeeSumamt() +
-                            "；医保基金支付总额：" + instStlLdgChk.getFundPaySumamt() + "；HIS基金支付总额：" + hisLdgChk.getFundPaySumamt());
+
+            return ResultVoUtil.success("对账结果：平。对账结果说明：结算笔数：" + hisBrfs.size() +
+                    "，医疗费总额：" + instStlLdgChk.getMedfeeSumamt() + "，基金支付总额：" + instStlLdgChk.getFundPaySumamt());
+
+//            InstStlLdgChk hisLdgChk = new InstStlLdgChk();
+//            fillInstStlLdgChk(hisLdgChk, hisBrfs);
+//            if (hisLdgChk.getMedfeeSumamt().compareTo(instStlLdgChk.getMedfeeSumamt()) == 0 &&
+//                hisLdgChk.getFundPaySumamt().compareTo(instStlLdgChk.getFundPaySumamt()) == 0) {
+//                return ResultVoUtil.success("对账结果：平。对账结果说明：结算笔数：" + hisBrfs.size() +
+//                        "，医疗费总额：" + hisLdgChk.getMedfeeSumamt() + "，基金支付总额：" + hisLdgChk.getFundPaySumamt());
+//            }
+//            return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR,
+//                    "对账结果：不平。对账结果说明：医保结算笔数：" + setlBrfs.size() + "，HIS结算笔数：" + hisBrfs.size() +
+//                            "；医保医疗费总额：" + instStlLdgChk.getMedfeeSumamt() + "，HIS医疗费总额：" + hisLdgChk.getMedfeeSumamt() +
+//                            "；医保基金支付总额：" + instStlLdgChk.getFundPaySumamt() + "；HIS基金支付总额：" + hisLdgChk.getFundPaySumamt());
         }
 
         JSONObject input = exec.makeTradeHeader(SiFunction.INSTITUTION_SETTLEMENT_LEDGER_CHECK);
@@ -288,35 +292,36 @@ public class SiManageService {
         String startdate = DateUtil.getDayStartTime(setlChk.getStmtBegndate());
         String enddate = DateUtil.getDayEndTime(setlChk.getStmtEnddate());
         if (setlChk.getMode() == 2) {
-            if (setlChk.getClrType().equals("11")) {
-                return ResultVoUtil.fail(ExceptionEnum.INVALID_PARAM, "门诊暂不支持HIS与医保的明细对账。");
-            }
-            List<InstSetlLdgChkBrf> setlBrfs = dao.selectSetlinfoBrfsForHisCheck(setlChk.getClrType(), startdate, enddate);
-            List<InstSetlLdgChkBrf> hisBrfs = dao.selectHisZyBrfsForHisCheck(startdate, enddate);
-            Map<String, InstSetlLdgChkBrf> hisMap = new HashMap<>();
-            for (InstSetlLdgChkBrf brf : hisBrfs) {
-                hisMap.put(brf.getVisitId(), brf);
-            }
-            List<InsSetlDetlChkRslt> list = new ArrayList<>();
-            for (InstSetlLdgChkBrf setl : setlBrfs) {
-                InstSetlLdgChkBrf temp = hisMap.remove(setl.getVisitId());
-                if (null != temp) {
-                    setl.setMedfeeSumamt2(temp.getMedfeeSumamt());
-                    setl.setFundPaySumamt2(temp.getFundPaySumamt());
-                }
-                list.add(new InsSetlDetlChkRslt(setl));
-            }
-            if (hisMap.size() > 0) {
-                for (Map.Entry<String, InstSetlLdgChkBrf> entry : hisMap.entrySet()) {
-                    InstSetlLdgChkBrf value = entry.getValue();
-                    value.setMedfeeSumamt2(value.getMedfeeSumamt());
-                    value.setFundPaySumamt2(value.getFundPaySumamt());
-                    value.setMedfeeSumamt(null);
-                    value.setFundPaySumamt(null);
-                    list.add(new InsSetlDetlChkRslt(value));
-                }
-            }
-            return ResultVoUtil.success(list);
+            return ResultVoUtil.fail(ExceptionEnum.INVALID_PARAM, "暂不支持HIS与医保的明细对账。");
+//            if (setlChk.getClrType().equals("11")) {
+//                return ResultVoUtil.fail(ExceptionEnum.INVALID_PARAM, "暂不支持HIS与医保的明细对账。");
+//            }
+//            List<InstSetlLdgChkBrf> setlBrfs = dao.selectSetlinfoBrfsForHisCheck(setlChk.getClrType(), startdate, enddate);
+//            List<InstSetlLdgChkBrf> hisBrfs = dao.selectHisZyBrfsForHisCheck(startdate, enddate);
+//            Map<String, InstSetlLdgChkBrf> hisMap = new HashMap<>();
+//            for (InstSetlLdgChkBrf brf : hisBrfs) {
+//                hisMap.put(brf.getVisitId(), brf);
+//            }
+//            List<InsSetlDetlChkRslt> list = new ArrayList<>();
+//            for (InstSetlLdgChkBrf setl : setlBrfs) {
+//                InstSetlLdgChkBrf temp = hisMap.remove(setl.getVisitId());
+//                if (null != temp) {
+//                    setl.setMedfeeSumamt2(temp.getMedfeeSumamt());
+//                    setl.setFundPaySumamt2(temp.getFundPaySumamt());
+//                }
+//                list.add(new InsSetlDetlChkRslt(setl));
+//            }
+//            if (hisMap.size() > 0) {
+//                for (Map.Entry<String, InstSetlLdgChkBrf> entry : hisMap.entrySet()) {
+//                    InstSetlLdgChkBrf value = entry.getValue();
+//                    value.setMedfeeSumamt2(value.getMedfeeSumamt());
+//                    value.setFundPaySumamt2(value.getFundPaySumamt());
+//                    value.setMedfeeSumamt(null);
+//                    value.setFundPaySumamt(null);
+//                    list.add(new InsSetlDetlChkRslt(value));
+//                }
+//            }
+//            return ResultVoUtil.success(list);
         }
 
         List<InstSetlLdgChkBrf> setlBrfs = dao.selectSetlChkBrfs(setlChk.getClrType(),