Merge remote-tracking branch 'origin/hb/beilun' into hb/beilun

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

@@ -41,7 +41,7 @@ public class FIRC03086 extends QCCatalogue {
             return;
         }
         //规则匹配增加
-        if (structureV.contains("一级") || structureV.contains("二级") || structureV.contains("三级")) {
+        if (structureV.contains("护理") && (structureV.contains("一级") || structureV.contains("二级") || structureV.contains("三级") || structureV.contains("Ⅰ级") || structureV.contains("Ⅱ级") || structureV.contains("Ⅲ级"))) {
             status.set("0");
             return;
         }

kernel/src/main/java/com/lantone/qc/kernel/catalogue/hospital/ningbozhongyi/firstcourserecord/FIRC03086.java

@@ -1,57 +0,0 @@
-package com.lantone.qc.kernel.catalogue.hospital.ningbozhongyi.firstcourserecord;
-
-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.model.doc.FirstCourseRecordDoc;
-import com.lantone.qc.pub.model.label.TreatPlanLabel;
-import com.lantone.qc.pub.util.StringUtil;
-import org.springframework.stereotype.Component;
-
-import java.util.Map;
-
-/**
- * @ClassName : FIRC03086
- * @Description : 治疗措施不具体（缺护理级别）
- * @Author : wsy
- * @Date: 2021-01-07 15:21
- */
-@Component
-public class FIRC03086 extends QCCatalogue {
-    public void start(InputInfo inputInfo, OutputInfo outputInfo) {
-        FirstCourseRecordDoc firstCourseRecordDoc = inputInfo.getFirstCourseRecordDoc();
-        if (firstCourseRecordDoc == null) {
-            status.set("0");
-            return;
-        }
-        TreatPlanLabel treatPlanLabel = firstCourseRecordDoc.getTreatPlanLabel();
-        if (treatPlanLabel == null) {
-            status.set("0");
-            return;
-        }
-        String text = treatPlanLabel.getText();
-        boolean findText = false;
-        if (StringUtil.isNotBlank(text) && text.contains("护理")) {
-            findText = true;
-        }
-        Map<String, String> structureMap = firstCourseRecordDoc.getStructureMap();
-        String structureV = structureMap.get("诊疗计划");
-        if (StringUtil.isBlank(structureV) && StringUtil.isBlank(text)) {
-            status.set("0");
-            return;
-        }
-        if (StringUtil.isNotBlank(structureV) && (structureV.contains("护理") || structureV.contains("三级") || structureV.contains("二级") || structureV.contains("一级"))) {
-            findText = true;
-        }
-        if (treatPlanLabel.getNursingLevel() != null) {
-            if (findText && !treatPlanLabel.getNursingLevel().getName().contains("护理常规")) {
-                status.set("0");
-                return;
-            }
-        }
-        if (treatPlanLabel.getNursingLevel() == null || treatPlanLabel.getNursingLevel().getName().contains("护理常规")) {
-            status.set("-1");
-            return;
-        }
-    }
-}