代码优化

icssman-service/src/main/java/com/diagbot/facade/ModuleInfoFacade.java

@@ -234,32 +234,34 @@ public class ModuleInfoFacade extends ModuleInfoServiceImpl {
         }
         List<ModuleInfo> moduleInfoList = this.list(moduleInfoQueryWrapper);
         List<Long> moduleIdList = moduleInfoList.stream().map(m -> m.getId()).collect(Collectors.toList());
-        //获取模板明细信息
-        QueryWrapper<ModuleDetail> moduleDetailQueryWrapper = new QueryWrapper<>();
-        moduleDetailQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
-                .in("module_id", moduleIdList);
-        List<ModuleDetail> moduleDetailList = moduleDetailFacade.list(moduleDetailQueryWrapper);
-        //将模板明细根据模板id放入map
-        Map<Long, List<ModuleDetail>> moduleDetailMap = new HashMap<>();
-        List<ModuleDetail> allModuleDetials = null;
-        for (ModuleInfo moduleInfo : moduleInfoList) {
-            allModuleDetials = new ArrayList<>();
-            for (ModuleDetail moduleDetail : moduleDetailList) {
-                if (moduleInfo.getId().longValue() == moduleDetail.getModuleId().longValue()) {
-                    allModuleDetials.add(moduleDetail);
-                }
-            }
-            moduleDetailMap.put(moduleInfo.getId(), allModuleDetials);
-        }
         //给ModuleInfoDTO设值
         List<ModuleInfoDTO> moduleInfoDTOList = new ArrayList<>();
-        ModuleInfoDTO moduleInfoDTO = null;
-        for (ModuleInfo moduleInfo : moduleInfoList) {
-            moduleInfoDTO = new ModuleInfoDTO();
-            moduleInfoDTO.setId(moduleInfo.getId());
-            moduleInfoDTO.setName(moduleInfo.getName());
-            moduleInfoDTO.setModuleDetails(moduleDetailMap.get(moduleInfoDTO.getId()));
-            moduleInfoDTOList.add(moduleInfoDTO);
+        if (ListUtil.isNotEmpty(moduleIdList)) {
+            //获取模板明细信息
+            QueryWrapper<ModuleDetail> moduleDetailQueryWrapper = new QueryWrapper<>();
+            moduleDetailQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
+                    .in("module_id", moduleIdList);
+            List<ModuleDetail> moduleDetailList = moduleDetailFacade.list(moduleDetailQueryWrapper);
+            //将模板明细根据模板id放入map
+            Map<Long, List<ModuleDetail>> moduleDetailMap = new HashMap<>();
+            List<ModuleDetail> allModuleDetials = null;
+            for (ModuleInfo moduleInfo : moduleInfoList) {
+                allModuleDetials = new ArrayList<>();
+                for (ModuleDetail moduleDetail : moduleDetailList) {
+                    if (moduleInfo.getId().longValue() == moduleDetail.getModuleId().longValue()) {
+                        allModuleDetials.add(moduleDetail);
+                    }
+                }
+                moduleDetailMap.put(moduleInfo.getId(), allModuleDetials);
+            }
+            ModuleInfoDTO moduleInfoDTO = null;
+            for (ModuleInfo moduleInfo : moduleInfoList) {
+                moduleInfoDTO = new ModuleInfoDTO();
+                moduleInfoDTO.setId(moduleInfo.getId());
+                moduleInfoDTO.setName(moduleInfo.getName());
+                moduleInfoDTO.setModuleDetails(moduleDetailMap.get(moduleInfoDTO.getId()));
+                moduleInfoDTOList.add(moduleInfoDTO);
+            }
         }
         return moduleInfoDTOList;
     }

tran-service/src/main/java/com/diagbot/facade/HospitalDeptFacade.java

@@ -1,25 +1,26 @@
 package com.diagbot.facade;
 
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.diagbot.dto.HospitalDeptDTO;
+import com.diagbot.dto.HospitalDeptInfoDTO;
+import com.diagbot.entity.HospitalDept;
+import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.enums.StatusEnum;
+import com.diagbot.exception.CommonErrorCode;
+import com.diagbot.exception.CommonException;
+import com.diagbot.service.impl.HospitalDeptServiceImpl;
+import com.diagbot.util.BeanUtil;
 import com.diagbot.util.EntityUtil;
 import com.diagbot.util.ListUtil;
+import com.diagbot.vo.HospitalDeptInfoVO;
 import com.diagbot.vo.HospitalDeptVO;
 import com.google.common.collect.Lists;
 import org.springframework.stereotype.Component;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.diagbot.dto.HospitalDeptInfoDTO;
-import com.diagbot.entity.HospitalDept;
-import com.diagbot.enums.IsDeleteEnum;
-import com.diagbot.service.impl.HospitalDeptServiceImpl;
-import com.diagbot.util.BeanUtil;
-import com.diagbot.vo.HospitalDeptInfoVO;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * @author rgb
@@ -64,6 +65,9 @@ public class HospitalDeptFacade extends HospitalDeptServiceImpl {
      * @return
      */
     public Map<String, List<HospitalDeptDTO>> hospitalDeptByConceptNames(HospitalDeptVO hospitalDeptVO) {
+        if (ListUtil.isEmpty(hospitalDeptVO.getConceptNames())) {
+            throw new CommonException(CommonErrorCode.PARAM_IS_ERROR, "请输入ICSS科室名称");
+        }
         Map<String, List<HospitalDeptDTO>> retMap = new LinkedHashMap<>();
         QueryWrapper<HospitalDept> hospitalDeptQueryWrapper = new QueryWrapper<>();
         hospitalDeptQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
@@ -72,7 +76,8 @@ public class HospitalDeptFacade extends HospitalDeptServiceImpl {
                 .in("concept_dept_name", hospitalDeptVO.getConceptNames());
         List<HospitalDept> hospitalDeptList = this.list(hospitalDeptQueryWrapper);
         if (ListUtil.isNotEmpty(hospitalDeptList)) {
-            Map<String, List<HospitalDept>> hospitalDeptMap = EntityUtil.makeEntityListMap(hospitalDeptList, "conceptDeptName");
+            Map<String, List<HospitalDept>> hospitalDeptMap
+                    = EntityUtil.makeEntityListMap(hospitalDeptList, "conceptDeptName");
             for (Map.Entry<String, List<HospitalDept>> entry : hospitalDeptMap.entrySet()) {
                 List<HospitalDeptDTO> hospitalDeptDTOList = Lists.newArrayList();
                 for (HospitalDept hospitalDept : entry.getValue()) {