放松病案首页身份证验证的限制

src/main/java/thyyxxk/webserver/service/casefrontsheet/CaseFrontSheetService.java

@@ -517,7 +517,7 @@ public class CaseFrontSheetService {
             return ResultVoUtil.fail(ExceptionEnum.INTERNAL_SERVER_ERROR, "校验未通过。", map);
         }
         List<PureCodeName> force = VerifyCaseFrontSheet.getInstance().printVerify(sheet);
-        List<PureCodeName> advice = new ArrayList<>();
+        List<PureCodeName> advice = VerifyCaseFrontSheet.getInstance().adviseVerification(sheet.getSocialNo());
         JSONObject powersi = qualityControl(sheet);
         if (null != powersi) {
             JSONObject responseEntity = powersi.getJSONObject("responseEntity");

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

@@ -56,6 +56,17 @@ public class VerifyCaseFrontSheet {
         return connectedVerify(array, sheet);
     }
 
+    public List<PureCodeName> adviseVerification(String socialNo) {
+        List<PureCodeName> array = new ArrayList<>();
+        if (StringUtil.invalidValue(socialNo)) {
+            array.add(new PureCodeName("socialNo","请补全患者身份证！"));
+        }
+        if (!IdCardUtil.isValidatedIdCard(socialNo)) {
+            array.add(new PureCodeName("socialNo","患者身份证不合法！"));
+        }
+        return array;
+    }
+
     public List<PureCodeName> printVerify(CaseFrontsheetMain info) {
         List<PureCodeName> array = new ArrayList<>();
         if (StringUtil.invalidValue(info.getName())) {
@@ -79,12 +90,6 @@ public class VerifyCaseFrontSheet {
         if (StringUtil.invalidValue(info.getNation())) {
             array.add(new PureCodeName("nation","患者民族不能为空！"));
         }
-        if (StringUtil.invalidValue(info.getSocialNo())) {
-            array.add(new PureCodeName("socialNo","患者身份证不能为空！"));
-        }
-        if (!IdCardUtil.isValidatedIdCard(info.getSocialNo())) {
-            array.add(new PureCodeName("socialNo","患者身份证不合法！"));
-        }
         if (StringUtil.invalidValue(info.getOccupation())) {
             array.add(new PureCodeName("occupation","患者职业不能为空！"));
         }