内涵质控修改逻辑

kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH02969.java

@@ -1,13 +1,17 @@
 package com.lantone.qc.kernel.catalogue.behospitalized;
 
+import com.google.common.collect.Lists;
 import com.lantone.qc.kernel.catalogue.QCCatalogue;
 import com.lantone.qc.pub.model.InputInfo;
 import com.lantone.qc.pub.model.OutputInfo;
 import com.lantone.qc.pub.util.StringUtil;
 import org.springframework.stereotype.Component;
 
+import java.util.List;
 import java.util.Map;
 
+import static com.lantone.qc.trans.comsis.ModelDocGenerate.structureMapJoin;
+
 /**
  * @ClassName : BEH02969
  * @Description :  入院记录中监测生命体征书写不规范
@@ -23,17 +27,11 @@ public class BEH02969 extends QCCatalogue {
             return;
         }
         Map<String, String> beHospitalStructureMap = inputInfo.getBeHospitalizedDoc().getStructureMap();
-        String treatPlan = beHospitalStructureMap.get("诊疗计划");
-        String treatmentMonitoringPlan = beHospitalStructureMap.get("治疗监测计划");
-        if (StringUtil.isBlank(treatPlan) && StringUtil.isBlank(treatmentMonitoringPlan)) {
-            return;
-        }
-        treatPlan = StringUtil.isBlank(treatPlan) ? "" : treatPlan;
-        treatmentMonitoringPlan = StringUtil.isBlank(treatmentMonitoringPlan) ? "" : treatmentMonitoringPlan;
-        String text = treatPlan + "," + treatmentMonitoringPlan;
-        if (text.contains("生命体征") && !text.contains("血压") && !text.contains("心率")) {
+        List<String> keys = Lists.newArrayList("需求评估", "预期目标", "诊疗计划", "治疗监测计划");
+        String text = structureMapJoin(beHospitalStructureMap, keys);
+        if (StringUtil.isNotBlank(text) && text.contains("生命体征") && !text.contains("血压") && !text.contains("心率")) {
             status.set("-1");
-            info.set("需具体描述测血压、心律等");
+            info.set("需具体描述测血压、心率等");
         }
     }
 }

kernel/src/main/java/com/lantone/qc/kernel/catalogue/firstcourserecord/FIRC02970.java

@@ -1,5 +1,6 @@
 package com.lantone.qc.kernel.catalogue.firstcourserecord;
 
+import com.google.common.collect.Lists;
 import com.lantone.qc.kernel.catalogue.QCCatalogue;
 import com.lantone.qc.pub.model.InputInfo;
 import com.lantone.qc.pub.model.OutputInfo;
@@ -8,8 +9,11 @@ import com.lantone.qc.pub.util.StringUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Component;
 
+import java.util.List;
 import java.util.Map;
 
+import static com.lantone.qc.trans.comsis.ModelDocGenerate.structureMapJoin;
+
 /**
  * @ClassName : FIRC02970
  * @Description : 首次病程记录中监测生命体征书写不规范
@@ -24,17 +28,11 @@ public class FIRC02970 extends QCCatalogue {
             return;
         }
         Map<String, String> firstCourseRecordStructureMap = inputInfo.getFirstCourseRecordDoc().getStructureMap();
-        String treatPlan = firstCourseRecordStructureMap.get("诊疗计划");
-        String treatmentMonitoringPlan = firstCourseRecordStructureMap.get("治疗监测计划");
-        if (StringUtil.isBlank(treatPlan) && StringUtil.isBlank(treatmentMonitoringPlan)) {
-            return;
-        }
-        treatPlan = StringUtil.isBlank(treatPlan) ? "" : treatPlan;
-        treatmentMonitoringPlan = StringUtil.isBlank(treatmentMonitoringPlan) ? "" : treatmentMonitoringPlan;
-        String text = treatPlan + "," + treatmentMonitoringPlan;
-        if (text.contains("生命体征") && !text.contains("血压") && !text.contains("心率")) {
+        List<String> keys = Lists.newArrayList("需求评估", "预期目标", "诊疗计划", "治疗监测计划");
+        String text = structureMapJoin(firstCourseRecordStructureMap, keys);
+        if (StringUtil.isNotBlank(text) && text.contains("生命体征") && !text.contains("血压") && !text.contains("心率") && !text.contains("心电监护")) {
             status.set("-1");
-            info.set("需具体描述测血压、心律等");
+            info.set("需具体描述测血压、心率等");
         }
     }
 }