wangfeng пре 4 година
родитељ
комит
95d81d7d05

+ 31 - 0
cdssman-service/src/main/java/com/diagbot/dto/KlConceptAllDTO.java

@@ -0,0 +1,31 @@
+package com.diagbot.dto;
+
+import io.swagger.models.auth.In;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @author wangfeng
+ * @Description:
+ * @date 2021-03-02 14:07
+ */
+@Setter
+@Getter
+public class KlConceptAllDTO {
+    private Long conceptId;
+    private String libName;
+    private String spell;
+    private String libType;
+    private String typeName;
+    private String synonymName;
+    private Integer status;
+    private Integer isConcept;
+    private Integer sexType;
+    private Integer isHasCommon;
+    private Double minAge;
+    private Double maxAge;
+    private Double minVal;
+    private Double maxVal;
+    private Integer scopeType;
+    private String  icdCode;
+}

+ 16 - 0
cdssman-service/src/main/java/com/diagbot/facade/KlConceptFacade.java

@@ -3,6 +3,7 @@ package com.diagbot.facade;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.diagbot.dto.KlConceptAllDTO;
 import com.diagbot.dto.KlConceptInfoDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.entity.KlConcept;
@@ -14,6 +15,7 @@ import com.diagbot.util.CryptUtil;
 import com.diagbot.util.ListUtil;
 import com.diagbot.util.RespDTOUtil;
 import com.diagbot.util.StringUtil;
+import com.diagbot.vo.KlConceptAllVO;
 import com.diagbot.vo.KlConceptInfoVO;
 import com.google.common.collect.Lists;
 import org.springframework.stereotype.Component;
@@ -30,7 +32,21 @@ import java.util.stream.Collectors;
 @Component
 public class KlConceptFacade extends KlConceptServiceImpl {
 
+    /**
+     *
+     * @param klConceptInfoVO
+     * @return
+     */
     public IPage<KlConceptInfoDTO> getConceptInfoPage(KlConceptInfoVO klConceptInfoVO) {
      return  getConceptPage(klConceptInfoVO);
     }
+
+    /**
+     *
+     * @param klConceptAllVO
+     * @return
+     */
+    public List<KlConceptAllDTO> getConceptAlls(KlConceptAllVO klConceptAllVO) {
+        return  getConceptAll(klConceptAllVO);
+    }
 }

+ 6 - 0
cdssman-service/src/main/java/com/diagbot/mapper/KlConceptMapper.java

@@ -1,11 +1,15 @@
 package com.diagbot.mapper;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.diagbot.dto.KlConceptAllDTO;
 import com.diagbot.dto.KlConceptInfoDTO;
 import com.diagbot.entity.KlConcept;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.diagbot.vo.KlConceptAllVO;
 import com.diagbot.vo.KlConceptInfoVO;
 
+import java.util.List;
+
 /**
  * <p>
  * 概念表 Mapper 接口
@@ -17,4 +21,6 @@ import com.diagbot.vo.KlConceptInfoVO;
 public interface KlConceptMapper extends BaseMapper<KlConcept> {
 
     IPage<KlConceptInfoDTO> getConceptPage(KlConceptInfoVO klConceptInfoVO);
+
+    List<KlConceptAllDTO> getConceptAll(KlConceptAllVO klConceptAllVO);
 }

+ 5 - 0
cdssman-service/src/main/java/com/diagbot/service/KlConceptService.java

@@ -1,11 +1,15 @@
 package com.diagbot.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.diagbot.dto.KlConceptAllDTO;
 import com.diagbot.dto.KlConceptInfoDTO;
 import com.diagbot.entity.KlConcept;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.diagbot.vo.KlConceptAllVO;
 import com.diagbot.vo.KlConceptInfoVO;
 
+import java.util.List;
+
 /**
  * <p>
  * 概念表 服务类
@@ -16,4 +20,5 @@ import com.diagbot.vo.KlConceptInfoVO;
  */
 public interface KlConceptService extends IService<KlConcept> {
     public IPage<KlConceptInfoDTO> getConceptPage(KlConceptInfoVO klConceptInfoVO);
+    public List<KlConceptAllDTO> getConceptAll(KlConceptAllVO klConceptAllVO);
 }

+ 9 - 0
cdssman-service/src/main/java/com/diagbot/service/impl/KlConceptServiceImpl.java

@@ -2,14 +2,18 @@ package com.diagbot.service.impl;
 
 import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.diagbot.dto.KlConceptAllDTO;
 import com.diagbot.dto.KlConceptInfoDTO;
 import com.diagbot.entity.KlConcept;
 import com.diagbot.mapper.KlConceptMapper;
 import com.diagbot.service.KlConceptService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.diagbot.vo.KlConceptAllVO;
 import com.diagbot.vo.KlConceptInfoVO;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * <p>
  * 概念表 服务实现类
@@ -26,4 +30,9 @@ public class KlConceptServiceImpl extends ServiceImpl<KlConceptMapper, KlConcept
     public IPage<KlConceptInfoDTO> getConceptPage(KlConceptInfoVO klConceptInfoVO) {
         return baseMapper.getConceptPage(klConceptInfoVO);
     }
+
+    @Override
+    public List<KlConceptAllDTO> getConceptAll(KlConceptAllVO klConceptAllVO) {
+        return baseMapper.getConceptAll(klConceptAllVO);
+    }
 }

+ 18 - 0
cdssman-service/src/main/java/com/diagbot/vo/KlConceptAllVO.java

@@ -0,0 +1,18 @@
+package com.diagbot.vo;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * @author wangfeng
+ * @Description:
+ * @date 2021-03-02 14:06
+ */
+@Setter
+@Getter
+public class KlConceptAllVO {
+    @NotNull(message = "请输入conceptId")
+    private Long  conceptId;
+}

+ 15 - 4
cdssman-service/src/main/java/com/diagbot/web/KlConceptController.java

@@ -3,9 +3,11 @@ package com.diagbot.web;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.diagbot.annotation.SysLogger;
+import com.diagbot.dto.KlConceptAllDTO;
 import com.diagbot.dto.KlConceptInfoDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.facade.KlConceptFacade;
+import com.diagbot.vo.KlConceptAllVO;
 import com.diagbot.vo.KlConceptInfoVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -13,10 +15,11 @@ 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.stereotype.Controller;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.validation.Valid;
+import java.util.List;
+
 /**
  * <p>
  * 概念表 前端控制器
@@ -27,16 +30,24 @@ import org.springframework.web.bind.annotation.RestController;
  */
 @RestController
 @RequestMapping("/graph/klConcept")
-@Api(value = "基础术语维护相关API", tags = { "基础术语维护相关API" })
+@Api(value = "新-基础术语维护相关API", tags = { "基础术语维护相关API" })
 @SuppressWarnings("unchecked")
 public class KlConceptController {
     @Autowired
     KlConceptFacade klConceptFacade;
 
-    @ApiOperation(value = "知识库标准化-获取医学术语命名列表[by:wangfeng]")
+    @ApiOperation(value = "分页获取基础术语维护列表[by:wangfeng]")
     @PostMapping("/getConceptInfoPage")
     @SysLogger("getConceptInfoPage")
     public RespDTO<IPage<KlConceptInfoDTO>> getConceptInfoPages(@RequestBody KlConceptInfoVO klConceptInfoVO) {
         return RespDTO.onSuc(klConceptFacade.getConceptInfoPage(klConceptInfoVO));
     }
+
+    @ApiOperation(value = "根据id获取基础术语详情[by:wangfeng]")
+    @PostMapping("/getConceptAll")
+    @SysLogger("getConceptAll")
+    public RespDTO<List<KlConceptAllDTO>> getConceptInfoAll(@RequestBody @Valid KlConceptAllVO klConceptAllVO) {
+        return RespDTO.onSuc(klConceptFacade.getConceptAlls(klConceptAllVO));
+    }
+
 }

+ 37 - 0
cdssman-service/src/main/resources/mapper/KlConceptMapper.xml

@@ -53,4 +53,41 @@
         </if>
         GROUP BY a.concept_id
     </select>
+    <select id="getConceptAll" resultType="com.diagbot.dto.KlConceptAllDTO">
+        SELECT
+        a.concept_id AS conceptId,
+        b.lib_name AS libName,
+        a.spell AS spell,
+        b.lib_type AS libType,
+        d.name AS typeName,
+        a.name AS synonymName,
+        b.status,
+        d.is_has_common AS isHasCommon ,
+        a.is_concept AS isConcept,
+        f.sex_type AS sexType,
+        f.min_age AS minAge,
+        f.max_age AS maxAge,
+        g.min_value AS minVal,
+        g.max_value AS maxVal,
+        g.type AS scopeType,
+        h.icd10_code AS icdCode
+        FROM
+        kl_library_info a
+        INNER JOIN kl_concept b
+        ON b.id = a.concept_id
+        INNER JOIN kl_concept c
+        ON c.id = a.concept_id
+        INNER JOIN kl_lexicon d
+        ON b.lib_type = d.code
+        LEFT JOIN kl_concept_common f ON f.concept_id = a.concept_id
+        LEFT JOIN kl_lis g ON g.concept_id = a.concept_id
+        LEFT JOIN kl_disease h ON h.concept_id = a.concept_id
+        WHERE a.is_deleted = 'N'
+        AND b.is_deleted = 'N'
+        AND d.is_deleted = 'N'
+        <if test="conceptId != null">
+            AND a.concept_id = #{conceptId}
+        </if>
+        ORDER BY a.is_concept DESC
+    </select>
 </mapper>