|
@@ -28,14 +28,14 @@ public class BEH0006 extends QCCatalogue {
|
|
|
return;
|
|
|
}
|
|
|
ChiefLabel chiefLabel = inputInfo.getBeHospitalizedDoc().getChiefLabel();
|
|
|
- if (chiefLabel == null) {
|
|
|
+ if (chiefLabel == null || StringUtil.isBlank(chiefLabel.getText())) {
|
|
|
status.set("0");
|
|
|
return;
|
|
|
}
|
|
|
List<Clinical> clinicalList = chiefLabel.getClinicals();
|
|
|
boolean flag = true;
|
|
|
// 主诉症状不超过1年就不报错,单位不包含“年”
|
|
|
- if(ListUtil.isNotEmpty(clinicalList)){
|
|
|
+ if (ListUtil.isNotEmpty(clinicalList)) {
|
|
|
for (Clinical c : clinicalList) {
|
|
|
List<PD> pds = c.getTimestamp();
|
|
|
if (ListUtil.isNotEmpty(pds)) {
|
|
@@ -71,12 +71,14 @@ public class BEH0006 extends QCCatalogue {
|
|
|
|| pdName.contains("分") || pdName.contains("日") || pdName.contains("今")
|
|
|
|| pdName.contains("1年") || pdName.contains("一年")) {
|
|
|
status.set("0");
|
|
|
- return;
|
|
|
+ break;
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
// 如果都没包含,则报错
|
|
|
status.set("-1");
|
|
|
+ } else {
|
|
|
+ status.set("0");
|
|
|
}
|
|
|
/*List<Clinical> clinicals = chiefLabel.getClinicals();
|
|
|
if(clinicals.size()>0){
|