Merge branch 'develop' into dev/diagnose20210315

src/main/resources/mapper/KlConceptMapper.xml

@@ -188,7 +188,7 @@
 		a.is_deleted = 'N'
 		AND b.is_deleted = 'N'
 		AND c.is_deleted = 'N'
-		AND a.id = b.lib_id
+		AND a.concept_id = b.id
 		AND b.lib_type = c.code
 		AND b.`status` = 1
 		<if test="typeIds != null and typeIds.size > 0">
@@ -202,7 +202,7 @@
 		WHERE
 		1=1
 		<if test="inputStr!=null and inputStr!=''">
-			AND ( t.name = #{inputStr}
+			AND ( t.retrievalName = #{inputStr}
 			OR LOWER(t.spell) = LOWER(#{inputStr})
 			OR LOWER(l1.icd10_code) = LOWER(#{inputStr}))
 		</if>
@@ -231,7 +231,7 @@
 		a.is_deleted = 'N'
 		AND b.is_deleted = 'N'
 		AND c.is_deleted = 'N'
-		AND a.id = b.lib_id
+		AND a.concept_id = b.id
 		AND b.lib_type = c.code
 		AND b.`status` = 1
 		<if test="typeIds != null and typeIds.size > 0">
@@ -245,7 +245,7 @@
 		WHERE
 		1=1
 		<if test="inputStr!=null and inputStr!=''">
-			AND ( t.name LIKE concat(#{inputStr},'%')
+			AND ( t.retrievalName LIKE concat(#{inputStr},'%')
 			OR LOWER(t.spell) LIKE LOWER( concat(#{inputStr},'%'))
 			OR LOWER(l1.icd10_code) LIKE LOWER( concat(#{inputStr},'%')))
 		</if>
@@ -274,7 +274,7 @@
 		a.is_deleted = 'N'
 		AND b.is_deleted = 'N'
 		AND c.is_deleted = 'N'
-		AND a.id = b.lib_id
+		AND a.concept_id = b.id
 		AND b.lib_type = c.code
 		AND b.`status` = 1
 		<if test="typeIds != null and typeIds.size > 0">
@@ -288,7 +288,7 @@
 		WHERE
 		1=1
 		<if test="inputStr!=null and inputStr!=''">
-			AND ( t.name LIKE concat('%',#{inputStr},'%')
+			AND ( t.retrievalName LIKE concat('%',#{inputStr},'%')
 			OR LOWER(t.spell) LIKE LOWER( concat('%',#{inputStr},'%'))
 			OR LOWER(l1.icd10_code) LIKE LOWER( concat('%',#{inputStr},'%')))
 		</if>
@@ -313,7 +313,7 @@
 			AND c.is_deleted = 'N'
 			AND d.is_deleted = 'N'
 			AND e.is_deleted = 'N'
-			AND a.id = b.lib_id
+			AND a.concept_id = b.id
 			AND b.id = d.end_id
 			AND e.id = d.start_id
 			AND e.lib_type = c.code
@@ -344,7 +344,7 @@
 			AND c.is_deleted = 'N'
 			AND d.is_deleted = 'N'
 			AND e.is_deleted = 'N'
-			AND a.id = b.lib_id
+			AND a.concept_id = b.id
 			AND b.id = d.end_id
 			AND e.id = d.start_id
 			AND e.lib_type = c.code
@@ -375,7 +375,7 @@
 			AND c.is_deleted = 'N'
 			AND d.is_deleted = 'N'
 			AND e.is_deleted = 'N'
-			AND a.id = b.lib_id
+			AND a.concept_id = b.id
 			AND b.id = d.end_id
 			AND e.id = d.start_id
 			AND e.lib_type = c.code

src/main/resources/mapper/KlConceptStaticMapper.xml

@@ -70,7 +70,7 @@
         kl_concept_detail c
         WHERE
         a.id = b.concept_id
-        and a.id = c.concept_id
+        and b.concept_id = c.concept_id
         and a.is_deleted = 'N'
         and b.is_deleted = 'N'
         and c.is_deleted = 'N'