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

knowledgeman-service/src/main/java/com/diagbot/dto/LisSonContactListDTO.java

@@ -17,29 +17,33 @@ import lombok.Setter;
 @Setter
 public class LisSonContactListDTO {
 	
-    
-    /**
-     * 概念id
+	/**
+     * 医学标准术语id
      */
-	@ApiModelProperty(value="概念id")
+	@ApiModelProperty(value="医学标准术语id")
     private Long conceptId;
     
     /**
-     * 医学标准术语
+     * 医学标准术语名称
      */
-	@ApiModelProperty(value="医学标准术语")
+	@ApiModelProperty(value="医学标准术语名称")
     private String libName;
     
     /**
-     * 术语类型
+     * 医学标准术语类型
      */
-	@ApiModelProperty(value="术语类型")
+	@ApiModelProperty(value="医学标准术语类型")
     private String libType;
+	
+	/**
+	 * 医学标准术语名称(医学标准术语类型)
+	 */
+	private String libNameType;
     
     /**
-     * 同义词
+     * 关联术语
      */
-	@ApiModelProperty(value="同义词")
+	@ApiModelProperty(value="关联术语")
     private String otherNames;
     
     /**
@@ -62,8 +66,5 @@ public class LisSonContactListDTO {
 	private String isDeleted;
     
     
-    
-    
-    
 
 }

knowledgeman-service/src/main/resources/mapper/RelationMapper.xml

@@ -95,10 +95,13 @@
 		LEFT JOIN kl_relation_order b ON a.id=b.t_relation_id
 		LEFT JOIN (SELECT * FROM kl_relation WHERE relation_id=17) c
 		ON a.start_id=c.end_id
-		WHERE b.id IS NULL AND c.id IS NULL) t1
+		LEFT JOIN (SELECT * FROM kl_relation WHERE relation_id=17) d
+		ON a.end_id=d.start_id
+		WHERE b.id IS NULL AND c.id IS NULL AND d.id IS NULL) t1
 		JOIN kl_concept t2 ON t1.start_id=t2.id
 		JOIN kl_concept t3 ON t1.end_id=t3.id
 		JOIN kl_lexicon t4 ON t3.lib_type=t4.id
+		where t2.is_deleted='N' AND t3.is_deleted='N' AND t4.is_deleted='N'
 		GROUP BY t3.id) tab
 		where 1=1
 		<if test="name!=null and name!=''">
@@ -132,7 +135,36 @@
 		JOIN kl_concept t2 ON t1.start_id=t2.id
 		JOIN kl_concept t3 ON t1.end_id=t3.id
 		JOIN kl_lexicon t4 ON t3.lib_type=t4.id
+		where t2.is_deleted='N' AND t3.is_deleted='N' AND t4.is_deleted='N'
 		GROUP BY t3.id) tab
+		where 1=1
+		<if test="name!=null and name!=''">
+			and libNameType like concat('%',#{name},'%')
+		</if>
+		ORDER BY isDeleted ASC,operTime DESC
+    </select>
+    
+    <select id="lisSonContactList" resultType="com.diagbot.dto.LisSonContactListDTO">
+    	SELECT
+			*
+		FROM
+		(SELECT  
+		t3.id AS conceptId,
+		t3.lib_name AS libName,
+		t4.name AS libType,
+		CONCAT(t3.lib_name,'(',t4.name,')') AS libNameType,
+		GROUP_CONCAT(t2.lib_name ORDER BY t1.gmt_modified DESC) AS otherNames,
+		t1.modifier AS operName,
+		MAX(t1.gmt_modified) AS operTime,
+		t1.is_deleted AS isDeleted
+		FROM kl_relation t1
+		JOIN kl_concept t2 ON t1.start_id=t2.id
+		JOIN kl_concept t3 ON t1.end_id=t3.id
+		JOIN kl_lexicon t4 ON t3.lib_type=t4.id
+		WHERE t2.is_deleted='N' AND t3.is_deleted='N' AND t4.is_deleted='N'
+		AND t1.relation_id=18
+		GROUP BY t3.id) tab
+		where 1=1
 		<if test="name!=null and name!=''">
 			and libNameType like concat('%',#{name},'%')
 		</if>