diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/crowdinfo/impl/CrowdInfoServiceImpl.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/crowdinfo/impl/CrowdInfoServiceImpl.java index 3f468278..bec01bf3 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/crowdinfo/impl/CrowdInfoServiceImpl.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/crowdinfo/impl/CrowdInfoServiceImpl.java @@ -53,19 +53,23 @@ public class CrowdInfoServiceImpl implements ICrowdInfoService { return crowdInfos; } //字典表匹配数据(特殊人群回显文字) - List crowdType = sysDictDataMapper.selectDictDataByType("crowd_type"); - if (CollectionUtils.isEmpty(crowdType) || crowdType.size() == 0) { + List crowdTypeList = sysDictDataMapper.selectDictDataByType("crowd_type"); + if (CollectionUtils.isEmpty(crowdTypeList) || crowdTypeList.size() == 0) { return crowdInfos; } - List collect = crowdType.stream().filter(Objects::nonNull).map(SysDictData::getDictValue).distinct().map(String::toLowerCase).collect(Collectors.toList()); - List sysDictData = sysDictDataMapper.selectDictDataByTypeList(collect); - if (CollectionUtils.isEmpty(sysDictData) || sysDictData.size() == 0) { + List collect = crowdTypeList.stream().filter(Objects::nonNull).map(SysDictData::getDictValue).distinct().map(String::toLowerCase).collect(Collectors.toList()); + List sysDictDataList = sysDictDataMapper.selectDictDataByTypeList(collect); + if (CollectionUtils.isEmpty(sysDictDataList) || sysDictDataList.size() == 0) { return crowdInfos; } for (CrowdInfo info : crowdInfos) { - SysDictData sysDictData1 = sysDictData.stream().filter(Objects::nonNull).filter(item -> item.getDictValue().equals(info.getSpecialType())).findFirst().orElse(new SysDictData()); - if (StringUtils.isNotBlank(sysDictData1.getDictLabel())) { - info.setSpecialType(sysDictData1.getDictLabel()); + SysDictData crowdType = crowdTypeList.stream().filter(Objects::nonNull).filter(item -> item.getDictValue().equals(info.getCrowdType())).findFirst().orElse(new SysDictData()); + if (StringUtils.isNotBlank(crowdType.getDictLabel())) { + info.setCrowdType(crowdType.getDictLabel()); + } + SysDictData sysDictData = sysDictDataList.stream().filter(Objects::nonNull).filter(item -> item.getDictValue().equals(info.getSpecialType())).findFirst().orElse(new SysDictData()); + if (StringUtils.isNotBlank(sysDictData.getDictLabel())) { + info.setSpecialType(sysDictData.getDictLabel()); } } return crowdInfos;