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

aipt-service/src/main/java/com/diagbot/dto/DisDTO.java

@@ -0,0 +1,20 @@
+package com.diagbot.dto;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @Description: 返回诊断基本信息
+ * @Author: ztg
+ * @Date: 2018/10/24 16:11
+ */
+@Getter
+@Setter
+public class DisDTO {
+
+    private Long conceptId;// 概念id
+    private String name;//内容
+    @JsonIgnore
+    private Integer type;//类型,19:慢病，20:急诊
+}

aipt-service/src/main/java/com/diagbot/dto/DisScaleDTO.java

@@ -0,0 +1,17 @@
+package com.diagbot.dto;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @Description: 返回诊断量表列表
+ * @Author: ztg
+ * @Date: 2018/10/24 16:11
+ */
+@Getter
+@Setter
+public class DisScaleDTO {
+
+    private Long conceptId;// 概念id
+    private String name;//名称
+}

aipt-service/src/main/java/com/diagbot/dto/DisTypeDTO.java

@@ -0,0 +1,20 @@
+package com.diagbot.dto;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @Description: 返回诊断类型
+ * @Author: ztg
+ * @Date: 2018/10/24 16:11
+ */
+@Getter
+@Setter
+public class DisTypeDTO {
+
+    private List<DisDTO> chronic = new ArrayList<>();
+    private List<DisDTO> emergency = new ArrayList<>();
+}

aipt-service/src/main/java/com/diagbot/entity/DisScale.java

@@ -0,0 +1,78 @@
+package com.diagbot.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 诊断量表映射表
+ * </p>
+ *
+ * @author zhoutg
+ * @since 2019-03-11
+ */
+@TableName("icss_dis_scale")
+@Getter
+@Setter
+public class DisScale implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 是否删除,N:未删除，Y:删除
+     */
+    private String isDeleted;
+
+    /**
+     * 记录创建时间
+     */
+    private Date gmtCreate;
+
+    /**
+     * 记录修改时间,如果时间是1970年则表示纪录未修改
+     */
+    private Date gmtModified;
+
+    /**
+     * 创建人，0表示无创建人值
+     */
+    private String creator;
+
+    /**
+     * 修改人,如果为0则表示纪录未修改
+     */
+    private String modifier;
+
+    /**
+     * 诊断标签id
+     */
+    private Long disId;
+
+    /**
+     * 量表标签id
+     */
+    private Long scaleId;
+
+    /**
+     * 排序号
+     */
+    private Integer orderNo;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+}

aipt-service/src/main/java/com/diagbot/entity/DisType.java

@@ -0,0 +1,78 @@
+package com.diagbot.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 诊断类型表
+ * </p>
+ *
+ * @author zhoutg
+ * @since 2019-03-08
+ */
+@TableName("icss_dis_type")
+@Getter
+@Setter
+public class DisType implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 是否删除,N:未删除，Y:删除
+     */
+    private String isDeleted;
+
+    /**
+     * 记录创建时间
+     */
+    private Date gmtCreate;
+
+    /**
+     * 记录修改时间,如果时间是1970年则表示纪录未修改
+     */
+    private Date gmtModified;
+
+    /**
+     * 创建人，0表示无创建人值
+     */
+    private String creator;
+
+    /**
+     * 修改人,如果为0则表示纪录未修改
+     */
+    private String modifier;
+
+    /**
+     * 诊断标签id
+     */
+    private Long disId;
+
+    /**
+     * parentId
+     */
+    private Long parentId;
+
+    /**
+     * 0：慢病，1：急诊
+     */
+    private Integer type;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+}

aipt-service/src/main/java/com/diagbot/enums/DisTypeEnum.java

@@ -0,0 +1,51 @@
+package com.diagbot.enums;
+
+import com.diagbot.core.KeyedNamed;
+import lombok.Setter;
+
+/**
+ * 
+ * @author zhoutg
+ * @Description: 诊断类型
+ * @date 2018年11月21日 下午2:31:42
+ */
+public enum DisTypeEnum implements KeyedNamed {
+    CHRONIC(19, "慢病"),
+    EMERGENCY(20, "急诊");
+
+    @Setter
+    private Integer key;
+
+    @Setter
+    private String name;
+
+    DisTypeEnum(Integer key, String name) {
+        this.key = key;
+        this.name = name;
+    }
+
+    public static DisTypeEnum getEnum(Integer key) {
+        for (DisTypeEnum item : DisTypeEnum.values()) {
+            if (item.key == key) {
+                return item;
+            }
+        }
+        return null;
+    }
+
+    public static String getName(Integer key) {
+        DisTypeEnum item = getEnum(key);
+        return item != null ? item.name : null;
+    }
+
+    @Override
+    public int getKey() {
+        return key;
+    }
+
+    @Override
+    public String getName() {
+        return name;
+    }
+}
+

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

@@ -0,0 +1,26 @@
+package com.diagbot.facade;
+
+import com.diagbot.dto.DisScaleDTO;
+import com.diagbot.service.impl.DisScaleServiceImpl;
+import com.diagbot.vo.DisScaleVO;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * @Description: 诊断量表
+ * @author: zhoutg
+ * @time: 2015/05/05 13:19
+ */
+@Component
+public class DisScaleFacade extends DisScaleServiceImpl {
+
+    /**
+     * 返回诊断量表列表
+     *
+     * @return
+     */
+    public List<DisScaleDTO> getDisScaleFac(DisScaleVO disScaleVO) {
+        return getDisScale(disScaleVO.getDisName());
+    }
+}

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

@@ -0,0 +1,46 @@
+package com.diagbot.facade;
+
+import com.diagbot.dto.DisDTO;
+import com.diagbot.dto.DisTypeDTO;
+import com.diagbot.enums.DisTypeEnum;
+import com.diagbot.service.impl.DisTypeServiceImpl;
+import com.diagbot.util.EntityUtil;
+import com.diagbot.util.ListUtil;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @Description: 诊断类型
+ * @author: zhoutg
+ * @time: 2018/11/19 13:19
+ */
+@Component
+public class DisTypeFacade extends DisTypeServiceImpl {
+
+
+    /**
+     * 返回诊断类型
+     *
+     * @return
+     */
+    public DisTypeDTO getDisTypeFac() {
+        DisTypeDTO res = new DisTypeDTO();
+        List<DisDTO> data = this.getDisType();
+        Map<String, List<DisDTO>> map = EntityUtil.makeEntityListMap(data, "type");
+        if (map != null) {
+            List<DisDTO> chr = map.get(DisTypeEnum.CHRONIC.getKey()); //放入慢病列表
+            if (ListUtil.isNotEmpty(chr)) {
+                res.setChronic(chr);
+            }
+            List<DisDTO> eme = map.get(DisTypeEnum.EMERGENCY.getKey()); //放入急诊列表
+            if (ListUtil.isNotEmpty(eme)) {
+                res.setEmergency(eme);
+            }
+        }
+        return res;
+    }
+
+
+}

aipt-service/src/main/java/com/diagbot/mapper/DisScaleMapper.java

@@ -0,0 +1,20 @@
+package com.diagbot.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.diagbot.dto.DisScaleDTO;
+import com.diagbot.entity.DisScale;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 诊断量表映射表 Mapper 接口
+ * </p>
+ *
+ * @author zhoutg
+ * @since 2019-03-11
+ */
+public interface DisScaleMapper extends BaseMapper<DisScale> {
+
+    public List<DisScaleDTO> getDisScale(String disName);
+}

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

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

aipt-service/src/main/java/com/diagbot/service/DisScaleService.java

@@ -0,0 +1,26 @@
+package com.diagbot.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.diagbot.dto.DisScaleDTO;
+import com.diagbot.entity.DisScale;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 诊断量表映射表 服务类
+ * </p>
+ *
+ * @author zhoutg
+ * @since 2019-03-11
+ */
+public interface DisScaleService extends IService<DisScale> {
+
+    /**
+     * 返回诊断量表列表
+     *
+     * @param disName
+     * @return
+     */
+    public List<DisScaleDTO> getDisScale(String disName);
+}

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

@@ -0,0 +1,25 @@
+package com.diagbot.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.diagbot.dto.DisDTO;
+import com.diagbot.entity.DisType;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 诊断类型表 服务类
+ * </p>
+ *
+ * @author zhoutg
+ * @since 2019-03-08
+ */
+public interface DisTypeService extends IService<DisType> {
+
+
+    /**
+     *
+     * @return 返回诊断类型
+     */
+    public List<DisDTO> getDisType();
+}

aipt-service/src/main/java/com/diagbot/service/impl/DisScaleServiceImpl.java

@@ -0,0 +1,27 @@
+package com.diagbot.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.diagbot.dto.DisScaleDTO;
+import com.diagbot.entity.DisScale;
+import com.diagbot.mapper.DisScaleMapper;
+import com.diagbot.service.DisScaleService;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 诊断量表映射表 服务实现类
+ * </p>
+ *
+ * @author zhoutg
+ * @since 2019-03-11
+ */
+@Service
+public class DisScaleServiceImpl extends ServiceImpl<DisScaleMapper, DisScale> implements DisScaleService {
+
+    @Override
+    public List<DisScaleDTO> getDisScale(String disName) {
+        return baseMapper.getDisScale(disName);
+    }
+}

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

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

aipt-service/src/main/java/com/diagbot/vo/DisScaleVO.java

@@ -0,0 +1,15 @@
+package com.diagbot.vo;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @Description: 诊断量表入参
+ * @author: zhoutg
+ * @time: 2018/8/6 10:16
+ */
+@Getter
+@Setter
+public class DisScaleVO {
+    private String disName;
+}

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

@@ -0,0 +1,43 @@
+package com.diagbot.web;
+
+
+import com.diagbot.dto.DisScaleDTO;
+import com.diagbot.dto.RespDTO;
+import com.diagbot.facade.DisScaleFacade;
+import com.diagbot.vo.DisScaleVO;
+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 java.util.List;
+
+/**
+ * <p>
+ * 诊断量表映射表 前端控制器
+ * </p>
+ *
+ * @author zhoutg
+ * @since 2019-05-05
+ */
+@RestController
+@RequestMapping("/scale")
+@Api(value = "诊断量表API", tags = { "知识库标准化-诊断量表API" })
+@SuppressWarnings("unchecked")
+public class DisScaleController {
+
+    @Autowired
+    DisScaleFacade disScaleFacade;
+
+    @ApiOperation(value = "知识库标准化-返回诊断量表列表[by:zhoutg]",
+            notes = "")
+    @PostMapping("/getList")
+    public RespDTO<List<DisScaleDTO>> getList(@RequestBody DisScaleVO scaleVO) {
+        List<DisScaleDTO> data = disScaleFacade.getDisScaleFac(scaleVO);
+        return RespDTO.onSuc(data);
+    }
+
+}

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

@@ -0,0 +1,39 @@
+package com.diagbot.web;
+
+
+import com.diagbot.dto.DisTypeDTO;
+import com.diagbot.dto.RespDTO;
+import com.diagbot.facade.DisTypeFacade;
+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.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 诊断类型表 前端控制器
+ * </p>
+ *
+ * @author zhoutg
+ * @since 2019-05-05
+ */
+@RestController
+@RequestMapping("/disType")
+@Api(value = "诊断类型API", tags = { "知识库标准化-诊断类型API" })
+@SuppressWarnings("unchecked")
+public class DisTypeController {
+
+
+    @Autowired
+    DisTypeFacade disTypeFacade;
+
+    @ApiOperation(value = "知识化标准化-返回诊断类型[by:zhoutg]",
+            notes = "")
+    @PostMapping("/getDisType")
+    public RespDTO<DisTypeDTO> getDisType() {
+        DisTypeDTO data = disTypeFacade.getDisTypeFac();
+        return RespDTO.onSuc(data);
+    }
+}

aipt-service/src/main/resources/mapper/DisScaleMapper.xml

@@ -0,0 +1,11 @@
+<?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.DisScaleMapper">
+
+    <select id="getDisScale" resultType="com.diagbot.dto.DisScaleDTO">
+        SELECT a.lib_name name, a.id concept_id  FROM `kl_concept` a, kl_relation b, kl_relation_order c
+        where a.is_deleted = 'N' and b.is_deleted = 'N' and c.is_deleted = 'N'
+        and a.id = b.end_id and b.start_id = (select id from kl_concept where lib_name = #{disName} and lib_type = 18)
+        and b.relation_id = 17 and b.id = c.t_relation_id ORDER BY c.order_no;
+    </select>
+</mapper>

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

@@ -0,0 +1,10 @@
+<?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">
+
+    <select id="getDisType" resultType="com.diagbot.dto.DisDTO">
+        SELECT a.lib_name name, a.id concept_id, b.relation_id type FROM `kl_concept` a, kl_relation b
+        where a.is_deleted = 'N' and b.is_deleted = 'N'
+        and b.relation_id in (19,20) and b.end_id = a.id and a.lib_type = 18
+    </select>
+</mapper>

icss-service/src/main/java/com/diagbot/client/AiptServiceClient.java

@@ -6,7 +6,10 @@ import com.diagbot.client.bean.Response;
 import com.diagbot.client.bean.ResponseData;
 import com.diagbot.client.bean.SearchData;
 import com.diagbot.client.hystrix.AiptServiceHystrix;
+import com.diagbot.dto.DisScaleDTO;
+import com.diagbot.dto.DisTypeDTO;
 import com.diagbot.dto.RespDTO;
+import com.diagbot.vo.DisScaleVO;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -36,4 +39,10 @@ public interface AiptServiceClient {
 
     @PostMapping(value = "/clinicaldata/scaleCalc")
     Response<Map<String, Object>> scaleCalc(@RequestBody CalculateData calculateData);
+
+    @PostMapping(value = "/scale/getList")
+    RespDTO<List<DisScaleDTO>> getList(@RequestBody DisScaleVO scaleVO);
+
+    @PostMapping(value = "/disType/getDisType")
+    RespDTO<DisTypeDTO> getDisType();
 }

icss-service/src/main/java/com/diagbot/client/hystrix/AiptServiceHystrix.java

@@ -6,6 +6,10 @@ import com.diagbot.client.bean.GdbResponse;
 import com.diagbot.client.bean.Response;
 import com.diagbot.client.bean.ResponseData;
 import com.diagbot.client.bean.SearchData;
+import com.diagbot.dto.DisScaleDTO;
+import com.diagbot.dto.DisTypeDTO;
+import com.diagbot.dto.RespDTO;
+import com.diagbot.vo.DisScaleVO;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -51,4 +55,16 @@ public class AiptServiceHystrix implements AiptServiceClient {
         log.error("【hystrix】调用{}异常", "scaleCalc");
         return null;
     }
+
+    @Override
+    public RespDTO<List<DisScaleDTO>> getList(DisScaleVO scaleVO) {
+        log.error("【hystrix】调用{}异常", "getList");
+        return null;
+    }
+
+    @Override
+    public RespDTO<DisTypeDTO> getDisType() {
+        log.error("【hystrix】调用{}异常", "getDisType");
+        return null;
+    }
 }

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

@@ -12,9 +12,6 @@ import lombok.Setter;
 @Setter
 public class DisDTO {
 
-    private Long id;// id
-    private Long parentId;// parentId
+    private Long conceptId;
     private String name;//内容
-    private Integer type;//类型(0:慢病，1：急诊)
-    private Integer tagType; //标签标识
 }

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

@@ -4,7 +4,7 @@ import lombok.Getter;
 import lombok.Setter;
 
 /**
- * @Description: 返回诊断量表信息
+ * @Description: 返回诊断量表列表
  * @Author: ztg
  * @Date: 2018/10/24 16:11
  */
@@ -12,8 +12,6 @@ import lombok.Setter;
 @Setter
 public class DisScaleDTO {
 
-    private Long id;// id
-    private String name;//内容
-    private Integer tagType; //标签标识
-    private Integer orderNo; //排序
+    private Long conceptId;// 概念id
+    private String name;//名称
 }

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

@@ -1,7 +1,13 @@
 package com.diagbot.facade;
 
+import com.diagbot.client.AiptServiceClient;
 import com.diagbot.dto.DisScaleDTO;
+import com.diagbot.dto.RespDTO;
+import com.diagbot.exception.CommonErrorCode;
+import com.diagbot.exception.CommonException;
 import com.diagbot.service.impl.DisScaleServiceImpl;
+import com.diagbot.vo.DisScaleVO;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 import java.util.List;
@@ -14,12 +20,20 @@ import java.util.List;
 @Component
 public class DisScaleFacade extends DisScaleServiceImpl {
 
+    @Autowired
+    AiptServiceClient aiptServiceClient;
+
     /**
      * 返回诊断量表列表
      *
+     * @param disScaleVO
      * @return
      */
-    public List<DisScaleDTO> getDisScaleFac(Long disId) {
-        return getDisScale(disId);
+    public List<DisScaleDTO> getDisScaleFac(DisScaleVO disScaleVO) {
+        RespDTO<List<DisScaleDTO>> res = aiptServiceClient.getList(disScaleVO);
+        if (res == null || !CommonErrorCode.OK.getCode().equals(res.code)) {
+            throw new CommonException(CommonErrorCode.RPC_ERROR, "远程调用诊断量表列表失败");
+        }
+        return res.data;
     }
 }

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

@@ -1,22 +1,19 @@
 package com.diagbot.facade;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.diagbot.dto.DisDTO;
+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.DisTypeEnum;
 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.DisTypeServiceImpl;
-import com.diagbot.util.EntityUtil;
-import com.diagbot.util.ListUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
-import java.util.List;
-import java.util.Map;
-
 /**
  * @Description: 诊断类型
  * @author: zhoutg
@@ -26,6 +23,8 @@ import java.util.Map;
 public class DisTypeFacade extends DisTypeServiceImpl {
     @Autowired
     private QuestionFacade questionFacade;
+    @Autowired
+    AiptServiceClient aiptServiceClient;
 
     /**
      * 返回诊断类型
@@ -33,20 +32,11 @@ public class DisTypeFacade extends DisTypeServiceImpl {
      * @return
      */
     public DisTypeDTO getDisTypeFac() {
-        DisTypeDTO res = new DisTypeDTO();
-        List<DisDTO> data = this.getDisType();
-        Map<String, List<DisDTO>> map = EntityUtil.makeEntityListMap(data, "type");
-        if (map != null) {
-            List<DisDTO> chr = map.get(DisTypeEnum.CHRONIC.getKey()); //放入慢病列表
-            if (ListUtil.isNotEmpty(chr)) {
-                res.setChronic(chr);
-            }
-            List<DisDTO> eme = map.get(DisTypeEnum.EMERGENCY.getKey()); //放入急诊列表
-            if (ListUtil.isNotEmpty(eme)) {
-                res.setEmergency(eme);
-            }
+        RespDTO<DisTypeDTO> res =  aiptServiceClient.getDisType();
+        if (res == null || !CommonErrorCode.OK.getCode().equals(res.code)) {
+            throw new CommonException(CommonErrorCode.RPC_ERROR, "远程调用诊断类型失败");
         }
-        return res;
+        return res.data;
     }
 
     /**

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

@@ -1,11 +1,8 @@
 package com.diagbot.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.diagbot.dto.DisScaleDTO;
 import com.diagbot.entity.DisScale;
 
-import java.util.List;
-
 /**
  * <p>
  * 诊断量表映射表 Mapper 接口
@@ -16,5 +13,4 @@ import java.util.List;
  */
 public interface DisScaleMapper extends BaseMapper<DisScale> {
 
-    public List<DisScaleDTO> getDisScaleFac(Long disId);
 }

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

@@ -1,11 +1,8 @@
 package com.diagbot.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.diagbot.dto.DisDTO;
 import com.diagbot.entity.DisType;
 
-import java.util.List;
-
 /**
  * <p>
  * 诊断类型表 Mapper 接口
@@ -16,6 +13,4 @@ import java.util.List;
  */
 public interface DisTypeMapper extends BaseMapper<DisType> {
 
-
-    public List<DisDTO> getDisType();
 }

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

@@ -1,11 +1,8 @@
 package com.diagbot.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.diagbot.dto.DisScaleDTO;
 import com.diagbot.entity.DisScale;
 
-import java.util.List;
-
 /**
  * <p>
  * 诊断量表映射表 服务类
@@ -16,10 +13,4 @@ import java.util.List;
  */
 public interface DisScaleService extends IService<DisScale> {
 
-    /**
-     * 返回诊断量表列表
-     *
-     * @return
-     */
-    public List<DisScaleDTO> getDisScale(Long disId);
 }

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

@@ -1,11 +1,8 @@
 package com.diagbot.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.diagbot.dto.DisDTO;
 import com.diagbot.entity.DisType;
 
-import java.util.List;
-
 /**
  * <p>
  * 诊断类型表 服务类
@@ -16,10 +13,4 @@ import java.util.List;
  */
 public interface DisTypeService extends IService<DisType> {
 
-
-    /**
-     *
-     * @return 返回诊断类型
-     */
-    public List<DisDTO> getDisType();
 }

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

@@ -1,14 +1,11 @@
 package com.diagbot.service.impl;
 
-import com.diagbot.dto.DisScaleDTO;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.diagbot.entity.DisScale;
 import com.diagbot.mapper.DisScaleMapper;
 import com.diagbot.service.DisScaleService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
-import java.util.List;
-
 /**
  * <p>
  * 诊断量表映射表 服务实现类
@@ -20,8 +17,4 @@ import java.util.List;
 @Service
 public class DisScaleServiceImpl extends ServiceImpl<DisScaleMapper, DisScale> implements DisScaleService {
 
-    @Override
-    public List<DisScaleDTO> getDisScale(Long disId) {
-        return baseMapper.getDisScaleFac(disId);
-    }
 }

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

@@ -1,14 +1,11 @@
 package com.diagbot.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.diagbot.dto.DisDTO;
 import com.diagbot.entity.DisType;
 import com.diagbot.mapper.DisTypeMapper;
 import com.diagbot.service.DisTypeService;
 import org.springframework.stereotype.Service;
 
-import java.util.List;
-
 /**
  * <p>
  * 标签基础表 服务实现类
@@ -20,9 +17,4 @@ import java.util.List;
 @Service
 public class DisTypeServiceImpl extends ServiceImpl<DisTypeMapper, DisType> implements DisTypeService {
 
-
-    @Override
-    public List<DisDTO> getDisType() {
-        return baseMapper.getDisType();
-    }
 }

icss-service/src/main/java/com/diagbot/vo/DisScaleVO.java

@@ -11,5 +11,5 @@ import lombok.Setter;
 @Getter
 @Setter
 public class DisScaleVO {
-    private Long disId;
+    private String disName;
 }

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

@@ -29,21 +29,20 @@ import java.util.List;
  */
 @RestController
 @RequestMapping("/scale")
-@Api(value = "诊断量表API", tags = { "2期-诊断量表API" })
+@Api(value = "诊断量表API", tags = { "知识库标准化-诊断量表API" })
 @SuppressWarnings("unchecked")
 public class DisScaleController {
 
     @Autowired
     DisScaleFacade disScaleFacade;
-
     @Autowired
     ScaleContentFacade scaleContentFacade;
 
-    @ApiOperation(value = "2期-返回诊断量表列表[by:zhoutg]",
+    @ApiOperation(value = "知识库标准化-返回诊断量表列表[by:zhoutg]",
             notes = "")
     @PostMapping("/getList")
     public RespDTO<List<DisScaleDTO>> getList(@RequestBody DisScaleVO scaleVO) {
-        List<DisScaleDTO> data = disScaleFacade.getDisScaleFac(scaleVO.getDisId());
+        List<DisScaleDTO> data = disScaleFacade.getDisScaleFac(scaleVO);
         return RespDTO.onSuc(data);
     }
 

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

@@ -21,7 +21,7 @@ import org.springframework.web.bind.annotation.RestController;
  */
 @RestController
 @RequestMapping("/disType")
-@Api(value = "诊断类型API", tags = { "2期-诊断类型API" })
+@Api(value = "诊断类型API", tags = { "知识化标准化-诊断类型API" })
 @SuppressWarnings("unchecked")
 public class DisTypeController {
 
@@ -29,7 +29,7 @@ public class DisTypeController {
     @Autowired
     DisTypeFacade disTypeFacade;
 
-    @ApiOperation(value = "2期-返回诊断类型[by:zhoutg]",
+    @ApiOperation(value = "知识化标准化-返回诊断类型[by:zhoutg]",
             notes = "")
     @PostMapping("/getDisType")
     public RespDTO<DisTypeDTO> getDisType() {

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

@@ -16,10 +16,4 @@
         <result column="remark" property="remark" />
     </resultMap>
 
-
-    <select id="getDisScaleFac" resultType="com.diagbot.dto.DisScaleDTO">
-        SELECT b.id,b.name,b.tag_type,a.order_no FROM `icss_dis_scale` a, icss_question_info b
-        where a.scale_id = b.id and a.is_deleted = 'N' and b.is_deleted = 'N' and a.dis_id = #{disId}
-        order by a.order_no
-    </select>
 </mapper>

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

@@ -16,9 +16,4 @@
         <result column="remark" property="remark" />
     </resultMap>
 
-    <select id="getDisType" resultType="com.diagbot.dto.DisDTO">
-        SELECT a.type,a.parent_id,b.name,b.id,b.tag_type FROM `icss_dis_type` a, icss_question_info b
-        where a.dis_id = b.id and a.is_deleted = 'N' and b.is_deleted = 'N' and a.type in (1,2)
-        order by a.type
-    </select>
 </mapper>