添加门诊结算单缺失的年度累计信息

src/main/java/thyyxxk/webserver/entity/medicalinsurance/setllist/CuminfoInYear.java

@@ -28,7 +28,6 @@ public class CuminfoInYear {
     private BigDecimal yearMafPayAmtZy = new BigDecimal(0);
     private BigDecimal yearPolicySelfPayZy = new BigDecimal(0);
     private BigDecimal yearPreSelfPayZy = new BigDecimal(0);
-
     // 门诊累计
     private BigDecimal yearAdmtimesMz = new BigDecimal(0);
     private BigDecimal yearMedfeesumMz = new BigDecimal(0);
@@ -37,6 +36,10 @@ public class CuminfoInYear {
     private BigDecimal yearBigdssFundPayAmtMz = new BigDecimal(0);
     private BigDecimal yearMafPayAmtMz = new BigDecimal(0);
     private BigDecimal yearAcctPayMz = new BigDecimal(0);
+    private BigDecimal yearPeriodfeeSumamtMz = new BigDecimal(0);
+    private BigDecimal yearPayedBegnlineMz = new BigDecimal(0);
+    private BigDecimal yearPolicySelfPayMz = new BigDecimal(0);
+    private BigDecimal yearPreSelfPayMz = new BigDecimal(0);
 
     public void addYearAdmtimesZy(double val) {
         yearAdmtimesZy = yearAdmtimesZy.add(BigDecimal.valueOf(val));
@@ -46,6 +49,10 @@ public class CuminfoInYear {
         yearPeriodfeeSumamtZy = yearPeriodfeeSumamtZy.add(BigDecimal.valueOf(val));
     }
 
+    public void addYearPeriodFeeSumMz(double val) {
+        yearPeriodfeeSumamtMz = yearPeriodfeeSumamtMz.add(BigDecimal.valueOf(val));
+    }
+
     public void addYearFeesumZy(double val) {
         yearMedfeesumZy = yearMedfeesumZy.add(BigDecimal.valueOf(val));
     }
@@ -54,6 +61,10 @@ public class CuminfoInYear {
         yearPayedBegnlineZy = yearPayedBegnlineZy.add(BigDecimal.valueOf(val));
     }
 
+    public void addYearPayedbegnlineMz(double val) {
+        yearPayedBegnlineMz = yearPayedBegnlineMz.add(BigDecimal.valueOf(val));
+    }
+
     public void addYearFundpaysZy(double val) {
         yearBaseFundPayAmtZy = yearBaseFundPayAmtZy.add(BigDecimal.valueOf(val));
     }
@@ -62,10 +73,17 @@ public class CuminfoInYear {
         yearPolicySelfPayZy = yearPolicySelfPayZy.add(BigDecimal.valueOf(val));
     }
 
+    public void addYearPolicySelfpayMz(double val) {
+        yearPolicySelfPayMz = yearPolicySelfPayMz.add(BigDecimal.valueOf(val));
+    }
+
     public void addYearPreSelfpayZy(double val) {
         yearPreSelfPayZy = yearPreSelfPayZy.add(BigDecimal.valueOf(val));
     }
 
+    public void addYearPreSelfpayMz(double val) {
+        yearPreSelfPayMz = yearPreSelfPayMz.add(BigDecimal.valueOf(val));
+    }
 
     public void addYearBigAmtpaysZy(double val) {
         yearBigAmtpaysZy = yearBigAmtpaysZy.add(BigDecimal.valueOf(val));

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

@@ -117,6 +117,9 @@ public class SiQueryService {
         if (null != qryPsnBsInfo.getLedgerSn() && qryPsnBsInfo.getLedgerSn() != 0) {
             qryPsnBsInfo.setLedgerSn(dao.selectMaxLedgerSn(qryPsnBsInfo.getPatNo(), qryPsnBsInfo.getTimes()));
         }
+        if (StringUtil.isBlank(qryPsnBsInfo.getStaffId())) {
+            qryPsnBsInfo.setStaffId(TokenUtil.getTokenUserId());
+        }
         JSONObject input = exec.makeTradeHeaderWithInsureArea(SiFunction.OBTAIN_BASIC_PERSON_INFO, qryPsnBsInfo.getAdmdvs());
         JSONObject data = new JSONObject();
         if (qryPsnBsInfo.getSocialNo().length() < 15) {
@@ -133,7 +136,7 @@ public class SiQueryService {
         }
         input.getJSONObject("input").put("data", data);
         JSONObject result = exec.executeTrade(input, SiFunction.OBTAIN_BASIC_PERSON_INFO);
-        log.info("【操作员：{}】，人员基本信息获取：\n参数：{}，\n结果：{}", TokenUtil.getTokenUserId(), input, result);
+        log.info("【操作员：{}】，人员基本信息获取：\n参数：{}，\n结果：{}", qryPsnBsInfo.getStaffId(), input, result);
         if (null == result) {
             return ResultVoUtil.fail(ExceptionEnum.NETWORK_ERROR);
         }
@@ -1150,6 +1153,16 @@ public class SiQueryService {
                     case "S0000_BIZ52":
                         cuminfo.addYearPeriodFeeSumZy(itm.getDoubleValue("cum"));
                         break;
+                    // 本年度门诊分段计算费用累计
+                    case "S0000_BIZ11":
+                    case "S0000_BIZ13":
+                    case "S0000_BIZ14":
+                    case "S0000_BIZ51":
+                    case "S0000_BIZ9901":
+                    case "S0000_BIZ9903":
+                    case "S0000_BIZ9904":
+                        cuminfo.addYearPeriodFeeSumMz(itm.getDoubleValue("cum"));
+                        break;
                     // 住院医疗费合计
                     case "F0000_BIZ2101":
                     case "F0000_BIZ2102":
@@ -1178,6 +1191,16 @@ public class SiQueryService {
                     case "Q0000_BIZ52":
                         cuminfo.addYearPayedbegnlineZy(itm.getDoubleValue("cum"));
                         break;
+                    // 门诊已付起付线
+                    case "Q0000_BIZ11":
+                    case "Q0000_BIZ13":
+                    case "Q0000_BIZ14":
+                    case "Q0000_BIZ51":
+                    case "Q0000_BIZ9901":
+                    case "Q0000_BIZ9903":
+                    case "Q0000_BIZ9904":
+                        cuminfo.addYearPayedbegnlineMz(itm.getDoubleValue("cum"));
+                        break;
                     // 住院统筹支付
                     case "D310101_BIZ2101":
                     case "D310101_BIZ2102":
@@ -1210,7 +1233,7 @@ public class SiQueryService {
                     case "D390101_BIZ9904":
                         cuminfo.addYearFundpaysMz(itm.getDoubleValue("cum"));
                         break;
-                    // 政策自费
+                    // 住院政策自费
                     case "Z0000_BIZ2101_LAB101":
                     case "Z0000_BIZ2102_LAB101":
                     case "Z0000_BIZ22_LAB101":
@@ -1225,7 +1248,7 @@ public class SiQueryService {
                     case "Z0000_BIZ52_LAB103":
                         cuminfo.addYearPolicySelfpayZy(itm.getDoubleValue("cum"));
                         break;
-                    // 政策自付
+                    // 住院政策自付
                     case "Z0000_BIZ2101_LAB102":
                     case "Z0000_BIZ2102_LAB102":
                     case "Z0000_BIZ22_LAB102":
@@ -1234,6 +1257,33 @@ public class SiQueryService {
                     case "Z0000_BIZ52_LAB102":
                         cuminfo.addYearPreSelfpayZy(itm.getDoubleValue("cum"));
                         break;
+                    // 门诊政策自费
+                    case "Z0000_BIZ11_LAB101":
+                    case "Z0000_BIZ13_LAB101":
+                    case "Z0000_BIZ14_LAB101":
+                    case "Z0000_BIZ51_LAB101":
+                    case "Z0000_BIZ9901_LAB101":
+                    case "Z0000_BIZ9903_LAB101":
+                    case "Z0000_BIZ9904_LAB101":
+                    case "Z0000_BIZ11_LAB103":
+                    case "Z0000_BIZ13_LAB103":
+                    case "Z0000_BIZ14_LAB103":
+                    case "Z0000_BIZ51_LAB103":
+                    case "Z0000_BIZ9901_LAB103":
+                    case "Z0000_BIZ9903_LAB103":
+                    case "Z0000_BIZ9904_LAB103":
+                        cuminfo.addYearPolicySelfpayMz(itm.getDoubleValue("cum"));
+                        break;
+                    // 门诊政策自付
+                    case "Z0000_BIZ11_LAB102":
+                    case "Z0000_BIZ13_LAB102":
+                    case "Z0000_BIZ14_LAB102":
+                    case "Z0000_BIZ51_LAB102":
+                    case "Z0000_BIZ9901_LAB102":
+                    case "Z0000_BIZ9903_LAB102":
+                    case "Z0000_BIZ9904_LAB102":
+                        cuminfo.addYearPreSelfpayMz(itm.getDoubleValue("cum"));
+                        break;
                     // 住院大额基金支付
                     case "D330101_BIZ2101":
                     case "D330101_BIZ2102":