commit

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

@@ -232,6 +232,11 @@ public class SiZyService {
                         o.getBedNo(), o.getInpatientNo(), o.getName());
                 return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, message);
             }
+            if (isSelfPayPatient(o.getMedType())) {
+                String message = String.format("【%s床，%s，%s】是自费患者，不支持批量上传。",
+                        o.getBedNo(), o.getInpatientNo(), o.getName());
+                return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, message);
+            }
             o.setStaffId(TokenUtil.getInstance().getTokenUserId());
         }
         return zySrvc.uploadMultiplePatientFees(siZyFeeUrl, overviews);
@@ -239,7 +244,12 @@ public class SiZyService {
 
     private boolean invalidMultipleUploadPatient(String medtype) {
         MedType medType = MedType.get(medtype);
-        return null == medType ||  medType == MedType.SELF_PAY;
+        return null == medType || medType == MedType.ZHUYUAN_ZHITI_CAN || medType == MedType.ZHUYUAN_ZHIYE_BING || medType == MedType.ZHUYUAN_KANGFU;
+    }
+
+    private boolean isSelfPayPatient(String medtype) {
+        MedType medType = MedType.get(medtype);
+        return medType == MedType.SELF_PAY;
     }
 
     public String hospitalizationPreSettlement(ZyPatientInfo p, ZyOrJzYbData ybData) {