|
|
@@ -63,7 +63,7 @@ public class THR03079 extends QCCatalogue {
|
|
|
.stream()
|
|
|
.filter(Objects::nonNull)
|
|
|
.map(DoctorAdviceDoc::getStructureMap)
|
|
|
- .filter(x -> StringUtil.isNotBlank(x.get("药品类型")) && x.get("药品类型").contains("激素") && StringUtil.isNotBlank(x.get("一次使用数量")))
|
|
|
+ .filter(x -> StringUtil.isNotBlank(x.get("药品类型")) && x.get("药品类型").contains("激素") && StringUtil.isNotBlank(x.get("医嘱单次剂量")))
|
|
|
.filter(x -> StringUtil.isNotBlank(x.get("医嘱状态判别")) && !x.get("医嘱状态判别").contains("已停止"))
|
|
|
.collect(Collectors.toList());
|
|
|
docAdvStruct.removeIf(x -> StringUtil.isNotBlank(x.get("给药方式")) && !filterKey.contains(x.get("给药方式")));
|
|
|
@@ -77,7 +77,7 @@ public class THR03079 extends QCCatalogue {
|
|
|
Date startDate = null;
|
|
|
for (Map<String, String> structMap : docAdvStruct) {
|
|
|
drugName = structMap.get("医嘱项目名称");
|
|
|
- value = structMap.get("一次使用数量");
|
|
|
+ value = structMap.get("医嘱单次剂量");
|
|
|
startDateStr = structMap.get("医嘱开始时间");
|
|
|
startDate = DateUtil.dateZeroClear(StringUtil.parseDateTime(startDateStr));
|
|
|
if (extData != null && extData.containsKey(startDate) && extData.get(startDate).equals(drugName)) {
|
wangsy