Browse Source

1.无子女情况下不判断子女相关规则

hujing 5 years ago
parent
commit
65dce5f042

+ 16 - 6
kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0058.java

@@ -25,17 +25,27 @@ public class BEH0058 extends QCCatalogue {
 
     @Override
     public void start(InputInfo inputInfo, OutputInfo outputInfo) {
-        if(inputInfo.getBeHospitalizedDoc() == null){
+        if (inputInfo.getBeHospitalizedDoc() == null) {
             status.set("0");
             return;
         }
         BeHospitalizedDoc beHospitalizedDoc = inputInfo.getBeHospitalizedDoc();
         //硬规则 匹配未育
         MaritalLabel maritalLabel = beHospitalizedDoc.getMaritalLabel();
-        if (maritalLabel != null){
+        if (maritalLabel != null) {
             String maritalLabelText = maritalLabel.getText();
-            if (StringUtil.isBlank(maritalLabelText)
-                    || maritalLabelText.contains("未育") || maritalLabelText.contains("未婚")){
+            if (StringUtil.isBlank(maritalLabelText)) {
+                status.set("0");
+                return;
+            } else {
+                String regex = ".*\\d?子\\d?女.*";
+                boolean flag = maritalLabelText.matches(regex);
+                if (flag) {
+                    status.set("0");
+                    return;
+                }
+            }
+            if (maritalLabelText.contains("未育") || maritalLabelText.contains("未婚")) {
                 status.set("0");
                 return;
             }
@@ -52,8 +62,8 @@ public class BEH0058 extends QCCatalogue {
             familyList.addAll(familiesMl);
         }
         Pattern p = Pattern.compile("[儿子女]");
-        if (StringUtil.isNotBlank(familyMembersHealth)){
-            if (p.matcher(familyMembersHealth).find()){
+        if (StringUtil.isNotBlank(familyMembersHealth)) {
+            if (p.matcher(familyMembersHealth).find()) {
                 status.set("0");
                 return;
             }

+ 2 - 1
kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0376.java

@@ -45,7 +45,8 @@ public class BEH0376 extends QCCatalogue {
         }
         //硬规则 匹配未育
         String maritalLabelText = maritalLabel.getText();
-        if (maritalLabelText.contains("未育") || maritalLabelText.contains("未婚")) {
+        if ( StringUtil.isNotBlank(maritalLabelText) &&
+                (maritalLabelText.contains("未育") || maritalLabelText.contains("未婚") ||  maritalLabelText.contains("0子0女"))) {
             status.set("0");
             return;
         }