义乌主治医师的查房未描述初步诊断、鉴别诊断、诊疗计划规则修改

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

@@ -30,7 +30,7 @@ public class THR0131 extends QCCatalogue {
         if (firstCourseRecordDoc != null) {
             Map<String, String> structureMap = firstCourseRecordDoc.getStructureMap();
             String diffDiag = structureMap.get("鉴别诊断");
-            if (StringUtil.isNotBlank(diffDiag) && (diffDiag.contains("诊断明确") || diffDiag.contains("无需鉴别"))) {
+            if (StringUtil.isNotBlank(diffDiag)/* && (diffDiag.contains("诊断明确") || diffDiag.contains("无需鉴别"))*/) {
                 status.set("0");
                 return;
             }

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

@@ -4,6 +4,7 @@ import com.lantone.qc.kernel.catalogue.QCCatalogue;
 import com.lantone.qc.kernel.util.CatalogueUtil;
 import com.lantone.qc.pub.model.InputInfo;
 import com.lantone.qc.pub.model.OutputInfo;
+import com.lantone.qc.pub.model.doc.FirstCourseRecordDoc;
 import com.lantone.qc.pub.model.doc.ward.AttendingDoctorWardDoc;
 import com.lantone.qc.pub.model.label.ThreeLevelWardLabel;
 import com.lantone.qc.pub.util.StringUtil;
@@ -25,6 +26,17 @@ public class THR0133 extends QCCatalogue {
             status.set("0");
             return;
         }
+        //取首次病程录的诊疗计划
+        FirstCourseRecordDoc firstCourseRecordDoc = inputInfo.getFirstCourseRecordDoc();
+        if (firstCourseRecordDoc != null) {
+            Map<String, String> structureMap = firstCourseRecordDoc.getStructureMap();
+            String treatplan = structureMap.get("诊疗计划");
+            if (StringUtil.isNotBlank(treatplan)) {
+                status.set("0");
+                return;
+            }
+        }
+
         List<AttendingDoctorWardDoc> attendDocs = inputInfo.getThreeLevelWardDocs().get(0).getAttendingDoctorWardDocs();
         if (attendDocs.size() == 0) {
             status.set("0");

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

@@ -4,6 +4,7 @@ import com.lantone.qc.kernel.catalogue.QCCatalogue;
 import com.lantone.qc.kernel.util.CatalogueUtil;
 import com.lantone.qc.pub.model.InputInfo;
 import com.lantone.qc.pub.model.OutputInfo;
+import com.lantone.qc.pub.model.doc.FirstCourseRecordDoc;
 import com.lantone.qc.pub.model.doc.ward.AttendingDoctorWardDoc;
 import com.lantone.qc.pub.model.label.ThreeLevelWardLabel;
 import com.lantone.qc.pub.util.StringUtil;
@@ -25,6 +26,17 @@ public class THR0134 extends QCCatalogue {
             status.set("0");
             return;
         }
+        //取首次病程录的初步诊断
+        FirstCourseRecordDoc firstCourseRecordDoc = inputInfo.getFirstCourseRecordDoc();
+        if (firstCourseRecordDoc != null) {
+            Map<String, String> structureMap = firstCourseRecordDoc.getStructureMap();
+            String priDiag = structureMap.get("初步诊断");
+            if (StringUtil.isNotBlank(priDiag)) {
+                status.set("0");
+                return;
+            }
+        }
+
         List<AttendingDoctorWardDoc> attendDocs = inputInfo.getThreeLevelWardDocs().get(0).getAttendingDoctorWardDocs();
         if (attendDocs.size() == 0) {
             status.set("0");

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

@@ -26,7 +26,7 @@ public class THR0136 extends QCCatalogue {
             status.set("0");
             return;
         }
-        FirstCourseRecordDoc firstCourseRecordDoc = inputInfo.getFirstCourseRecordDoc();
+       /* FirstCourseRecordDoc firstCourseRecordDoc = inputInfo.getFirstCourseRecordDoc();
         if (firstCourseRecordDoc != null) {
             Map<String, String> structureMap = firstCourseRecordDoc.getStructureMap();
             String diffDiag = structureMap.get("鉴别诊断");
@@ -35,7 +35,7 @@ public class THR0136 extends QCCatalogue {
                 status.set("0");
                 return;
             }
-        }
+        }*/
         List<DirectorDoctorWardDoc> directorDocs = inputInfo.getThreeLevelWardDocs().get(0).getDirectorDoctorWardDocs();
         if (directorDocs.size() == 0) {
             status.set("0");