化验公表项接口修改

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

@@ -20,34 +20,33 @@
     		conceptName
     	FROM
     	((SELECT
-		b.`name` as conceptName
-		FROM kl_concept a JOIN kl_library_info b ON a.lib_id=b.id
-		WHERE a.is_deleted='N' AND b.type='化验套餐'
-		ORDER BY a.gmt_modified DESC)
+		lib_name as conceptName
+		FROM kl_concept
+		WHERE is_deleted='N' AND lib_type=12
+		ORDER BY gmt_modified DESC)
 		UNION
 		(SELECT
-		conceptName
-		FROM
-		(SELECT
 		CONCAT(t1.conceptName,'-',t3.conceptName) as conceptName
 		FROM
 		(SELECT
-		a.id as conceptId,
-		b.`name` as conceptName
-		FROM kl_concept a JOIN kl_library_info b ON a.lib_id=b.id
-		WHERE a.is_deleted='N' AND b.type='化验套餐') t1
+		id as conceptId,
+		lib_name as conceptName
+		FROM kl_concept
+		WHERE is_deleted='N' AND lib_type=12) t1
 		JOIN
 		kl_relation t2 
 		ON t1.conceptId=t2.end_id 
 		JOIN
 		(SELECT
-		a.id as conceptId,
-		b.`name` as conceptName
-		FROM kl_concept a JOIN kl_library_info b ON a.lib_id=b.id
-		WHERE a.is_deleted='N' AND b.type='化验明细') t3
+		id as conceptId,
+		lib_name as conceptName
+		FROM kl_concept
+		WHERE is_deleted='N' AND lib_type=13) t3
 		ON t2.start_id=t3.conceptId
+		LEFT JOIN kl_relation_order t4
+		ON t2.id=t4.t_relation_id
 		WHERE t2.is_deleted='N' AND t2.relation_id=3
-		ORDER BY t2.gmt_modified DESC) t)) t
+		ORDER BY t4.order_no DESC)) t
 		WHERE 1=1
 		<if test="conceptName!=null and conceptName!=''">
 			and (conceptName LIKE CONCAT('%',#{conceptName},'%'))