Merge remote-tracking branch 'origin/dev-1.2' into dev-1.2

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

@@ -1,6 +1,7 @@
 package com.lantone.qc.kernel.catalogue.behospitalized;
 
 import com.lantone.qc.kernel.catalogue.QCCatalogue;
+import com.lantone.qc.pub.Content;
 import com.lantone.qc.pub.model.InputInfo;
 import com.lantone.qc.pub.model.OutputInfo;
 import com.lantone.qc.pub.model.doc.BeHospitalizedDoc;
@@ -22,21 +23,22 @@ public class BEH0053 extends QCCatalogue {
     @Override
     public void start(InputInfo inputInfo, OutputInfo outputInfo) {
         BeHospitalizedDoc beHospitalizedDoc = inputInfo.getBeHospitalizedDoc();
-        if(beHospitalizedDoc == null){
+        if (beHospitalizedDoc == null) {
             status.set("0");
             return;
         }
         //硬规则 匹配未婚
+        String marry = beHospitalizedDoc.getStructureMap().get(Content.marry);
         MaritalLabel maritalLabel = beHospitalizedDoc.getMaritalLabel();
-        if (maritalLabel != null &&
-                (StringUtil.isBlank(maritalLabel.getText()) || maritalLabel.getText().contains("未婚"))) {
+        if ("未婚".equals(marry) || (maritalLabel != null &&
+                (StringUtil.isBlank(maritalLabel.getText()) || maritalLabel.getText().contains("未婚")))) {
             status.set("0");
             return;
         }
         //先取一次结构化数据
         Map<String, String> beHospitalizedStructureMap = beHospitalizedDoc.getStructureMap();
         String marryiAgeStr = beHospitalizedStructureMap.get("结婚年龄");
-        if (StringUtil.isNotBlank(marryiAgeStr)){
+        if (StringUtil.isNotBlank(marryiAgeStr)) {
             status.set("0");
             return;
         }

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

@@ -1,6 +1,7 @@
 package com.lantone.qc.kernel.catalogue.behospitalized;
 
 import com.lantone.qc.kernel.catalogue.QCCatalogue;
+import com.lantone.qc.pub.Content;
 import com.lantone.qc.pub.model.InputInfo;
 import com.lantone.qc.pub.model.OutputInfo;
 import com.lantone.qc.pub.model.entity.Consanguineous;
@@ -23,9 +24,10 @@ public class BEH0054 extends QCCatalogue {
             return;
         }
         //硬规则 未婚
+        String marry = inputInfo.getBeHospitalizedDoc().getStructureMap().get(Content.marry);
         MaritalLabel maritalLabel = inputInfo.getBeHospitalizedDoc().getMaritalLabel();
-        if (maritalLabel != null &&
-                (StringUtil.isBlank(maritalLabel.getText()) || maritalLabel.getText().contains("未婚"))) {
+        if ("未婚".equals(marry) || (maritalLabel != null &&
+                (StringUtil.isBlank(maritalLabel.getText()) || maritalLabel.getText().contains("未婚")))) {
             status.set("0");
             return;
         }

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

@@ -1,6 +1,7 @@
 package com.lantone.qc.kernel.catalogue.behospitalized;
 
 import com.lantone.qc.kernel.catalogue.QCCatalogue;
+import com.lantone.qc.pub.Content;
 import com.lantone.qc.pub.model.InputInfo;
 import com.lantone.qc.pub.model.OutputInfo;
 import com.lantone.qc.pub.model.doc.BeHospitalizedDoc;
@@ -39,8 +40,9 @@ public class BEH0056 extends QCCatalogue {
             return;
         }
         //硬规则 匹配未婚
+        String marry = structureMap.get(Content.marry);
         MaritalLabel maritalLabel = beHospitalizedDoc.getMaritalLabel();
-        if (maritalLabel != null && maritalLabel.getText().contains("未婚")) {
+        if ((maritalLabel != null && maritalLabel.getText().contains("未婚")) || "未婚".equals(marry)) {
             status.set("0");
             return;
         }

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

@@ -2,6 +2,7 @@ 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.Content;
 import com.lantone.qc.pub.model.InputInfo;
 import com.lantone.qc.pub.model.OutputInfo;
 import com.lantone.qc.pub.model.doc.BeHospitalizedDoc;
@@ -31,6 +32,7 @@ public class BEH0058 extends QCCatalogue {
         }
         BeHospitalizedDoc beHospitalizedDoc = inputInfo.getBeHospitalizedDoc();
         //硬规则 匹配未育
+        String marry = beHospitalizedDoc.getStructureMap().get(Content.marry);
         MaritalLabel maritalLabel = beHospitalizedDoc.getMaritalLabel();
         if (maritalLabel != null) {
             String maritalLabelText = maritalLabel.getText();
@@ -45,7 +47,7 @@ public class BEH0058 extends QCCatalogue {
                     return;
                 }
             }
-            if (maritalLabelText.contains("未育") || maritalLabelText.contains("未婚")) {
+            if (maritalLabelText.contains("未育") || maritalLabelText.contains("未婚") || "未婚".equals(marry)) {
                 status.set("0");
                 return;
             }

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

@@ -2,6 +2,7 @@ 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.Content;
 import com.lantone.qc.pub.model.InputInfo;
 import com.lantone.qc.pub.model.OutputInfo;
 import com.lantone.qc.pub.model.entity.Family;
@@ -31,12 +32,17 @@ public class BEH0375 extends QCCatalogue {
             return;
         }
         //硬规则 匹配未婚
+        String marry = inputInfo.getBeHospitalizedDoc().getStructureMap().get(Content.marry);
         MaritalLabel maritalLabel = inputInfo.getBeHospitalizedDoc().getMaritalLabel();
-        if (maritalLabel != null &&
+        if ("未婚".equals(marry) ||
+                (maritalLabel != null &&
                 (StringUtil.isBlank(maritalLabel.getText())
                         || maritalLabel.getText().contains("未婚")
                         || maritalLabel.getText().contains("离婚")
-                        || maritalLabel.getText().contains("已故"))) {
+                        || maritalLabel.getText().contains("已故")
+                )
+                )
+        ) {
             status.set("0");
             return;
         }

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

@@ -2,6 +2,7 @@ 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.Content;
 import com.lantone.qc.pub.model.InputInfo;
 import com.lantone.qc.pub.model.OutputInfo;
 import com.lantone.qc.pub.model.doc.BeHospitalizedDoc;
@@ -44,9 +45,10 @@ public class BEH0376 extends QCCatalogue {
             return;
         }
         //硬规则 匹配未育
+        String marry = structureMap_beh.get(Content.marry);
         String maritalLabelText = maritalLabel.getText();
-        if ( StringUtil.isNotBlank(maritalLabelText) &&
-                (maritalLabelText.contains("未育") || maritalLabelText.contains("未婚") ||  maritalLabelText.contains("0子0女"))) {
+        if ((StringUtil.isNotBlank(maritalLabelText) && (maritalLabelText.contains("未育") || maritalLabelText.contains("未婚") || maritalLabelText.contains("0子0女")))
+                || "未婚".equals(marry)) {
             status.set("0");
             return;
         }

kernel/src/main/java/com/lantone/qc/kernel/catalogue/firstpagerecord/FIRP0169.java

@@ -6,6 +6,7 @@ import com.lantone.qc.pub.Content;
 import com.lantone.qc.pub.model.InputInfo;
 import com.lantone.qc.pub.model.OutputInfo;
 import com.lantone.qc.pub.model.entity.BeHospitalizedWay;
+import com.lantone.qc.pub.util.StringUtil;
 import org.springframework.stereotype.Component;
 
 import java.util.Map;
@@ -29,6 +30,9 @@ public class FIRP0169 extends QCCatalogue {
                 return;
             }
             String beHospitalizedWayStr = beHospitalizedWay.getName();
+            if (StringUtil.isBlank(beHospitalizedWayStr)){
+                return;
+            }
             if (!CatalogueUtil.compareToken(admitPath, beHospitalizedWayStr)) {
                 status.set("-1");
             }