diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/signpatientrecord/impl/SignPatientRecordServiceImpl.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/signpatientrecord/impl/SignPatientRecordServiceImpl.java index e66ee794..e6f41eb3 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/signpatientrecord/impl/SignPatientRecordServiceImpl.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/signpatientrecord/impl/SignPatientRecordServiceImpl.java @@ -340,7 +340,9 @@ public class SignPatientRecordServiceImpl implements ISignPatientRecordService { if (!CollectionUtils.isEmpty(labelFieldContentList)) { // 按照任务细分分组 - Map> groupByPartition = labelFieldContentList.stream().collect(Collectors.groupingBy(LabelFieldInfoContentVo::getTaskPartitionDictId)); + Map> groupByPartition = labelFieldContentList.stream() + .filter(labelField-> ObjectUtils.isNotEmpty(labelField.getTaskPartitionDictId())) + .collect(Collectors.groupingBy(LabelFieldInfoContentVo::getTaskPartitionDictId)); // 查询用药 List drugList = labelFieldContentList.stream().filter(labelField->labelField.getFieldCode().equals("DRUGNAME")).collect(Collectors.toList()); // 包含用药的标签列表