|
@@ -45,7 +45,7 @@ public class BEH0058 extends QCCatalogue {
|
|
} else {
|
|
} else {
|
|
String regex = ".*\\d?子\\d?女.*";
|
|
String regex = ".*\\d?子\\d?女.*";
|
|
boolean flag = maritalText.matches(regex);
|
|
boolean flag = maritalText.matches(regex);
|
|
- regex = ".*\\d+-\\d+-\\d+-0.*";
|
|
|
|
|
|
+ regex = ".*\\d+-\\d+-\\d+-[1-9].*";
|
|
boolean matches = maritalText.matches(regex);
|
|
boolean matches = maritalText.matches(regex);
|
|
if (flag || matches) {
|
|
if (flag || matches) {
|
|
status.set("0");
|
|
status.set("0");
|
|
@@ -59,7 +59,7 @@ public class BEH0058 extends QCCatalogue {
|
|
}
|
|
}
|
|
if (StringUtil.isNotBlank(maritalText)) {
|
|
if (StringUtil.isNotBlank(maritalText)) {
|
|
List<String> words = Lists.newArrayList("未婚", "未育", "未婚育", "未生育", "未生", "0子0女"
|
|
List<String> words = Lists.newArrayList("未婚", "未育", "未婚育", "未生育", "未生", "0子0女"
|
|
- , "0-0-0-0", "详见原病历");
|
|
|
|
|
|
+ , "0-0-0-0", "详见原病历", "0-0-0-0");
|
|
for (String word : words) {
|
|
for (String word : words) {
|
|
if (maritalText.contains(word)) {
|
|
if (maritalText.contains(word)) {
|
|
status.set("0");
|
|
status.set("0");
|