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

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

@@ -54,6 +54,21 @@ public class ConceptFacade extends ConceptServiceImpl {
         return concept;
     }
 
+    /**
+     * 获取概念基本信息
+     *
+     * @param conceptBaseVO
+     * @return
+     */
+    public Concept getConcept(ConceptBaseVO conceptBaseVO) {
+        QueryWrapper<Concept> conceptQueryWrapper = new QueryWrapper<>();
+        conceptQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
+                .eq("lib_name", conceptBaseVO.getName())
+                .eq("lib_type", conceptBaseVO.getLibType());
+        Concept concept = this.getOne(conceptQueryWrapper);
+        return concept;
+    }
+
     /**
      * 根据概念Id列表获取概念列表Map
      *

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

@@ -6,6 +6,7 @@ import com.diagbot.dto.ConceptBaseDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.RetrievalDTO;
 import com.diagbot.facade.ConceptFacade;
+import com.diagbot.vo.ConceptBaseVO;
 import com.diagbot.vo.ConceptSearchVO;
 import com.diagbot.vo.ConceptUsualVO;
 import com.diagbot.vo.RetrievalVO;
@@ -16,6 +17,7 @@ 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 springfox.documentation.annotations.ApiIgnore;
 
 import javax.validation.Valid;
 import java.util.List;
@@ -59,10 +61,26 @@ public class ConceptController {
             notes = "conceptIds: 术语Id列表")
     @PostMapping("/getConceptMap")
     @SysLogger("getConceptMap")
-    public RespDTO<Map<String, Long>> getConceptMap(@RequestBody ConceptSearchVO conceptSearchVO){
+    public RespDTO<Map<String, Long>> getConceptMap(@RequestBody ConceptSearchVO conceptSearchVO) {
         return RespDTO.onSuc(conceptFacade.getConceptMap(conceptSearchVO));
     }
 
+    /**
+     * 验证存在并且获取概念基本信息
+     *
+     * @param conceptBaseVO
+     * @return
+     */
+    @ApiOperation(value = "知识库标准化-验证存在并且获取概念基本信息[by:zhaops]",
+            notes = "name: 概念名称<br>" +
+                    "libType: 词性<br>")
+    @PostMapping("/exist")
+    @SysLogger("exist")
+    @ApiIgnore
+    public RespDTO<ConceptBaseDTO> exist(@RequestBody ConceptBaseVO conceptBaseVO) {
+        return RespDTO.onSuc(conceptFacade.exist(conceptBaseVO));
+    }
+
     @ApiOperation(value = "知识库标准化-标签检索[by:wangyu]",
             notes = "type：类型(1：症状 3：其他史 4：查体，5：化验 6：辅检 7：诊断)，必填<br>" +
                     "age：年龄，必填<br>" +

icss-service/src/main/java/com/diagbot/dto/ConceptPushDTO.java

@@ -0,0 +1,16 @@
+package com.diagbot.dto;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @Description:推理返回标签（概念）
+ * @Author:zhaops
+ * @time: 2019/5/7 20:06
+ */
+@Getter
+@Setter
+public class ConceptPushDTO extends ConceptBaseDTO {
+    private Integer libType;  //词性
+    private Long id;          //标签id
+}