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

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

@@ -29,7 +29,7 @@ public class BEH0043 extends QCCatalogue {
         }
         //台州结构化
         Map<String, String> structureMap = inputInfo.getBeHospitalizedDoc().getStructureMap();
-        if(StringUtils.isNotEmpty(structureMap.get("联系地址"))){
+        if(StringUtils.isNotEmpty(structureMap.get("联系地址")) || StringUtils.isNotEmpty(structureMap.get("现住址"))){
             status.set("0");
             return;
         }

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

@@ -29,7 +29,8 @@ public class BEH0065 extends QCCatalogue {
         if (inputInfo.getBeHospitalizedDoc().getStructureMap().get("性别") == null
                 || inputInfo.getBeHospitalizedDoc().getStructureMap().get("性别").contains("男")) {
             status.set("0"); //如果性别是男,就不报错
-        } else if (inputInfo.getBeHospitalizedDoc().getMenstrualLabel() == null) {
+        } else if (inputInfo.getBeHospitalizedDoc().getMenstrualLabel() == null
+                || inputInfo.getBeHospitalizedDoc().getMenstrualLabel().getText().contains("null")) {
             status.set("0");
         } else {
             MenstrualLabel menstrualLabel = inputInfo.getBeHospitalizedDoc().getMenstrualLabel();

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

@@ -26,6 +26,9 @@ public class BEH0068 extends QCCatalogue {
         if (inputInfo.getBeHospitalizedDoc().getStructureMap().get("性别") == null
                 || inputInfo.getBeHospitalizedDoc().getStructureMap().get("性别").contains("男")) {
             status.set("0"); //如果性别是男,就不报错
+        } else if (inputInfo.getBeHospitalizedDoc().getMenstrualLabel() == null
+                || inputInfo.getBeHospitalizedDoc().getMenstrualLabel().getText().contains("null")) {
+            status.set("0");
         } else {
             Map<String, String> structureMap = inputInfo.getBeHospitalizedDoc().getStructureMap();
             if (StringUtil.isNotBlank(structureMap.get("白带"))) {
@@ -45,8 +48,6 @@ public class BEH0068 extends QCCatalogue {
                 if (menstrualLabel.getLeukorrheas().size() > 0) {
                     status.set("0");
                 }
-            } else {
-                status.set("0");
             }
         }
     }

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

@@ -30,7 +30,7 @@ public class BEH0454 extends QCCatalogue {
         }
         PastLabel pastLabel = inputInfo.getBeHospitalizedDoc().getPastLabel();
         if (pastLabel != null) {
-            if (StringUtils.isNotEmpty(pastLabel.getHeathCondition())) {
+            if (StringUtils.isNotEmpty(pastLabel.getHeathCondition()) || pastLabel.getText().contains("既往")) {
                 status.set("0");
             }
         }