diff --git a/virtual-patient-manage/src/main/java/com/supervision/manage/service/impl/DiseaseTreatmentPlanManageServiceImpl.java b/virtual-patient-manage/src/main/java/com/supervision/manage/service/impl/DiseaseTreatmentPlanManageServiceImpl.java index 353d87e8..65aae26b 100644 --- a/virtual-patient-manage/src/main/java/com/supervision/manage/service/impl/DiseaseTreatmentPlanManageServiceImpl.java +++ b/virtual-patient-manage/src/main/java/com/supervision/manage/service/impl/DiseaseTreatmentPlanManageServiceImpl.java @@ -89,11 +89,10 @@ public class DiseaseTreatmentPlanManageServiceImpl implements DiseaseTreatmentPl .stream().map(DiseaseTreatmentPlanDrug::getDrugId).collect(Collectors.toList())); // 设置处置药物剂型与剂型的翻译数据 String drugId = CollUtil.getFirst(item.getDrugIds()); - String fistMeasuresId = StrUtil.isNotEmpty(drugId) ? drugIdMapDose.getOrDefault(drugId, - Pair.of(StrUtil.EMPTY,StrUtil.EMPTY)).getKey() : StrUtil.EMPTY; - String fistMeasures = StrUtil.isNotEmpty(drugId) ? drugIdMapDose.getOrDefault(drugId, Pair.of(StrUtil.EMPTY, StrUtil.EMPTY)).getValue() : StrUtil.EMPTY; - item.setFirstMeasuresId(fistMeasuresId); - item.setFirstMeasures(fistMeasures); + if (StrUtil.isNotEmpty(drugId)){ + item.setFirstMeasuresId(drugIdMapDose.getOrDefault(drugId, Pair.of(StrUtil.EMPTY,StrUtil.EMPTY)).getKey()); + item.setFirstMeasures(drugIdMapDose.getOrDefault(drugId, Pair.of(StrUtil.EMPTY, StrUtil.EMPTY)).getValue()); + } } return diseaseTreatmentPlanResVos; }