rengb 5 лет назад
Родитель
Сommit
b1ccd7a00c

+ 6 - 2
kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0042.java

@@ -30,8 +30,12 @@ public class BEH0042 extends QCCatalogue {
             long count = addresses.stream().filter(i -> {
                 boolean flag = false;
                 if (i != null && StringUtil.isNotBlank(i.getName())) {
-                    Pattern pattern = Pattern.compile("[\\s\\S]*(出生|生长)[\\s\\S]{0,5}" + i.getName() + "[\\s\\S]*");
-                    flag = pattern.matcher(text).matches();
+                    if (i.getName().indexOf("出生") > -1) {
+                        flag = true;
+                    } else {
+                        Pattern pattern = Pattern.compile("[\\s\\S]*(出生|生长)[\\s\\S]{0,5}" + i.getName() + "[\\s\\S]*");
+                        flag = pattern.matcher(text).matches();
+                    }
                 }
                 return flag;
             }).count();

+ 6 - 2
kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0043.java

@@ -30,8 +30,12 @@ public class BEH0043 extends QCCatalogue {
             long count = addresses.stream().filter(i -> {
                 boolean flag = false;
                 if (i != null && StringUtil.isNotBlank(i.getName())) {
-                    Pattern pattern = Pattern.compile("[\\s\\S]*(居住|生长)[\\s\\S]{0,5}" + i.getName() + "[\\s\\S]*");
-                    flag = pattern.matcher(text).matches();
+                    if (i.getName().indexOf("居住") > -1) {
+                        flag = true;
+                    } else {
+                        Pattern pattern = Pattern.compile("[\\s\\S]*(居住|生长)[\\s\\S]{0,5}" + i.getName() + "[\\s\\S]*");
+                        flag = pattern.matcher(text).matches();
+                    }
                 }
                 return flag;
             }).count();