Explorar el Código

北仑:婚育状况未婚不提示消息

wangsy hace 4 años
padre
commit
18164490ca

+ 9 - 3
kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0052.java

@@ -6,6 +6,8 @@ import com.lantone.qc.pub.model.OutputInfo;
 import com.lantone.qc.pub.util.StringUtil;
 import org.springframework.stereotype.Component;
 
+import java.util.Map;
+
 /**
  * @Description: 婚育史未填写
  * @author: rengb
@@ -16,12 +18,16 @@ public class BEH0052 extends QCCatalogue {
 
     @Override
     public void start(InputInfo inputInfo, OutputInfo outputInfo) {
-        if(inputInfo.getBeHospitalizedDoc() == null){
+        if (inputInfo.getBeHospitalizedDoc() == null) {
             status.set("0");
             return;
         }
-        if(inputInfo.getBeHospitalizedDoc().getStructureMap().get("婚姻") != null
-                && inputInfo.getBeHospitalizedDoc().getStructureMap().get("婚姻").contains("未婚")){
+        Map<String, String> BehStructureMap = inputInfo.getBeHospitalizedDoc().getStructureMap();
+        String marry = BehStructureMap.get("婚姻");
+        if (StringUtil.isBlank(marry)) {
+            marry = BehStructureMap.get("婚姻状况");
+        }
+        if (StringUtil.isNotBlank(marry) && marry.contains("未婚")) {
             status.set("0");
             return;
         }