优化代码

src/main/java/thyyxxk/webserver/constants/sidicts/FundPayType.java

@@ -33,12 +33,10 @@ public enum FundPayType {
 
     HOSP_PAY("999996", "医院垫付"),
 
-    EX_GRATIA_COMPENSATION("620100","特惠保补偿金"),
+    EX_GRATIA_COMPENSATION("620100", "特惠保补偿金"),
 
     OTHERS("999997", "其他基金");
 
-    // 620100  310301
-
     private final String code;
     private final String name;
 
@@ -47,14 +45,6 @@ public enum FundPayType {
         this.name = name;
     }
 
-    public String getCode() {
-        return code;
-    }
-
-    public String getName() {
-        return name;
-    }
-
     public static FundPayType get(String code) {
         if (StringUtil.isBlank(code)) {
             return null;
@@ -66,4 +56,12 @@ public enum FundPayType {
         }
         return null;
     }
+
+    public String getCode() {
+        return code;
+    }
+
+    public String getName() {
+        return name;
+    }
 }

src/main/java/thyyxxk/webserver/entity/datamodify/GetDropdownBox.java

@@ -7,34 +7,30 @@ import lombok.Data;
 public class GetDropdownBox {
     private String code;
     private String name;
-
-    private String label;
-    private String value;
-
-
     @JsonInclude(JsonInclude.Include.NON_NULL)
     private String pyCode;
     @JsonInclude(JsonInclude.Include.NON_NULL)
     private String wCode;
-
     @JsonInclude(JsonInclude.Include.NON_NULL)
     private String ybCode;
-
     @JsonInclude(JsonInclude.Include.NON_NULL)
     private String deptName;
-
     @JsonInclude(JsonInclude.Include.NON_NULL)
     private String codeRs;
-
     @JsonInclude(JsonInclude.Include.NON_NULL)
     private String siCaty;
-
     @JsonInclude(JsonInclude.Include.NON_NULL)
     private String siCatyName;
-
     @JsonInclude(JsonInclude.Include.NON_NULL)
     private String empTitName;
-
     @JsonInclude(JsonInclude.Include.NON_NULL)
     private String parentCode;
+
+    public String getValue() {
+        return code;
+    }
+
+    public String getLabel() {
+        return name;
+    }
 }

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

@@ -105,12 +105,6 @@ public class SetlListUpldService {
                 throw new BizException(ExceptionEnum.INTERNAL_SERVER_ERROR, "患者联系人姓名不能为空。");
             }
         }
-        if (StringUtil.notBlank(upldCollection.getData().getSetlinfo().getHiType())
-                && upldCollection.getData().getSetlinfo().getHiType().trim().equals("310")) {
-            if (StringUtil.isBlank(upldCollection.getData().getSetlinfo().getEmpAddr()) || StringUtil.isBlank(upldCollection.getData().getSetlinfo().getEmpName())) {
-                throw new BizException(ExceptionEnum.INTERNAL_SERVER_ERROR, "结算清单中职工参保人的单位及地址不能为空。");
-            }
-        }
         if (ListUtil.notBlank(upldCollection.getData().getOprninfo())) {
             for (OprninfoUpld item : upldCollection.getData().getOprninfo()) {
                 if (StringUtil.isBlank(item.getOperDrCode())) {
@@ -278,9 +272,6 @@ public class SetlListUpldService {
         List<IcuinfoUpld> zhongZhenJianHu = getIcuinfoUplds(patNo, times);
         List<PayinfoUpld> payinfo = dao.payinfoUpld(patNo, times, ledgerSn);
 
-        // 310100
-
-
         List<DiseinfoUpld> diseinfos = dao.diseinfo(patNo, times, flag == 1 ? "zy_dis_diag_yb_modify" : "zy_dis_diag_yb");
         setlinfoUpld.setDiagCodeCnt(String.valueOf(diseinfos.size()));
 
@@ -295,6 +286,7 @@ public class SetlListUpldService {
         if (isFertilitySign) {
             setlinfoUpld.setHiPaymtd("1");
         }
+        //  如果是 职工基本医疗保险的话 没有单位名称和地址 那么就 写死成 普通职工 和 现住址
         if ("310".equals(setlinfoUpld.getHiType())) {
             if (StringUtil.isBlank(setlinfoUpld.getEmpAddr())) {
                 setlinfoUpld.setEmpAddr(setlinfoUpld.getCurrAddr());
@@ -394,6 +386,10 @@ public class SetlListUpldService {
         // 患者基本信息
         temp.setSetlinfo(EntityCopy.Copy(uploadInfo.getData().getSetlinfo(), SetlinfoUpldTemp.class));
         temp.getSetlinfo().setSetlListId(dao.billingListSerialNumber(patNo, times, ledgerSn));
+        //城乡居民 和 城镇职工  生育基金 不显示 上传需要，打印不需要
+        // 390100 和  310100 和  510100 不显示
+        List<String> printWithoutDisplay = Arrays.asList("390100", "310100", "510100");
+        uploadInfo.getData().getPayinfo().removeIf(item -> printWithoutDisplay.contains(item.getFundPayType()));
         temp.setPayinfo(EntityCopy.CopyList(uploadInfo.getData().getPayinfo(), PayinfoUpldTemp.class));
         //  门诊慢特病
         temp.setOpspdiseinfo(EntityCopy.CopyList(uploadInfo.getData().getOpspdiseinfo(), OpspdiseinfoUpldTemp.class));

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

@@ -490,8 +490,8 @@ public class SiZyService {
 
     private int calculateHiPaymtd(String insuplcAdmdvs, String insutype, String medType) {
         int hiPaymtd = 3;
-        List<String> insuplcAdmdvses = new ArrayList<>(Collections.singletonList("430121,430181"));
-        List<String> insutypes = new ArrayList<>(Collections.singletonList("340,350"));
+        List<String> insuplcAdmdvses = Arrays.asList("430121", "430181");
+        List<String> insutypes = Arrays.asList("340", "350");
         if (medType.equals("2101") || medType.equals("22")) {
             if (!insuplcAdmdvs.startsWith("4301") || insuplcAdmdvses.contains(insuplcAdmdvs) || insutypes.contains(insutype)) {
                 hiPaymtd = 1;