zhoutg 5 роки тому
батько
коміт
5bc436f908
1 змінених файлів з 60 додано та 51 видалено
  1. 60 51
      aipt-service/src/main/resources/mapper/ConceptMapper.xml

+ 60 - 51
aipt-service/src/main/resources/mapper/ConceptMapper.xml

@@ -587,11 +587,15 @@
                                 )
                             ) b1,
                             kl_concept b2,
-                            kl_concept_detail b3
+                            kl_concept_detail b3,
+                            kl_lis_mapping m
                         WHERE
                             b2.is_deleted = 'N'
                         AND b3.is_deleted = 'N'
-                        AND b1.selfName = b2.lib_name
+                        AND m.is_deleted = 'N'
+                        AND m.item_id = 0
+                        AND m.meal_id = b1.selfId
+                        AND m.unique_id = b2.id
                         AND b2.lib_type = 46
                         AND b2.id = b3.concept_id
                     )
@@ -633,11 +637,15 @@
                                 )
                             ) b1,
                             kl_concept b2,
-                            kl_concept_detail b3
+                            kl_concept_detail b3,
+                            kl_lis_mapping m
                         WHERE
                             b2.is_deleted = 'N'
                         AND b3.is_deleted = 'N'
-                        AND b1.selfName = b2.lib_name
+                        AND m.is_deleted = 'N'
+                        AND m.item_id = 0
+                        AND m.meal_id = b1.selfId
+                        AND m.unique_id = b2.id
                         AND b2.lib_type = 46
                         AND b2.id = b3.concept_id
                     )
@@ -679,11 +687,15 @@
                                 )
                             ) b1,
                             kl_concept b2,
-                            kl_concept_detail b3
+                            kl_concept_detail b3,
+                            kl_lis_mapping m
                         WHERE
                             b2.is_deleted = 'N'
                         AND b3.is_deleted = 'N'
-                        AND b1.selfName = b2.lib_name
+                        AND m.is_deleted = 'N'
+                        AND m.item_id = 0
+                        AND m.meal_id = b1.selfId
+                        AND m.unique_id = b2.id
                         AND b2.lib_type = 46
                         AND b2.id = b3.concept_id
                     ) -- 化验子项推父项,父项公表项匹配静态知识
@@ -702,7 +714,7 @@
                         FROM
                             (
                                 SELECT
-                                    0 selfId,
+                                    t1.id selfId,
                                     t1.lib_name selfName,
                                     t5.id parentId,
                                     t5.lib_name parentName,
@@ -732,11 +744,15 @@
                                 AND t4.relation_id = 18
                             ) b1,
                             kl_concept b2,
-                            kl_concept_detail b3
+                            kl_concept_detail b3,
+                            kl_lis_mapping m
                         WHERE
                             b2.is_deleted = 'N'
                         AND b3.is_deleted = 'N'
-                        AND b1.parentName = b2.lib_name
+                        AND m.is_deleted = 'N'
+                        AND m.meal_id = b1.parentId
+                        AND m.item_id = b1.selfId
+                        AND m.unique_id = b2.id
                         AND b2.lib_type = 46
                         AND b2.id = b3.concept_id
                     )
@@ -755,7 +771,7 @@
                         FROM
                             (
                                 SELECT
-                                    0 selfId,
+                                    t1.id selfId,
                                     t1.lib_name selfName,
                                     t5.id parentId,
                                     t5.lib_name parentName,
@@ -785,11 +801,15 @@
                                 AND t4.relation_id = 18
                             ) b1,
                             kl_concept b2,
-                            kl_concept_detail b3
+                            kl_concept_detail b3,
+                            kl_lis_mapping m
                         WHERE
                             b2.is_deleted = 'N'
                         AND b3.is_deleted = 'N'
-                        AND b1.parentName = b2.lib_name
+                        AND m.is_deleted = 'N'
+                        AND m.meal_id = b1.parentId
+                        AND m.item_id = b1.selfId
+                        AND m.unique_id = b2.id
                         AND b2.lib_type = 46
                         AND b2.id = b3.concept_id
                     )
@@ -808,7 +828,7 @@
                         FROM
                             (
                                 SELECT
-                                    0 selfId,
+                                    t1.id selfId,
                                     t1.lib_name selfName,
                                     t5.id parentId,
                                     t5.lib_name parentName,
@@ -838,11 +858,15 @@
                                 AND t4.relation_id = 18
                             ) b1,
                             kl_concept b2,
-                            kl_concept_detail b3
+                            kl_concept_detail b3,
+                            kl_lis_mapping m
                         WHERE
                             b2.is_deleted = 'N'
                         AND b3.is_deleted = 'N'
-                        AND b1.parentName = b2.lib_name
+                        AND m.is_deleted = 'N'
+                        AND m.meal_id = b1.parentId
+                        AND m.item_id = b1.selfId
+                        AND m.unique_id = b2.id
                         AND b2.lib_type = 46
                         AND b2.id = b3.concept_id
                     ) -- 化验子项推父项,父项--子项组合公表项匹配静态知识
@@ -850,12 +874,7 @@
                     (
                         SELECT
                             b2.id conceptId,
-                            CONCAT(
-                                b1.parentName,
-                                '(',
-                                b1.selfName,
-                                ')'
-                            ) `name`,
+                            b2.lib_name `name`,
                             41 AS orderNo,
                             b1.retrievalName retrievalName,
                             b1.showType + 20 showType,
@@ -896,15 +915,15 @@
                                 AND t4.relation_id = 18
                             ) b1,
                             kl_concept b2,
-                            kl_concept_detail b3
+                            kl_concept_detail b3,
+                            kl_lis_mapping m
                         WHERE
                             b2.is_deleted = 'N'
                         AND b3.is_deleted = 'N'
-                        AND CONCAT(
-                            b1.parentName,
-                            '--',
-                            b1.selfName
-                        ) = b2.lib_name
+                        AND m.is_deleted = 'N'
+                        AND m.meal_id = b1.parentId
+                        AND m.item_id = b1.selfId
+                        AND m.unique_id = b2.id
                         AND b2.lib_type = 46
                         AND b2.id = b3.concept_id
                     )
@@ -912,12 +931,7 @@
                     (
                         SELECT
                             b2.id conceptId,
-                            CONCAT(
-                                b1.parentName,
-                                '(',
-                                b1.selfName,
-                                ')'
-                            ) `name`,
+                            b2.lib_name `name`,
                             42 AS orderNo,
                             b1.retrievalName retrievalName,
                             b1.showType + 20 showType,
@@ -958,15 +972,15 @@
                                 AND t4.relation_id = 18
                             ) b1,
                             kl_concept b2,
-                            kl_concept_detail b3
+                            kl_concept_detail b3,
+                            kl_lis_mapping m
                         WHERE
                             b2.is_deleted = 'N'
                         AND b3.is_deleted = 'N'
-                        AND CONCAT(
-                            b1.parentName,
-                            '--',
-                            b1.selfName
-                        ) = b2.lib_name
+                        AND m.is_deleted = 'N'
+                        AND m.meal_id = b1.parentId
+                        AND m.item_id = b1.selfId
+                        AND m.unique_id = b2.id
                         AND b2.lib_type = 46
                         AND b2.id = b3.concept_id
                     )
@@ -974,12 +988,7 @@
                     (
                         SELECT
                             b2.id conceptId,
-                            CONCAT(
-                                b1.parentName,
-                                '(',
-                                b1.selfName,
-                                ')'
-                            ) `name`,
+                            b2.lib_name `name`,
                             43 AS orderNo,
                             b1.retrievalName retrievalName,
                             b1.showType + 20 showType,
@@ -1020,15 +1029,15 @@
                                 AND t4.relation_id = 18
                             ) b1,
                             kl_concept b2,
-                            kl_concept_detail b3
+                            kl_concept_detail b3,
+                            kl_lis_mapping m
                         WHERE
                             b2.is_deleted = 'N'
                         AND b3.is_deleted = 'N'
-                        AND CONCAT(
-                            b1.parentName,
-                            '--',
-                            b1.selfName
-                        ) = b2.lib_name
+                        AND m.is_deleted = 'N'
+                        AND m.meal_id = b1.parentId
+                        AND m.item_id = b1.selfId
+                        AND m.unique_id = b2.id
                         AND b2.lib_type = 46
                         AND b2.id = b3.concept_id
                     )