Merge branch 'dev/KLBstand' of http://192.168.2.236:10080/gaodm/diagbotcloud.git into dev/KLBstand

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

@@ -17,4 +17,6 @@ public class ConceptRetrievalDTO {
     private String parentName;//父级名称
     private String sameName;//同义词名称
     private Integer showType;//显示类型（1本体，2同义词）
+    private Long libTypeId;//标签类型id
+    private String libTypeName;//标签类型名称
 }

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

@@ -188,17 +188,19 @@
 
     <select id="retrievalConcept" resultType="com.diagbot.dto.ConceptRetrievalDTO">
         SELECT a1.* from (
-        SELECT t1.id selfId,t1.lib_name selfName,t5.id parentId,t5.lib_name parentName,null sameName,t2.is_concept showType FROM kl_concept t1
+        SELECT t1.id selfId,t1.lib_name selfName,t5.id parentId,t5.lib_name parentName,null sameName,t2.is_concept showType,t1.lib_type libTypeId,t6.`name` libTypeName FROM kl_concept t1
         LEFT JOIN kl_library_info t2 ON t1.id = t2.concept_id
         LEFT JOIN kl_concept_common t3 ON t1.id = t2.concept_id
         LEFT JOIN kl_relation t4 ON t4.end_id= t1.id
         LEFT JOIN kl_concept t5 on t5.id = t4.start_id
+        LEFT JOIN kl_lexicon t6 ON t6.id = t1.lib_type
         WHERE
         t1.is_deleted = 'N'
         AND t2.is_deleted = 'N'
         AND t3.is_deleted = 'N'
         AND t4.is_deleted = 'N'
         AND t5.is_deleted = 'N'
+        AND t6.is_deleted = 'N'
         AND t1.lib_type = #{type}
         <if test="sexType == 3">
         and t3.sex_type in ('1','2','3')
@@ -219,17 +221,19 @@
         </if>
         AND t4.relation_id = 18
         UNION
-        SELECT t1.id selfId,t1.lib_name selfName,t5.id parentId,t5.lib_name parentName,null sameName,t2.is_concept showType FROM kl_concept t1
+        SELECT t1.id selfId,t1.lib_name selfName,t5.id parentId,t5.lib_name parentName,null sameName,t2.is_concept showType,t1.lib_type libTypeId,t6.`name` libTypeName FROM kl_concept t1
         LEFT JOIN kl_library_info t2 ON t1.id = t2.concept_id
         LEFT JOIN kl_concept_common t3 ON t1.id = t2.concept_id
         LEFT JOIN kl_relation t4 ON t4.end_id= t1.id
         LEFT JOIN kl_concept t5 on t5.id = t4.start_id
+        LEFT JOIN kl_lexicon t6 ON t6.id = t1.lib_type
         WHERE
         t1.is_deleted = 'N'
         AND t2.is_deleted = 'N'
         AND t3.is_deleted = 'N'
         AND t4.is_deleted = 'N'
         AND t5.is_deleted = 'N'
+        AND t6.is_deleted = 'N'
         AND t1.lib_type = #{type}
         <if test="sexType == 3">
             and t3.sex_type in ('1','2','3')
@@ -250,17 +254,19 @@
         </if>
         AND t4.relation_id = 18
         UNION
-        SELECT t1.id selfId,t1.lib_name selfName,t5.id parentId,t5.lib_name parentName,null sameName,t2.is_concept showType FROM kl_concept t1
+        SELECT t1.id selfId,t1.lib_name selfName,t5.id parentId,t5.lib_name parentName,null sameName,t2.is_concept showType,t1.lib_type libTypeId,t6.`name` libTypeName FROM kl_concept t1
         LEFT JOIN kl_library_info t2 ON t1.id = t2.concept_id
         LEFT JOIN kl_concept_common t3 ON t1.id = t2.concept_id
         LEFT JOIN kl_relation t4 ON t4.end_id= t1.id
         LEFT JOIN kl_concept t5 on t5.id = t4.start_id
+        LEFT JOIN kl_lexicon t6 ON t6.id = t1.lib_type
         WHERE
         t1.is_deleted = 'N'
         AND t2.is_deleted = 'N'
         AND t3.is_deleted = 'N'
         AND t4.is_deleted = 'N'
         AND t5.is_deleted = 'N'
+        AND t6.is_deleted = 'N'
         AND t1.lib_type = #{type}
         <if test="sexType == 3">
             and t3.sex_type in ('1','2','3')
@@ -281,13 +287,15 @@
         </if>
         AND t4.relation_id = 18
         UNION
-        SELECT t1.id selfId,t1.lib_name selfName,0 parentId,null parentName,t2.`name` sameName,t2.is_concept showType FROM kl_concept t1
+        SELECT t1.id selfId,t1.lib_name selfName,0 parentId,null parentName,t2.`name` sameName,t2.is_concept showType,t1.lib_type libTypeId,t6.`name` libTypeName FROM kl_concept t1
         LEFT JOIN kl_library_info t2 ON t1.id = t2.concept_id
         LEFT JOIN kl_concept_common t3 ON t1.id = t2.concept_id
+        LEFT JOIN kl_lexicon t6 ON t6.id = t1.lib_type
         WHERE
         t1.is_deleted = 'N'
         AND t2.is_deleted = 'N'
         AND t3.is_deleted = 'N'
+        AND t6.is_deleted = 'N'
         AND t1.lib_type = #{type}
         <if test="sexType == 3">
         and t3.sex_type in ('1','2','3')
@@ -307,13 +315,15 @@
         </if>
         AND (t2.spell =  #{InputStr} OR t2.name =  #{InputStr})
         UNION
-        SELECT t1.id selfId,t1.lib_name selfName,0 parentId,null parentName,t2.`name` sameName,t2.is_concept showType FROM kl_concept t1
+        SELECT t1.id selfId,t1.lib_name selfName,0 parentId,null parentName,t2.`name` sameName,t2.is_concept showType,t1.lib_type libTypeId,t6.`name` libTypeName FROM kl_concept t1
         LEFT JOIN kl_library_info t2 ON t1.id = t2.concept_id
         LEFT JOIN kl_concept_common t3 ON t1.id = t2.concept_id
+        LEFT JOIN kl_lexicon t6 ON t6.id = t1.lib_type
         WHERE
         t1.is_deleted = 'N'
         AND t2.is_deleted = 'N'
         AND t3.is_deleted = 'N'
+        AND t6.is_deleted = 'N'
         AND t1.lib_type = #{type}
         <if test="sexType == 3">
             and t3.sex_type in ('1','2','3')
@@ -333,13 +343,15 @@
         </if>
         AND (t2.spell LIKE CONCAT( #{InputStr},'%') OR t2.name LIKE CONCAT( #{InputStr},'%'))
         UNION
-        SELECT t1.id selfId,t1.lib_name selfName,0 parentId,null parentName,t2.`name` sameName,t2.is_concept showType FROM kl_concept t1
+        SELECT t1.id selfId,t1.lib_name selfName,0 parentId,null parentName,t2.`name` sameName,t2.is_concept showType,t1.lib_type libTypeId,t6.`name` libTypeName FROM kl_concept t1
         LEFT JOIN kl_library_info t2 ON t1.id = t2.concept_id
         LEFT JOIN kl_concept_common t3 ON t1.id = t2.concept_id
+        LEFT JOIN kl_lexicon t6 ON t6.id = t1.lib_type
         WHERE
         t1.is_deleted = 'N'
         AND t2.is_deleted = 'N'
         AND t3.is_deleted = 'N'
+        AND t6.is_deleted = 'N'
         AND t1.lib_type = #{type}
         <if test="sexType == 3">
             and t3.sex_type in ('1','2','3')

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

@@ -17,4 +17,6 @@ public class ConceptRetrievalDTO {
     private String parentName;//父级名称
     private String sameName;//同义词名称
     private Integer showType;//显示类型（1本体，2同义词）
+    private Long libTypeId;//标签类型id
+    private String libTypeName;//标签类型名称
 }

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

@@ -21,4 +21,8 @@ public class RetrievalDTO {
     private String retrievalName;
     //概念id
     private Long conceptId;
+    //标签类型id
+    private Long libTypeId;
+    //标签类型名称
+    private String libTypeName;
 }

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

@@ -77,6 +77,8 @@ public class RetrievalFacade {
                 if (StringUtil.isNotEmpty(conceptRetrievalDTO.getSameName())) {//同义词
                     retrievalDTO.setRetrievalName(conceptRetrievalDTO.getSameName());
                 }
+                retrievalDTO.setLibTypeId(conceptRetrievalDTO.getLibTypeId());
+                retrievalDTO.setLibTypeName(conceptRetrievalDTO.getLibTypeName());
                 retrievalDTO.setShowType(conceptRetrievalDTO.getShowType());
                 retrievalDTOS.add(retrievalDTO);
             }