|
@@ -192,7 +192,8 @@ public class ModuleInfoFacade extends ModuleInfoServiceImpl {
|
|
|
conceptTypeVO.setType(1);
|
|
|
RespDTO<List<ConceptBaseDTO>> deptInfoList = knowledgemanServiceClient.getConceptListByType(conceptTypeVO);
|
|
|
RespDTOUtil.respNGDeal(deptInfoList, "获取科室信息失败");
|
|
|
- Map<Long, ConceptBaseDTO> deptInfoMap = deptInfoList.data.stream().collect(Collectors.toMap(ConceptBaseDTO::getConceptId, conceptBaseDTO -> conceptBaseDTO));
|
|
|
+ Map<Long, ConceptBaseDTO> deptInfoMap = deptInfoList.data.stream()
|
|
|
+ .collect(Collectors.toMap(ConceptBaseDTO::getConceptId, conceptBaseDTO -> conceptBaseDTO));
|
|
|
//获取模板类型名称
|
|
|
QueryWrapper<DictionaryInfo> dictionaryInfoQueryWrapper = new QueryWrapper<>();
|
|
|
dictionaryInfoQueryWrapper
|
|
@@ -201,7 +202,8 @@ public class ModuleInfoFacade extends ModuleInfoServiceImpl {
|
|
|
.eq("return_type", 1)
|
|
|
.orderByDesc("order_no");
|
|
|
List<DictionaryInfo> dictionaryInfoList = dictionaryFacade.list(dictionaryInfoQueryWrapper);
|
|
|
- Map<String, DictionaryInfo> dictionaryInfoMap = dictionaryInfoList.stream().collect(Collectors.toMap(DictionaryInfo::getVal, dictionaryInfo -> dictionaryInfo));
|
|
|
+ Map<String, DictionaryInfo> dictionaryInfoMap = dictionaryInfoList.stream()
|
|
|
+ .collect(Collectors.toMap(DictionaryInfo::getVal, dictionaryInfo -> dictionaryInfo));
|
|
|
if (ListUtil.isNotEmpty(moduleInfoDTOIPage.getRecords())) {
|
|
|
//获取用户信息
|
|
|
RespDTO<Map<String, String>> respDTO = userServiceClient.getUserInfoByIds(ids);
|
|
@@ -215,13 +217,15 @@ public class ModuleInfoFacade extends ModuleInfoServiceImpl {
|
|
|
if (moduleInfoListDTO.getModuleType().intValue() == 1) {//根据科室
|
|
|
if (moduleInfoListDTO.getRelationId().intValue() != -1) {//判断是不是科室通用子模板
|
|
|
if (null != deptInfoMap.get(moduleInfoListDTO.getRelationId())) {
|
|
|
- moduleInfoListDTO.setRelationName(deptInfoMap.get(moduleInfoListDTO.getRelationId()).getName());
|
|
|
+ moduleInfoListDTO.setRelationName(
|
|
|
+ deptInfoMap.get(moduleInfoListDTO.getRelationId()).getName());
|
|
|
}
|
|
|
} else {
|
|
|
moduleInfoListDTO.setRelationName(ModuleInfoTypeEnum.Common.getName());
|
|
|
}
|
|
|
}
|
|
|
- moduleInfoListDTO.setModuleTypeName(ModuleInfoTypeEnum.getName(moduleInfoListDTO.getModuleType().intValue()));
|
|
|
+ moduleInfoListDTO.setModuleTypeName(
|
|
|
+ ModuleInfoTypeEnum.getName(moduleInfoListDTO.getModuleType().intValue()));
|
|
|
}
|
|
|
}
|
|
|
return moduleInfoDTOIPage;
|