加强病案首页的校验。

pom.xml

@@ -10,7 +10,7 @@
     </parent>
     <groupId>thyyxxk</groupId>
     <artifactId>web-server</artifactId>
-    <version>2</version>
+    <version>1</version>
     <name>web-server</name>
     <description>server for yibao-web</description>
     <properties>

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

@@ -12,6 +12,8 @@ import thyyxxk.webserver.utils.IdCardUtil;
 import thyyxxk.webserver.utils.StringUtil;
 
 import java.util.*;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 /**
  * @author dj
@@ -139,6 +141,10 @@ public class VerifyCaseFrontSheet {
         }
         if (StringUtil.invalidValue(info.getContactAddrName())) {
             array.add(new PureCodeName("contactAddrName","患者联系人地址不能为空！"));
+        } else {
+            if (info.getContactAddrName().length() > 16) {
+                array.add(new PureCodeName("contactAddrName", "患者联系人地址不能超过16个汉字！"));
+            }
         }
         if (StringUtil.invalidValue(info.getContactPhone())) {
             array.add(new PureCodeName("contactPhone","患者联系人电话不能为空！"));
@@ -191,6 +197,9 @@ public class VerifyCaseFrontSheet {
         if (StringUtil.invalidValue(info.getAdmissDoctor())) {
             array.add(new PureCodeName("admissDoctorName","住院医师不能为空！"));
         }
+        if (StringUtil.invalidValue(info.getDutyNurse())) {
+            array.add(new PureCodeName("dutyNurseName","责任护士不能为空！"));
+        }
         if (StringUtil.invalidValue(info.getQualityControlLevel())) {
             array.add(new PureCodeName("qualityControlLevel","病案质量不能为空！"));
         }
@@ -203,6 +212,9 @@ public class VerifyCaseFrontSheet {
         if (StringUtil.invalidValue(info.getQualityControlDoctor())) {
             array.add(new PureCodeName("qualityControlDoctorName","质控医生不能为空！"));
         }
+        if (StringUtil.invalidValue(info.getQualityControlNurse())) {
+            array.add(new PureCodeName("qualityControlNurseName","质控护士不能为空！"));
+        }
         if (StringUtil.invalidValue(info.getCaseClassification())) {
             array.add(new PureCodeName("caseClassification","病例分型不能为空！"));
         }
@@ -257,8 +269,8 @@ public class VerifyCaseFrontSheet {
         if (StringUtil.notBlank(info.getUnitPlace()) && info.getUnitPlace().length() > 16) {
             array.add(new PureCodeName("unitPlace", "患者单位地址不能超过16个汉字！"));
         }
-        if (info.getContactAddrName().length() > 16) {
-            array.add(new PureCodeName("contactAddrName", "患者联系人地址不能超过16个汉字！"));
+        if (StringUtil.notBlank(info.getAgeDays()) && !isPositiveDigital(info.getAgeDays())) {
+            array.add(new PureCodeName("ageDays", "不足1周岁婴儿的年龄请填写正整数。"));
         }
         if (isNewBorn(info.getHasInfant(), info.getBirthDate())) {
             if (StringUtil.invalidValue(info.getNewBornWeight()) ||
@@ -504,4 +516,13 @@ public class VerifyCaseFrontSheet {
     private boolean isNewBorn(String hasInfant, Date birthDate) {
         return (StringUtil.validValue(hasInfant) && "1".equals(hasInfant)) || DateUtil.daysBetween(new Date(), birthDate) <= 28;
     }
+
+    private boolean isPositiveDigital(String string) {
+        String regEx1 = "\\d+";
+        Pattern p;
+        Matcher m;
+        p = Pattern.compile(regEx1);
+        m = p.matcher(string);
+        return m.matches();
+    }
 }