Merge branch 'beilun/dev' into beilun/dev-fqw

kernel/src/main/java/com/lantone/qc/kernel/catalogue/beilun/behospitalized/BEH0001.java

@@ -8,7 +8,9 @@ import com.lantone.qc.pub.model.label.ChiefLabel;
 import com.lantone.qc.pub.util.StringUtil;
 import org.springframework.stereotype.Component;
 
+import java.util.Arrays;
 import java.util.List;
+import java.util.Map;
 
 
 /**
@@ -19,7 +21,15 @@ import java.util.List;
  */
 @Component
 public class BEH0001 extends QCCatalogue {
+
     public void start(InputInfo inputInfo, OutputInfo outputInfo) {
+        if (outputInfo != null && outputInfo.getResult() != null) {
+            Map<String, Object> outputMap = outputInfo.getResult().get("BEH0009");
+            if (outputMap != null && "-1".equals(outputMap.get("status"))) {
+                status.set("0");
+                return;
+            }
+        }
         if (inputInfo.getBeHospitalizedDoc() == null) {
             status.set("0");
             return;
@@ -34,9 +44,15 @@ public class BEH0001 extends QCCatalogue {
             status.set("0");
             return;
         }
-        if (StringUtil.isNotBlank(chiefText) && (chiefText.contains("检查") || chiefText.contains("术后") || chiefText.contains("药物"))) {
-            status.set("0");
-            return;
+        if (StringUtil.isNotBlank(chiefText)) {
+            if (chiefText.contains("检查") || chiefText.contains("术后") || chiefText.contains("药物")
+                    || chiefText.contains("天") || chiefText.contains("周") || chiefText.contains("月")
+                    || chiefText.contains("时") || chiefText.contains("秒") || chiefText.contains("半年")
+                    || chiefText.contains("日") || chiefText.contains("今") || chiefText.contains("余年")
+                    || chiefText.contains("年") || chiefText.contains("分") || isDate(chiefText)) {
+                status.set("0");
+                return;
+            }
         } else {
             List<PD> pds = chiefLabel.getPds();
             if (pds != null && pds.size() > 0) {

kernel/src/main/java/com/lantone/qc/kernel/catalogue/beilun/behospitalized/BEH0006.java

@@ -11,6 +11,7 @@ import org.springframework.stereotype.Component;
 
 import java.util.Arrays;
 import java.util.List;
+import java.util.Map;
 
 
 /**
@@ -24,6 +25,13 @@ public class BEH0006 extends QCCatalogue {
     private List<String> containList = Arrays.asList("半年", "术后");
 
     public void start(InputInfo inputInfo, OutputInfo outputInfo) {
+        if (outputInfo != null && outputInfo.getResult() != null) {
+            Map<String, Object> outputMap = outputInfo.getResult().get("BEH0009");
+            if (outputMap != null && "-1".equals(outputMap.get("status"))) {
+                status.set("0");
+                return;
+            }
+        }
         if (inputInfo.getBeHospitalizedDoc() == null) {
             status.set("0");
             return;

kernel/src/main/java/com/lantone/qc/kernel/catalogue/beilun/behospitalized/BEH0372.java

@@ -47,7 +47,7 @@ public class BEH0372 extends QCCatalogue {
             return;
         }
 
-        if (bhbasicInfoStatus.equals("丧偶") && basicInfoStatus.contains("已故")) {
+        if (bhbasicInfoStatus.equals("丧偶") && (basicInfoStatus.contains("已故") || basicInfoStatus.contains("丧偶"))) {
             status.set("0");
             return;
         }

kernel/src/main/java/com/lantone/qc/kernel/catalogue/yiwu/clinicalblood/CLI0308.java

@@ -36,7 +36,7 @@ public class CLI0308 extends QCCatalogue {
                     break;
                 }
 
-                String infusion_process = cliBStructureMap.get("输注过程");
+                String infusion_process = cliBStructureMap.get("病情记录");
                 if (StringUtils.isNotEmpty(infusion_process)) {
                     if (infusion_process.matches(regex) || infusion_process.contains("无") || infusion_process.contains("未见")
                     || infusion_process.contains("未觉")) {

trans/src/main/java/com/lantone/qc/trans/beilun/util/BeiLunBeHospitalizedHtmlAnalysis.java

@@ -61,7 +61,7 @@ public class BeiLunBeHospitalizedHtmlAnalysis implements BeiLunHtmlAnalysis {
         //诊断 table解析
         String disTableElementId = null;
         Element disTableElement = null;
-        String[] disTableElementIds = {"table7_2_0_0_1_1_2_0_1_4_5_6_7_0_1_37", "table7_2_0_0_1_1_2_0_1_4_5_6_7_0_1", "table7_2_0_0_1_1_2_0_1_4_5_6_7", "table7_2_0_0_1_1_2_0_1_4_5_6_7_0_1_5_2_3_1_2"};
+        String[] disTableElementIds = {"table7_2_0_0_1_1_2_0_1_4_5_6_7_0_1_37", "table7_2_0_0_1_1_2_0_1_4_5_6_7_0_1", "table7_2_0_0_1_1_2_0_1_4_5_6_7", "table7_2_0_0_1_1_2_0_1_4_5_6_7_0_1_5_2_3_1_2","table7_2_0_0_1_1_2_0_1_4_5_6_7_0_1_5_2_3"};
         for (String eid : disTableElementIds) {
             disTableElement = doc.getElementById(eid);
             if (disTableElement != null) {