Bläddra i källkod

首页签收的时候不校验现住址冗余情况,只在医生打印的时候校验

lighter 2 år sedan
förälder
incheckning
4d6eb03245

+ 6 - 0
src/main/java/thyyxxk/webserver/entity/casefrontsheet/CaseFrontsheetMain.java

@@ -835,6 +835,9 @@ public class CaseFrontsheetMain implements Serializable {
     @TableField(exist = false)
     private StandardAddressMember addressMember;
 
+    @TableField(exist = false)
+    private Boolean isDoctorPrint;
+
     public List<CaseFrontsheetDisdiag> getDisdiagList() {
         return null == disdiagList ? new ArrayList<>() : disdiagList;
     }
@@ -899,4 +902,7 @@ public class CaseFrontsheetMain implements Serializable {
         return isBlank(icuHours) ? "0" : icuHours;
     }
 
+    public Boolean isDoctorPrint() {
+        return null != isDoctorPrint && isDoctorPrint;
+    }
 }

+ 1 - 0
src/main/java/thyyxxk/webserver/service/casefrontsheet/CaseFrontSheetMainService.java

@@ -580,6 +580,7 @@ public class CaseFrontSheetMainService {
             return ResultVoUtil.fail(ExceptionEnum.INTERNAL_SERVER_ERROR, "校验未通过。", map);
         }
         sheet.setAddressMember(getStandardAddress(sheet.getStandardAddress()));
+        sheet.setIsDoctorPrint(true);
         List<CodeName> force = VerifyCaseFrontSheet.getInstance().printVerify(sheet);
         List<CodeName> advice = VerifyCaseFrontSheet.getInstance().adviseVerification(sheet.getSocialNo());
         JSONObject powersi = qualityControl(sheet);

+ 1 - 1
src/main/java/thyyxxk/webserver/service/casefrontsheet/VerifyCaseFrontSheet.java

@@ -107,7 +107,7 @@ public class VerifyCaseFrontSheet {
         if (StringUtil.invalidValue(info.getLivePlace())) {
             array.add(new CodeName("livePlace2","患者现住址(街道/小区/乡镇)不能为空!"));
         }
-        if (null != info.getAddressMember() && StringUtil.notBlank(info.getLivePlace())) {
+        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()) ||