各医院对应的诊断icd——查询接口修改

aipt-service/src/main/java/com/diagbot/client/TranServiceClient.java

@@ -1,13 +1,17 @@
 package com.diagbot.client;
 
 import com.diagbot.client.hystrix.TranServiceHystrix;
+import com.diagbot.dto.GetDiseaseIcdDTO;
 import com.diagbot.dto.HospitalDeptInfoDTO;
 import com.diagbot.dto.HospitalDeptInfoVO;
 import com.diagbot.dto.RespDTO;
+import com.diagbot.vo.GetDiseaseIcdVO;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 
+import java.util.List;
+
 /**
  * @Description: 调用信息对接层服务
  * @author: gaodm
@@ -24,4 +28,12 @@ public interface TranServiceClient {
     @PostMapping("/hospitalDeptInfo/getHospitalDeptInfo")
     RespDTO<HospitalDeptInfoDTO> getHospitalDeptInfo(@RequestBody HospitalDeptInfoVO hospitalDeptInfoVO);
 
+    /**
+     * 根据医院编号疾病id获取各医院对应的诊断icd
+     *
+     * @param getDiseaseIcdVO
+     * @return
+     */
+    @PostMapping("/diseaseIcd/getDiseaseIcds")
+    RespDTO<List<GetDiseaseIcdDTO>> getDiseaseIcds(@RequestBody GetDiseaseIcdVO getDiseaseIcdVO);
 }

aipt-service/src/main/java/com/diagbot/client/hystrix/TranServiceHystrix.java

@@ -1,12 +1,16 @@
 package com.diagbot.client.hystrix;
 
 import com.diagbot.client.TranServiceClient;
+import com.diagbot.dto.GetDiseaseIcdDTO;
 import com.diagbot.dto.HospitalDeptInfoDTO;
 import com.diagbot.dto.HospitalDeptInfoVO;
 import com.diagbot.dto.RespDTO;
+import com.diagbot.vo.GetDiseaseIcdVO;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
 
+import java.util.List;
+
 /**
  * @Description: 调用信息对接层服务
  * @author: gaodm
@@ -20,4 +24,10 @@ public class TranServiceHystrix implements TranServiceClient {
         log.error("【hystrix】调用{}异常", "getHospitalDeptInfo");
         return null;
     }
+
+    @Override
+    public RespDTO<List<GetDiseaseIcdDTO>> getDiseaseIcds(GetDiseaseIcdVO getDiseaseIcdVO) {
+        log.error("【hystrix】调用{}异常", "getDiseaseIcds");
+        return null;
+    }
 }

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

@@ -0,0 +1,38 @@
+package com.diagbot.dto;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @Description:
+ * @author: wangyu
+ * @time: 2019/2/14 14:59
+ */
+@Getter
+@Setter
+public class DiseaseIcdDTO  {
+    /**
+     * 医院编码
+     */
+    private String hospitalCode;
+
+    /**
+     * HIS疾病名称
+     */
+    private String diseaseName;
+
+    /**
+     * icd编码
+     */
+    private String icd;
+
+    /**
+     * 朗通疾病概念id
+     */
+    private Long conceptId;
+
+    /**
+     * 朗通疾病名称
+     */
+    private String conceptDisName;
+}

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

@@ -12,8 +12,4 @@ import lombok.Setter;
 @Getter
 @Setter
 public class GetDiseaseIcdDTO extends DiseaseIcd {
-    /**
-     * 疾病id
-     */
-    private Long questionId;
 }

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

@@ -54,7 +54,7 @@ public class DiseaseIcd implements Serializable {
     private String hospitalCode;
 
     /**
-     * icss疾病名称
+     * HIS疾病名称
      */
     private String diseaseName;
 
@@ -93,6 +93,7 @@ public class DiseaseIcd implements Serializable {
     public void setId(Long id) {
         this.id = id;
     }
+
     public String getIsDeleted() {
         return isDeleted;
     }
@@ -100,6 +101,7 @@ public class DiseaseIcd implements Serializable {
     public void setIsDeleted(String isDeleted) {
         this.isDeleted = isDeleted;
     }
+
     public Date getGmtCreate() {
         return gmtCreate;
     }
@@ -107,6 +109,7 @@ public class DiseaseIcd implements Serializable {
     public void setGmtCreate(Date gmtCreate) {
         this.gmtCreate = gmtCreate;
     }
+
     public Date getGmtModified() {
         return gmtModified;
     }
@@ -114,6 +117,7 @@ public class DiseaseIcd implements Serializable {
     public void setGmtModified(Date gmtModified) {
         this.gmtModified = gmtModified;
     }
+
     public String getCreator() {
         return creator;
     }
@@ -121,6 +125,7 @@ public class DiseaseIcd implements Serializable {
     public void setCreator(String creator) {
         this.creator = creator;
     }
+
     public String getModifier() {
         return modifier;
     }
@@ -128,6 +133,7 @@ public class DiseaseIcd implements Serializable {
     public void setModifier(String modifier) {
         this.modifier = modifier;
     }
+
     public String getHospitalCode() {
         return hospitalCode;
     }
@@ -135,6 +141,7 @@ public class DiseaseIcd implements Serializable {
     public void setHospitalCode(String hospitalCode) {
         this.hospitalCode = hospitalCode;
     }
+
     public String getDiseaseName() {
         return diseaseName;
     }
@@ -142,6 +149,7 @@ public class DiseaseIcd implements Serializable {
     public void setDiseaseName(String diseaseName) {
         this.diseaseName = diseaseName;
     }
+
     public String getIcd() {
         return icd;
     }
@@ -149,6 +157,7 @@ public class DiseaseIcd implements Serializable {
     public void setIcd(String icd) {
         this.icd = icd;
     }
+
     public String getStatus() {
         return status;
     }
@@ -156,6 +165,7 @@ public class DiseaseIcd implements Serializable {
     public void setStatus(String status) {
         this.status = status;
     }
+
     public String getRemark() {
         return remark;
     }

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

@@ -0,0 +1,76 @@
+package com.diagbot.facade;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.diagbot.client.TranServiceClient;
+import com.diagbot.dto.DiseaseIcdDTO;
+import com.diagbot.dto.GetDiseaseIcdDTO;
+import com.diagbot.dto.RespDTO;
+import com.diagbot.entity.Concept;
+import com.diagbot.enums.IsDeleteEnum;
+import com.diagbot.enums.LexiconTypeEnum;
+import com.diagbot.util.BeanUtil;
+import com.diagbot.util.ListUtil;
+import com.diagbot.util.RespDTOUtil;
+import com.diagbot.vo.GetDiseaseIcdVO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+/**
+ * @Description:
+ * @author: wangyu
+ * @time: 2019/2/14 15:25
+ */
+@Component
+public class DiseaseIcdFacade {
+
+    @Autowired
+    TranServiceClient tranServiceClient;
+    @Autowired
+    ConceptFacade conceptFacade;
+
+    /**
+     * 根据医院编号和诊断ids获取各自的icd编码
+     *
+     * @param getDiseaseIcdVO
+     * @return
+     */
+    public List<DiseaseIcdDTO> getDiseaseIcds(GetDiseaseIcdVO getDiseaseIcdVO) {
+        RespDTO<List<GetDiseaseIcdDTO>> getDiseaseIcdsList = tranServiceClient.getDiseaseIcds(getDiseaseIcdVO);
+        RespDTOUtil.respNGDealCover(getDiseaseIcdsList, "获取icd编码失败");
+
+        List<DiseaseIcdDTO> res = new ArrayList<>();
+
+        List<String> disNames
+                = getDiseaseIcdsList.data.stream().map(g -> g.getConceptDisName()).distinct().collect(Collectors.toList());
+        if (ListUtil.isEmpty(disNames)) {
+            return res;
+        }
+
+        QueryWrapper<Concept> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
+                .eq("lib_type", LexiconTypeEnum.DIAGNOSIS.getKey())
+                .in("lib_name", disNames);
+
+        List<Concept> conceptDisNames = conceptFacade.list(queryWrapper);
+
+        Map<String, Long> map
+                = conceptDisNames.stream().collect(Collectors.toMap(c -> c.getLibName(), c -> c.getId()));
+        if (null != map) {
+            DiseaseIcdDTO diseaseIcdDTO = null;
+            for (GetDiseaseIcdDTO getDiseaseIcdDTO : getDiseaseIcdsList.data) {
+                if (null != map.get(getDiseaseIcdDTO.getConceptDisName())) {
+                    diseaseIcdDTO = new DiseaseIcdDTO();
+                    BeanUtil.copyProperties(getDiseaseIcdDTO, diseaseIcdDTO);
+                    diseaseIcdDTO.setConceptId(map.get(getDiseaseIcdDTO.getConceptDisName()));
+                    res.add(diseaseIcdDTO);
+                }
+            }
+        }
+        return res;
+    }
+}

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

@@ -0,0 +1,23 @@
+package com.diagbot.vo;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
+/**
+ * @Description:
+ * @author: wangyu
+ * @time: 2019/2/14 14:56
+ */
+@Getter
+@Setter
+public class GetDiseaseIcdVO {
+    //疾病名称
+    @NotBlank(message="疾病名称必传")
+    private String disNames;
+    //医院编码
+    @NotBlank(message="医院编码必传")
+    private String hospitalCode;
+}

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

@@ -2,9 +2,9 @@ package com.diagbot.web;
 
 
 import com.diagbot.annotation.SysLogger;
-import com.diagbot.dto.GetDiseaseIcdDTO;
+import com.diagbot.dto.DiseaseIcdDTO;
 import com.diagbot.dto.RespDTO;
-import com.diagbot.facade.TranDiseaseIcdFacade;
+import com.diagbot.facade.DiseaseIcdFacade;
 import com.diagbot.vo.GetDiseaseIcdVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -13,6 +13,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;
@@ -29,17 +30,18 @@ import java.util.List;
 @RequestMapping("/diseaseIcd")
 @Api(value = "对应的诊断icd API", tags = { "对应的诊断icd API" })
 @SuppressWarnings("unchecked")
-public class TranDiseaseIcdController {
+public class DiseaseIcdController {
     @Autowired
-    TranDiseaseIcdFacade tranDiseaseIcdFacade;
+    DiseaseIcdFacade diseaseIcdFacade;
 
     @ApiOperation(value = "各医院对应的诊断icd——查询[by:wangyu]",
             notes = "questions：疾病id，必填<br>" +
                     "hospitalCode:医院编号，必填<br>")
     @PostMapping("/getDiseaseIcds")
     @SysLogger("getDiseaseIcds")
-    public RespDTO<List<GetDiseaseIcdDTO>> getDiseaseIcds(@RequestBody @Valid GetDiseaseIcdVO getDiseaseIcdVO) {
-        List<GetDiseaseIcdDTO> data = tranDiseaseIcdFacade.getDiseaseIcds(getDiseaseIcdVO);
+    @ApiIgnore
+    public RespDTO<List<DiseaseIcdDTO>> getDiseaseIcds(@RequestBody @Valid GetDiseaseIcdVO getDiseaseIcdVO) {
+        List<DiseaseIcdDTO> data = diseaseIcdFacade.getDiseaseIcds(getDiseaseIcdVO);
         return RespDTO.onSuc(data);
     }
 }

docs/009.20190425知识库标准化脚本/init_cloud_service.sql

@@ -1,4 +1,5 @@
 -- 高达明
 use `sys-tran`;
 ALTER TABLE `tran_hospital_dept` CHANGE `icss_dept_name` `concept_dept_name` varchar(200) DEFAULT NULL COMMENT '朗通科室名称';
-ALTER TABLE `tran_disease_icd` CHANGE `icss_question_name` `concept_dis_name` varchar(200) DEFAULT NULL COMMENT '朗通疾病名称';
+ALTER TABLE `tran_disease_icd` CHANGE `icss_question_name` `concept_dis_name` varchar(200) DEFAULT NULL COMMENT '朗通疾病名称';
+ALTER TABLE `tran_disease_icd` MODIFY COLUMN `disease_name` varchar(200) DEFAULT NULL COMMENT 'HIS疾病名称';

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

@@ -10,12 +10,14 @@ import com.diagbot.dto.ConceptIntroduceDTO;
 import com.diagbot.dto.DeptInfoDTO;
 import com.diagbot.dto.DisScaleDTO;
 import com.diagbot.dto.DisTypeDTO;
+import com.diagbot.dto.DiseaseIcdDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.entity.ScaleContent;
 import com.diagbot.vo.ConceptIntroduceVO;
 import com.diagbot.vo.ConceptUsualVO;
 import com.diagbot.vo.DeptInfoVO;
 import com.diagbot.vo.DisScaleVO;
+import com.diagbot.vo.GetDiseaseIcdVO;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -64,4 +66,13 @@ public interface AiptServiceClient {
 
     @PostMapping(value = "/deptInfo/getDeptInfo")
     RespDTO<DeptInfoDTO> getDeptInfo(@Valid @RequestBody DeptInfoVO deptInfoVO);
+
+    /**
+     * 根据医院编号疾病id获取各医院对应的诊断icd
+     *
+     * @param getDiseaseIcdVO
+     * @return
+     */
+    @PostMapping("/diseaseIcd/getDiseaseIcds")
+    RespDTO<List<DiseaseIcdDTO>> getDiseaseIcds(@RequestBody GetDiseaseIcdVO getDiseaseIcdVO);
 }

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

@@ -2,9 +2,7 @@ package com.diagbot.client;
 
 import com.diagbot.client.hystrix.TranServiceHystrix;
 import com.diagbot.dto.DoctorInfoDTO;
-import com.diagbot.dto.GetDiseaseIcdDTO;
 import com.diagbot.dto.GetTopPatientInfoDTO;
-import com.diagbot.dto.HospitalDeptInfoDTO;
 import com.diagbot.dto.HospitalInfoDTO;
 import com.diagbot.dto.LisConfigDTO;
 import com.diagbot.dto.PatientInfoDTO;
@@ -14,10 +12,8 @@ import com.diagbot.entity.DoctorInfo;
 import com.diagbot.entity.HospitalDept;
 import com.diagbot.entity.PatientInfo;
 import com.diagbot.vo.DoctorInfoVO;
-import com.diagbot.vo.GetDiseaseIcdVO;
 import com.diagbot.vo.GetTopPatientInfoVO;
 import com.diagbot.vo.HosCodeVO;
-import com.diagbot.vo.HospitalDeptInfoVO;
 import com.diagbot.vo.HospitalInfoVO;
 import com.diagbot.vo.LisHospitalCodeVO;
 import com.diagbot.vo.PatientInfoVO;
@@ -119,15 +115,6 @@ public interface TranServiceClient {
     @PostMapping("/tranFieldInfo/getInfoByUuid")
     RespDTO<List<TranFieldInfoDTO>> getInfoByUuid(@RequestBody TranFieldInfoVO tranFieldInfoVO);
 
-    /**
-     * 根据医院编号疾病id获取各医院对应的诊断icd
-     *
-     * @param getDiseaseIcdVO
-     * @return
-     */
-    @PostMapping("/diseaseIcd/getDiseaseIcds")
-    RespDTO<List<GetDiseaseIcdDTO>> getDiseaseIcds(@RequestBody GetDiseaseIcdVO getDiseaseIcdVO);
-
     /**
      * 将问诊保存的一些相关信息发送到对接层
      *

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

@@ -10,14 +10,17 @@ import com.diagbot.dto.ConceptIntroduceDTO;
 import com.diagbot.dto.DeptInfoDTO;
 import com.diagbot.dto.DisScaleDTO;
 import com.diagbot.dto.DisTypeDTO;
+import com.diagbot.dto.DiseaseIcdDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.entity.ScaleContent;
 import com.diagbot.vo.ConceptIntroduceVO;
 import com.diagbot.vo.ConceptUsualVO;
 import com.diagbot.vo.DeptInfoVO;
 import com.diagbot.vo.DisScaleVO;
+import com.diagbot.vo.GetDiseaseIcdVO;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
+import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestParam;
 
@@ -94,8 +97,20 @@ public class AiptServiceHystrix implements AiptServiceClient {
     }
 
     @Override
-    public RespDTO<DeptInfoDTO> getDeptInfo(@Valid @RequestBody DeptInfoVO deptInfoVO){
+    public RespDTO<DeptInfoDTO> getDeptInfo(@Valid @RequestBody DeptInfoVO deptInfoVO) {
         log.error("【hystrix】调用{}异常", "getDeptInfo");
         return null;
     }
+
+    /**
+     * 根据医院编号疾病id获取各医院对应的诊断icd
+     *
+     * @param getDiseaseIcdVO
+     * @return
+     */
+    @Override
+    public RespDTO<List<DiseaseIcdDTO>> getDiseaseIcds(@RequestBody GetDiseaseIcdVO getDiseaseIcdVO) {
+        log.error("【hystrix】调用{}异常", "getDiseaseIcds");
+        return null;
+    }
 }

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

@@ -2,9 +2,7 @@ package com.diagbot.client.hystrix;
 
 import com.diagbot.client.TranServiceClient;
 import com.diagbot.dto.DoctorInfoDTO;
-import com.diagbot.dto.GetDiseaseIcdDTO;
 import com.diagbot.dto.GetTopPatientInfoDTO;
-import com.diagbot.dto.HospitalDeptInfoDTO;
 import com.diagbot.dto.HospitalInfoDTO;
 import com.diagbot.dto.LisConfigDTO;
 import com.diagbot.dto.PatientInfoDTO;
@@ -14,10 +12,8 @@ import com.diagbot.entity.DoctorInfo;
 import com.diagbot.entity.HospitalDept;
 import com.diagbot.entity.PatientInfo;
 import com.diagbot.vo.DoctorInfoVO;
-import com.diagbot.vo.GetDiseaseIcdVO;
 import com.diagbot.vo.GetTopPatientInfoVO;
 import com.diagbot.vo.HosCodeVO;
-import com.diagbot.vo.HospitalDeptInfoVO;
 import com.diagbot.vo.HospitalInfoVO;
 import com.diagbot.vo.LisHospitalCodeVO;
 import com.diagbot.vo.PatientInfoVO;
@@ -93,12 +89,6 @@ public class TranServiceHystrix implements TranServiceClient {
         return null;
     }
 
-    @Override
-    public RespDTO<List<GetDiseaseIcdDTO>> getDiseaseIcds(GetDiseaseIcdVO getDiseaseIcdVO) {
-        log.error("【hystrix】调用{}异常", "getDiseaseIcds");
-        return null;
-    }
-
     @Override
     public RespDTO<Boolean> saveInquiryToHis(SaveInquiryToHisVO saveInquiryToHisVO) {
         log.error("【hystrix】调用{}异常", "saveInquiryToHis");

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

@@ -0,0 +1,38 @@
+package com.diagbot.dto;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @Description:
+ * @author: wangyu
+ * @time: 2019/2/14 14:59
+ */
+@Getter
+@Setter
+public class DiseaseIcdDTO {
+    /**
+     * 医院编码
+     */
+    private String hospitalCode;
+
+    /**
+     * HIS疾病名称
+     */
+    private String diseaseName;
+
+    /**
+     * icd编码
+     */
+    private String icd;
+
+    /**
+     * 朗通疾病概念id
+     */
+    private Long conceptId;
+
+    /**
+     * 朗通疾病名称
+     */
+    private String conceptDisName;
+}

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

@@ -0,0 +1,35 @@
+package com.diagbot.facade;
+
+import com.diagbot.client.AiptServiceClient;
+import com.diagbot.dto.DiseaseIcdDTO;
+import com.diagbot.dto.RespDTO;
+import com.diagbot.util.RespDTOUtil;
+import com.diagbot.vo.GetDiseaseIcdVO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * @Description:
+ * @author: wangyu
+ * @time: 2019/2/14 15:25
+ */
+@Component
+public class DiseaseIcdFacade {
+
+    @Autowired
+    AiptServiceClient aiptServiceClient;
+
+    /**
+     * 根据医院编号和诊断ids获取各自的icd编码
+     *
+     * @param getDiseaseIcdVO
+     * @return
+     */
+    public List<DiseaseIcdDTO> getDiseaseIcds(GetDiseaseIcdVO getDiseaseIcdVO) {
+        RespDTO<List<DiseaseIcdDTO>> res = aiptServiceClient.getDiseaseIcds(getDiseaseIcdVO);
+        RespDTOUtil.respNGDealCover(res, "获取icd编码失败");
+        return res.data;
+    }
+}

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

@@ -1,68 +0,0 @@
-package com.diagbot.facade;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.diagbot.client.TranServiceClient;
-import com.diagbot.dto.GetDiseaseIcdDTO;
-import com.diagbot.dto.RespDTO;
-import com.diagbot.entity.QuestionInfo;
-import com.diagbot.enums.IsDeleteEnum;
-import com.diagbot.enums.QuestionTypeEnum;
-import com.diagbot.util.ListUtil;
-import com.diagbot.util.RespDTOUtil;
-import com.diagbot.vo.GetDiseaseIcdVO;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.stream.Collectors;
-
-/**
- * @Description:
- * @author: wangyu
- * @time: 2019/2/14 15:25
- */
-@Component
-public class TranDiseaseIcdFacade {
-
-    @Autowired
-    TranServiceClient tranServiceClient;
-    @Autowired
-    QuestionFacade questionFacade;
-
-    /**
-     * 根据医院编号和诊断ids获取各自的icd编码
-     *
-     * @param getDiseaseIcdVO
-     * @return
-     */
-    public List<GetDiseaseIcdDTO> getDiseaseIcds(GetDiseaseIcdVO getDiseaseIcdVO) {
-        RespDTO<List<GetDiseaseIcdDTO>> getDiseaseIcdsList = tranServiceClient.getDiseaseIcds(getDiseaseIcdVO);
-        RespDTOUtil.respNGDealCover(getDiseaseIcdsList, "获取icd编码失败");
-
-        List<GetDiseaseIcdDTO> res = new ArrayList<>();
-
-        List<String> questionNames
-                = getDiseaseIcdsList.data.stream().map(getDiseaseIcdDTO -> getDiseaseIcdDTO.getConceptDisName()).collect(Collectors.toList());
-        if (ListUtil.isEmpty(questionNames)) {
-            return res;
-        }
-
-        QueryWrapper<QuestionInfo> questionInfoQueryWrapper = new QueryWrapper<>();
-        questionInfoQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
-                .eq("type", QuestionTypeEnum.Disease.getKey())
-                .in("name", questionNames);
-
-        List<String> icssQuestionNames
-                = questionFacade.list(questionInfoQueryWrapper).stream()
-                .map(r -> r.getName()).collect(Collectors.toList());
-        if (ListUtil.isNotEmpty(icssQuestionNames)) {
-            for (GetDiseaseIcdDTO getDiseaseIcdDTO : getDiseaseIcdsList.data) {
-                if (icssQuestionNames.contains(getDiseaseIcdDTO.getConceptDisName())) {
-                    res.add(getDiseaseIcdDTO);
-                }
-            }
-        }
-        return res;
-    }
-}

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

@@ -12,7 +12,7 @@ import lombok.Setter;
 @Setter
 public class GetDiseaseIcdVO {
     //疾病名称
-    private String questions;
+    private String disNames;
     //医院编码
     private String hospitalCode;
 }

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

@@ -29,7 +29,7 @@ import javax.validation.Valid;
 @RequestMapping("/deptInfo")
 @Api(value = "科室信息API", tags = { "科室信息API" })
 @SuppressWarnings("unchecked")
-//@ApiIgnore
+@ApiIgnore
 @Deprecated
 public class DeptInfoController {
 

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

@@ -0,0 +1,45 @@
+package com.diagbot.web;
+
+
+import com.diagbot.annotation.SysLogger;
+import com.diagbot.dto.DiseaseIcdDTO;
+import com.diagbot.dto.RespDTO;
+import com.diagbot.facade.DiseaseIcdFacade;
+import com.diagbot.vo.GetDiseaseIcdVO;
+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;
+
+/**
+ * <p>
+ * 各医院对应的诊断icd 前端控制器
+ * </p>
+ *
+ * @author wangyu
+ * @since 2019-02-14
+ */
+@RestController
+@RequestMapping("/diseaseIcd")
+@Api(value = "知识化标准化-对应的诊断icd API", tags = { "知识化标准化-对应的诊断icd API" })
+@SuppressWarnings("unchecked")
+public class DiseaseIcdController {
+    @Autowired
+    DiseaseIcdFacade diseaseIcdFacade;
+
+    @ApiOperation(value = "知识化标准化-各医院对应的诊断icd——查询[by:wangyu]",
+            notes = "questions：疾病id，必填<br>" +
+                    "hospitalCode:医院编号，必填<br>")
+    @PostMapping("/getDiseaseIcds")
+    @SysLogger("getDiseaseIcds")
+    public RespDTO<List<DiseaseIcdDTO>> getDiseaseIcds(@RequestBody @Valid GetDiseaseIcdVO getDiseaseIcdVO) {
+        List<DiseaseIcdDTO> data = diseaseIcdFacade.getDiseaseIcds(getDiseaseIcdVO);
+        return RespDTO.onSuc(data);
+    }
+}

tran-service/src/main/java/com/diagbot/entity/DiseaseIcd.java

@@ -54,7 +54,7 @@ public class DiseaseIcd implements Serializable {
     private String hospitalCode;
 
     /**
-     * icss疾病名称
+     * HIS疾病名称
      */
     private String diseaseName;
 

tran-service/src/main/java/com/diagbot/facade/TranDiseaseIcdFacade.java

@@ -30,13 +30,13 @@ public class TranDiseaseIcdFacade extends DiseaseIcdServiceImpl {
      */
     public List<GetDiseaseIcdDTO> getDiseaseIcds(GetDiseaseIcdVO getDiseaseIcdVO) {
         Map paramMap = new HashMap<>();
-        paramMap.put("questions", Arrays.asList(getDiseaseIcdVO.getQuestions().split(",")));
+        paramMap.put("disNames", Arrays.asList(getDiseaseIcdVO.getDisNames().split(",")));
         paramMap.put("hospitalCode", getDiseaseIcdVO.getHospitalCode());
         return this.getDiseaseIcds(paramMap);
     }
 
     /**
-     * 根据医院编码获取疾病映射关系 Map<icssName,diseaseName>
+     * 根据医院编码获取疾病映射关系 Map<conceptDisName,diseaseName>
      *
      * @return
      */
@@ -44,7 +44,7 @@ public class TranDiseaseIcdFacade extends DiseaseIcdServiceImpl {
         QueryWrapper<DiseaseIcd> diseaseIcdQueryWrapper = new QueryWrapper<>();
         diseaseIcdQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey()).eq("hospital_code",hosCode);
         List<DiseaseIcd> diseaseIcdList = this.list(diseaseIcdQueryWrapper);
-        Map<String, String> retMap= EntityUtil.makeMapWithKeyValue(diseaseIcdList, "icssQuestionName", "diseaseName");
+        Map<String, String> retMap= EntityUtil.makeMapWithKeyValue(diseaseIcdList, "conceptDisName", "diseaseName");
         return retMap;
     }
 }

tran-service/src/main/java/com/diagbot/vo/GetDiseaseIcdVO.java

@@ -14,8 +14,8 @@ import javax.validation.constraints.NotNull;
 @Setter
 public class GetDiseaseIcdVO {
     //疾病id
-    @NotNull(message="疾病id必传")
-    private String questions;
+    @NotNull(message="疾病名称必传")
+    private String disNames;
     //医院编码
     @NotNull(message="医院编码必传")
     private String hospitalCode;

tran-service/src/main/resources/mapper/DiseaseIcdMapper.xml

@@ -22,8 +22,8 @@
         select * from tran_disease_icd t where
         FIND_IN_SET(#{hospitalCode},hospital_code)
         and
-        icss_question_name in
-        <foreach item="item" collection="questions" open="(" separator="," close=")">
+        concept_dis_name in
+        <foreach item="item" collection="disNames" open="(" separator="," close=")">
             #{item}
         </foreach>
         and status = '1'