义乌规则修改

kernel/src/main/java/com/lantone/qc/kernel/catalogue/yiwu/firstpagerecord/FIRP0161.java

@@ -49,6 +49,12 @@ public class FIRP0161 extends QCCatalogue {
             if (StringUtil.isNotBlank(admissionAge) && admissionAge.contains("天")) {
                 admissAge = admissionAge.substring(0, admissionAge.indexOf("天"));
             }
+            if (StringUtil.isNotBlank(firstAdmissionAge) && firstAdmissionAge.contains("岁")) {
+                firstAdmissionAge = firstAdmissionAge.substring(0, firstAdmissionAge.indexOf("岁"));
+            }
+            if (StringUtil.isNotBlank(firstAdmissionAge) && firstAdmissionAge.contains("天")) {
+                firstAdmissionAge = firstAdmissionAge.substring(0, firstAdmissionAge.indexOf("天"));
+            }
             // int firstAdmissionAgeNum = removalUnit(firstAdmissionAge);
             // int admissionAgeNum = removalUnit(admissionAge);
             // 只比较年龄前的数值

kernel/src/main/java/com/lantone/qc/kernel/catalogue/yiwu/threelevelward/THR0133.java

@@ -12,6 +12,8 @@ import org.springframework.stereotype.Component;
 
 import java.util.List;
 import java.util.Map;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 /**
  * @ClassName : THR0133
@@ -73,5 +75,15 @@ public class THR0133 extends QCCatalogue {
         if (firstAttendLabel.getTreatmentPlans().size() != 0) {
             status.set("0");
         }
+
+        if (StringUtil.isNotBlank(firstAttendStructureMap.get("病情记录"))) {
+            String content = firstAttendStructureMap.get("病情记录");
+            String regex = ".*完善.*检查.*";
+            Pattern p = Pattern.compile(regex);
+            Matcher m = p.matcher(content);
+            if (m.find()) {
+                status.set("0");
+            }
+        }
     }
 }

kernel/src/main/java/com/lantone/qc/kernel/catalogue/yiwu/threelevelward/THR0138.java

@@ -11,6 +11,8 @@ import org.springframework.stereotype.Component;
 
 import java.util.List;
 import java.util.Map;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 /**
  * @ClassName : THR0138
@@ -56,5 +58,15 @@ public class THR0138 extends QCCatalogue {
         if (firstDirectLabel.getTreatmentPlans().size() != 0) {
             status.set("0");
         }
+
+        if (StringUtil.isNotBlank(firstDirectStructureMap.get("病情记录"))) {
+            String content = firstDirectStructureMap.get("病情记录");
+            String regex = ".*完善.*检查.*";
+            Pattern p = Pattern.compile(regex);
+            Matcher m = p.matcher(content);
+            if (m.find()) {
+                status.set("0");
+            }
+        }
     }
 }