|
@@ -136,7 +136,7 @@ public class GroupRule {
|
|
|
}
|
|
|
break;
|
|
|
case "未经产妇":
|
|
|
- regex = "(\\d)-(\\d)-(\\d)-(\\d)";
|
|
|
+ regex = "(\\d+)-(\\d+)-(\\d+)-(\\d+)";
|
|
|
if (sex == 2 && StringUtil.isNotBlank(marital) && RegexUtil.getRegexRes(marital, regex)) {
|
|
|
if (Integer.parseInt(RegexUtil.getRegexData(marital, regex, 1))
|
|
|
+ Integer.parseInt(RegexUtil.getRegexData(marital, regex, 2))
|
|
@@ -146,7 +146,7 @@ public class GroupRule {
|
|
|
}
|
|
|
break;
|
|
|
case "经产妇":
|
|
|
- regex = "(\\d)-(\\d)-(\\d)-(\\d)";
|
|
|
+ regex = "(\\d+)-(\\d+)-(\\d+)-(\\d+)";
|
|
|
if (sex == 2 && StringUtil.isNotBlank(marital) && RegexUtil.getRegexRes(marital, regex)) {
|
|
|
if (Integer.parseInt(RegexUtil.getRegexData(marital, regex, 1))
|
|
|
+ Integer.parseInt(RegexUtil.getRegexData(marital, regex, 2))
|