去除病案部分限制

src/main/java/thyyxxk/webserver/entity/casefrontsheet/CaseFrontsheetMain.java

@@ -844,6 +844,13 @@ public class CaseFrontsheetMain implements Serializable {
     private String noCertReason;
     private String noCertReasonInput;
 
+    private String tchrw;
+    private String tchryxjc;
+    private String tchrjyjc;
+    private String tchrbljc;
+    private String tchrqt;
+    private String pathwayMng;
+
 
     /**
      * 诊断列表

src/main/java/thyyxxk/webserver/service/inpatient/casefrontsheet/CaseFrontSheetMainService.java

@@ -420,6 +420,10 @@ public class CaseFrontSheetMainService {
                 log.error("反射出错", e);
             }
         }
+        if (sheet.getAdmissDeptCode().equals(sheet.getTransDeptCode())) {
+            sheet.setTransDept("-");
+            sheet.setTransDeptCode(null);
+        }
         sheet.setSurgicalFee(DecimalUtil.add(sheet.getAnesthetizeFee(), sheet.getSurgeryFee()));
         autoFillPart(sheet);
         return sheet;
@@ -1402,7 +1406,7 @@ public class CaseFrontSheetMainService {
         if (StringUtil.isBlank(admdvs)) {
             return ResultVoUtil.fail(ExceptionEnum.NO_DATA_EXIST, "自费及工伤患者无需进行医保结算单质控。");
         }
-        if (!admdvs.startsWith("43")) {
+        if (!admdvs.startsWith("32")) {
             return ResultVoUtil.fail(ExceptionEnum.NO_DATA_EXIST, "跨省异地患者无需进行医保结算单质控。");
         }
         return ResultVoUtil.success();

src/main/java/thyyxxk/webserver/service/inpatient/casefrontsheet/VerifyCaseFrontSheet.java

@@ -114,29 +114,26 @@ public class VerifyCaseFrontSheet {
         if (StringUtil.invalidValue(info.getMarriage())) {
             array.add(new CodeName("marriage","患者婚姻状况不能为空！"));
         }
-        if (null == info.getStandardAddress() || info.getStandardAddress().length == 0 || null == info.getStandardAddress()[0]) {
-            array.add(new CodeName("livePlace1","患者现住址(省/市/区)不能为空！"));
-        }
         if (StringUtil.invalidValue(info.getLivePlace())) {
-            array.add(new CodeName("livePlace2","患者现住址(街道/小区/乡镇)不能为空！"));
-        }
-        if (info.isDoctorPrint() && null != info.getAddressMember() && StringUtil.notBlank(info.getLivePlace())) {
-            String liveAddress = info.getLivePlace();
-            StandardAddressMember member = info.getAddressMember();
-            if (liveAddress.contains(member.getProvinceName()) || liveAddress.contains(member.getCityName()) ||
-                    liveAddress.contains(member.getDistrictName())) {
-                array.add(new CodeName("livePlace2","患者现住址有冗余重复！"));
-            }
-        }
-
-        try {
-            byte[] livePlaceBytes = info.getLivePlace().getBytes("GBK");
-            if (livePlaceBytes.length > 32) {
-                array.add(new CodeName("livePlace", "患者现住址不能超过32个字节，当前字节数为" + livePlaceBytes.length + "（1汉字=2字节，1字母或数字=1字节）！"));
-            }
-        } catch (Exception e) {
-            log.error("分析患者现住址长度出现异常", e);
-        }
+            array.add(new CodeName("livePlace","患者现住址不能为空！"));
+        }
+//        if (info.isDoctorPrint() && null != info.getAddressMember() && StringUtil.notBlank(info.getLivePlace())) {
+//            String liveAddress = info.getLivePlace();
+//            StandardAddressMember member = info.getAddressMember();
+//            if (liveAddress.contains(member.getProvinceName()) || liveAddress.contains(member.getCityName()) ||
+//                    liveAddress.contains(member.getDistrictName())) {
+//                array.add(new CodeName("livePlace2","患者现住址有冗余重复！"));
+//            }
+//        }
+//
+//        try {
+//            byte[] livePlaceBytes = info.getLivePlace().getBytes("GBK");
+//            if (livePlaceBytes.length > 32) {
+//                array.add(new CodeName("livePlace", "患者现住址不能超过32个字节，当前字节数为" + livePlaceBytes.length + "（1汉字=2字节，1字母或数字=1字节）！"));
+//            }
+//        } catch (Exception e) {
+//            log.error("分析患者现住址长度出现异常", e);
+//        }
         if (StringUtil.invalidValue(info.getPhone())) {
             array.add(new CodeName("phone","患者电话不能为空！"));
         }