Merge remote-tracking branch 'origin/dev/diagbotcloud20190918_vital' into dev/diagbotcloud20190918_vital

aipt-service/src/main/java/com/diagbot/facade/ConceptDetailFacade.java

@@ -159,20 +159,21 @@ public class ConceptDetailFacade extends ConceptDetailServiceImpl {
      * @return
      */
     public List<Long> existListByConceptIds(ExistListByConceptIdsVO existListByConceptIdsVO) {
-        QueryWrapper<ConceptDetail> conceptDetailQueryWrapper = new QueryWrapper<>();
-        conceptDetailQueryWrapper
-                .eq("is_deleted", IsDeleteEnum.N.getKey())
-                .in("concept_id", existListByConceptIdsVO.getConceptIds());
-        List<ConceptDetail> conceptDetailList = this.list(conceptDetailQueryWrapper);
-        if (ListUtil.isNotEmpty(conceptDetailList)) {
-            List<Long> retConceptIds = conceptDetailList
-                    .stream()
-                    .map(conceptDetail -> conceptDetail.getConceptId())
-                    .distinct()
-                    .collect(Collectors.toList());
-            return retConceptIds;
-        } else {
-            return null;
+        if (ListUtil.isNotEmpty(existListByConceptIdsVO.getConceptIds())) {
+            QueryWrapper<ConceptDetail> conceptDetailQueryWrapper = new QueryWrapper<>();
+            conceptDetailQueryWrapper
+                    .eq("is_deleted", IsDeleteEnum.N.getKey())
+                    .in("concept_id", existListByConceptIdsVO.getConceptIds());
+            List<ConceptDetail> conceptDetailList = this.list(conceptDetailQueryWrapper);
+            if (ListUtil.isNotEmpty(conceptDetailList)) {
+                List<Long> retConceptIds = conceptDetailList
+                        .stream()
+                        .map(conceptDetail -> conceptDetail.getConceptId())
+                        .distinct()
+                        .collect(Collectors.toList());
+                return retConceptIds;
+            }
         }
+        return null;
     }
 }

aipt-service/src/main/java/com/diagbot/facade/ConceptFacade.java

@@ -142,10 +142,13 @@ public class ConceptFacade extends ConceptServiceImpl {
      * @return
      */
     public List<Concept> getListByIds(List<Long> ids) {
-        QueryWrapper<Concept> conceptQueryWrapper = new QueryWrapper<>();
-        conceptQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
-                .in("id", ids);
-        List<Concept> list = this.list(conceptQueryWrapper);
+        List<Concept> list = new ArrayList<>();
+        if (ListUtil.isNotEmpty(ids)) {
+            QueryWrapper<Concept> conceptQueryWrapper = new QueryWrapper<>();
+            conceptQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
+                    .in("id", ids);
+            list = this.list(conceptQueryWrapper);
+        }
         return list;
     }
 
@@ -157,13 +160,16 @@ public class ConceptFacade extends ConceptServiceImpl {
      * @return
      */
     public List<Concept> getListByNamesAndType(List<String> nameList, Integer libType) {
-        QueryWrapper<Concept> conceptQueryWrapper = new QueryWrapper<>();
-        conceptQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
-                .in("lib_name", nameList);
-        if (libType != null) {
-            conceptQueryWrapper.eq("lib_type", libType);
+        List<Concept> list = new ArrayList<>();
+        if (ListUtil.isNotEmpty(nameList)) {
+            QueryWrapper<Concept> conceptQueryWrapper = new QueryWrapper<>();
+            conceptQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
+                    .in("lib_name", nameList);
+            if (libType != null) {
+                conceptQueryWrapper.eq("lib_type", libType);
+            }
+            list = this.list(conceptQueryWrapper);
         }
-        List<Concept> list = this.list(conceptQueryWrapper);
         return list;
     }
 
@@ -174,10 +180,13 @@ public class ConceptFacade extends ConceptServiceImpl {
      * @return
      */
     public List<Concept> getListByNames(List<String> nameList) {
-        QueryWrapper<Concept> conceptQueryWrapper = new QueryWrapper<>();
-        conceptQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
-                .in("lib_name", nameList);
-        List<Concept> list = this.list(conceptQueryWrapper);
+        List<Concept> list = new ArrayList<>();
+        if (ListUtil.isNotEmpty(nameList)) {
+            QueryWrapper<Concept> conceptQueryWrapper = new QueryWrapper<>();
+            conceptQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
+                    .in("lib_name", nameList);
+            list = this.list(conceptQueryWrapper);
+        }
         return list;
     }
 
@@ -316,18 +325,18 @@ public class ConceptFacade extends ConceptServiceImpl {
         // 有本体，过滤同义词和子项；无本体，有子项，过滤同义词
         for (ConceptRetrievalDTO bean : conceptRetrievalDTOS) {
             if (bean.getShowType().intValue() == 1) {
-                if(retrievalVO.getIsSonShow().intValue() == 0){//isSonShow为0执行检索去重逻辑
+                if (retrievalVO.getIsSonShow().intValue() == 0) {//isSonShow为0执行检索去重逻辑
                     res.add(bean);
                 }
             } else if (bean.getShowType().intValue() == 2) {
-                if(retrievalVO.getIsSonShow().intValue() == 0){//isSonShow为0执行检索去重逻辑
-                    if (!selfList.contains(bean.getParentId()) && !conceptNameList.contains(bean.getParentName()) ) {
+                if (retrievalVO.getIsSonShow().intValue() == 0) {//isSonShow为0执行检索去重逻辑
+                    if (!selfList.contains(bean.getParentId()) && !conceptNameList.contains(bean.getParentName())) {
                         conceptNameList.add(bean.getParentName());
                         res.add(bean);
                     }
                 }
             } else if (bean.getShowType().intValue() == 0) {
-                if(retrievalVO.getIsSonShow().intValue() == 0){//isSonShow为0执行检索去重逻辑
+                if (retrievalVO.getIsSonShow().intValue() == 0) {//isSonShow为0执行检索去重逻辑
                     if (!selfList.contains(bean.getSelfId()) && !subList.contains(bean.getSelfId()) && !conceptNameList.contains(bean.getSelfName())) {
                         conceptNameList.add(bean.getSelfName());
                         res.add(bean);
@@ -354,12 +363,12 @@ public class ConceptFacade extends ConceptServiceImpl {
      */
     public List<RetrievalDTO> getStaticKnowledge(GetStaticKnowledgeVO getStaticKnowledgeVO) {
         RetrievalVO retrievalVO = new RetrievalVO();
-        BeanUtil.copyProperties(getStaticKnowledgeVO,retrievalVO);
+        BeanUtil.copyProperties(getStaticKnowledgeVO, retrievalVO);
         List<RetrievalDTO> staticRetrievalList = this.staticKnowledge(retrievalVO);
         for (RetrievalDTO retrievalDTO : staticRetrievalList) {
             retrievalDTO.setType(ParamConvertUtil.libConvert2Concept(retrievalDTO.getLibTypeId().intValue()));
-            if((retrievalDTO.getShowType().intValue() == 1)
-                || (retrievalDTO.getShowType().intValue() == 21)){//去除本体retrivalName和（父项--子项）组合的retrivalName
+            if ((retrievalDTO.getShowType().intValue() == 1)
+                    || (retrievalDTO.getShowType().intValue() == 21)) {//去除本体retrivalName和（父项--子项）组合的retrivalName
                 retrievalDTO.setRetrievalName(null);
             }
         }

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;
     }
@@ -384,19 +386,27 @@ public class ModuleInfoFacade extends ModuleInfoServiceImpl {
             }
         } else {
             //获取标签信息
-            QueryWrapper<QuestionInfo> questionInfoQueryWrapper = new QueryWrapper<>();
-            questionInfoQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
-                    .in("id", questionIdList);
-            List<QuestionInfo> questionInfoList = questionFacade.list(questionInfoQueryWrapper);
-            Map<Long, QuestionInfo> questionInfoMap = questionInfoList.stream()
-                    .collect(Collectors.toMap(QuestionInfo::getId, questionInfo -> questionInfo));
+            Map<Long, QuestionInfo> questionInfoMap = new HashMap<>();
+            if (ListUtil.isNotEmpty(questionIdList)) {
+                QueryWrapper<QuestionInfo> questionInfoQueryWrapper = new QueryWrapper<>();
+                questionInfoQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
+                        .in("id", questionIdList);
+                List<QuestionInfo> questionInfoList = questionFacade.list(questionInfoQueryWrapper);
+                questionInfoMap = questionInfoList.stream()
+                        .collect(Collectors.toMap(QuestionInfo::getId, questionInfo -> questionInfo));
+            }
+
             //获取模板信息
-            QueryWrapper<ModuleInfo> moduleInfoQueryWrapper = new QueryWrapper<>();
-            questionInfoQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
-                    .in("id", moduleIdList);
-            List<ModuleInfo> moduleInfoList = this.list(moduleInfoQueryWrapper);
-            Map<Long, ModuleInfo> moduleInfoMap = moduleInfoList.stream()
-                    .collect(Collectors.toMap(ModuleInfo::getId, moduleInfo -> moduleInfo));
+            Map<Long, ModuleInfo> moduleInfoMap = new HashMap<>();
+            if (ListUtil.isNotEmpty(moduleIdList)) {
+                QueryWrapper<ModuleInfo> moduleInfoQueryWrapper = new QueryWrapper<>();
+                moduleInfoQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
+                        .in("id", moduleIdList);
+                List<ModuleInfo> moduleInfoList = this.list(moduleInfoQueryWrapper);
+                moduleInfoMap = moduleInfoList.stream()
+                        .collect(Collectors.toMap(ModuleInfo::getId, moduleInfo -> moduleInfo));
+            }
+
             //循环给出参赋值
             for (ModuleDetail moduleDetail : moduleDetailList) {
                 getModuleDetailInfoDTO = new GetModuleDetailInfoDTO();

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

@@ -492,6 +492,9 @@ public class QuestionFacade extends QuestionInfoServiceImpl {
             return true;
         }
         List<String> idList = Arrays.asList(ids.split(","));
+        if (ListUtil.isEmpty(idList)) {
+            return true;
+        }
         StringBuffer errMsg = new StringBuffer();
         Date now = DateUtil.now();
         String person = UserUtils.getCurrentPrincipleID();
@@ -683,16 +686,16 @@ public class QuestionFacade extends QuestionInfoServiceImpl {
         return getQuestionInfoDTOS;
     }
 
-    public List<Long> getQuestionIdsByType(GetQuestionIdsByTypeVO getQuestionIdsByTypeVO) {
-        QueryWrapper<QuestionInfo> queryWrapper = new QueryWrapper<>();
-        queryWrapper.in("id", getQuestionIdsByTypeVO.getQuestionIds())
-                .eq("is_deleted", IsDeleteEnum.N.getKey())
-                .eq("type", getQuestionIdsByTypeVO.getQuestionType());
-        List<QuestionInfo> questionInfoList = this.list(queryWrapper);
-        List<Long> questionIds = questionInfoList.stream().map(questionInfo -> questionInfo.getId())
-                .collect(Collectors.toList());
-        return questionIds;
-    }
+//    public List<Long> getQuestionIdsByType(GetQuestionIdsByTypeVO getQuestionIdsByTypeVO) {
+//        QueryWrapper<QuestionInfo> queryWrapper = new QueryWrapper<>();
+//        queryWrapper.in("id", getQuestionIdsByTypeVO.getQuestionIds())
+//                .eq("is_deleted", IsDeleteEnum.N.getKey())
+//                .eq("type", getQuestionIdsByTypeVO.getQuestionType());
+//        List<QuestionInfo> questionInfoList = this.list(queryWrapper);
+//        List<Long> questionIds = questionInfoList.stream().map(questionInfo -> questionInfo.getId())
+//                .collect(Collectors.toList());
+//        return questionIds;
+//    }
 
     /**
      * 根据参数返回标签内容

knowledgeman-service/src/main/java/com/diagbot/facade/ConceptDetailFacade.java

@@ -82,6 +82,9 @@ public class ConceptDetailFacade extends ConceptDetailServiceImpl {
                 || IsDeleteEnum.Y.getKey().equals(removeConceptDetailVO.getStatus()))) {
             throw new CommonException(CommonErrorCode.STATUS_IS_ERROR, "状态值错误【Y】或【N】");
         }
+        if (ListUtil.isEmpty(removeConceptDetailVO.getConceptId())) {
+            throw new CommonException(CommonErrorCode.PARAM_IS_ERROR, "医学术语静态知识概念id必传");
+        }
         String person = UserUtils.getCurrentPrincipleID();
         List<Long> ids = removeConceptDetailVO.getConceptId();
         Date now = DateUtil.now();

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

@@ -286,17 +286,27 @@ public class ModuleInfoFacade extends ModuleInfoServiceImpl {
             List<Long> questionIdList = moduleDetailList.stream().map(moduleDetail -> moduleDetail.getQuestionId()).collect(Collectors.toList());
             List<Long> moduleIdList = moduleDetailList.stream().map(moduleDetail -> moduleDetail.getRelationModule()).collect(Collectors.toList());
             //获取标签信息
-            QueryWrapper<QuestionInfo> questionInfoQueryWrapper = new QueryWrapper<>();
-            questionInfoQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
-                    .in("id", questionIdList);
-            List<QuestionInfo> questionInfoList = questionFacade.list(questionInfoQueryWrapper);
-            Map<Long, QuestionInfo> questionInfoMap = questionInfoList.stream().collect(Collectors.toMap(QuestionInfo::getId, questionInfo -> questionInfo));
+            Map<Long, QuestionInfo> questionInfoMap = new HashMap<>();
+            if (ListUtil.isNotEmpty(questionIdList)) {
+                QueryWrapper<QuestionInfo> questionInfoQueryWrapper = new QueryWrapper<>();
+                questionInfoQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
+                        .in("id", questionIdList);
+                List<QuestionInfo> questionInfoList = questionFacade.list(questionInfoQueryWrapper);
+                questionInfoMap = questionInfoList.stream()
+                        .collect(Collectors.toMap(QuestionInfo::getId, questionInfo -> questionInfo));
+            }
+
             //获取模板信息
-            QueryWrapper<ModuleInfo> getRelationModuleWapper = new QueryWrapper<>();
-            questionInfoQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
-                    .in("id", moduleIdList);
-            List<ModuleInfo> moduleInfoList = this.list(getRelationModuleWapper);
-            Map<Long, ModuleInfo> moduleInfoMap = moduleInfoList.stream().collect(Collectors.toMap(ModuleInfo::getId, m -> moduleInfo));
+            Map<Long, ModuleInfo> moduleInfoMap = new HashMap<>();
+            if (ListUtil.isNotEmpty(moduleIdList)) {
+                QueryWrapper<ModuleInfo> getRelationModuleWapper = new QueryWrapper<>();
+                getRelationModuleWapper.eq("is_deleted", IsDeleteEnum.N.getKey())
+                        .in("id", moduleIdList);
+                List<ModuleInfo> moduleInfoList = this.list(getRelationModuleWapper);
+                moduleInfoMap = moduleInfoList.stream()
+                        .collect(Collectors.toMap(ModuleInfo::getId, m -> moduleInfo));
+            }
+
             //循环给出参赋值
             for (ModuleDetail moduleDetail : moduleDetailList) {
                 getModuleDetailInfoDTO = new GetModuleDetailInfoDTO();

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()) {