1

tran-service/src/main/java/com/diagbot/dto/GetDiseaseNameDTO.java

@@ -11,5 +11,34 @@ import lombok.Setter;
  */
 @Getter
 @Setter
-public class GetDiseaseNameDTO extends DiseaseIcd {
+public class GetDiseaseNameDTO {
+    /**
+     * 医院编码
+     */
+    private String hospitalCode;
+
+    /**
+     * HIS疾病名称
+     */
+    private String diseaseName;
+
+    /**
+     * icd编码
+     */
+    private String icd;
+
+    /**
+     * 状态(1:有效)
+     */
+    private String status;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 朗通疾病名称
+     */
+    private String conceptDisName;
 }

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

@@ -10,6 +10,7 @@ public class LisPacsInfoForDJVO implements Serializable {
 
     private String mealName;//套餐名
     private String itemName;//项目名
+    private String diseaseName;//诊断名
     private int type;//类型 5：化验 6：辅检
     private String hosCode;//医院编码
 }

tran-service/src/main/java/com/diagbot/web/InquiryInfoController.java

@@ -210,7 +210,7 @@ public class InquiryInfoController {
                 getDiseaseNameVO.setHospitalCode(nlpRemote.getHospitalCode());
                 List<GetDiseaseNameDTO> a = diseaseIcdFacade.getDiseaseNames(getDiseaseNameVO);
                 if(a.size()!=0){
-                    for(DiseaseIcd di : a){
+                    for(GetDiseaseNameDTO di : a){
                         dn.append(di.getConceptDisName()+ ",") ;
                     }
                     dn1 = dn.substring(0, dn.length() - 1);
@@ -326,6 +326,13 @@ public class InquiryInfoController {
             List<PacsConfigDTO> b = pacsConfigFacade.getPacsConfigByNameAndHosCode(lisPacsInfoForDJVO);
             url = "http://127.0.0.1:5446/information.html?type=" + lisPacsInfoForDJVO.getType() +
                     "&position=2" + "&name=" + b.get(0).getUniqueName();
+        }else if (lisPacsInfoForDJVO.getType() == 7){
+            GetDiseaseNameVO getDiseaseNameVO =new GetDiseaseNameVO();
+            getDiseaseNameVO.setHospitalCode(lisPacsInfoForDJVO.getHosCode());
+            getDiseaseNameVO.setHisDiseaseName(lisPacsInfoForDJVO.getDiseaseName());
+            List<GetDiseaseNameDTO> c = diseaseIcdFacade.getDiseaseNames(getDiseaseNameVO);
+            url = "http://127.0.0.1:5446/information.html?type=" + lisPacsInfoForDJVO.getType() +
+                    "&position=2" + "&name=" + c.get(0).getConceptDisName();
         }
         return url;
     }

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

@@ -30,7 +30,7 @@
         and is_deleted = 'N'
     </select>
 
-    <select id="getDiseaseNames" resultMap="BaseResultMap" parameterType="java.util.Map">
+    <select id="getDiseaseNames" resultMap="com.diagbot.dto.GetDiseaseNameDTO" parameterType="java.util.Map">
         select * from tran_disease_icd t where
         FIND_IN_SET(#{hospitalCode},hospital_code)
         and