|
@@ -31,7 +31,9 @@ public class BEH02988 extends QCCatalogue {
|
|
if (beHospitalizedDoc == null) {
|
|
if (beHospitalizedDoc == null) {
|
|
return;
|
|
return;
|
|
}
|
|
}
|
|
- if (StringUtil.isBlank(chiefLabel.getText()) && (StringUtil.isNotBlank(presentLabel.getText()) || StringUtil.isNotBlank(pastLabel.getText()))) {
|
|
|
|
|
|
+ boolean isCorrectPresent = isPeriod(presentLabel.getText());
|
|
|
|
+ boolean isCorrectPast = isPeriod(pastLabel.getText());
|
|
|
|
+ if (StringUtil.isBlank(chiefLabel.getText()) && (isCorrectPresent || isCorrectPast)) {
|
|
status.set("-1");
|
|
status.set("-1");
|
|
return;
|
|
return;
|
|
}
|
|
}
|
|
@@ -39,4 +41,11 @@ public class BEH02988 extends QCCatalogue {
|
|
status.set("-1");
|
|
status.set("-1");
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
+
|
|
|
|
+ private boolean isPeriod(String text) {
|
|
|
|
+ if (StringUtil.isNotBlank(text) && !"。".equals(text)) {
|
|
|
|
+ return true;
|
|
|
|
+ }
|
|
|
|
+ return false;
|
|
|
|
+ }
|
|
}
|
|
}
|