Explorar el Código

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

rengb hace 4 años
padre
commit
5813acd183

+ 4 - 0
kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0375.java

@@ -33,6 +33,9 @@ public class BEH0375 extends QCCatalogue {
         }
         //硬规则 匹配未婚
         String marry = inputInfo.getBeHospitalizedDoc().getStructureMap().get(Content.marry);
+        if(StringUtil.isBlank(marry)){
+            marry = inputInfo.getBeHospitalizedDoc().getStructureMap().get("婚姻状况");
+        }
         MaritalLabel maritalLabel = inputInfo.getBeHospitalizedDoc().getMaritalLabel();
         if ("未婚".equals(marry) ||
                 (maritalLabel != null &&
@@ -41,6 +44,7 @@ public class BEH0375 extends QCCatalogue {
                         || maritalLabel.getText().contains("离婚")
                         || maritalLabel.getText().contains("离异")
                         || maritalLabel.getText().contains("已故")
+                        || maritalLabel.getText().contains("已逝")
                         || maritalLabel.getText().contains("丧偶")
                         || maritalLabel.getText().contains("详见原病历")
                 )