Browse Source

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

zhoutg 4 years ago
parent
commit
f733cfdcc5
1 changed files with 6 additions and 0 deletions
  1. 6 0
      src/main/resources/mapper/KlConceptMapper.xml

+ 6 - 0
src/main/resources/mapper/KlConceptMapper.xml

@@ -190,6 +190,7 @@
 		AND c.is_deleted = 'N'
 		AND c.is_deleted = 'N'
 		AND a.id = b.lib_id
 		AND a.id = b.lib_id
 		AND b.lib_type = c.code
 		AND b.lib_type = c.code
+		AND b.`status` = 1
 		<if test="typeIds != null and typeIds.size > 0">
 		<if test="typeIds != null and typeIds.size > 0">
 			<foreach item="typeId" collection="typeIds" open="and(" separator="or" close=")" >
 			<foreach item="typeId" collection="typeIds" open="and(" separator="or" close=")" >
 				a.type_id =#{typeId}
 				a.type_id =#{typeId}
@@ -232,6 +233,7 @@
 		AND c.is_deleted = 'N'
 		AND c.is_deleted = 'N'
 		AND a.id = b.lib_id
 		AND a.id = b.lib_id
 		AND b.lib_type = c.code
 		AND b.lib_type = c.code
+		AND b.`status` = 1
 		<if test="typeIds != null and typeIds.size > 0">
 		<if test="typeIds != null and typeIds.size > 0">
 			<foreach item="typeId" collection="typeIds" open="and(" separator="or" close=")" >
 			<foreach item="typeId" collection="typeIds" open="and(" separator="or" close=")" >
 				a.type_id =#{typeId}
 				a.type_id =#{typeId}
@@ -274,6 +276,7 @@
 		AND c.is_deleted = 'N'
 		AND c.is_deleted = 'N'
 		AND a.id = b.lib_id
 		AND a.id = b.lib_id
 		AND b.lib_type = c.code
 		AND b.lib_type = c.code
+		AND b.`status` = 1
 		<if test="typeIds != null and typeIds.size > 0">
 		<if test="typeIds != null and typeIds.size > 0">
 			<foreach item="typeId" collection="typeIds" open="and(" separator="or" close=")" >
 			<foreach item="typeId" collection="typeIds" open="and(" separator="or" close=")" >
 				a.type_id =#{typeId}
 				a.type_id =#{typeId}
@@ -317,6 +320,7 @@
 			AND b.lib_type = 108
 			AND b.lib_type = 108
 			AND e.lib_type = 107
 			AND e.lib_type = 107
 			AND d.relation_id = 600
 			AND d.relation_id = 600
+			AND b.`status` = 1
 			<if test="inputStr!=null and inputStr!=''">
 			<if test="inputStr!=null and inputStr!=''">
 				AND ( a.name = #{inputStr} OR LOWER(a.spell) = LOWER(#{inputStr}))
 				AND ( a.name = #{inputStr} OR LOWER(a.spell) = LOWER(#{inputStr}))
 			</if>
 			</if>
@@ -347,6 +351,7 @@
 			AND b.lib_type = 108
 			AND b.lib_type = 108
 			AND e.lib_type = 107
 			AND e.lib_type = 107
 			AND d.relation_id = 600
 			AND d.relation_id = 600
+			AND b.`status` = 1
 			<if test="inputStr!=null and inputStr!=''">
 			<if test="inputStr!=null and inputStr!=''">
 				AND ( a.name LIKE concat(#{inputStr},'%') OR LOWER(a.spell) LIKE LOWER( concat(#{inputStr},'%')))
 				AND ( a.name LIKE concat(#{inputStr},'%') OR LOWER(a.spell) LIKE LOWER( concat(#{inputStr},'%')))
 			</if>
 			</if>
@@ -377,6 +382,7 @@
 			AND b.lib_type = 108
 			AND b.lib_type = 108
 			AND e.lib_type = 107
 			AND e.lib_type = 107
 			AND d.relation_id = 600
 			AND d.relation_id = 600
+			AND b.`status` = 1
 			<if test="inputStr!=null and inputStr!=''">
 			<if test="inputStr!=null and inputStr!=''">
 				AND ( a.name LIKE concat('%',#{inputStr},'%') OR LOWER(a.spell) LIKE LOWER( concat('%',#{inputStr},'%')))
 				AND ( a.name LIKE concat('%',#{inputStr},'%') OR LOWER(a.spell) LIKE LOWER( concat('%',#{inputStr},'%')))
 			</if>
 			</if>