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

icss-service/src/main/java/com/diagbot/entity/ScaleContent.java

@@ -14,7 +14,6 @@ import java.io.Serializable;
  * @author zhoutg
  * @since 2019-03-11
  */
-@TableName("icss_scale_content")
 @Getter
 @Setter
 public class ScaleContent implements Serializable {

icss-service/src/main/java/com/diagbot/facade/DeptInfoFacade.java

@@ -3,7 +3,6 @@ package com.diagbot.facade;
 import com.diagbot.client.AiptServiceClient;
 import com.diagbot.dto.DeptInfoDTO;
 import com.diagbot.dto.RespDTO;
-import com.diagbot.service.impl.DeptInfoServiceImpl;
 import com.diagbot.util.RespDTOUtil;
 import com.diagbot.vo.DeptInfoVO;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -15,7 +14,7 @@ import org.springframework.stereotype.Component;
  * @time: 2018/11/19 19:21
  */
 @Component
-public class DeptInfoFacade extends DeptInfoServiceImpl {
+public class DeptInfoFacade {
 
     @Autowired
     AiptServiceClient aiptServiceClient;

icss-service/src/main/java/com/diagbot/facade/DisTypeFacade.java

@@ -1,14 +1,8 @@
 package com.diagbot.facade;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.diagbot.client.AiptServiceClient;
 import com.diagbot.dto.DisTypeDTO;
 import com.diagbot.dto.RespDTO;
-import com.diagbot.entity.DisType;
-import com.diagbot.entity.QuestionInfo;
-import com.diagbot.enums.IsDeleteEnum;
-import com.diagbot.enums.QuestionTypeEnum;
-import com.diagbot.service.impl.DisTypeServiceImpl;
 import com.diagbot.util.RespDTOUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
@@ -19,9 +13,7 @@ import org.springframework.stereotype.Component;
  * @time: 2018/11/19 13:19
  */
 @Component
-public class DisTypeFacade extends DisTypeServiceImpl {
-    @Autowired
-    private QuestionFacade questionFacade;
+public class DisTypeFacade {
     @Autowired
     AiptServiceClient aiptServiceClient;
 
@@ -31,48 +23,8 @@ public class DisTypeFacade extends DisTypeServiceImpl {
      * @return
      */
     public DisTypeDTO getDisTypeFac() {
-        RespDTO<DisTypeDTO> res =  aiptServiceClient.getDisType();
+        RespDTO<DisTypeDTO> res = aiptServiceClient.getDisType();
         RespDTOUtil.respNGDeal(res, "远程调用诊断类型失败");
         return res.data;
     }
-
-    /**
-     * 根据诊断id判断类型
-     *
-     * @param diseaseId
-     * @param type
-     * @return
-     */
-    public Boolean judgeByDisId(Long diseaseId, Integer type) {
-        QueryWrapper<DisType> disTypeQueryWrapper = new QueryWrapper<>();
-        disTypeQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
-                .eq("dis_id", diseaseId)
-                .eq("type", type);
-        DisType disType = this.getOne(disTypeQueryWrapper);
-        if (disType == null) {
-            return false;
-        } else {
-            return true;
-        }
-    }
-
-    /**
-     * 根据诊断名称判断类型
-     *
-     * @param disName
-     * @param type
-     * @return
-     */
-    public Boolean judgeByDisName(String disName, Integer type) {
-        QueryWrapper<QuestionInfo> questionInfoQueryWrapper = new QueryWrapper<>();
-        questionInfoQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
-                .eq("tag_name", disName)
-                .eq("type", QuestionTypeEnum.Disease.getKey());
-        QuestionInfo disease = questionFacade.getOne(questionInfoQueryWrapper);
-        if (disease == null) {
-            return false;
-        } else {
-            return judgeByDisId(disease.getId(), type);
-        }
-    }
 }

icss-service/src/main/java/com/diagbot/facade/IntroduceDetailFacade.java

@@ -1,13 +0,0 @@
-package com.diagbot.facade;
-
-import com.diagbot.service.impl.IntroduceDetailServiceImpl;
-import org.springframework.stereotype.Component;
-
-/**
- * @Description:
- * @Author:zhaops
- * @time: 2018/11/16 9:28
- */
-@Component
-public class IntroduceDetailFacade extends IntroduceDetailServiceImpl {
-}

icss-service/src/main/java/com/diagbot/facade/IntroduceInfoFacade.java

@@ -1,302 +0,0 @@
-package com.diagbot.facade;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.diagbot.client.TranServiceClient;
-import com.diagbot.dto.EMRIntroduceDetailDTO;
-import com.diagbot.dto.IntroduceDTO;
-import com.diagbot.dto.RespDTO;
-import com.diagbot.entity.IntroduceDetail;
-import com.diagbot.entity.IntroduceInfo;
-import com.diagbot.entity.IntroduceMap;
-import com.diagbot.entity.QuestionInfo;
-import com.diagbot.enums.IsDeleteEnum;
-import com.diagbot.enums.QuestionTypeEnum;
-import com.diagbot.exception.CommonErrorCode;
-import com.diagbot.exception.CommonException;
-import com.diagbot.service.impl.IntroduceInfoServiceImpl;
-import com.diagbot.util.ArrayUtil;
-import com.diagbot.util.BeanUtil;
-import com.diagbot.util.ListUtil;
-import com.diagbot.util.RespDTOUtil;
-import com.diagbot.util.StringUtil;
-import com.diagbot.vo.EMRIntroduceVO;
-import com.diagbot.vo.HosCodeVO;
-import com.diagbot.vo.IntroduceByQuestionVO;
-import com.google.common.collect.Lists;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-import java.util.Arrays;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * @Description:
- * @Author:zhaops
- * @time: 2018/11/16 9:27
- */
-@Component
-public class IntroduceInfoFacade extends IntroduceInfoServiceImpl {
-    @Autowired
-    IntroduceMapFacade introduceMapFacade;
-    @Autowired
-    IntroduceDetailFacade introduceDetailFacade;
-    @Autowired
-    QuestionFacade questionFacade;
-    @Autowired
-    TranServiceClient tranServiceClient;
-    @Autowired
-    LisMappingFacade lisMappingFacade;
-
-    /**
-     * 根据标签id获取提示信息
-     *
-     * @param introduceByQuestionVO
-     * @return
-     */
-    public IntroduceDTO getByQuestionId(IntroduceByQuestionVO introduceByQuestionVO) {
-        Long questionId = introduceByQuestionVO.getQuestionId();
-        if (questionId == null) {
-            throw new CommonException(CommonErrorCode.PARAM_IS_NULL, "请输入标签id");
-        }
-        QuestionInfo questionInfo = questionFacade.getById(questionId);
-        if (questionInfo == null) {
-            throw new CommonException(CommonErrorCode.PARAM_IS_NULL, "未找到标签");
-        }
-        QueryWrapper<IntroduceMap> introduceMapQueryWrapper = new QueryWrapper<>();
-        introduceMapQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey()).
-                eq("question_id", introduceByQuestionVO.getQuestionId()).
-                eq("type", introduceByQuestionVO.getType());
-        IntroduceMap introduceMap = introduceMapFacade.getOne(introduceMapQueryWrapper);
-        if (introduceMap == null) {
-            throw new CommonException(CommonErrorCode.NOT_EXISTS, "提示信息未维护");
-        }
-
-        IntroduceDTO introduceDTO = this.getRecordByIdAndPosition(introduceMap.getIntroduceId(), introduceByQuestionVO.getPosition());
-        introduceDTO.setTagName(questionInfo.getTagName());
-        return introduceDTO;
-    }
-
-    /**
-     * 根据标签名称获取提示信息
-     *
-     * @param introduceByQuestionVO
-     * @return
-     */
-    public IntroduceDTO getByQuestionName(IntroduceByQuestionVO introduceByQuestionVO) {
-        if (StringUtil.isBlank(introduceByQuestionVO.getTagName())) {
-            throw new CommonException(CommonErrorCode.PARAM_IS_NULL, "请输入标签名称");
-        }
-        QueryWrapper<QuestionInfo> questionInfoQueryWrapper = new QueryWrapper<>();
-        questionInfoQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
-                .eq("tag_name", introduceByQuestionVO.getTagName())
-                .eq("type", introduceByQuestionVO.getType());
-        QuestionInfo questionInfo = questionFacade.getOne(questionInfoQueryWrapper);
-        if (questionInfo == null) {
-            throw new CommonException(CommonErrorCode.NOT_EXISTS, "标签不存在");
-        }
-
-        QueryWrapper<IntroduceMap> introduceMapQueryWrapper = new QueryWrapper<>();
-        introduceMapQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey()).
-                eq("question_id", questionInfo.getId()).
-                eq("type", introduceByQuestionVO.getType());
-        IntroduceMap introduceMap = introduceMapFacade.getOne(introduceMapQueryWrapper);
-        if (introduceMap == null) {
-            throw new CommonException(CommonErrorCode.NOT_EXISTS, "提示信息未维护");
-        }
-
-        IntroduceDTO introduceDTO = this.getRecordByIdAndPosition(introduceMap.getIntroduceId(), introduceByQuestionVO.getPosition());
-        introduceDTO.setTagName(questionInfo.getTagName());
-        return introduceDTO;
-    }
-
-    /**
-     * 获取指定位置提示信息
-     *
-     * @param id
-     * @param position
-     * @return
-     */
-    public IntroduceDTO getRecordByIdAndPosition(Long id, Integer position) {
-        IntroduceDTO introduceDTO = new IntroduceDTO();
-        IntroduceInfo introduceInfo = this.getById(id);
-        if (introduceInfo == null) {
-            throw new CommonException(CommonErrorCode.NOT_EXISTS, "提示信息未维护");
-        } else if (introduceInfo.getIsDeleted().equals(IsDeleteEnum.Y.getKey())) {
-            throw new CommonException(CommonErrorCode.NOT_EXISTS, "提示信息已删除");
-        }
-        BeanUtil.copyProperties(introduceInfo, introduceDTO);
-
-
-        QueryWrapper<IntroduceDetail> introduceDetailQueryWrapper = new QueryWrapper<>();
-        //展示位置
-        if (position != null) {
-            introduceDetailQueryWrapper.apply("find_in_set({0},position)", position);
-        }
-        introduceDetailQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey()).
-                eq("introduce_id", introduceInfo.getId()).
-                orderByAsc("order_no");
-        List<IntroduceDetail> introduceDetailList = introduceDetailFacade.list(introduceDetailQueryWrapper);
-        introduceDTO.setIntroduceDetailList(introduceDetailList);
-        return introduceDTO;
-    }
-
-    /**
-     * 根据id获取提示信息
-     *
-     * @param id
-     * @return
-     */
-    public IntroduceDTO getRecordById(Long id) {
-        return getRecordByIdAndPosition(id, null);
-    }
-
-    /**
-     * 获取电子病历评级提示信息
-     *
-     * @param emrIntroduceVO
-     * @return
-     */
-    public List<EMRIntroduceDetailDTO> getIntroduceByEMR(EMRIntroduceVO emrIntroduceVO) {
-        Boolean isDocking = tranServiceClient.isDocking().data;
-        //入参处理
-        HosCodeVO hosCodeVO = new HosCodeVO();
-        hosCodeVO.setHosCode(emrIntroduceVO.getHosCode());
-        //公表转换
-        String uniqueName = "";
-        Integer type = emrIntroduceVO.getType();
-        if (type.equals(QuestionTypeEnum.Lis.getKey())) {
-            if (StringUtil.isNotBlank(emrIntroduceVO.getName())) {
-                if (StringUtil.isNotBlank(emrIntroduceVO.getDetailName())) {
-                    Map<String, Map<String, String>> lisConfigMap = new LinkedHashMap<>();
-                    if (isDocking) {
-                        RespDTO<Map<String, Map<String, String>>> respLisConfigMap = tranServiceClient.getLisConfigByHosCode_NotEmptyItemName(hosCodeVO);
-                        RespDTOUtil.respNGDealCover(respLisConfigMap, CommonErrorCode.RPC_ERROR.getMsg());
-                        lisConfigMap = respLisConfigMap.data;
-                    } else {
-                        lisConfigMap = lisMappingFacade.getLisMapping_NotEmptyItemName();
-                    }
-
-                    uniqueName = lisConfigMap.get(emrIntroduceVO.getName()).get(emrIntroduceVO.getDetailName());
-                } else {
-                    Map<String, String> lisConfigMap_emptyItemName = new LinkedHashMap<>();
-                    if (isDocking) {
-                        RespDTO<Map<String, String>> respLisConfigMap_emptyItemName = tranServiceClient.getLisConfigByHosCode_EmptyItemName(hosCodeVO);
-                        RespDTOUtil.respNGDealCover(respLisConfigMap_emptyItemName, CommonErrorCode.RPC_ERROR.getMsg());
-                        lisConfigMap_emptyItemName = respLisConfigMap_emptyItemName.data;
-                    } else {
-                        lisConfigMap_emptyItemName = lisMappingFacade.getLisConfig_EmptyItemName();
-                    }
-                    uniqueName = lisConfigMap_emptyItemName.get(emrIntroduceVO.getName());
-                }
-            }
-        } else if (type.equals(QuestionTypeEnum.Pacs.getKey())) {
-            if (isDocking) {
-                RespDTO<Map<String, String>> respPacsConfigMap = tranServiceClient.getPacsConfigByHosCode(hosCodeVO);
-                RespDTOUtil.respNGDealCover(respPacsConfigMap, CommonErrorCode.RPC_ERROR.getMsg());
-                Map<String, String> pacsConfigMap = respPacsConfigMap.data;
-                uniqueName = pacsConfigMap.get(emrIntroduceVO.getName());
-            } else {
-                uniqueName = emrIntroduceVO.getName();
-            }
-        } else if (type.equals(QuestionTypeEnum.Disease.getKey())) {
-            if (isDocking) {
-                RespDTO<Map<String, String>> respDisMap = tranServiceClient.getDiseaseIcdByHosCode(hosCodeVO);
-                RespDTOUtil.respNGDealCover(respDisMap, CommonErrorCode.RPC_ERROR.getMsg());
-                Map<String, String> disMap = respDisMap.data;
-                uniqueName = disMap.get(emrIntroduceVO.getName());
-            } else {
-                uniqueName = emrIntroduceVO.getName();
-            }
-        }
-
-        //未找到映射标签名称
-        if (uniqueName == null || StringUtil.isBlank(uniqueName)) {
-            throw new CommonException(CommonErrorCode.NOT_EXISTS, "项目未找到");
-        }
-
-        String[] titles = emrIntroduceVO.getTitles();
-        //对接标题映射
-        Map<String, String> titleMapping = new LinkedHashMap<>();
-        List<String> uniqueTitleList = Lists.newLinkedList();
-        if (ArrayUtil.isNotEmpty(titles)) {
-            if (isDocking) {
-                RespDTO<Map<String, String>> respTitleMappingMap = tranServiceClient.getTitleMappingHosCode(hosCodeVO);
-                RespDTOUtil.respNGDealCover(respTitleMappingMap, CommonErrorCode.RPC_ERROR.getMsg());
-                Map<String, String> titleMappingMap = respTitleMappingMap.data;
-                for (String title : titles) {
-                    String uniqueTitle = titleMappingMap.get(title);
-                    titleMapping.put(title, uniqueTitle);
-                    if (StringUtil.isNotBlank(uniqueTitle)) {
-                        uniqueTitleList.add(uniqueTitle);
-                    }
-                }
-            } else {
-                uniqueTitleList = Arrays.asList(titles);
-            }
-        }
-
-        QueryWrapper<QuestionInfo> questionInfoQueryWrapper = new QueryWrapper<>();
-        questionInfoQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
-                .eq("tag_name", uniqueName)
-                .eq("type", type);
-        QuestionInfo questionInfo = questionFacade.getOne(questionInfoQueryWrapper);
-        if (questionInfo == null) {
-            throw new CommonException(CommonErrorCode.NOT_EXISTS, "公表标签不存在");
-        }
-
-
-        QueryWrapper<IntroduceMap> introduceMapQueryWrapper = new QueryWrapper<>();
-        introduceMapQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey()).
-                eq("type", type).
-                eq("question_id", questionInfo.getId());
-        IntroduceMap introduceMap = introduceMapFacade.getOne(introduceMapQueryWrapper);
-        if (introduceMap == null) {
-            throw new CommonException(CommonErrorCode.NOT_EXISTS, "提示信息未维护");
-        }
-
-        QueryWrapper<IntroduceDetail> introduceDetailQueryWrapper = new QueryWrapper<>();
-        introduceDetailQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey()).
-                eq("introduce_id", introduceMap.getIntroduceId()).
-                orderByAsc("order_no");
-        //如果标题列表未传，全部返回
-        if (ArrayUtil.isNotEmpty(emrIntroduceVO.getTitles())) {
-            if (ListUtil.isNotEmpty(uniqueTitleList)) {
-                introduceDetailQueryWrapper.in("title", uniqueTitleList);
-            } else {
-                //标题未匹配上，不返回数据,加一个不成立的条件
-                introduceDetailQueryWrapper.eq("is_deleted", IsDeleteEnum.Y.getKey());
-            }
-        }
-        if (emrIntroduceVO.getPosition() != null) {
-            introduceDetailQueryWrapper.apply("find_in_set({0},position)", emrIntroduceVO.getPosition());
-        }
-
-        List<IntroduceDetail> introduceDetailList = introduceDetailFacade.list(introduceDetailQueryWrapper);
-        List<EMRIntroduceDetailDTO> retList = Lists.newLinkedList();
-        if (ArrayUtil.isNotEmpty(emrIntroduceVO.getTitles())) {
-            //对接模式，返回原标题
-            if (isDocking) {
-                for (Map.Entry<String, String> entry : titleMapping.entrySet()) {
-                    EMRIntroduceDetailDTO detailDTO = new EMRIntroduceDetailDTO();
-                    detailDTO.setTitle(entry.getKey());
-                    if (StringUtil.isNotBlank(entry.getValue())) {
-                        for (IntroduceDetail introduceDetail : introduceDetailList) {
-                            if (entry.getValue().equals(introduceDetail.getTitle())) {
-                                detailDTO.setText(introduceDetail.getText());
-                                detailDTO.setContent(introduceDetail.getContent());
-                            }
-                        }
-                    }
-                    retList.add(detailDTO);
-                }
-            } else {
-                retList = BeanUtil.listCopyTo(introduceDetailList, EMRIntroduceDetailDTO.class);
-            }
-        } else {
-            retList = BeanUtil.listCopyTo(introduceDetailList, EMRIntroduceDetailDTO.class);
-        }
-        return retList;
-    }
-}

icss-service/src/main/java/com/diagbot/facade/IntroduceMapFacade.java

@@ -1,56 +0,0 @@
-package com.diagbot.facade;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.diagbot.entity.IntroduceMap;
-import com.diagbot.entity.QuestionInfo;
-import com.diagbot.enums.IsDeleteEnum;
-import com.diagbot.service.impl.IntroduceMapServiceImpl;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-/**
- * @Description:
- * @Author:zhaops
- * @time: 2018/11/16 9:28
- */
-@Component
-public class IntroduceMapFacade extends IntroduceMapServiceImpl {
-    @Autowired
-    QuestionFacade questionFacade;
-
-    /**
-     * 根据标签id和类型判断时候有关联静态知识
-     *
-     * @param questionId
-     * @param type
-     * @return
-     */
-    public Boolean hasIntroduceByQuestionId(Long questionId, Integer type) {
-        QueryWrapper<IntroduceMap> introduceMapQueryWrapper = new QueryWrapper<>();
-        introduceMapQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey()).eq("question_id", questionId).eq("type", type);
-        IntroduceMap introduceMap = this.getOne(introduceMapQueryWrapper);
-        if (introduceMap == null) {
-            return false;
-        } else {
-            return true;
-        }
-    }
-
-    /**
-     * 根据标签名称和类型判断时候有关联静态知识
-     *
-     * @param questionName
-     * @param type
-     * @return
-     */
-    public Boolean hasIntroduceByQuestionName(String questionName, Integer type) {
-        QueryWrapper<QuestionInfo> questionInfoQueryWrapper = new QueryWrapper<>();
-        questionInfoQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey()).eq("tag_name", questionName).eq("type", type);
-        QuestionInfo questionInfo = questionFacade.getOne(questionInfoQueryWrapper);
-        if (questionInfo == null) {
-            return false;
-        } else {
-            return hasIntroduceByQuestionId(questionInfo.getId(), type);
-        }
-    }
-}

icss-service/src/main/java/com/diagbot/facade/RetrievalFacade.java

@@ -7,7 +7,6 @@ import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.RetrievalDTO;
 import com.diagbot.entity.QuestionInfo;
 import com.diagbot.enums.IsDeleteEnum;
-import com.diagbot.service.impl.RetrievalServiceImpl;
 import com.diagbot.util.ListUtil;
 import com.diagbot.util.RespDTOUtil;
 import com.diagbot.util.StringUtil;
@@ -28,7 +27,7 @@ import java.util.stream.Collectors;
  * @time: 2018/11/27 14:54
  */
 @Component
-public class RetrievalFacade extends RetrievalServiceImpl {
+public class RetrievalFacade {
 
     @Autowired
     QuestionFacade questionFacade;
@@ -45,39 +44,39 @@ public class RetrievalFacade extends RetrievalServiceImpl {
         List<RetrievalDTO> retrievalDTOS = new ArrayList<>();
         //调用aipt-服务
         RespDTO<List<ConceptRetrievalDTO>> conceptInfos = aiptServiceClient.retrivelConceptInfo(retrievalVO);
-        RespDTOUtil.respNGDeal(conceptInfos,"获取检索信息失败");
+        RespDTOUtil.respNGDeal(conceptInfos, "获取检索信息失败");
         //获取questionId
         List<String> questionNames = new ArrayList<>();
-        if(ListUtil.isNotEmpty(conceptInfos.data)){
-            for (ConceptRetrievalDTO conceptRetrievalDTO: conceptInfos.data) {
-                if(!questionNames.contains(conceptRetrievalDTO.getSameName())){
-                        questionNames.add(conceptRetrievalDTO.getSelfName());
-                    }
-                    if(!questionNames.contains(conceptRetrievalDTO.getParentName())){
-                        questionNames.add(conceptRetrievalDTO.getParentName());
-                    }
+        if (ListUtil.isNotEmpty(conceptInfos.data)) {
+            for (ConceptRetrievalDTO conceptRetrievalDTO : conceptInfos.data) {
+                if (!questionNames.contains(conceptRetrievalDTO.getSameName())) {
+                    questionNames.add(conceptRetrievalDTO.getSelfName());
                 }
+                if (!questionNames.contains(conceptRetrievalDTO.getParentName())) {
+                    questionNames.add(conceptRetrievalDTO.getParentName());
+                }
+            }
             QueryWrapper<QuestionInfo> questionInfoQueryWrapper = new QueryWrapper<>();
             questionInfoQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
-                    .in("tag_name",questionNames)
-                    .eq("type",retrievalVO.getType());
+                    .in("tag_name", questionNames)
+                    .eq("type", retrievalVO.getType());
             List<QuestionInfo> questionInfoList = questionFacade.list(questionInfoQueryWrapper);
-            Map<String,QuestionInfo> questionInfoMap = questionInfoList.stream().collect(Collectors.toMap(QuestionInfo::getTagName,questionInfo -> questionInfo));
+            Map<String, QuestionInfo> questionInfoMap = questionInfoList.stream().collect(Collectors.toMap(QuestionInfo::getTagName, questionInfo -> questionInfo));
             RetrievalDTO retrievalDTO = new RetrievalDTO();
             //封装
-            for (ConceptRetrievalDTO conceptRetrievalDTO: conceptInfos.data) {
+            for (ConceptRetrievalDTO conceptRetrievalDTO : conceptInfos.data) {
                 retrievalDTO = new RetrievalDTO();
                 retrievalDTO.setConceptId(conceptRetrievalDTO.getSelfId());
                 retrievalDTO.setName(conceptRetrievalDTO.getSelfName());
-                if(StringUtil.isNotEmpty(conceptRetrievalDTO.getParentName())){//parent不为空时说明有子项，返回父级id
+                if (StringUtil.isNotEmpty(conceptRetrievalDTO.getParentName())) {//parent不为空时说明有子项，返回父级id
                     retrievalDTO.setQuestionId(questionInfoMap.get(conceptRetrievalDTO.getParentName()).getId());
-                }else {//parent为空时说明没有子项返回本体id
+                } else {//parent为空时说明没有子项返回本体id
                     retrievalDTO.setQuestionId(questionInfoMap.get(conceptRetrievalDTO.getSelfName()).getId());
                 }
-                if(StringUtil.isNotEmpty(conceptRetrievalDTO.getSameName())){//同义词
+                if (StringUtil.isNotEmpty(conceptRetrievalDTO.getSameName())) {//同义词
                     retrievalDTO.setRetrievalName(conceptRetrievalDTO.getSameName());
                 }
-                if(StringUtil.isNotEmpty(conceptRetrievalDTO.getParentName())){//子项
+                if (StringUtil.isNotEmpty(conceptRetrievalDTO.getParentName())) {//子项
                     retrievalDTO.setRetrievalName(conceptRetrievalDTO.getParentName());
                 }
                 retrievalDTO.setShowType(conceptRetrievalDTO.getShowType());

icss-service/src/main/java/com/diagbot/facade/ScaleContentFacade.java

@@ -1,13 +1,9 @@
 package com.diagbot.facade;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.diagbot.client.AiptServiceClient;
 import com.diagbot.client.bean.SearchData;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.entity.ScaleContent;
-import com.diagbot.enums.IsDeleteEnum;
-import com.diagbot.enums.ScaleTypeEnum;
-import com.diagbot.service.impl.ScaleContentServiceImpl;
 import com.diagbot.util.RespDTOUtil;
 import com.diagbot.vo.PushVO;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -21,10 +17,7 @@ import java.util.List;
  * @time: 2018/11/19 13:19
  */
 @Component
-public class ScaleContentFacade extends ScaleContentServiceImpl {
-
-    @Autowired
-    PushFacade pushFacade;
+public class ScaleContentFacade {
     @Autowired
     AiptServiceClient aiptServiceClient;
     @Autowired
@@ -42,26 +35,4 @@ public class ScaleContentFacade extends ScaleContentServiceImpl {
         return res.data;
     }
 
-
-    /**
-     * 返回诊断量表列表
-     *
-     * @return
-     */
-    public List<ScaleContent> getContent(Long scaleId, String pushContent) {
-        //获取内容列表
-        List<ScaleContent> data = this.list(new QueryWrapper<ScaleContent>()
-                .eq("scale_id", scaleId)
-                .eq("is_deleted", IsDeleteEnum.N.getKey())
-                .orderByAsc("order_no"));
-
-        //看需是否要调用大数据
-        for (ScaleContent scaleContent : data) {
-            if (ScaleTypeEnum.PUSH.getKey() == scaleContent.getType()) {
-                scaleContent.setContent(pushContent);
-                break;
-            }
-        }
-        return data;
-    }
 }

icss-service/src/main/java/com/diagbot/mapper/DeptInfoMapper.java

@@ -1,16 +0,0 @@
-package com.diagbot.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.diagbot.entity.DeptInfo;
-
-/**
- * <p>
- * 科室信息表 Mapper 接口
- * </p>
- *
- * @author wangyu
- * @since 2018-11-19
- */
-public interface DeptInfoMapper extends BaseMapper<DeptInfo> {
-
-}

icss-service/src/main/java/com/diagbot/mapper/DisTypeMapper.java

@@ -1,16 +0,0 @@
-package com.diagbot.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.diagbot.entity.DisType;
-
-/**
- * <p>
- * 诊断类型表 Mapper 接口
- * </p>
- *
- * @author zhoutg
- * @since 2019-03-08
- */
-public interface DisTypeMapper extends BaseMapper<DisType> {
-
-}

icss-service/src/main/java/com/diagbot/mapper/IntroduceDetailMapper.java

@@ -1,16 +0,0 @@
-package com.diagbot.mapper;
-
-import com.diagbot.entity.IntroduceDetail;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * 提示信息明细 Mapper 接口
- * </p>
- *
- * @author zhaops
- * @since 2018-11-15
- */
-public interface IntroduceDetailMapper extends BaseMapper<IntroduceDetail> {
-
-}

icss-service/src/main/java/com/diagbot/mapper/IntroduceInfoMapper.java

@@ -1,16 +0,0 @@
-package com.diagbot.mapper;
-
-import com.diagbot.entity.IntroduceInfo;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * 提示信息 Mapper 接口
- * </p>
- *
- * @author zhaops
- * @since 2018-11-15
- */
-public interface IntroduceInfoMapper extends BaseMapper<IntroduceInfo> {
-
-}

icss-service/src/main/java/com/diagbot/mapper/IntroduceMapMapper.java

@@ -1,16 +0,0 @@
-package com.diagbot.mapper;
-
-import com.diagbot.entity.IntroduceMap;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * 标签与提示信息映射表 Mapper 接口
- * </p>
- *
- * @author zhaops
- * @since 2018-11-15
- */
-public interface IntroduceMapMapper extends BaseMapper<IntroduceMap> {
-
-}

icss-service/src/main/java/com/diagbot/mapper/RetrievalMapper.java

@@ -1,26 +0,0 @@
-package com.diagbot.mapper;
-
-import com.diagbot.dto.RetrievalDTO;
-import com.diagbot.entity.Retrieval;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.diagbot.vo.RetrievalVO;
-
-import java.util.List;
-
-/**
- * <p>
- * 检索表 Mapper 接口
- * </p>
- *
- * @author wangyu
- * @since 2018-11-16
- */
-public interface RetrievalMapper extends BaseMapper<Retrieval> {
-
-    /**
-     * 获取主诉信息
-     * @param retrievalVO
-     * @return
-     */
-    public List<RetrievalDTO> getSymptopInfo(RetrievalVO retrievalVO);
-}

icss-service/src/main/java/com/diagbot/mapper/RetrievalMappingMapper.java

@@ -1,16 +0,0 @@
-package com.diagbot.mapper;
-
-import com.diagbot.entity.RetrievalMapping;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * 检索映射表 Mapper 接口
- * </p>
- *
- * @author wangyu
- * @since 2018-11-16
- */
-public interface RetrievalMappingMapper extends BaseMapper<RetrievalMapping> {
-
-}

icss-service/src/main/java/com/diagbot/mapper/ScaleContentMapper.java

@@ -1,16 +0,0 @@
-package com.diagbot.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.diagbot.entity.ScaleContent;
-
-/**
- * <p>
- * 量表内容表 Mapper 接口
- * </p>
- *
- * @author zhoutg
- * @since 2019-03-11
- */
-public interface ScaleContentMapper extends BaseMapper<ScaleContent> {
-
-}

icss-service/src/main/java/com/diagbot/service/DeptInfoService.java

@@ -1,16 +0,0 @@
-package com.diagbot.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.diagbot.entity.DeptInfo;
-
-/**
- * <p>
- * 科室信息表 服务类
- * </p>
- *
- * @author wangyu
- * @since 2018-11-19
- */
-public interface DeptInfoService extends IService<DeptInfo> {
-
-}

icss-service/src/main/java/com/diagbot/service/DisTypeService.java

@@ -1,16 +0,0 @@
-package com.diagbot.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.diagbot.entity.DisType;
-
-/**
- * <p>
- * 诊断类型表 服务类
- * </p>
- *
- * @author zhoutg
- * @since 2019-03-08
- */
-public interface DisTypeService extends IService<DisType> {
-
-}

icss-service/src/main/java/com/diagbot/service/IntroduceDetailService.java

@@ -1,16 +0,0 @@
-package com.diagbot.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.diagbot.entity.IntroduceDetail;
-
-/**
- * <p>
- * 提示信息明细 服务类
- * </p>
- *
- * @author zhaops
- * @since 2018-11-15
- */
-public interface IntroduceDetailService extends IService<IntroduceDetail> {
-
-}

icss-service/src/main/java/com/diagbot/service/IntroduceInfoService.java

@@ -1,16 +0,0 @@
-package com.diagbot.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.diagbot.entity.IntroduceInfo;
-
-/**
- * <p>
- * 提示信息 服务类
- * </p>
- *
- * @author zhaops
- * @since 2018-11-15
- */
-public interface IntroduceInfoService extends IService<IntroduceInfo> {
-
-}

icss-service/src/main/java/com/diagbot/service/IntroduceMapService.java

@@ -1,16 +0,0 @@
-package com.diagbot.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.diagbot.entity.IntroduceMap;
-
-/**
- * <p>
- * 标签与提示信息映射表 服务类
- * </p>
- *
- * @author zhaops
- * @since 2018-11-15
- */
-public interface IntroduceMapService extends IService<IntroduceMap> {
-
-}

icss-service/src/main/java/com/diagbot/service/RetrievalMappingService.java

@@ -1,16 +0,0 @@
-package com.diagbot.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.diagbot.entity.RetrievalMapping;
-
-/**
- * <p>
- * 检索映射表 服务类
- * </p>
- *
- * @author wangyu
- * @since 2018-11-16
- */
-public interface RetrievalMappingService extends IService<RetrievalMapping> {
-
-}

icss-service/src/main/java/com/diagbot/service/RetrievalService.java

@@ -1,27 +0,0 @@
-package com.diagbot.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.diagbot.dto.RetrievalDTO;
-import com.diagbot.entity.Retrieval;
-import com.diagbot.vo.RetrievalVO;
-
-import java.util.List;
-
-/**
- * <p>
- * 检索表 服务类
- * </p>
- *
- * @author wangyu
- * @since 2018-11-16
- */
-public interface RetrievalService extends IService<Retrieval> {
-
-    /**
-     * 获取主诉信息
-     *
-     * @param retrievalVO
-     * @return
-     */
-    public List<RetrievalDTO> getSymptopInfo(RetrievalVO retrievalVO);
-}

icss-service/src/main/java/com/diagbot/service/ScaleContentService.java

@@ -1,16 +0,0 @@
-package com.diagbot.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.diagbot.entity.ScaleContent;
-
-/**
- * <p>
- * 量表内容表 服务类
- * </p>
- *
- * @author zhoutg
- * @since 2019-03-11
- */
-public interface ScaleContentService extends IService<ScaleContent> {
-
-}

icss-service/src/main/java/com/diagbot/service/impl/DeptInfoServiceImpl.java

@@ -1,23 +0,0 @@
-package com.diagbot.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.diagbot.dto.DeptInfoDTO;
-import com.diagbot.entity.DeptInfo;
-import com.diagbot.mapper.DeptInfoMapper;
-import com.diagbot.service.DeptInfoService;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- * <p>
- * 科室信息表 服务实现类
- * </p>
- *
- * @author wangyu
- * @since 2018-11-19
- */
-@Service
-public class DeptInfoServiceImpl extends ServiceImpl<DeptInfoMapper, DeptInfo> implements DeptInfoService {
-
-}

icss-service/src/main/java/com/diagbot/service/impl/DisTypeServiceImpl.java

@@ -1,20 +0,0 @@
-package com.diagbot.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.diagbot.entity.DisType;
-import com.diagbot.mapper.DisTypeMapper;
-import com.diagbot.service.DisTypeService;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * 标签基础表 服务实现类
- * </p>
- *
- * @author zhoutg
- * @since 2018-11-15
- */
-@Service
-public class DisTypeServiceImpl extends ServiceImpl<DisTypeMapper, DisType> implements DisTypeService {
-
-}

icss-service/src/main/java/com/diagbot/service/impl/IntroduceDetailServiceImpl.java

@@ -1,20 +0,0 @@
-package com.diagbot.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.diagbot.entity.IntroduceDetail;
-import com.diagbot.mapper.IntroduceDetailMapper;
-import com.diagbot.service.IntroduceDetailService;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * 提示信息明细 服务实现类
- * </p>
- *
- * @author zhaops
- * @since 2018-11-15
- */
-@Service
-public class IntroduceDetailServiceImpl extends ServiceImpl<IntroduceDetailMapper, IntroduceDetail> implements IntroduceDetailService {
-
-}

icss-service/src/main/java/com/diagbot/service/impl/IntroduceInfoServiceImpl.java

@@ -1,20 +0,0 @@
-package com.diagbot.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.diagbot.entity.IntroduceInfo;
-import com.diagbot.mapper.IntroduceInfoMapper;
-import com.diagbot.service.IntroduceInfoService;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * 提示信息 服务实现类
- * </p>
- *
- * @author zhaops
- * @since 2018-11-15
- */
-@Service
-public class IntroduceInfoServiceImpl extends ServiceImpl<IntroduceInfoMapper, IntroduceInfo> implements IntroduceInfoService {
-
-}

icss-service/src/main/java/com/diagbot/service/impl/IntroduceMapServiceImpl.java

@@ -1,20 +0,0 @@
-package com.diagbot.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.diagbot.entity.IntroduceMap;
-import com.diagbot.mapper.IntroduceMapMapper;
-import com.diagbot.service.IntroduceMapService;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * 标签与提示信息映射表 服务实现类
- * </p>
- *
- * @author zhaops
- * @since 2018-11-15
- */
-@Service
-public class IntroduceMapServiceImpl extends ServiceImpl<IntroduceMapMapper, IntroduceMap> implements IntroduceMapService {
-
-}

icss-service/src/main/java/com/diagbot/service/impl/RetrievalMappingServiceImpl.java

@@ -1,20 +0,0 @@
-package com.diagbot.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.diagbot.entity.RetrievalMapping;
-import com.diagbot.mapper.RetrievalMappingMapper;
-import com.diagbot.service.RetrievalMappingService;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * 检索映射表 服务实现类
- * </p>
- *
- * @author wangyu
- * @since 2018-11-16
- */
-@Service
-public class RetrievalMappingServiceImpl extends ServiceImpl<RetrievalMappingMapper, RetrievalMapping> implements RetrievalMappingService {
-
-}

icss-service/src/main/java/com/diagbot/service/impl/RetrievalServiceImpl.java

@@ -1,28 +0,0 @@
-package com.diagbot.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.diagbot.dto.RetrievalDTO;
-import com.diagbot.entity.Retrieval;
-import com.diagbot.mapper.RetrievalMapper;
-import com.diagbot.service.RetrievalService;
-import com.diagbot.vo.RetrievalVO;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- * <p>
- * 检索表 服务实现类
- * </p>
- *
- * @author wangyu
- * @since 2018-11-16
- */
-@Service
-public class RetrievalServiceImpl extends ServiceImpl<RetrievalMapper, Retrieval> implements RetrievalService {
-
-    @Override
-    public List<RetrievalDTO> getSymptopInfo(RetrievalVO retrievalVO) {
-        return baseMapper.getSymptopInfo(retrievalVO);
-    }
-}

icss-service/src/main/java/com/diagbot/service/impl/ScaleContentServiceImpl.java

@@ -1,20 +0,0 @@
-package com.diagbot.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.diagbot.entity.ScaleContent;
-import com.diagbot.mapper.ScaleContentMapper;
-import com.diagbot.service.ScaleContentService;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * 量表内容表 服务实现类
- * </p>
- *
- * @author zhoutg
- * @since 2019-03-11
- */
-@Service
-public class ScaleContentServiceImpl extends ServiceImpl<ScaleContentMapper, ScaleContent> implements ScaleContentService {
-
-}

icss-service/src/main/java/com/diagbot/web/EMRController.java

@@ -1,76 +0,0 @@
-package com.diagbot.web;
-
-import com.diagbot.annotation.SysLogger;
-import com.diagbot.dto.EMRIntroduceDetailDTO;
-import com.diagbot.dto.PushEMRDTO;
-import com.diagbot.dto.RespDTO;
-import com.diagbot.facade.IntroduceInfoFacade;
-import com.diagbot.facade.PushFacade;
-import com.diagbot.vo.EMRIntroduceVO;
-import com.diagbot.vo.EMRPushVO;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.validation.Valid;
-import java.util.List;
-
-/**
- * @Description: 电子病历评级
- * @Author:zhaops
- * @time: 2019/3/12 15:07
- */
-@RestController
-@RequestMapping("/emr")
-@Api(value = "电子病历评级相关API", tags = { "知识库标准化-电子病历评级相关API" })
-@SuppressWarnings("unchecked")
-public class EMRController {
-    @Autowired
-    IntroduceInfoFacade introduceInfoFacade;
-    @Autowired
-    PushFacade pushFacade;
-
-    @ApiOperation(value = "知识库标准化-电子病历解读[by:zhaops]",
-            notes = "hosCode: 医院编码，必填，String<br>" +
-                    "type: 检验检查类型，5-检验，6-检查，7-诊断，单选必填，Integer<br>" +
-                    "name: 名称（检验检查诊断），必填，String<br>" +
-                    "detailName: 项目名称（检验选填，检查不填），String<br>" +
-                    "titles: 提示信息标题列表，String数组<br>" +
-                    "icdCode: 诊断icd10编码，String<br>" +
-                    "position: 显示位置1-推送展示，2-更多展示，Integer<br>")
-    @PostMapping("/getIntroduceByEMR")
-    public RespDTO<List<EMRIntroduceDetailDTO>> getIntroduceByEMR(@RequestBody EMRIntroduceVO emrIntroduceVO) {
-        List<EMRIntroduceDetailDTO> data = introduceInfoFacade.getIntroduceByEMR(emrIntroduceVO);
-        return RespDTO.onSuc(data);
-    }
-
-    @ApiOperation(value = "知识库标准化-推理[by:zhaops]",
-            notes = "hosCode： 医院编码(必填)<br>" +
-                    "age： 年龄(必填)<br>" +
-                    "sex：性别(必填)，1：男，2：女<br>" +
-                    "symptom：症状,String<br>" +
-                    "other：其它史,String<br>" +
-                    "vital：查体,String<br>" +
-                    "lis：化验,Array<br>" +
-                    "lis：name：套餐名称(必填),String<br>" +
-                    "lis：detailName：化验项名称(必填),String<br>" +
-                    "lis：uniqueName：公表名称,String<br>" +
-                    "lis：value：值,Double<br>" +
-                    "lis：maxValue：最大值,Double<br>" +
-                    "lis：minValue：最小值,Double<br>" +
-                    "lis：units：单位,String<br>" +
-                    "lis：otherValue：其他结果，包括阴性阳性，文字描述等,String<br>" +
-                    "lis：source：数据来源（必填）0-内部来源，1-外部来源,Integer<br>" +
-                    "pacs：辅检,String<br>" +
-                    "diag：诊断,String<br>" +
-                    "featureType：类型(多选必填)，1：症状，4：查体，5：检验，6：检查，7：诊断,String<br>")
-    @PostMapping("/pushEMR")
-    @SysLogger("pushEMR")
-    public RespDTO<PushEMRDTO> pushEMR(@RequestBody @Valid EMRPushVO emrPushVO) {
-        return RespDTO.onSuc(pushFacade.pushEMR(emrPushVO));
-    }
-}

icss-service/src/main/java/com/diagbot/web/IntroduceInfoController.java

@@ -1,66 +0,0 @@
-package com.diagbot.web;
-
-
-import com.diagbot.dto.IntroduceDTO;
-import com.diagbot.dto.RespDTO;
-import com.diagbot.facade.IntroduceInfoFacade;
-import com.diagbot.vo.IntroduceByQuestionVO;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-import springfox.documentation.annotations.ApiIgnore;
-
-import javax.validation.Valid;
-
-/**
- * <p>
- * 提示信息 前端控制器
- * </p>
- *
- * @author zhaops
- * @since 2018-11-15
- */
-@RestController
-@RequestMapping("/introduceInfo")
-@Api(value = "提示信息相关API", tags = { "知识库标准化-提示信息相关API" })
-@SuppressWarnings("unchecked")
-@ApiIgnore
-@Deprecated
-public class IntroduceInfoController {
-
-    @Autowired
-    IntroduceInfoFacade introduceInfoFacade;
-
-    @ApiOperation(value = "知识库标准化-根据标签id获取提示信息[by:zhaops]",
-            notes = "questionId: 标签id，必填<br>" +
-                    "type：标签类型，必填<br>" +
-                    "position：展示位置（1-推送展示，2-更多展示，3-一般治疗展示，4-手术治疗展示），必填")
-    @PostMapping("/getByQuestionId")
-    public RespDTO<IntroduceDTO> getByQuestionId(@RequestBody @Valid IntroduceByQuestionVO introduceByQuestionVO) {
-        IntroduceDTO introduceDTO = introduceInfoFacade.getByQuestionId(introduceByQuestionVO);
-        return RespDTO.onSuc(introduceDTO);
-    }
-
-    @ApiOperation(value = "知识库标准化-根据标签名称获取提示信息[by:zhaops]",
-            notes = "tagName: 标签名称，必填<br>" +
-                    "type：标签类型，必填<br>" +
-                    "position：展示位置（1-推送展示，2-更多展示，3-一般治疗展示，4-手术治疗展示），必填")
-    @PostMapping("/getByQuestionName")
-    public RespDTO<IntroduceDTO> getByQuestionName(@RequestBody @Valid IntroduceByQuestionVO introduceByQuestionVO) {
-        IntroduceDTO introduceDTO = introduceInfoFacade.getByQuestionName(introduceByQuestionVO);
-        return RespDTO.onSuc(introduceDTO);
-    }
-
-    @ApiOperation(value = "知识库标准化-根据id获取提示信息[by:zhaops]",
-            notes = "id: 提示信息id，必填<br>")
-    @PostMapping("/getRecordById")
-    public RespDTO<IntroduceDTO> getRecordById(@RequestParam Long id) {
-        IntroduceDTO introduceDTO = introduceInfoFacade.getRecordById(id);
-        return RespDTO.onSuc(introduceDTO);
-    }
-}

icss-service/src/main/java/com/diagbot/web/PushController.java

@@ -101,6 +101,7 @@ public class PushController {
         return RespDTO.onSuc(pushFacade.pushTreatment(pushVO));
     }
 
+    @ApiIgnore
     @ApiOperation(value = "推理接口(文本模式)[by:zhaops]",
             notes = "age： 年龄(必填)<br>" +
                     "sex：性别(必填)，1：男，2：女<br>" +

icss-service/src/main/resources/mapper/DeptInfoMapper.xml

@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.diagbot.mapper.DeptInfoMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.diagbot.entity.DeptInfo">
-        <id column="id" property="id" />
-        <result column="is_deleted" property="isDeleted" />
-        <result column="gmt_create" property="gmtCreate" />
-        <result column="gmt_modified" property="gmtModified" />
-        <result column="creator" property="creator" />
-        <result column="modifier" property="modifier" />
-        <result column="name" property="name" />
-        <result column="remark" property="remark" />
-    </resultMap>
-</mapper>

icss-service/src/main/resources/mapper/DisTypeMapper.xml

@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.diagbot.mapper.DisTypeMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.diagbot.entity.DisType">
-        <id column="id" property="id" />
-        <result column="is_deleted" property="isDeleted" />
-        <result column="gmt_create" property="gmtCreate" />
-        <result column="gmt_modified" property="gmtModified" />
-        <result column="creator" property="creator" />
-        <result column="modifier" property="modifier" />
-        <result column="dis_id" property="disId" />
-        <result column="parent_id" property="parentId" />
-        <result column="type" property="type" />
-        <result column="remark" property="remark" />
-    </resultMap>
-
-</mapper>

icss-service/src/main/resources/mapper/IntroduceDetailMapper.xml

@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.diagbot.mapper.IntroduceDetailMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.diagbot.entity.IntroduceDetail">
-        <id column="id" property="id" />
-        <result column="is_deleted" property="isDeleted" />
-        <result column="gmt_create" property="gmtCreate" />
-        <result column="gmt_modified" property="gmtModified" />
-        <result column="creator" property="creator" />
-        <result column="modifier" property="modifier" />
-        <result column="introduce_id" property="introduceId" />
-        <result column="title" property="title" />
-        <result column="content" property="content" />
-        <result column="text" property="text" />
-        <result column="order_no" property="orderNo" />
-        <result column="position" property="position" />
-        <result column="is_reason" property="isReason" />
-    </resultMap>
-
-</mapper>

icss-service/src/main/resources/mapper/IntroduceInfoMapper.xml

@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.diagbot.mapper.IntroduceInfoMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.diagbot.entity.IntroduceInfo">
-        <id column="id" property="id" />
-        <result column="is_deleted" property="isDeleted" />
-        <result column="gmt_create" property="gmtCreate" />
-        <result column="gmt_modified" property="gmtModified" />
-        <result column="creator" property="creator" />
-        <result column="modifier" property="modifier" />
-        <result column="name" property="name" />
-        <result column="remark" property="remark" />
-    </resultMap>
-
-</mapper>

icss-service/src/main/resources/mapper/IntroduceMapMapper.xml

@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.diagbot.mapper.IntroduceMapMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.diagbot.entity.IntroduceMap">
-        <id column="id" property="id" />
-        <result column="is_deleted" property="isDeleted" />
-        <result column="gmt_create" property="gmtCreate" />
-        <result column="gmt_modified" property="gmtModified" />
-        <result column="creator" property="creator" />
-        <result column="modifier" property="modifier" />
-        <result column="question_id" property="questionId" />
-        <result column="introduce_id" property="introduceId" />
-        <result column="type" property="type" />
-        <result column="remark" property="remark" />
-    </resultMap>
-
-</mapper>

icss-service/src/main/resources/mapper/RetrievalMapper.xml

@@ -1,106 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.diagbot.mapper.RetrievalMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.diagbot.entity.Retrieval">
-        <id column="id" property="id" />
-        <result column="is_deleted" property="isDeleted" />
-        <result column="gmt_create" property="gmtCreate" />
-        <result column="gmt_modified" property="gmtModified" />
-        <result column="creator" property="creator" />
-        <result column="modifier" property="modifier" />
-        <result column="name" property="name" />
-        <result column="spell" property="spell" />
-        <result column="remark" property="remark" />
-    </resultMap>
-
-    <select id="getSymptopInfo" resultType="com.diagbot.dto.RetrievalDTO">
-        SELECT a.`name` as retrieval_name,c.id as question_id,b.show_type FROM icss_retrieval a
-        LEFT JOIN icss_retrieval_mapping b ON a.id = b.retrieval_id
-        LEFT JOIN icss_question_info c ON b.question_id = c.id
-        WHERE a.is_deleted = 'N' AND b.is_deleted = 'N' AND c.is_deleted = 'N'
-        AND (a.spell = #{InputStr} or a.`name` = #{InputStr})
-        AND c.type = #{type}
-        <if test="age != null and age != ''">
-            <![CDATA[ and c.age_begin <= #{age} ]]>
-            <![CDATA[ and c.age_end >= #{age} ]]>
-        </if>
-        <if test="tagType != null and tagType != ''">
-            <![CDATA[ and c.tag_type = #{tagType} ]]>
-        </if>
-        <if test="itemType != null">
-            <![CDATA[ and c.item_type = #{itemType} ]]>
-        </if>
-        <if test="sexType == 3">
-            and c.sex_type in ('1','2','3')
-        </if>
-        <if test="sexType != 3">
-            and c.sex_type in ('3',#{sexType})
-        </if>
-        <if test="inputIds != null and inputIds.size > 0">
-            and c.id not in
-            <foreach item="id" collection="inputIds" open="(" separator="," close=")">
-                #{id}
-            </foreach>
-        </if>
-        UNION
-        SELECT a.`name` as retrieval_name,c.id as question_id,b.show_type FROM icss_retrieval a
-        LEFT JOIN icss_retrieval_mapping b ON a.id = b.retrieval_id
-        LEFT JOIN icss_question_info c ON b.question_id = c.id
-        WHERE a.is_deleted = 'N' AND b.is_deleted = 'N' AND c.is_deleted = 'N'
-        AND (a.spell LIKE CONCAT(#{InputStr},'%') or a.`name` LIKE CONCAT(#{InputStr},'%'))
-        AND c.type = #{type}
-        <if test="age != null and age != ''">
-            <![CDATA[ and c.age_begin <= #{age} ]]>
-            <![CDATA[ and c.age_end >= #{age} ]]>
-        </if>
-        <if test="tagType != null and tagType != ''">
-            <![CDATA[ and c.tag_type = #{tagType} ]]>
-        </if>
-        <if test="itemType != null">
-            <![CDATA[ and c.item_type = #{itemType} ]]>
-        </if>
-        <if test="sexType == 3">
-            and c.sex_type in ('1','2','3')
-        </if>
-        <if test="sexType != 3">
-            and c.sex_type in ('3',#{sexType})
-        </if>
-        <if test="inputIds != null and inputIds.size > 0">
-            and c.id not in
-            <foreach item="id" collection="inputIds" open="(" separator="," close=")">
-                #{id}
-            </foreach>
-        </if>
-        UNION
-        SELECT a.`name` as retrieval_name,c.id as question_id,b.show_type FROM icss_retrieval a
-        LEFT JOIN icss_retrieval_mapping b ON a.id = b.retrieval_id
-        LEFT JOIN icss_question_info c ON b.question_id = c.id
-        WHERE a.is_deleted = 'N' AND b.is_deleted = 'N' AND c.is_deleted = 'N'
-        AND (a.spell LIKE CONCAT('%',#{InputStr},'%') or a.`name` LIKE CONCAT('%',#{InputStr},'%'))
-        AND c.type = #{type}
-        <if test="age != null and age != ''">
-            <![CDATA[ and c.age_begin <= #{age} ]]>
-            <![CDATA[ and c.age_end >= #{age} ]]>
-        </if>
-        <if test="tagType != null and tagType != ''">
-            <![CDATA[ and c.tag_type = #{tagType} ]]>
-        </if>
-        <if test="itemType != null">
-            <![CDATA[ and c.item_type = #{itemType} ]]>
-        </if>
-        <if test="sexType == 3">
-            and c.sex_type in ('1','2','3')
-        </if>
-        <if test="sexType != 3">
-            and c.sex_type in ('3',#{sexType})
-        </if>
-        <if test="inputIds != null and inputIds.size > 0">
-            and c.id not in
-            <foreach item="id" collection="inputIds" open="(" separator="," close=")">
-                #{id}
-            </foreach>
-        </if>
-    </select>
-</mapper>

icss-service/src/main/resources/mapper/RetrievalMappingMapper.xml

@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.diagbot.mapper.RetrievalMappingMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.diagbot.entity.RetrievalMapping">
-        <id column="id" property="id" />
-        <result column="is_deleted" property="isDeleted" />
-        <result column="gmt_create" property="gmtCreate" />
-        <result column="gmt_modified" property="gmtModified" />
-        <result column="creator" property="creator" />
-        <result column="modifier" property="modifier" />
-        <result column="retrieval_id" property="retrievalId" />
-        <result column="question_id" property="questionId" />
-        <result column="show_type" property="showType" />
-        <result column="remark" property="remark" />
-    </resultMap>
-
-</mapper>

icss-service/src/main/resources/mapper/ScaleContentMapper.xml

@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.diagbot.mapper.ScaleContentMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.diagbot.entity.ScaleContent">
-        <id column="id" property="id" />
-        <result column="scale_id" property="scaleId" />
-        <result column="content" property="content" />
-        <result column="type" property="type" />
-        <result column="order_no" property="orderNo" />
-        <result column="remark" property="remark" />
-    </resultMap>
-
-</mapper>

knowledgeman-service/src/main/java/com/diagbot/dto/IndexConfigAllDTO.java

@@ -38,6 +38,8 @@ public class IndexConfigAllDTO {
      */
     private String modifier;
 
+    
+    private Long conceptId;
     /**
      * 指标公表名
      */

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

@@ -919,4 +919,27 @@ public class ConceptFacade extends ConceptServiceImpl {
         indexVO.setLibType(libType);
         return this.index(indexVO);
     }
+    /**
+     * 根据概念Id列表获取概念列表Map
+     *
+     * @param conceptSearchVO 搜索参数
+     * @return 术语id和术语 Map
+     */
+    public Map<Long, String> getConceptNameMap(ConceptSearchVO conceptSearchVO) {
+        //入参验证
+        if (ListUtil.isEmpty(conceptSearchVO.getConceptIds())) {
+            throw new CommonException(CommonErrorCode.PARAM_IS_NULL, "术语列表不能为空");
+        }
+
+        //获取结构
+        List<Concept> concepts
+                = this.getListByIds(conceptSearchVO.getConceptIds());
+
+        //出参封装
+        Map<Long, String> map = new HashMap<>();
+        if (ListUtil.isNotEmpty(concepts)) {
+            map = concepts.stream().collect(Collectors.toMap(r -> r.getId(), r -> r.getLibName()));
+        }
+        return map;
+    }
 }

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

@@ -44,7 +44,7 @@ public class EvaluationFacade extends EvaluationServiceImpl {
     @Autowired
     UserServiceClient userServiceClient;
     @Autowired
-    @Qualifier("evaluationFacade")
+    @Qualifier("evaluationServiceImpl")
     EvaluationService evaluationModuleMappingService;
 
     /**
@@ -114,6 +114,7 @@ public class EvaluationFacade extends EvaluationServiceImpl {
                 evaMou.setCreator(operator);
                 evaMou.setModifier(operator);
                 evaMou.setOrderNo(dataNew.getOrderNo());
+                evaMou.setConceptId(dataNew.getDiseaseId());
                 evaluationModuleLsit.add(evaMou);
             }
 
@@ -154,6 +155,7 @@ public class EvaluationFacade extends EvaluationServiceImpl {
                 evaMou.setGmtModified(optDate);
                 evaMou.setCreator(operator);
                 evaMou.setModifier(operator);
+                evaMou.setConceptId(dataNew.getDiseaseId());
                 evaluationModuleLsit.add(evaMou);
             }
             res = evaluationModuleMappingService.saveBatch(evaluationModuleLsit);

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

@@ -1,5 +1,16 @@
 package com.diagbot.facade;
 
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.stereotype.Component;
+
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -18,20 +29,11 @@ import com.diagbot.util.DateUtil;
 import com.diagbot.util.ListUtil;
 import com.diagbot.util.RespDTOUtil;
 import com.diagbot.util.UserUtils;
+import com.diagbot.vo.ConceptSearchVO;
 import com.diagbot.vo.IndexConfigDiseaseIdVO;
 import com.diagbot.vo.IndexConfigDiseaseNameVO;
 import com.diagbot.vo.IndexConfigListVO;
 import com.diagbot.vo.IndexConfigVO;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.stereotype.Component;
-
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
 
 /**
  * @author wangfeng
@@ -41,138 +43,148 @@ import java.util.stream.Collectors;
 @Component
 public class IndexConfigFacade extends IndexConfigServiceImpl {
 
-    @Autowired
-    @Qualifier("indexConfigServiceImpl")
-    IndexConfigService indexConfigService;
-    @Autowired
-    UserServiceClient userServiceClient;
-
-    /**
-     * @param indexConfigDiseaseNameVO
-     * @return
-     */
-    public IPage<IndexConfigDTO> queryIndexConfigPage(IndexConfigDiseaseNameVO indexConfigDiseaseNameVO) {
-        IPage<IndexConfigDTO> datas = this.queryIndexConfigPageAlls(indexConfigDiseaseNameVO);
-        List<IndexConfigDTO> data = datas.getRecords();
-        List<String> modifierid
-                = data.stream().map(ac -> ac.getModifier()).collect(Collectors.toList());
-        Map<String, String> userNames = new HashMap<>();
-        if (ListUtil.isNotEmpty(modifierid)) {
-            RespDTO<Map<String, String>> userNamesDTO = userServiceClient.getUserInfoByIds(modifierid);
-            if (RespDTOUtil.respIsNG(userNamesDTO)) {
-                throw new CommonException(CommonErrorCode.SERVER_IS_ERROR, "获取所有用户信息失败");
-            }
-            userNames = userNamesDTO.data;
-        }
-
-        for (IndexConfigDTO evalua : data) {
-            evalua.setModifier(userNames.get(evalua.getModifier()));
-        }
-        return datas;
-    }
-
-    /**
-     * @param indexConfigDiseaseIdVO
-     * @return
-     */
-    public List<IndexConfigAllDTO> getIndexConfigLists(IndexConfigDiseaseIdVO indexConfigDiseaseIdVO) {
-        QueryWrapper<IndexConfig> IndexConfigQuery = new QueryWrapper<IndexConfig>();
-        IndexConfigQuery.eq("disease_id", indexConfigDiseaseIdVO.getDiseaseId())
-                .eq("is_deleted", IsDeleteEnum.N.getKey());
-        List<IndexConfig> datas = list(IndexConfigQuery);
-        //过滤
-        List<IndexConfigAllDTO> data = BeanUtil.listCopyTo(datas, IndexConfigAllDTO.class);
-        return data;
-    }
-
-    /**
-     * @param indexConfigListVO
-     * @return
-     */
-    public boolean updateIndexConfigList(IndexConfigListVO indexConfigListVO) {
-        boolean res = false;
-        if (indexConfigListVO != null && ListUtil.isNotEmpty(indexConfigListVO.getIndexConfigData())) {
-            IndexConfigDiseaseIdVO indexConfigDiseaseIdVO = new IndexConfigDiseaseIdVO();
-            indexConfigDiseaseIdVO.setDiseaseId(indexConfigListVO.getDiseaseId());
-            res = cancelIndexConfigAlls(indexConfigDiseaseIdVO);
-            List<IndexConfig> IndexConfigLsit = new ArrayList<IndexConfig>();
-            List<IndexConfigVO> data = indexConfigListVO.getIndexConfigData();
-            Date optDate = DateUtil.now();
-            String operator = UserUtils.getCurrentPrincipleID();
-            for (IndexConfigVO dataNew : data) {
-                IndexConfig IndexConfig = new IndexConfig();
-                BeanUtil.copyProperties(dataNew, IndexConfig);
-                IndexConfig.setGmtCreate(optDate);
-                IndexConfig.setGmtModified(optDate);
-                IndexConfig.setCreator(operator);
-                IndexConfig.setModifier(operator);
-                IndexConfigLsit.add(IndexConfig);
-            }
-
-            res = indexConfigService.saveBatch(IndexConfigLsit);
-
-        }
-
-        return res;
-    }
-
-    /**
-     * @param indexConfigListVO
-     * @return
-     */
-    public boolean saveIndexConfigList(IndexConfigListVO indexConfigListVO) {
-        boolean res = false;
-        if (indexConfigListVO != null
-                && ListUtil.isNotEmpty(indexConfigListVO.getIndexConfigData())) {
-            List<IndexConfigVO> indexConfigData = indexConfigListVO.getIndexConfigData();
-            List<String> indexUnique = new ArrayList<>();
-            for (IndexConfigVO e : indexConfigData) {
-                indexUnique.add(e.getIndexUnique());
-            }
-
-            QueryWrapper<IndexConfig> IndexConfigQuery = new QueryWrapper<>();
-
-            IndexConfigQuery.eq("disease_id", indexConfigListVO.getDiseaseId())
-                    .eq("is_deleted", IsDeleteEnum.N.getKey())
-                    .in("index_unique", indexUnique);
-            List<IndexConfig> dataUnique = list(IndexConfigQuery);
-            if (ListUtil.isNotEmpty(dataUnique)) {
-                throw new CommonException(CommonErrorCode.SERVER_IS_ERROR,
-                        "该'" + dataUnique.get(0).getConceptId() + "'已存在");
-            }
-
-            List<IndexConfig> IndexConfigLsit = new ArrayList<IndexConfig>();
-            List<IndexConfigVO> data = indexConfigListVO.getIndexConfigData();
-            Date optDate = DateUtil.now();
-            String operator = UserUtils.getCurrentPrincipleID();
-            for (IndexConfigVO dataNew : data) {
-                IndexConfig IndexConfig = new IndexConfig();
-                BeanUtil.copyProperties(dataNew, IndexConfig);
-                IndexConfig.setGmtCreate(optDate);
-                IndexConfig.setGmtModified(optDate);
-                IndexConfig.setCreator(operator);
-                IndexConfig.setModifier(operator);
-                IndexConfigLsit.add(IndexConfig);
-            }
-            res = indexConfigService.saveBatch(IndexConfigLsit);
-        }
-
-        return res;
-    }
-
-    /**
-     * @param indexConfigDiseaseIdVO
-     * @return
-     */
-    public boolean cancelIndexConfigAlls(IndexConfigDiseaseIdVO indexConfigDiseaseIdVO) {
-
-        UpdateWrapper<IndexConfig> IndexConfigNew = new UpdateWrapper<>();
-        IndexConfigNew.eq("disease_id", indexConfigDiseaseIdVO.getDiseaseId())
-                .eq("is_deleted", IsDeleteEnum.N.getKey())
-                .set("is_deleted", IsDeleteEnum.Y.getKey())
-                .set("modifier", UserUtils.getCurrentPrincipleID())
-                .set("gmt_modified", DateUtil.now());
-        return update(new IndexConfig(), IndexConfigNew);
-    }
+	@Autowired
+	@Qualifier("indexConfigServiceImpl")
+	IndexConfigService indexConfigService;
+	@Autowired
+	UserServiceClient userServiceClient;
+	@Autowired
+	ConceptFacade conceptFacade;
+
+	/**
+	 * @param indexConfigDiseaseNameVO
+	 * @return
+	 */
+	public IPage<IndexConfigDTO> queryIndexConfigPage(IndexConfigDiseaseNameVO indexConfigDiseaseNameVO) {
+		IPage<IndexConfigDTO> datas = this.queryIndexConfigPageAlls(indexConfigDiseaseNameVO);
+		List<IndexConfigDTO> data = datas.getRecords();
+		List<String> modifierid = data.stream().map(ac -> ac.getModifier()).collect(Collectors.toList());
+		Map<String, String> userNames = new HashMap<>();
+		if (ListUtil.isNotEmpty(modifierid)) {
+			RespDTO<Map<String, String>> userNamesDTO = userServiceClient.getUserInfoByIds(modifierid);
+			if (RespDTOUtil.respIsNG(userNamesDTO)) {
+				throw new CommonException(CommonErrorCode.SERVER_IS_ERROR, "获取所有用户信息失败");
+			}
+			userNames = userNamesDTO.data;
+		}
+
+		for (IndexConfigDTO evalua : data) {
+			evalua.setModifier(userNames.get(evalua.getModifier()));
+		}
+		return datas;
+	}
+
+	/**
+	 * @param indexConfigDiseaseIdVO
+	 * @return
+	 */
+	public List<IndexConfigAllDTO> getIndexConfigLists(IndexConfigDiseaseIdVO indexConfigDiseaseIdVO) {
+		QueryWrapper<IndexConfig> IndexConfigQuery = new QueryWrapper<IndexConfig>();
+		IndexConfigQuery.eq("disease_id", indexConfigDiseaseIdVO.getDiseaseId()).eq("is_deleted",
+				IsDeleteEnum.N.getKey());
+		List<IndexConfig> datas = list(IndexConfigQuery);
+		// 过滤
+		List<IndexConfigAllDTO> data = BeanUtil.listCopyTo(datas, IndexConfigAllDTO.class);
+
+		List<Long> conceptIds = data.stream().map(ac -> ac.getConceptId()).collect(Collectors.toList());
+		ConceptSearchVO conceptSearchVO = new ConceptSearchVO();
+		conceptSearchVO.setConceptIds(conceptIds);
+		Map<Long, String> indexUniques = new HashMap<>();
+		if (ListUtil.isNotEmpty(conceptIds)) {
+			indexUniques = conceptFacade.getConceptNameMap(conceptSearchVO);
+		}
+
+		for (IndexConfigAllDTO evalua : data) {
+			evalua.setIndexUnique(indexUniques.get(evalua.getConceptId()));
+		}
+
+		return data;
+	}
+
+	/**
+	 * @param indexConfigListVO
+	 * @return
+	 */
+	public boolean updateIndexConfigList(IndexConfigListVO indexConfigListVO) {
+		boolean res = false;
+		if (indexConfigListVO != null && ListUtil.isNotEmpty(indexConfigListVO.getIndexConfigData())) {
+			IndexConfigDiseaseIdVO indexConfigDiseaseIdVO = new IndexConfigDiseaseIdVO();
+			indexConfigDiseaseIdVO.setDiseaseId(indexConfigListVO.getDiseaseId());
+			res = cancelIndexConfigAlls(indexConfigDiseaseIdVO);
+			List<IndexConfig> IndexConfigLsit = new ArrayList<IndexConfig>();
+			List<IndexConfigVO> data = indexConfigListVO.getIndexConfigData();
+			Date optDate = DateUtil.now();
+			String operator = UserUtils.getCurrentPrincipleID();
+			for (IndexConfigVO dataNew : data) {
+				IndexConfig IndexConfig = new IndexConfig();
+				BeanUtil.copyProperties(dataNew, IndexConfig);
+				IndexConfig.setGmtCreate(optDate);
+				IndexConfig.setGmtModified(optDate);
+				IndexConfig.setCreator(operator);
+				IndexConfig.setModifier(operator);
+				IndexConfigLsit.add(IndexConfig);
+			}
+
+			res = indexConfigService.saveBatch(IndexConfigLsit);
+
+		}
+
+		return res;
+	}
+
+	/**
+	 * @param indexConfigListVO
+	 * @return
+	 */
+	public boolean saveIndexConfigList(IndexConfigListVO indexConfigListVO) {
+		boolean res = false;
+		if (indexConfigListVO != null && ListUtil.isNotEmpty(indexConfigListVO.getIndexConfigData())) {
+			List<IndexConfigVO> indexConfigData = indexConfigListVO.getIndexConfigData();
+			List<Long> conceptId = new ArrayList<>();
+			for (IndexConfigVO e : indexConfigData) {
+				conceptId.add(e.getConceptId());
+			}
+
+			QueryWrapper<IndexConfig> IndexConfigQuery = new QueryWrapper<>();
+
+			IndexConfigQuery.eq("disease_id", indexConfigListVO.getDiseaseId())
+					.eq("is_deleted", IsDeleteEnum.N.getKey()).in("concept_id", conceptId);
+			List<IndexConfig> dataUnique = list(IndexConfigQuery);
+			if (ListUtil.isNotEmpty(dataUnique)) {
+				throw new CommonException(CommonErrorCode.SERVER_IS_ERROR,
+						"该'" + dataUnique.get(0).getConceptId() + "'已存在");
+			}
+
+			List<IndexConfig> IndexConfigLsit = new ArrayList<IndexConfig>();
+			List<IndexConfigVO> data = indexConfigListVO.getIndexConfigData();
+			Date optDate = DateUtil.now();
+			String operator = UserUtils.getCurrentPrincipleID();
+			for (IndexConfigVO dataNew : data) {
+				IndexConfig IndexConfig = new IndexConfig();
+				BeanUtil.copyProperties(dataNew, IndexConfig);
+				IndexConfig.setGmtCreate(optDate);
+				IndexConfig.setGmtModified(optDate);
+				IndexConfig.setCreator(operator);
+				IndexConfig.setModifier(operator);
+				IndexConfigLsit.add(IndexConfig);
+			}
+			res = indexConfigService.saveBatch(IndexConfigLsit);
+		}
+
+		return res;
+	}
+
+	/**
+	 * @param indexConfigDiseaseIdVO
+	 * @return
+	 */
+	public boolean cancelIndexConfigAlls(IndexConfigDiseaseIdVO indexConfigDiseaseIdVO) {
+
+		UpdateWrapper<IndexConfig> IndexConfigNew = new UpdateWrapper<>();
+		IndexConfigNew.eq("disease_id", indexConfigDiseaseIdVO.getDiseaseId()).eq("is_deleted", IsDeleteEnum.N.getKey())
+				.set("is_deleted", IsDeleteEnum.Y.getKey()).set("modifier", UserUtils.getCurrentPrincipleID())
+				.set("gmt_modified", DateUtil.now());
+		return update(new IndexConfig(), IndexConfigNew);
+	}
 
 }

knowledgeman-service/src/main/java/com/diagbot/vo/IndexConfigVO.java

@@ -13,9 +13,9 @@ import lombok.Setter;
 @Getter
 public class IndexConfigVO {
 	/**
-     * 指标公表名
+     * 指标术语id
      */
-    private String indexUnique;
+    private Long conceptId;
 
     /**
      * 疾病id