模板维护，获取标签池（辅检）

icssman-service/src/main/java/com/diagbot/client/KnowledgemanServiceClient.java

@@ -6,6 +6,7 @@ import com.diagbot.dto.RespDTO;
 import com.diagbot.vo.ConceptExistVO;
 import com.diagbot.vo.ConceptSearchVO;
 import com.diagbot.vo.ConceptTypeVO;
+import com.diagbot.vo.GetConceptPacInfosVO;
 import com.diagbot.vo.IndexLexiconVO;
 import com.diagbot.vo.IndexVO;
 import org.springframework.cloud.openfeign.FeignClient;
@@ -49,4 +50,13 @@ public interface KnowledgemanServiceClient {
      */
     @PostMapping("/concept/getConceptListByType")
     RespDTO<List<ConceptBaseDTO>> getConceptListByType(@RequestBody ConceptTypeVO conceptTypeVO);
+
+    /**
+     * 模板维护获取辅检标签
+     *
+     * @param getConceptPacInfosVO
+     * @return
+     */
+    @PostMapping("/concept/getConceptPacInfos")
+    RespDTO<List<ConceptBaseDTO>> getConceptPacInfos(@RequestBody GetConceptPacInfosVO getConceptPacInfosVO);
 }

icssman-service/src/main/java/com/diagbot/client/hystrix/KnowledgemanServiceHystrix.java

@@ -6,6 +6,7 @@ import com.diagbot.dto.RespDTO;
 import com.diagbot.vo.ConceptExistVO;
 import com.diagbot.vo.ConceptSearchVO;
 import com.diagbot.vo.ConceptTypeVO;
+import com.diagbot.vo.GetConceptPacInfosVO;
 import com.diagbot.vo.IndexLexiconVO;
 import com.diagbot.vo.IndexVO;
 import lombok.extern.slf4j.Slf4j;
@@ -65,4 +66,10 @@ public class KnowledgemanServiceHystrix implements KnowledgemanServiceClient {
         return null;
     }
 
+    @Override
+    public RespDTO<List<ConceptBaseDTO>> getConceptPacInfos(GetConceptPacInfosVO getConceptPacInfosVO) {
+        log.error("【hystrix】调用{}异常", "getConceptPacInfos");
+        return null;
+    }
+
 }

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

@@ -35,6 +35,7 @@ import com.diagbot.util.UserUtils;
 import com.diagbot.vo.AddModuleInfoVO;
 import com.diagbot.vo.ConceptTypeVO;
 import com.diagbot.vo.GetAllDeptAndDisInfoVO;
+import com.diagbot.vo.GetConceptPacInfosVO;
 import com.diagbot.vo.GetModuleDetailInfoVO;
 import com.diagbot.vo.GetModuleInfoOneVO;
 import com.diagbot.vo.GetModuleInfoVO;
@@ -180,9 +181,9 @@ public class ModuleInfoFacade extends ModuleInfoServiceImpl {
         //如果是辅检，调用aipt-获取概念信息
         if(moduleGetQuestionInfoVO.getType().intValue() == QuestionTypeEnum.Pacs.getKey()){
             getQuestionInfoDTOS = new ArrayList<>();
-            ConceptTypeVO conceptTypeVO = new ConceptTypeVO();
-            conceptTypeVO.setType(2);
-            RespDTO<List<ConceptBaseDTO>> conceptBaseDTOS = knowledgemanServiceClient.getConceptListByType(conceptTypeVO);
+            GetConceptPacInfosVO getConceptPacInfosVO = new GetConceptPacInfosVO();
+            getConceptPacInfosVO.setInputStr(moduleGetQuestionInfoVO.getTagName());
+            RespDTO<List<ConceptBaseDTO>> conceptBaseDTOS = knowledgemanServiceClient.getConceptPacInfos(getConceptPacInfosVO);
             RespDTOUtil.respNGDeal(conceptBaseDTOS,"获取辅检标签失败");
             if(ListUtil.isNotEmpty(moduleGetQuestionInfoVO.getNoIds())){
                 Iterator<ConceptBaseDTO> conceptBaseDTOIterator = conceptBaseDTOS.data.iterator();

icssman-service/src/main/java/com/diagbot/vo/GetConceptPacInfosVO.java

@@ -0,0 +1,16 @@
+package com.diagbot.vo;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @Description:
+ * @author: wangyu
+ * @time: 2019/7/1 19:59
+ */
+@Getter
+@Setter
+public class GetConceptPacInfosVO {
+    //输入内容
+    private String inputStr;
+}

knowledgeman-service/src/main/java/com/diagbot/config/ResourceServerConfigurer.java

@@ -29,6 +29,7 @@ public class ResourceServerConfigurer extends ResourceServerConfigurerAdapter {
                 .antMatchers("/getKlmEnumsData").permitAll()
                 .antMatchers("/concept/getConceptMap").permitAll()
                 .antMatchers("/concept/getConceptListByType").permitAll()
+                .antMatchers("/concept/getConceptPacInfos").permitAll()
                 .antMatchers("/concept/piyinUp").permitAll()
                 .antMatchers("/file/uploadImage").permitAll()
                 .antMatchers("/dictionaryInfo/getList").permitAll()

knowledgeman-service/src/main/java/com/diagbot/config/security/UrlAccessDecisionManager.java

@@ -92,6 +92,7 @@ public class UrlAccessDecisionManager implements AccessDecisionManager {
                 || matchers("/getKlmEnumsData", request)
                 || matchers("/concept/getConceptMap", request)
                 || matchers("/concept/getConceptListByType", request)
+                || matchers("/concept/getConceptPacInfos", request)
                 || matchers("/concept/piyinUp", request)
                 || matchers("/file/uploadImage", request)
                 || matchers("/dictionaryInfo/getList", request)

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

@@ -1,27 +1,5 @@
 package com.diagbot.facade;
 
-import java.io.InputStream;
-import java.text.DecimalFormat;
-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.apache.commons.lang.time.DateFormatUtils;
-import org.apache.poi.hssf.usermodel.HSSFDateUtil;
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.apache.poi.ss.usermodel.Cell;
-import org.apache.poi.ss.usermodel.Row;
-import org.apache.poi.ss.usermodel.Sheet;
-import org.apache.poi.ss.usermodel.Workbook;
-import org.apache.poi.xssf.usermodel.XSSFWorkbook;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.stereotype.Component;
-import org.springframework.web.multipart.MultipartFile;
-
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -69,10 +47,32 @@ import com.diagbot.vo.GetAllForRelationVO;
 import com.diagbot.vo.GetAllInformationVO;
 import com.diagbot.vo.GetAllLisConceptVO;
 import com.diagbot.vo.GetConceptInfoDetailVO;
+import com.diagbot.vo.GetConceptPacInfosVO;
 import com.diagbot.vo.IndexLexiconVO;
 import com.diagbot.vo.IndexVO;
 import com.diagbot.vo.RemoveConceptInfoVO;
 import com.google.common.collect.Lists;
+import org.apache.commons.lang.time.DateFormatUtils;
+import org.apache.poi.hssf.usermodel.HSSFDateUtil;
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
+import org.apache.poi.ss.usermodel.Cell;
+import org.apache.poi.ss.usermodel.Row;
+import org.apache.poi.ss.usermodel.Sheet;
+import org.apache.poi.ss.usermodel.Workbook;
+import org.apache.poi.xssf.usermodel.XSSFWorkbook;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.stereotype.Component;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.io.InputStream;
+import java.text.DecimalFormat;
+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;
 
 /**
  * @Description: 术语查询业务层
@@ -1063,4 +1063,28 @@ public class ConceptFacade extends ConceptServiceImpl {
         }
         return res;
     }
+
+    /**
+     * 模板维护辅检检索
+     *
+     * @param getConceptPacInfosVO
+     * @return
+     */
+    public List<ConceptBaseDTO> getConceptPacInfos(GetConceptPacInfosVO getConceptPacInfosVO){
+        QueryWrapper<Concept> conceptQueryWrapper = new QueryWrapper<>();
+        conceptQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
+                .eq("lib_type", LexiconTypeEnum.PACS_ITEMS.getKey())
+                .like("lib_name", getConceptPacInfosVO.getInputStr());
+        List<Concept> list = this.list(conceptQueryWrapper);
+        List<ConceptBaseDTO> res = ListUtil.newArrayList();
+        if (ListUtil.isNotEmpty(list)) {
+            for (Concept concept : list) {
+                ConceptBaseDTO conceptBaseDTO = new ConceptBaseDTO();
+                conceptBaseDTO.setConceptId(concept.getId());
+                conceptBaseDTO.setName(concept.getLibName());
+                res.add(conceptBaseDTO);
+            }
+        }
+        return res;
+    }
 }

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

@@ -0,0 +1,16 @@
+package com.diagbot.vo;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @Description:
+ * @author: wangyu
+ * @time: 2019/7/1 19:59
+ */
+@Getter
+@Setter
+public class GetConceptPacInfosVO {
+    //输入内容
+    private String inputStr;
+}

knowledgeman-service/src/main/java/com/diagbot/web/ConceptController.java

@@ -1,20 +1,5 @@
 package com.diagbot.web;
 
-import java.util.List;
-import java.util.Map;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.validation.Valid;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.transaction.annotation.Transactional;
-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 org.springframework.web.multipart.MultipartFile;
-
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.diagbot.annotation.SysLogger;
 import com.diagbot.dto.ConceptBaseDTO;
@@ -33,12 +18,25 @@ import com.diagbot.vo.GetAllForRelationVO;
 import com.diagbot.vo.GetAllInformationVO;
 import com.diagbot.vo.GetAllLisConceptVO;
 import com.diagbot.vo.GetConceptInfoDetailVO;
+import com.diagbot.vo.GetConceptPacInfosVO;
 import com.diagbot.vo.RemoveConceptInfoVO;
-
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
+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 org.springframework.web.multipart.MultipartFile;
 import springfox.documentation.annotations.ApiIgnore;
 
+import javax.servlet.http.HttpServletRequest;
+import javax.validation.Valid;
+import java.util.List;
+import java.util.Map;
+
 /**
  * <p>
  * 前端控制器
@@ -152,4 +150,18 @@ public class ConceptController {
         return RespDTO.onSuc(conceptFacade.piyinUp());
     }
 
+    /**
+     * 根据概念Id列表获取概念列表Map
+     *
+     * @param getConceptPacInfosVO 搜索参数
+     * @return 术语id和术语 name
+     */
+    @ApiOperation(value = "知识库标准化-获取辅检概念[by:wangyu]",
+            notes = "inputStr: 输入内容")
+    @PostMapping("/getConceptPacInfos")
+    @SysLogger("getConceptPacInfos")
+    @ApiIgnore
+    public RespDTO<List<ConceptBaseDTO>> getConceptPacInfos(@RequestBody GetConceptPacInfosVO getConceptPacInfosVO) {
+        return RespDTO.onSuc(conceptFacade.getConceptPacInfos(getConceptPacInfosVO));
+    }
 }