Browse Source

义乌规则修改

zhangzw 4 years ago
parent
commit
22473bfee1

+ 7 - 0
kernel/src/main/java/com/lantone/qc/kernel/catalogue/yiwu/threelevelward/THR0130.java

@@ -49,6 +49,13 @@ public class THR0130 extends QCCatalogue {
             status.set("0");
             return;
         }
+        if (StringUtil.isNotBlank(firstAttendStructureMap.get("病情记录"))) {
+            String content = firstAttendStructureMap.get("病情记录");
+            if (content.contains("查体")) {
+                status.set("0");
+                return;
+            }
+        }
         ThreeLevelWardLabel firstAttendLabel = firstAttendDoc.getThreeLevelWardLabel();
         if (firstAttendLabel == null) {
             return;

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

@@ -81,7 +81,7 @@ public class THR0133 extends QCCatalogue {
             String regex = ".*完善.*检查.*";
             Pattern p = Pattern.compile(regex);
             Matcher m = p.matcher(content);
-            if (m.find()) {
+            if (m.find() || content.contains("治疗计划")) {
                 status.set("0");
             }
         }

+ 1 - 1
kernel/src/main/java/com/lantone/qc/kernel/catalogue/yiwu/threelevelward/THR0134.java

@@ -48,7 +48,7 @@ public class THR0134 extends QCCatalogue {
         String admisDateStr = inputInfo.getBeHospitalizedDoc().getStructureMap().get("入院日期");
         String recordDateStr = firstAttendStructureMap.get("查房日期");
         String content = firstAttendStructureMap.get("病情记录");
-        if (content.contains("初步诊断")) {
+        if (StringUtil.isNotBlank(content) && (content.contains("初步诊断") || content.contains("诊断明确") || content.contains("目前诊断"))) {
             status.set("0");
             return;
         }

+ 7 - 0
kernel/src/main/java/com/lantone/qc/kernel/catalogue/yiwu/threelevelward/THR0135.java

@@ -48,6 +48,13 @@ public class THR0135 extends QCCatalogue {
             status.set("0");
             return;
         }
+        if (StringUtil.isNotBlank(firstDirectStructureMap.get("病情记录"))) {
+            String content = firstDirectStructureMap.get("病情记录");
+            if (content.contains("查体")) {
+                status.set("0");
+                return;
+            }
+        }
         ThreeLevelWardLabel firstDirectLabel = firstDirectDoc.getThreeLevelWardLabel();
         if (firstDirectLabel == null) {
             return;

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

@@ -64,7 +64,7 @@ public class THR0138 extends QCCatalogue {
             String regex = ".*完善.*检查.*";
             Pattern p = Pattern.compile(regex);
             Matcher m = p.matcher(content);
-            if (m.find()) {
+            if (m.find() || content.contains("治疗计划")) {
                 status.set("0");
             }
         }

+ 2 - 1
kernel/src/main/java/com/lantone/qc/kernel/catalogue/yiwu/threelevelward/THR0139.java

@@ -36,7 +36,7 @@ public class THR0139 extends QCCatalogue {
         String admisDateStr = inputInfo.getBeHospitalizedDoc().getStructureMap().get("入院日期");
         String recordDateStr = firstDirectStructureMap.get("查房日期");
         String content = firstDirectStructureMap.get("病情记录");
-        if (content.contains("初步诊断") || content.contains("诊断明确")) {
+        if (StringUtil.isNotBlank(content) && (content.contains("初步诊断") || content.contains("诊断明确") || content.contains("目前诊断"))) {
             status.set("0");
             return;
         }
@@ -49,6 +49,7 @@ public class THR0139 extends QCCatalogue {
             status.set("0");
             return;
         }
+
         ThreeLevelWardLabel firstDirectLabel = firstDirectDoc.getThreeLevelWardLabel();
         if (firstDirectLabel == null) {
             return;