|
@@ -56,7 +56,7 @@ public class IndexConfigFacade extends IndexConfigServiceImpl {
|
|
IPage<IndexConfigDTO> datas = this.queryIndexConfigPageAlls(indexConfigDiseaseNameVO);
|
|
IPage<IndexConfigDTO> datas = this.queryIndexConfigPageAlls(indexConfigDiseaseNameVO);
|
|
List<IndexConfigDTO> data = datas.getRecords();
|
|
List<IndexConfigDTO> data = datas.getRecords();
|
|
List<String> modifierid = new ArrayList<>();
|
|
List<String> modifierid = new ArrayList<>();
|
|
- modifierid = data.stream().map(ac -> ac.getModifier()).collect(Collectors.toList());
|
|
|
|
|
|
+ modifierid = data.stream().map(ac -> ac.getModifier()).distinct().collect(Collectors.toList());
|
|
Map<String, String> userNames = new HashMap<>();
|
|
Map<String, String> userNames = new HashMap<>();
|
|
if (modifierid.size() > 0) {
|
|
if (modifierid.size() > 0) {
|
|
RespDTO<Map<String, String>> userNamesDTO = userServiceClient.getUserInfoByIds(modifierid);
|
|
RespDTO<Map<String, String>> userNamesDTO = userServiceClient.getUserInfoByIds(modifierid);
|
|
@@ -65,16 +65,10 @@ public class IndexConfigFacade extends IndexConfigServiceImpl {
|
|
}
|
|
}
|
|
userNames = userNamesDTO.data;
|
|
userNames = userNamesDTO.data;
|
|
}
|
|
}
|
|
- List<IndexConfigDTO> indexConfigLists = new ArrayList<IndexConfigDTO>();
|
|
|
|
|
|
+
|
|
for (IndexConfigDTO evalua : data) {
|
|
for (IndexConfigDTO evalua : data) {
|
|
- IndexConfigDTO dateNew = new IndexConfigDTO();
|
|
|
|
- BeanUtil.copyProperties(evalua,dateNew);
|
|
|
|
- dateNew.setModifier(userNames.get(evalua.getModifier()));
|
|
|
|
- indexConfigLists.add(dateNew);
|
|
|
|
|
|
+ evalua.setModifier(userNames.get(evalua.getModifier()));
|
|
}
|
|
}
|
|
-
|
|
|
|
- datas.setRecords(indexConfigLists);
|
|
|
|
-
|
|
|
|
return datas;
|
|
return datas;
|
|
}
|
|
}
|
|
/**
|
|
/**
|