|
@@ -41,7 +41,8 @@ public class CRI0382 extends QCCatalogue {
|
|
isOutTime = true;
|
|
isOutTime = true;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
- };
|
|
|
|
|
|
+ }
|
|
|
|
+ ;
|
|
if (isOutTime == false) { //所有文书都未超过6小时,规则直接通过
|
|
if (isOutTime == false) { //所有文书都未超过6小时,规则直接通过
|
|
return;
|
|
return;
|
|
}
|
|
}
|
|
@@ -56,7 +57,7 @@ public class CRI0382 extends QCCatalogue {
|
|
List<String> allCrisises = new ArrayList<>();
|
|
List<String> allCrisises = new ArrayList<>();
|
|
crisisInfoDocs.forEach(crisisInfoDoc -> {
|
|
crisisInfoDocs.forEach(crisisInfoDoc -> {
|
|
String reptTime = crisisInfoDoc.getStructureMap().get("报告时间");
|
|
String reptTime = crisisInfoDoc.getStructureMap().get("报告时间");
|
|
- String crisisName = crisisInfoDoc.getStructureMap().get("危急值名称");
|
|
|
|
|
|
+ String crisisName = crisisInfoDoc.getStructureMap().get("危急结果值");
|
|
allCrisises.add(reptTime);
|
|
allCrisises.add(reptTime);
|
|
if (StringUtils.isNotEmpty(reptTime)) {
|
|
if (StringUtils.isNotEmpty(reptTime)) {
|
|
//当前时间和报告时间未超过6小时,规则通过
|
|
//当前时间和报告时间未超过6小时,规则通过
|
|
@@ -64,11 +65,11 @@ public class CRI0382 extends QCCatalogue {
|
|
findCrisises.add(reptTime);
|
|
findCrisises.add(reptTime);
|
|
} else {
|
|
} else {
|
|
for (CrisisValueReportDoc crisisValueReportDoc : crisisValueReportDocs) {
|
|
for (CrisisValueReportDoc crisisValueReportDoc : crisisValueReportDocs) {
|
|
- String recordTimeStr = crisisValueReportDoc.getStructureMap().get("记录时间");
|
|
|
|
- String docReptContent = crisisValueReportDoc.getStructureMap().get("危急值记录内容");
|
|
|
|
|
|
+ String recordTimeStr = crisisValueReportDoc.getStructureMap().get("病历日期");
|
|
|
|
+ String docReptContent = crisisValueReportDoc.getStructureMap().get("病情分析及处理");
|
|
if ((StringUtil.parseDateTime(recordTimeStr, dateFormats).getTime() - StringUtil.parseDateTime(reptTime, dateFormats).getTime()) > 0
|
|
if ((StringUtil.parseDateTime(recordTimeStr, dateFormats).getTime() - StringUtil.parseDateTime(reptTime, dateFormats).getTime()) > 0
|
|
&& (StringUtil.parseDateTime(recordTimeStr, dateFormats).getTime() - StringUtil.parseDateTime(reptTime, dateFormats).getTime()) < timeCha
|
|
&& (StringUtil.parseDateTime(recordTimeStr, dateFormats).getTime() - StringUtil.parseDateTime(reptTime, dateFormats).getTime()) < timeCha
|
|
- && docReptContent.contains(crisisName)) {
|
|
|
|
|
|
+ && StringUtil.removeBlank(docReptContent).contains(StringUtil.removeBlank(crisisName))) {
|
|
findCrisises.add(reptTime);
|
|
findCrisises.add(reptTime);
|
|
break;
|
|
break;
|
|
}
|
|
}
|
|
@@ -77,7 +78,7 @@ public class CRI0382 extends QCCatalogue {
|
|
}
|
|
}
|
|
});
|
|
});
|
|
|
|
|
|
- if(findCrisises.size() != allCrisises.size()) {
|
|
|
|
|
|
+ if (findCrisises.size() != allCrisises.size()) {
|
|
status.set("-1");
|
|
status.set("-1");
|
|
allCrisises.forEach(reptTime -> {
|
|
allCrisises.forEach(reptTime -> {
|
|
if (!findCrisises.contains(reptTime)) {
|
|
if (!findCrisises.contains(reptTime)) {
|