入院记录 婚姻状况去除映射 修改bug

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

@@ -5,6 +5,7 @@ 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.entity.MaritalStatus;
+import com.lantone.qc.pub.model.label.MaritalLabel;
 import com.lantone.qc.pub.util.StringUtil;
 import org.springframework.stereotype.Component;
 
@@ -25,17 +26,15 @@ public class BEH0372 extends QCCatalogue {
             status.set("0");
             return;
         }
-        //无婚育史
-        if (inputInfo.getBeHospitalizedDoc().getMaritalLabel().getText() == null) {
-            status.set("0");
-            return;
-        }
 
         String basicInfoStatus = inputInfo.getBeHospitalizedDoc().getStructureMap().get("婚姻");
         String bhbasicInfoStatus = inputInfo.getBeHospitalizedDoc().getStructureMap().get("婚姻状况");
-        basicInfoStatus = StringUtil.isNotBlank(basicInfoStatus) ? basicInfoStatus : "";
+        if (StringUtil.isBlank(basicInfoStatus) || StringUtil.isBlank(bhbasicInfoStatus)) {
+            status.set("0");
+            return;
+        }
 
-        if (StringUtil.isNotBlank(bhbasicInfoStatus) && basicInfoStatus.equals(bhbasicInfoStatus)){
+        if (basicInfoStatus.equals(bhbasicInfoStatus)) {
             status.set("0");
             return;
         }
@@ -47,6 +46,13 @@ public class BEH0372 extends QCCatalogue {
 
         if (chcekMaritalStatus(basicInfoStatus, maritalStatus)) {
             status.set("0");
+            return;
+        }
+
+        //无婚育史
+        MaritalLabel maritalLabel = inputInfo.getBeHospitalizedDoc().getMaritalLabel();
+        if (maritalLabel == null || maritalLabel.getText() == null) {
+            status.set("0");
         }
     }
 

trans/src/main/java/com/lantone/qc/trans/taizhou/TaiZhouBeHospitalizedDocTrans.java

@@ -58,7 +58,7 @@ public class TaiZhouBeHospitalizedDocTrans extends ModelDocTrans {
             "职业=职业",
             "出生地址=出生地",
             "出生、生长史=居住地",
-            "婚姻状况=婚姻",
+//            "婚姻状况=婚姻",
             "地址=联系地址",
             "信息来源=病史陈述者",
             "生日=出生日期",