增加疾病名

src/main/java/com/diagbot/dto/KlDiagnoseInfoDTO.java

@@ -33,6 +33,8 @@ public class KlDiagnoseInfoDTO {
      */
     private Long conceptId;
 
+    private String conceptName;
+
     /**
      * 描述
      */

src/main/resources/mapper/KlDiagnoseMapper.xml

@@ -120,14 +120,18 @@
         AND t12.groupDiff = 1
     </select>
     <select id="getKlDiagnosePages" resultType="com.diagbot.dto.KlDiagnoseInfoDTO">
-        select * from kl_diagnose where is_deleted = 'N'
+        SELECT dia.* ,con.lib_name as conceptName FROM
+        kl_diagnose dia,
+        kl_concept con
+        WHERE dia.is_deleted = 'N'
+        AND dia.concept_id = con.id
         <if test="description!=null and description!=''">
-            AND UPPER(description) LIKE CONCAT('%', UPPER(trim(#{description})), '%')
+            AND UPPER(dia.description) LIKE CONCAT('%', UPPER(trim(#{description})), '%')
         </if>
         <if test="status!=null">
-            AND status = #{status}
+            AND dia.status = #{status}
         </if>
-        ORDER BY gmt_modified DESC
+        ORDER BY dia.gmt_modified DESC
     </select>
     <select id="getByIdDiagnoses" resultType="com.diagbot.dto.KlDiagnoseByIdDTO">
         SELECT