|
|
@@ -60,11 +60,11 @@ public class CLI0304 extends QCCatalogue {
|
|
|
|
|
|
//医嘱类型判别：临时医嘱，医嘱处方类型：化验、检验、检查
|
|
|
List<DoctorAdviceDoc> filterDAList = doctorAdviceDocs.stream().filter(Objects::nonNull)
|
|
|
- .filter(i -> StringUtil.isNotBlank(i.getStructureMap().get("医嘱类型判别")) && i.getStructureMap().get("医嘱判别类型").equals("临时医嘱"))
|
|
|
+ .filter(i -> StringUtil.isNotBlank(i.getStructureMap().get("医嘱类型判别")) && i.getStructureMap().get("医嘱类型判别").equals("临时医嘱"))
|
|
|
.filter(i -> StringUtil.isNotBlank(i.getStructureMap().get("医嘱处方类型"))
|
|
|
- && (i.getStructureMap().get("医嘱处方类型").contains("化验")
|
|
|
- || i.getStructureMap().get("医嘱处方类型").contains("检验")
|
|
|
- || i.getStructureMap().get("医嘱处方类型").contains("检查")))
|
|
|
+ && (i.getStructureMap().get("医嘱处方类型").equals("化验")
|
|
|
+ || i.getStructureMap().get("医嘱处方类型").equals("检验")
|
|
|
+ || i.getStructureMap().get("医嘱处方类型").equals("检查")))
|
|
|
.collect(Collectors.toList());
|
|
|
if (ListUtil.isEmpty(filterDAList)) {
|
|
|
status.set("0");
|
|
|
@@ -132,7 +132,7 @@ public class CLI0304 extends QCCatalogue {
|
|
|
|
|
|
//输血临时医嘱
|
|
|
List<DoctorAdviceDoc> clinicalBloodDAList = doctorAdviceDocs.stream().filter(Objects::nonNull)
|
|
|
- .filter(i -> StringUtil.isNotBlank(i.getStructureMap().get("医嘱类型判别")) && i.getStructureMap().get("医嘱判别类型").equals("临时医嘱"))
|
|
|
+ .filter(i -> StringUtil.isNotBlank(i.getStructureMap().get("医嘱类型判别")) && i.getStructureMap().get("医嘱类型判别").equals("临时医嘱"))
|
|
|
.filter(i -> StringUtil.isNotBlank(i.getStructureMap().get("医嘱项目名称"))
|
|
|
&& (!i.getStructureMap().get("医嘱项目名称").contains("预约"))
|
|
|
&& RegexUtil.getRegexRes(i.getStructureMap().get("医嘱项目名称"), regex5))
|
zhaops