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

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

@@ -1,7 +1,12 @@
 package com.diagbot.client;
 
 import com.diagbot.client.hystrix.TranServiceHystrix;
+import com.diagbot.dto.HospitalDeptInfoDTO;
+import com.diagbot.dto.HospitalDeptInfoVO;
+import com.diagbot.dto.RespDTO;
 import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 
 /**
  * @Description: 调用信息对接层服务
@@ -10,5 +15,13 @@ import org.springframework.cloud.openfeign.FeignClient;
  */
 @FeignClient(value = "tran-service", fallback = TranServiceHystrix.class)
 public interface TranServiceClient {
+    /**
+     * 获取科室信息
+     *
+     * @param hospitalDeptInfoVO
+     * @return
+     */
+    @PostMapping("/hospitalDeptInfo/getHospitalDeptInfo")
+    RespDTO<HospitalDeptInfoDTO> getHospitalDeptInfo(@RequestBody HospitalDeptInfoVO hospitalDeptInfoVO);
 
 }

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

@@ -1,6 +1,9 @@
 package com.diagbot.client.hystrix;
 
 import com.diagbot.client.TranServiceClient;
+import com.diagbot.dto.HospitalDeptInfoDTO;
+import com.diagbot.dto.HospitalDeptInfoVO;
+import com.diagbot.dto.RespDTO;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
 
@@ -12,5 +15,9 @@ import org.springframework.stereotype.Component;
 @Component
 @Slf4j
 public class TranServiceHystrix implements TranServiceClient {
-
+    @Override
+    public RespDTO<HospitalDeptInfoDTO> getHospitalDeptInfo(HospitalDeptInfoVO hospitalDeptInfoVO) {
+        log.error("【hystrix】调用{}异常", "getHospitalDeptInfo");
+        return null;
+    }
 }

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

@@ -0,0 +1,9 @@
+package com.diagbot.dto;
+
+/**
+ * @Description:
+ * @author: gaodm
+ * @time: 2019/5/8 13:51
+ */
+public class DeptInfoDTO extends ConceptBaseDTO {
+}

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

@@ -0,0 +1,15 @@
+package com.diagbot.dto;
+
+import com.diagbot.entity.HospitalDept;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @Description:
+ * @author: wangyu
+ * @time: 2019/2/12 17:23
+ */
+@Setter
+@Getter
+public class HospitalDeptInfoDTO extends HospitalDept {
+}

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

@@ -0,0 +1,20 @@
+package com.diagbot.dto;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * @Description:
+ * @author: wangyu
+ * @time: 2019/2/12 17:24
+ */
+@Getter
+@Setter
+public class HospitalDeptInfoVO {
+    @NotNull(message = "请输入科室编码")
+    private String deptCode;
+    @NotNull(message = "请输入医院编码")
+    private String hospitalCode;
+}

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

@@ -0,0 +1,201 @@
+package com.diagbot.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 医院科室信息表
+ * </p>
+ *
+ * @author rengb
+ * @since 2018-11-19
+ */
+@TableName("tran_hospital_dept")
+public class HospitalDept 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;
+
+    /**
+     * 医院科室编码
+     */
+    private String code;
+
+    /**
+     * 医院科室名称
+     */
+    private String name;
+
+    /**
+     * 医院编码
+     */
+    private String hospitalCode;
+
+    /**
+     * 医院名称
+     */
+    private String hospitalName;
+
+    /**
+     * 朗通科室名称
+     */
+    private String conceptDeptName;
+
+    /**
+     * 状态：0.禁用1.启用
+     */
+    private Integer status;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+    public String getIsDeleted() {
+        return isDeleted;
+    }
+
+    public void setIsDeleted(String isDeleted) {
+        this.isDeleted = isDeleted;
+    }
+    public Date getGmtCreate() {
+        return gmtCreate;
+    }
+
+    public void setGmtCreate(Date gmtCreate) {
+        this.gmtCreate = gmtCreate;
+    }
+    public Date getGmtModified() {
+        return gmtModified;
+    }
+
+    public void setGmtModified(Date gmtModified) {
+        this.gmtModified = gmtModified;
+    }
+    public String getCreator() {
+        return creator;
+    }
+
+    public void setCreator(String creator) {
+        this.creator = creator;
+    }
+    public String getModifier() {
+        return modifier;
+    }
+
+    public void setModifier(String modifier) {
+        this.modifier = modifier;
+    }
+    public String getCode() {
+        return code;
+    }
+
+    public void setCode(String code) {
+        this.code = code;
+    }
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+    public String getHospitalCode() {
+        return hospitalCode;
+    }
+
+    public void setHospitalCode(String hospitalCode) {
+        this.hospitalCode = hospitalCode;
+    }
+    public String getHospitalName() {
+        return hospitalName;
+    }
+
+    public void setHospitalName(String hospitalName) {
+        this.hospitalName = hospitalName;
+    }
+
+    public String getConceptDeptName() {
+        return conceptDeptName;
+    }
+
+    public void setconceptDeptName(String conceptDeptName) {
+        this.conceptDeptName = conceptDeptName;
+    }
+
+    public Integer getStatus() {
+        return status;
+    }
+
+    public void setStatus(Integer status) {
+        this.status = status;
+    }
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    @Override
+    public String toString() {
+        return "HospitalDept{" +
+                "id=" + id +
+                ", isDeleted=" + isDeleted +
+                ", gmtCreate=" + gmtCreate +
+                ", gmtModified=" + gmtModified +
+                ", creator=" + creator +
+                ", modifier=" + modifier +
+                ", code=" + code +
+                ", name=" + name +
+                ", hospitalCode=" + hospitalCode +
+                ", hospitalName=" + hospitalName +
+                ", conceptDeptName=" + conceptDeptName +
+                ", status=" + status +
+                ", remark=" + remark +
+                "}";
+    }
+}

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

@@ -19,4 +19,5 @@ public class Symptom extends ConceptBaseDTO {
 
     @JsonIgnore
     private Long partConceptId;
+    private String desc = ""; //简述
 }

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

@@ -20,6 +20,7 @@ import org.springframework.web.bind.annotation.RequestBody;
 
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -55,6 +56,11 @@ public class ClinicalFacade {
 
         sData.setLisArr(processLis(sData.getLisArr()));
 
+        if (ListUtil.isNotEmpty(sData.getLisArr())) {
+            List<String> otherVal = sData.getLisArr().stream().map(lisArr -> lisArr.getOtherValue()).collect(Collectors.toList());
+            sData.setLis(String.join(",", otherVal));
+        }
+
         Response<ResponseData> res = aiServiceClient.bayesPageData(sData);
         if (res == null || res.getData() == null) {
             throw new CommonException(CommonErrorCode.SERVER_IS_ERROR, "AI没有返回结果");

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

@@ -0,0 +1,52 @@
+package com.diagbot.facade;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.diagbot.client.TranServiceClient;
+import com.diagbot.dto.DeptInfoDTO;
+import com.diagbot.dto.HospitalDeptInfoDTO;
+import com.diagbot.dto.HospitalDeptInfoVO;
+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.RespDTOUtil;
+import com.diagbot.vo.DeptInfoVO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * @Description:
+ * @author: wangyu
+ * @time: 2018/11/19 19:21
+ */
+@Component
+public class DeptInfoFacade {
+    @Autowired
+    private ConceptFacade conceptFacade;
+
+    @Autowired
+    private TranServiceClient tranServiceClient;
+
+    /**
+     * 获取科室信息
+     *
+     * @param deptInfoVO
+     * @return
+     */
+    public DeptInfoDTO getDeptInfo(DeptInfoVO deptInfoVO) {
+        HospitalDeptInfoVO hospitalDeptInfoVO = new HospitalDeptInfoVO();
+        BeanUtil.copyProperties(deptInfoVO, hospitalDeptInfoVO);
+        RespDTO<HospitalDeptInfoDTO> hospitalDeptInfoDTORespDTO = tranServiceClient.getHospitalDeptInfo(hospitalDeptInfoVO);
+        RespDTOUtil.respNGDealCover(hospitalDeptInfoDTORespDTO, "获取科室信息失败");
+        QueryWrapper<Concept> deptInfoDTOQueryWrapper = new QueryWrapper<>();
+        deptInfoDTOQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
+                .eq("lib_name", hospitalDeptInfoDTORespDTO.data.getConceptDeptName())
+                .eq("lib_type", LexiconTypeEnum.DEPARTMENT.getKey());
+        Concept deptInfo = conceptFacade.getOne(deptInfoDTOQueryWrapper);
+        DeptInfoDTO deptInfoDTO = new DeptInfoDTO();
+        deptInfoDTO.setConceptId(deptInfo.getId());
+        deptInfoDTO.setName(deptInfo.getLibName());
+        return deptInfoDTO;
+    }
+}

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

@@ -1,10 +1,13 @@
 package com.diagbot.facade;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.diagbot.dto.ConceptWithOrderRes;
 import com.diagbot.dto.PartDTO;
 import com.diagbot.dto.PartSymptomDTO;
+import com.diagbot.entity.ConceptDetail;
 import com.diagbot.entity.Symptom;
 import com.diagbot.entity.wrapper.ConceptWrapper;
+import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.enums.LexiconRSTypeEnum;
 import com.diagbot.enums.LexiconTypeEnum;
 import com.diagbot.exception.CommonErrorCode;
@@ -18,6 +21,7 @@ import org.springframework.stereotype.Component;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * @Description: 部位facade
@@ -29,6 +33,8 @@ public class PartFacade {
 
     @Autowired
     ConceptFacade conceptFacade;
+    @Autowired
+    ConceptDetailFacade conceptDetailFacade;
 
     /**
      * 根据已选部位返回对应的症状
@@ -60,6 +66,7 @@ public class PartFacade {
         ConceptWrapper conceptWrapper = new ConceptWrapper();
         conceptWrapper.setStartNameList(partList);
         conceptWrapper.setStartType(LexiconTypeEnum.BODYPART.getKey());
+        conceptWrapper.setRelationType(LexiconRSTypeEnum.ORDER_BY.getKey());
         conceptWrapper.setEndType(LexiconTypeEnum.BODYPART.getKey());
         conceptWrapper.setEndSex(partSymptomVO.getSexType());
         conceptWrapper.setEndAge(partSymptomVO.getAge());
@@ -110,6 +117,21 @@ public class PartFacade {
             bean.setPartConceptId(conceptWithOrderRes.getStartId());
             symptomList.add(bean);
         }
+
+        // 添加症状的简述信息
+        List<ConceptDetail> conceptDetailList = conceptDetailFacade.list(
+                new QueryWrapper<ConceptDetail>()
+                .eq("is_deleted", IsDeleteEnum.N.getKey())
+                .in("concept_id", symptomList.stream().map(row -> row.getConceptId()).distinct().collect(Collectors.toList()))
+                .apply("find_in_set({0},position)", 7));
+        Map<Long, String> map = conceptDetailList.stream().collect(Collectors.toMap(row->row.getConceptId(), row->row.getText()));
+        System.out.println(list);
+        for (Symptom symptom : symptomList) {
+            if (map.get(symptom.getConceptId()) != null) {
+                symptom.setDesc(map.get(symptom.getConceptId()));
+            }
+        }
+
         Map<Long, List<Symptom>> keyMap = EntityUtil.makeEntityListMap(symptomList, "partConceptId");
 
         // 设置二级部位对应的症状

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

@@ -0,0 +1,20 @@
+package com.diagbot.vo;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * @Description:
+ * @author: wangyu
+ * @time: 2018/11/19 18:58
+ */
+@Getter
+@Setter
+public class DeptInfoVO {
+    @NotNull(message = "请输入科室编码")
+    private String deptCode;
+    @NotNull(message = "请输入医院编码")
+    private String hospitalCode;
+}

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

@@ -0,0 +1,48 @@
+package com.diagbot.web;
+
+
+import com.diagbot.annotation.SysLogger;
+import com.diagbot.dto.DeptInfoDTO;
+import com.diagbot.dto.RespDTO;
+import com.diagbot.facade.DeptInfoFacade;
+import com.diagbot.vo.DeptInfoVO;
+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 springfox.documentation.annotations.ApiIgnore;
+
+import javax.validation.Valid;
+
+/**
+ * <p>
+ * 科室信息表 前端控制器
+ * </p>
+ *
+ * @author wangyu
+ * @since 2018-11-19
+ */
+@RestController
+@RequestMapping("/deptInfo")
+@Api(value = "科室信息API", tags = { "科室信息API" })
+@SuppressWarnings("unchecked")
+@ApiIgnore
+@Deprecated
+public class DeptInfoController {
+
+    @Autowired
+    private DeptInfoFacade deptInfoFacade;
+
+    @ApiOperation(value = "科室信息——查询[by:wangyu]",
+            notes = "deptCode：科室编号，必填<br>" +
+                    "hospitalCode:医院编号，必填<br>")
+    @PostMapping("/getDeptInfo")
+    @SysLogger("getDeptInfo")
+    public RespDTO<DeptInfoDTO> getDeptInfo(@Valid @RequestBody DeptInfoVO deptInfoVO) {
+        DeptInfoDTO data = deptInfoFacade.getDeptInfo(deptInfoVO);
+        return RespDTO.onSuc(data);
+    }
+}

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

@@ -0,0 +1,4 @@
+-- 高达明
+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 '朗通疾病名称';

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

@@ -7,12 +7,14 @@ import com.diagbot.client.bean.SearchData;
 import com.diagbot.client.hystrix.AiptServiceHystrix;
 import com.diagbot.dto.ConceptBaseDTO;
 import com.diagbot.dto.ConceptIntroduceDTO;
+import com.diagbot.dto.DeptInfoDTO;
 import com.diagbot.dto.DisScaleDTO;
 import com.diagbot.dto.DisTypeDTO;
 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 org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -59,4 +61,7 @@ public interface AiptServiceClient {
 
     @PostMapping(value = "/concept/getConceptUsual")
     RespDTO<List<ConceptBaseDTO>> getConceptUsual(@RequestBody @Valid ConceptUsualVO conceptUsualVO);
+
+    @PostMapping(value = "/deptInfo/getDeptInfo")
+    RespDTO<DeptInfoDTO> getDeptInfo(@Valid @RequestBody DeptInfoVO deptInfoVO);
 }

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

@@ -56,15 +56,6 @@ public interface TranServiceClient {
     @PostMapping("/doctorInfo/doctorInfoMapByIds")
     RespDTO<Map<Long, DoctorInfo>> doctorInfoMapByIds(@RequestBody List<Long> ids);
 
-    /**
-     * 获取科室信息
-     *
-     * @param hospitalDeptInfoVO
-     * @return
-     */
-    @PostMapping("/hospitalDeptInfo/getHospitalDeptInfo")
-    RespDTO<HospitalDeptInfoDTO> getHospitalDeptInfo(@RequestBody HospitalDeptInfoVO hospitalDeptInfoVO);
-
     /**
      * 根据ids获取科室信息map
      *

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

@@ -7,12 +7,14 @@ import com.diagbot.client.bean.ResponseData;
 import com.diagbot.client.bean.SearchData;
 import com.diagbot.dto.ConceptBaseDTO;
 import com.diagbot.dto.ConceptIntroduceDTO;
+import com.diagbot.dto.DeptInfoDTO;
 import com.diagbot.dto.DisScaleDTO;
 import com.diagbot.dto.DisTypeDTO;
 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 lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
@@ -90,4 +92,10 @@ public class AiptServiceHystrix implements AiptServiceClient {
         log.error("【hystrix】调用{}异常", "getConceptUsual");
         return null;
     }
+
+    @Override
+    public RespDTO<DeptInfoDTO> getDeptInfo(@Valid @RequestBody DeptInfoVO deptInfoVO){
+        log.error("【hystrix】调用{}异常", "getDeptInfo");
+        return null;
+    }
 }

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

@@ -57,12 +57,6 @@ public class TranServiceHystrix implements TranServiceClient {
         return null;
     }
 
-    @Override
-    public RespDTO<HospitalDeptInfoDTO> getHospitalDeptInfo(HospitalDeptInfoVO hospitalDeptInfoVO) {
-        log.error("【hystrix】调用{}异常", "getHospitalDeptInfo");
-        return null;
-    }
-
     @Override
     public RespDTO<Map<Long, HospitalDept>> hospitalDeptInfoMapByIds(List<Long> ids) {
         log.error("【hystrix】调用{}异常", "hospitalDeptInfoMapByIds");

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

@@ -1,11 +1,9 @@
 package com.diagbot.dto;
 
-import com.diagbot.entity.DeptInfo;
-
 /**
  * @Description:
  * @author: wangyu
  * @time: 2018/11/19 18:56
  */
-public class DeptInfoDTO extends DeptInfo {
+public class DeptInfoDTO extends ConceptBaseDTO {
 }

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

@@ -74,16 +74,16 @@ public class DiseaseIcd implements Serializable {
     private String remark;
 
     /**
-     * 疾病名称（内）
+     * 朗通疾病名称
      */
-    private String icssQuestionName;
+    private String conceptDisName;
 
-    public String getIcssQuestionName() {
-        return icssQuestionName;
+    public String getConceptDisName() {
+        return conceptDisName;
     }
 
-    public void setIcssQuestionName(String icssQuestionName) {
-        this.icssQuestionName = icssQuestionName;
+    public void setConceptDisName(String conceptDisName) {
+        this.conceptDisName = conceptDisName;
     }
 
     public Long getId() {
@@ -167,18 +167,18 @@ public class DiseaseIcd implements Serializable {
     @Override
     public String toString() {
         return "DiseaseIcd{" +
-        "id=" + id +
-        ", isDeleted=" + isDeleted +
-        ", gmtCreate=" + gmtCreate +
-        ", gmtModified=" + gmtModified +
-        ", creator=" + creator +
-        ", modifier=" + modifier +
-        ", hospitalCode=" + hospitalCode +
-        ", diseaseName=" + diseaseName +
-        ", icd=" + icd +
-        ", status=" + status +
-        ", remark=" + remark +
-        "，icssQuestionName" + icssQuestionName +
+                "id=" + id +
+                ", isDeleted=" + isDeleted +
+                ", gmtCreate=" + gmtCreate +
+                ", gmtModified=" + gmtModified +
+                ", creator=" + creator +
+                ", modifier=" + modifier +
+                ", hospitalCode=" + hospitalCode +
+                ", diseaseName=" + diseaseName +
+                ", icd=" + icd +
+                ", status=" + status +
+                ", remark=" + remark +
+                "，conceptDisName" + conceptDisName +
                 "}";
     }
 }

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

@@ -72,9 +72,9 @@ public class HospitalDept implements Serializable {
     private String hospitalName;
 
     /**
-     * icss科室名称
+     * 朗通科室名称
      */
-    private String icssDeptName;
+    private String conceptDeptName;
 
     /**
      * 状态：0.禁用1.启用
@@ -157,12 +157,12 @@ public class HospitalDept implements Serializable {
         this.hospitalName = hospitalName;
     }
 
-    public String getIcssDeptName() {
-        return icssDeptName;
+    public String getConceptDeptName() {
+        return conceptDeptName;
     }
 
-    public void setIcssDeptName(String icssDeptName) {
-        this.icssDeptName = icssDeptName;
+    public void setconceptDeptName(String conceptDeptName) {
+        this.conceptDeptName = conceptDeptName;
     }
 
     public Integer getStatus() {
@@ -183,19 +183,19 @@ public class HospitalDept implements Serializable {
     @Override
     public String toString() {
         return "HospitalDept{" +
-        "id=" + id +
-        ", isDeleted=" + isDeleted +
-        ", gmtCreate=" + gmtCreate +
-        ", gmtModified=" + gmtModified +
-        ", creator=" + creator +
-        ", modifier=" + modifier +
-        ", code=" + code +
-        ", name=" + name +
-        ", hospitalCode=" + hospitalCode +
-        ", hospitalName=" + hospitalName +
-        ", deptId=" + icssDeptName +
-        ", status=" + status +
-        ", remark=" + remark +
-        "}";
+                "id=" + id +
+                ", isDeleted=" + isDeleted +
+                ", gmtCreate=" + gmtCreate +
+                ", gmtModified=" + gmtModified +
+                ", creator=" + creator +
+                ", modifier=" + modifier +
+                ", code=" + code +
+                ", name=" + name +
+                ", hospitalCode=" + hospitalCode +
+                ", hospitalName=" + hospitalName +
+                ", conceptDeptName=" + conceptDeptName +
+                ", status=" + status +
+                ", remark=" + remark +
+                "}";
     }
 }

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

@@ -2,8 +2,6 @@ package com.diagbot.facade;
 
 import com.diagbot.client.AiptServiceClient;
 import com.diagbot.dto.RespDTO;
-import com.diagbot.exception.CommonErrorCode;
-import com.diagbot.exception.CommonException;
 import com.diagbot.util.RespDTOUtil;
 import com.diagbot.vo.CalculateVO;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -23,9 +21,7 @@ public class CalculateFacade {
 
     public Map<String, Object> calculate(CalculateVO calculateVO) {
         RespDTO<Map<String, Object>> res = aiptServiceClient.scaleCalc(calculateVO);
-        if (RespDTOUtil.respIsNG(res)) {
-            throw new CommonException(CommonErrorCode.SERVER_IS_ERROR, "计算没有结果返回");
-        }
+        RespDTOUtil.respNGDealCover(res, "计算没有结果返回");
         Map<String, Object> map = res.data;
         return map;
     }

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

@@ -1,19 +1,11 @@
 package com.diagbot.facade;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.diagbot.client.TranServiceClient;
+import com.diagbot.client.AiptServiceClient;
 import com.diagbot.dto.DeptInfoDTO;
-import com.diagbot.dto.HospitalDeptInfoDTO;
 import com.diagbot.dto.RespDTO;
-import com.diagbot.entity.DeptInfo;
-import com.diagbot.enums.IsDeleteEnum;
-import com.diagbot.exception.CommonErrorCode;
-import com.diagbot.exception.CommonException;
 import com.diagbot.service.impl.DeptInfoServiceImpl;
-import com.diagbot.util.BeanUtil;
 import com.diagbot.util.RespDTOUtil;
 import com.diagbot.vo.DeptInfoVO;
-import com.diagbot.vo.HospitalDeptInfoVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
@@ -26,7 +18,8 @@ import org.springframework.stereotype.Component;
 public class DeptInfoFacade extends DeptInfoServiceImpl {
 
     @Autowired
-    TranServiceClient tranServiceClient;
+    AiptServiceClient aiptServiceClient;
+
     /**
      * 获取科室信息
      *
@@ -34,20 +27,8 @@ public class DeptInfoFacade extends DeptInfoServiceImpl {
      * @return
      */
     public DeptInfoDTO getDeptInfo(DeptInfoVO deptInfoVO) {
-        HospitalDeptInfoVO hospitalDeptInfoVO = new HospitalDeptInfoVO();
-        BeanUtil.copyProperties(deptInfoVO,hospitalDeptInfoVO);
-        RespDTO<HospitalDeptInfoDTO> hospitalDeptInfoDTORespDTO = tranServiceClient.getHospitalDeptInfo(hospitalDeptInfoVO);
-        if (RespDTOUtil.respIsNG(hospitalDeptInfoDTORespDTO)) {
-            throw new CommonException(CommonErrorCode.RPC_ERROR,
-                    "获取科室信息失败");
-        }
-        QueryWrapper<DeptInfo> deptInfoDTOQueryWrapper = new QueryWrapper<>();
-        deptInfoDTOQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
-                .eq("name",hospitalDeptInfoDTORespDTO.data.getIcssDeptName());
-        DeptInfo deptInfo = this.getOne(deptInfoDTOQueryWrapper);
-        DeptInfoDTO deptInfoDTO = new DeptInfoDTO();
-        BeanUtil.copyProperties(deptInfo,deptInfoDTO);
-        deptInfoDTO.setId(deptInfo.getId());
-        return deptInfoDTO;
+        RespDTO<DeptInfoDTO> res = aiptServiceClient.getDeptInfo(deptInfoVO);
+        RespDTOUtil.respNGDealCover(res, "获取科室信息失败");
+        return res.data;
     }
 }

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

@@ -1,19 +1,16 @@
 package com.diagbot.facade;
 
-import java.util.List;
-import java.util.Map;
-
-import com.diagbot.util.RespDTOUtil;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
 import com.diagbot.client.TranServiceClient;
 import com.diagbot.dto.DoctorInfoDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.entity.DoctorInfo;
-import com.diagbot.exception.CommonErrorCode;
-import com.diagbot.exception.CommonException;
+import com.diagbot.util.RespDTOUtil;
 import com.diagbot.vo.DoctorInfoVO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+import java.util.Map;
 
 /**
  * @Description:
@@ -24,6 +21,7 @@ import com.diagbot.vo.DoctorInfoVO;
 public class DoctorInfoFacade {
     @Autowired
     private TranServiceClient tranServiceClient;
+
     /**
      * 获取医生信息
      *
@@ -32,25 +30,20 @@ public class DoctorInfoFacade {
      */
     public List<DoctorInfoDTO> getDoctorInfo(DoctorInfoVO doctorInfoVo) {
         RespDTO<List<DoctorInfoDTO>> doctorInfoDTOList = tranServiceClient.getDoctorInfo(doctorInfoVo);
-        if (RespDTOUtil.respIsNG(doctorInfoDTOList)) {
-            throw new CommonException(CommonErrorCode.RPC_ERROR,
-                    "获取医生信息失败");
-        }
+        RespDTOUtil.respNGDealCover(doctorInfoDTOList, "获取医生信息失败");
         return doctorInfoDTOList.data;
     }
-    
+
     /**
      * 根据ids获取医生信息map
+     *
      * @param ids 医生ids
      * @return 医生信息
      */
     public Map<Long, DoctorInfo> doctorInfoMapByIds(List<Long> ids) {
-    	 RespDTO<Map<Long, DoctorInfo>> retData = tranServiceClient.doctorInfoMapByIds(ids);
-         if (RespDTOUtil.respIsNG(retData)) {
-             throw new CommonException(CommonErrorCode.RPC_ERROR,
-                     "获取医生信息失败");
-         }
-         return retData.data;
+        RespDTO<Map<Long, DoctorInfo>> retData = tranServiceClient.doctorInfoMapByIds(ids);
+        RespDTOUtil.respNGDealCover(retData, "获取医生信息失败");
+        return retData.data;
     }
-    
+
 }

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

@@ -2,7 +2,6 @@ package com.diagbot.facade;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.diagbot.client.AiptServiceClient;
-import com.diagbot.client.bean.Response;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.SymptomFeatureDTO;
 import com.diagbot.entity.QuestionInfo;
@@ -43,9 +42,7 @@ public class FeatureFacade {
     public List<SymptomFeatureDTO> getSymptomFeature(String text) {
         List<SymptomFeatureDTO> symptomFeatureDTOList = Lists.newLinkedList();
         RespDTO<List<Map<String, Object>>> res = aiptServiceClient.symptomFeaturePageData(text);
-        if (RespDTOUtil.respIsNG(res)) {
-            throw new CommonException(CommonErrorCode.SERVER_IS_ERROR, "AI没有返回结果");
-        }
+        RespDTOUtil.respNGDealCover(res, "AI没有返回结果");
         List<Map<String, Object>> symptomFeatureList = res.data;
         List<String> symptomNameList = Lists.newLinkedList();
         for (Map<String, Object> symptomFeature : symptomFeatureList) {

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

@@ -5,7 +5,6 @@ import com.diagbot.dto.HospitalInfoDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.exception.CommonErrorCode;
 import com.diagbot.exception.CommonException;
-import com.diagbot.util.ListUtil;
 import com.diagbot.util.RespDTOUtil;
 import com.diagbot.vo.HospitalInfoVO;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -32,10 +31,7 @@ public class HospitalInfoFacade {
      */
     public List<HospitalInfoDTO> getHospitalInfo(HospitalInfoVO hospitalInfoVO) {
         RespDTO<List<HospitalInfoDTO>> hospitalInfoDTOList = tranServiceClient.getHospitalInfo(hospitalInfoVO);
-        if (RespDTOUtil.respIsNG(hospitalInfoDTOList)) {
-            throw new CommonException(CommonErrorCode.RPC_ERROR,
-                    "获取医院信息失败");
-        }
+        RespDTOUtil.respNGDealCover(hospitalInfoDTOList, "获取医院信息失败");
         return hospitalInfoDTOList.data;
     }
 

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

@@ -172,9 +172,7 @@ public class IntroduceInfoFacade extends IntroduceInfoServiceImpl {
                     Map<String, Map<String, String>> lisConfigMap = new LinkedHashMap<>();
                     if (isDocking) {
                         RespDTO<Map<String, Map<String, String>>> respLisConfigMap = tranServiceClient.getLisConfigByHosCode_NotEmptyItemName(hosCodeVO);
-                        if (RespDTOUtil.respIsNG(respLisConfigMap)) {
-                            throw new CommonException(CommonErrorCode.RPC_ERROR);
-                        }
+                        RespDTOUtil.respNGDealCover(respLisConfigMap, CommonErrorCode.RPC_ERROR.getMsg());
                         lisConfigMap = respLisConfigMap.data;
                     } else {
                         lisConfigMap = lisMappingFacade.getLisMapping_NotEmptyItemName();
@@ -185,9 +183,7 @@ public class IntroduceInfoFacade extends IntroduceInfoServiceImpl {
                     Map<String, String> lisConfigMap_emptyItemName = new LinkedHashMap<>();
                     if (isDocking) {
                         RespDTO<Map<String, String>> respLisConfigMap_emptyItemName = tranServiceClient.getLisConfigByHosCode_EmptyItemName(hosCodeVO);
-                        if (RespDTOUtil.respIsNG(respLisConfigMap_emptyItemName)) {
-                            throw new CommonException(CommonErrorCode.RPC_ERROR);
-                        }
+                        RespDTOUtil.respNGDealCover(respLisConfigMap_emptyItemName, CommonErrorCode.RPC_ERROR.getMsg());
                         lisConfigMap_emptyItemName = respLisConfigMap_emptyItemName.data;
                     } else {
                         lisConfigMap_emptyItemName = lisMappingFacade.getLisConfig_EmptyItemName();
@@ -198,9 +194,7 @@ public class IntroduceInfoFacade extends IntroduceInfoServiceImpl {
         } else if (type.equals(QuestionTypeEnum.Pacs.getKey())) {
             if (isDocking) {
                 RespDTO<Map<String, String>> respPacsConfigMap = tranServiceClient.getPacsConfigByHosCode(hosCodeVO);
-                if (RespDTOUtil.respIsNG(respPacsConfigMap)) {
-                    throw new CommonException(CommonErrorCode.RPC_ERROR);
-                }
+                RespDTOUtil.respNGDealCover(respPacsConfigMap, CommonErrorCode.RPC_ERROR.getMsg());
                 Map<String, String> pacsConfigMap = respPacsConfigMap.data;
                 uniqueName = pacsConfigMap.get(emrIntroduceVO.getName());
             } else {
@@ -209,9 +203,7 @@ public class IntroduceInfoFacade extends IntroduceInfoServiceImpl {
         } else if (type.equals(QuestionTypeEnum.Disease.getKey())) {
             if (isDocking) {
                 RespDTO<Map<String, String>> respDisMap = tranServiceClient.getDiseaseIcdByHosCode(hosCodeVO);
-                if (RespDTOUtil.respIsNG(respDisMap)) {
-                    throw new CommonException(CommonErrorCode.RPC_ERROR);
-                }
+                RespDTOUtil.respNGDealCover(respDisMap, CommonErrorCode.RPC_ERROR.getMsg());
                 Map<String, String> disMap = respDisMap.data;
                 uniqueName = disMap.get(emrIntroduceVO.getName());
             } else {
@@ -231,9 +223,7 @@ public class IntroduceInfoFacade extends IntroduceInfoServiceImpl {
         if (ArrayUtil.isNotEmpty(titles)) {
             if (isDocking) {
                 RespDTO<Map<String, String>> respTitleMappingMap = tranServiceClient.getTitleMappingHosCode(hosCodeVO);
-                if (RespDTOUtil.respIsNG(respTitleMappingMap)) {
-                    throw new CommonException(CommonErrorCode.RPC_ERROR);
-                }
+                RespDTOUtil.respNGDealCover(respTitleMappingMap, CommonErrorCode.RPC_ERROR.getMsg());
                 Map<String, String> titleMappingMap = respTitleMappingMap.data;
                 for (String title : titles) {
                     String uniqueTitle = titleMappingMap.get(title);

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

@@ -60,13 +60,13 @@ public class ModuleFacade extends ModuleInfoServiceImpl {
         } else if (moduleVO.getMouduleType().intValue() == 2) {
             //根据慢病筛选如果没有返回通用模板
             list = getModuleInfoByDisType(moduleVO.getMouduleType(), moduleVO.getRelationId());
-            if (ListUtil.isNotEmpty(list)) {
+            //if (ListUtil.isNotEmpty(list)) {
                 ids = list.stream()
                         .map(moduleDeptMapping -> moduleDeptMapping.getId())
                         .collect(Collectors.toList());
-            } else {
-                isDefault = true;
-            }
+            //} else {
+                //isDefault = true;
+            //}
         } else {
             isDefault = true;
         }

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

@@ -9,8 +9,6 @@ import com.diagbot.entity.DeptInfo;
 import com.diagbot.entity.DoctorPageMode;
 import com.diagbot.entity.PatientInfo;
 import com.diagbot.enums.IsDeleteEnum;
-import com.diagbot.exception.CommonErrorCode;
-import com.diagbot.exception.CommonException;
 import com.diagbot.util.RespDTOUtil;
 import com.diagbot.vo.GetTopPatientInfoVO;
 import com.diagbot.vo.PatientInfoVO;
@@ -44,10 +42,7 @@ public class PatientInfoFacade {
      */
     public PatientInfoDTO getPatientInfo(PatientInfoVO patientInfoVO) {
         RespDTO<PatientInfoDTO> patientInfoDTO = tranServiceClient.getPatientInfo(patientInfoVO);
-        if (RespDTOUtil.respIsNG(patientInfoDTO)) {
-            throw new CommonException(CommonErrorCode.RPC_ERROR,
-                    "获取患者信息失败");
-        }
+        RespDTOUtil.respNGDealCover(patientInfoDTO, "获取患者信息失败");
         return patientInfoDTO.data;
     }
 
@@ -59,10 +54,7 @@ public class PatientInfoFacade {
      */
     public GetTopPatientInfoDTO getTopPatientInfo(@RequestBody GetTopPatientInfoVO getTopPatientInfoVO) {
         RespDTO<GetTopPatientInfoDTO> respDTO = tranServiceClient.getTopPatientInfo(getTopPatientInfoVO);
-        if (RespDTOUtil.respIsNG(respDTO)) {
-            throw new CommonException(CommonErrorCode.RPC_ERROR,
-                    "页面顶部病人医生科室信息");
-        }
+        RespDTOUtil.respNGDealCover(respDTO, "页面顶部病人医生科室信息");
 
         GetTopPatientInfoDTO getTopPatientInfoDTO = respDTO.data;
 
@@ -94,10 +86,7 @@ public class PatientInfoFacade {
      */
     public Map<Long, PatientInfo> patientInfoMapByIds(List<Long> ids) {
         RespDTO<Map<Long, PatientInfo>> retData = tranServiceClient.patientInfoMapByIds(ids);
-        if (RespDTOUtil.respIsNG(retData)) {
-            throw new CommonException(CommonErrorCode.RPC_ERROR,
-                    "获取患者信息失败");
-        }
+        RespDTOUtil.respNGDealCover(retData, "获取患者信息失败");
         return retData.data;
     }
 

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

@@ -9,7 +9,6 @@ import com.diagbot.client.bean.FeatureRate;
 import com.diagbot.client.bean.GdbResponse;
 import com.diagbot.client.bean.MedicalIndication;
 import com.diagbot.client.bean.MedicalIndicationDetail;
-import com.diagbot.client.bean.Response;
 import com.diagbot.client.bean.ResponseData;
 import com.diagbot.client.bean.SearchData;
 import com.diagbot.dto.EMRQuestionDTO;
@@ -158,11 +157,7 @@ public class PushFacade {
      */
     public ResponseData pushAipt(SearchData searchData) {
         RespDTO<ResponseData> res = aiptServiceClient.aiptData(searchData);
-        if (null == res) {
-            throw new CommonException(CommonErrorCode.SERVER_IS_ERROR, "中间层没有返回结果");
-        } else if (null == res.data) {
-            throw new CommonException(CommonErrorCode.SERVER_IS_ERROR, res.msg);
-        }
+        RespDTOUtil.respNGDeal(res, "中间层没有返回结果");
         return res.data;
     }
 
@@ -174,9 +169,7 @@ public class PushFacade {
      */
     public Map<String, Object> scale(SearchData searchData) {
         RespDTO<Map<String, Object>> res = aiptServiceClient.scale(searchData);
-        if (RespDTOUtil.respIsNG(res)) {
-            throw new CommonException(CommonErrorCode.SERVER_IS_ERROR, "量表数据暂无内容");
-        }
+        RespDTOUtil.respNGDealCover(res, "量表数据暂无内容");
         return res.data;
     }
 

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

@@ -7,8 +7,6 @@ import com.diagbot.dto.RespDTO;
 import com.diagbot.entity.QuestionInfo;
 import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.enums.QuestionTypeEnum;
-import com.diagbot.exception.CommonErrorCode;
-import com.diagbot.exception.CommonException;
 import com.diagbot.util.ListUtil;
 import com.diagbot.util.RespDTOUtil;
 import com.diagbot.vo.GetDiseaseIcdVO;
@@ -39,31 +37,28 @@ public class TranDiseaseIcdFacade {
      * @return
      */
     public List<GetDiseaseIcdDTO> getDiseaseIcds(GetDiseaseIcdVO getDiseaseIcdVO) {
-        RespDTO<List<GetDiseaseIcdDTO>> getDiseaseIcdsList =  tranServiceClient.getDiseaseIcds(getDiseaseIcdVO);
-        if (RespDTOUtil.respIsNG(getDiseaseIcdsList)) {
-            throw new CommonException(CommonErrorCode.RPC_ERROR,
-                    "获取icd编码失败");
-        }
+        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.getIcssQuestionName()).collect(Collectors.toList());
-        if (ListUtil.isEmpty(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);
+                .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.getIcssQuestionName())){
+        if (ListUtil.isNotEmpty(icssQuestionNames)) {
+            for (GetDiseaseIcdDTO getDiseaseIcdDTO : getDiseaseIcdsList.data) {
+                if (icssQuestionNames.contains(getDiseaseIcdDTO.getConceptDisName())) {
                     res.add(getDiseaseIcdDTO);
                 }
             }

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

@@ -3,8 +3,6 @@ package com.diagbot.facade;
 import com.diagbot.client.TranServiceClient;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.TranFieldInfoDTO;
-import com.diagbot.exception.CommonErrorCode;
-import com.diagbot.exception.CommonException;
 import com.diagbot.util.RespDTOUtil;
 import com.diagbot.vo.TranFieldInfoVO;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -31,10 +29,7 @@ public class TranFieldInfoFacade {
      */
     public List<TranFieldInfoDTO> getInfoByUuid(TranFieldInfoVO info) {
         RespDTO<List<TranFieldInfoDTO>> tranFieldInfoDTOList = tranServiceClient.getInfoByUuid(info);
-        if (RespDTOUtil.respIsNG(tranFieldInfoDTOList)) {
-            throw new CommonException(CommonErrorCode.RPC_ERROR,
-                    "获取医生信息失败");
-        }
+        RespDTOUtil.respNGDealCover(tranFieldInfoDTOList, "获取医生信息失败");
         return tranFieldInfoDTOList.data;
     }
 }

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 {
 

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

@@ -74,9 +74,17 @@ public class DiseaseIcd implements Serializable {
     private String remark;
 
     /**
-     * 疾病名称（内）
+     * 朗通疾病名称
      */
-    private String icssQuestionName;
+    private String conceptDisName;
+
+    public String getConceptDisName() {
+        return conceptDisName;
+    }
+
+    public void setConceptDisName(String conceptDisName) {
+        this.conceptDisName = conceptDisName;
+    }
 
     public Long getId() {
         return id;
@@ -156,29 +164,21 @@ public class DiseaseIcd implements Serializable {
         this.remark = remark;
     }
 
-    public String getIcssQuestionName() {
-        return icssQuestionName;
-    }
-
-    public void setIcssQuestionName(String icssQuestionName) {
-        this.icssQuestionName = icssQuestionName;
-    }
-
     @Override
     public String toString() {
         return "DiseaseIcd{" +
-        "id=" + id +
-        ", isDeleted=" + isDeleted +
-        ", gmtCreate=" + gmtCreate +
-        ", gmtModified=" + gmtModified +
-        ", creator=" + creator +
-        ", modifier=" + modifier +
-        ", hospitalCode=" + hospitalCode +
-        ", diseaseName=" + diseaseName +
-        ", icd=" + icd +
-        ", status=" + status +
-        ", remark=" + remark +
-        "，icssQuestionName" + icssQuestionName +
+                "id=" + id +
+                ", isDeleted=" + isDeleted +
+                ", gmtCreate=" + gmtCreate +
+                ", gmtModified=" + gmtModified +
+                ", creator=" + creator +
+                ", modifier=" + modifier +
+                ", hospitalCode=" + hospitalCode +
+                ", diseaseName=" + diseaseName +
+                ", icd=" + icd +
+                ", status=" + status +
+                ", remark=" + remark +
+                "，conceptDisName" + conceptDisName +
                 "}";
     }
 }

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

@@ -72,9 +72,9 @@ public class HospitalDept implements Serializable {
     private String hospitalName;
 
     /**
-     * icss科室id
+     * 朗通科室名称
      */
-    private String icssDeptName;
+    private String conceptDeptName;
 
     /**
      * 状态：0.禁用1.启用
@@ -86,15 +86,6 @@ public class HospitalDept implements Serializable {
      */
     private String remark;
 
-
-    public String getIcssDeptName() {
-        return icssDeptName;
-    }
-
-    public void setIcssDeptName(String icssDeptName) {
-        this.icssDeptName = icssDeptName;
-    }
-
     public Long getId() {
         return id;
     }
@@ -165,6 +156,15 @@ public class HospitalDept implements Serializable {
     public void setHospitalName(String hospitalName) {
         this.hospitalName = hospitalName;
     }
+
+    public String getConceptDeptName() {
+        return conceptDeptName;
+    }
+
+    public void setconceptDeptName(String conceptDeptName) {
+        this.conceptDeptName = conceptDeptName;
+    }
+
     public Integer getStatus() {
         return status;
     }
@@ -183,19 +183,19 @@ public class HospitalDept implements Serializable {
     @Override
     public String toString() {
         return "HospitalDept{" +
-        "id=" + id +
-        ", isDeleted=" + isDeleted +
-        ", gmtCreate=" + gmtCreate +
-        ", gmtModified=" + gmtModified +
-        ", creator=" + creator +
-        ", modifier=" + modifier +
-        ", code=" + code +
-        ", name=" + name +
-        ", hospitalCode=" + hospitalCode +
-        ", hospitalName=" + hospitalName +
-        ", icssDeptName=" + icssDeptName +
-        ", status=" + status +
-        ", remark=" + remark +
-        "}";
+                "id=" + id +
+                ", isDeleted=" + isDeleted +
+                ", gmtCreate=" + gmtCreate +
+                ", gmtModified=" + gmtModified +
+                ", creator=" + creator +
+                ", modifier=" + modifier +
+                ", code=" + code +
+                ", name=" + name +
+                ", hospitalCode=" + hospitalCode +
+                ", hospitalName=" + hospitalName +
+                ", conceptDeptName=" + conceptDeptName +
+                ", status=" + status +
+                ", remark=" + remark +
+                "}";
     }
 }

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

@@ -15,7 +15,7 @@
         <result column="icd" property="icd" />
         <result column="status" property="status" />
         <result column="remark" property="remark" />
-        <result column="icss_question_name" property="icssQuestionName" />
+        <result column="concept_dis_name" property="conceptDisName" />
     </resultMap>
 
     <select id="getDiseaseIcds" resultMap="BaseResultMap" parameterType="java.util.Map">

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

@@ -14,7 +14,7 @@
         <result column="name" property="name" />
         <result column="hospital_code" property="hospitalCode" />
         <result column="hospital_name" property="hospitalName" />
-        <result column="icss_dept_name" property="icssDeptName" />
+        <result column="concept_dept_name" property="conceptDeptName" />
         <result column="status" property="status" />
         <result column="remark" property="remark" />
     </resultMap>

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

@@ -44,7 +44,7 @@
 		a.`code` as hospitalCode,
 		a.`name` as hospitalName,
 		b.id as hospitalDeptId,
-		b.icss_dept_name as selfDeptName,
+		b.concept_dept_name as selfDeptName,
 		b.`code` as hospitalDeptCode,
 		b.`name` as hospitalDeptName,
 		c.id as doctorId,

triage-service/src/main/java/com/diagbot/entity/Symptom.java

@@ -19,4 +19,5 @@ public class Symptom extends ConceptBaseDTO {
 
     @JsonIgnore
     private Long partConceptId;
+    private String desc = ""; //简述
 }