婚姻状况前后不一致取值添加婚姻

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

@@ -29,16 +29,25 @@ public class BEH0372 extends QCCatalogue {
 
         String basicInfoStatus = inputInfo.getBeHospitalizedDoc().getStructureMap().get("婚育史");
         String bhbasicInfoStatus = inputInfo.getBeHospitalizedDoc().getStructureMap().get("婚姻状况");
+        if (StringUtil.isBlank(bhbasicInfoStatus)) {
+            bhbasicInfoStatus = inputInfo.getBeHospitalizedDoc().getStructureMap().get("婚姻");
+        }
         if (StringUtil.isBlank(basicInfoStatus) || StringUtil.isBlank(bhbasicInfoStatus)) {
             status.set("0");
             return;
         }
-        if(StringUtil.isNotBlank(bhbasicInfoStatus) && basicInfoStatus.equals("其他")){
+
+        if (bhbasicInfoStatus.equals("未婚") && basicInfoStatus.contains("结婚")) {
+            return;
+        }
+
+        if (bhbasicInfoStatus.equals("未婚") && basicInfoStatus.contains("未婚")) {
             status.set("0");
             return;
         }
 
-        if (bhbasicInfoStatus.equals("未婚") && basicInfoStatus.contains("结婚")) {
+        if (StringUtil.isNotBlank(bhbasicInfoStatus) && basicInfoStatus.equals("其他")) {
+            status.set("0");
             return;
         }
 
@@ -48,7 +57,12 @@ public class BEH0372 extends QCCatalogue {
         }
 
         if ((bhbasicInfoStatus.equals("离婚") || bhbasicInfoStatus.equals("离异")) &&
-                basicInfoStatus.contains("结婚")) {
+                (basicInfoStatus.contains("离异") || bhbasicInfoStatus.equals("离婚"))) {
+            status.set("0");
+            return;
+        }
+
+        if (bhbasicInfoStatus.equals("已婚") && basicInfoStatus.contains("结婚")) {
             status.set("0");
             return;
         }