|
@@ -137,25 +137,24 @@ public class GroupRule {
|
|
break;
|
|
break;
|
|
case "未经产妇":
|
|
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))
|
|
|
|
- +Integer.parseInt(RegexUtil.getRegexData(marital,regex,3)) == 0){
|
|
|
|
|
|
+ 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))
|
|
|
|
+ + Integer.parseInt(RegexUtil.getRegexData(marital, regex, 3)) == 0) {
|
|
flag = true;
|
|
flag = true;
|
|
}
|
|
}
|
|
- break;
|
|
|
|
}
|
|
}
|
|
|
|
+ break;
|
|
case "经产妇":
|
|
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))
|
|
|
|
- +Integer.parseInt(RegexUtil.getRegexData(marital,regex,3)) >= 1){
|
|
|
|
|
|
+ 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))
|
|
|
|
+ + Integer.parseInt(RegexUtil.getRegexData(marital, regex, 3)) >= 1) {
|
|
flag = true;
|
|
flag = true;
|
|
}
|
|
}
|
|
- break;
|
|
|
|
}
|
|
}
|
|
-
|
|
|
|
|
|
+ break;
|
|
default:
|
|
default:
|
|
break;
|
|
break;
|
|
}
|
|
}
|