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

kernel/src/main/java/com/lantone/qc/kernel/catalogue/hangzhoudiqi/behospitalized/BEH0058.java

@@ -50,11 +50,19 @@ public class BEH0058 extends QCCatalogue {
             return;
         } else {
        //     String regex = ".*\\d?子\\d?女.*";
-            String regex = ".*[\\d一二三四五六七八九十]子[\\d一二三四五六七八九十]女.*";
-            String regex1 = ".*[\\d一二三四五六七八九十][子|男].*";
-            String regex2 = ".*[\\d一二三四五六七八九十]女.*";
+            String regex = ".*[\\d一两二三四五六七八九十]子[\\d一两二三四五六七八九十]女.*";
+            String regex1 = ".*[\\d一两二三四五六七八九十][子|男].*";
+            String regex2 = ".*[\\d一两二三四五六七八九十]女.*";
+            String regex3 = ".*子数[\\d一两二三四五六七八九十].*女数[\\d一两二三四五六七八九十].*";
+            String regex4 = ".*女数[\\d一两二三四五六七八九十].*子数[\\d一两二三四五六七八九十].*";
+            String regex5 = ".*子数[\\d一两二三四五六七八九十].*";
+            String regex6 = ".*女数[\\d一两二三四五六七八九十].*";
+            String regex7 = ".*[\\d一两二三四五六七八九十]个女.*";
+            String regex8 = ".*[\\d一两二三四五六七八九十]个子.*";
+            String regex9 = ".*[\\d一两二三四五六七八九十]个男.*";
             boolean flag=false;
-            if(maritalText.matches(regex1)||maritalText.matches(regex)||maritalText.matches(regex2)){
+            if(maritalText.matches(regex1)||maritalText.matches(regex)||maritalText.matches(regex2)||maritalText.matches(regex3)||maritalText.matches(regex4)
+                    ||maritalText.matches(regex5)||maritalText.matches(regex6)||maritalText.matches(regex7)||maritalText.matches(regex8)||maritalText.matches(regex9)){
              flag=true;
             }
             regex = ".*\\d+-\\d+-\\d+-[1-9].*";