|
@@ -151,13 +151,14 @@
|
|
|
FROM
|
|
|
(
|
|
|
SELECT
|
|
|
+ s.moduleNo,
|
|
|
s.id,
|
|
|
s.name,
|
|
|
s.retrievalName,
|
|
|
s.isConcept,
|
|
|
s.type,
|
|
|
s.typeName,
|
|
|
- group_concat(distinct s.code SEPARATOR '') as code,
|
|
|
+ s.code,
|
|
|
s1.concept_id AS conceptId,
|
|
|
s1.clinical_pathway_name,
|
|
|
s1.notice_name,
|
|
@@ -170,6 +171,7 @@
|
|
|
FROM
|
|
|
(
|
|
|
SELECT
|
|
|
+ t.moduleNo,
|
|
|
t.id,
|
|
|
t.NAME,
|
|
|
IF ( t.isConcept = 0, t.retrievalName, '' ) AS retrievalName,
|
|
@@ -180,6 +182,7 @@
|
|
|
FROM
|
|
|
(
|
|
|
SELECT
|
|
|
+ concat( '1', b.lib_type ) AS moduleNo,
|
|
|
a.NAME AS retrievalName,
|
|
|
a.spell AS spell,
|
|
|
a.is_concept AS isConcept,
|
|
@@ -210,6 +213,7 @@
|
|
|
) t left join kl_disease t1 on t.id = t1.concept_id and t1.is_deleted='N'
|
|
|
UNION
|
|
|
SELECT
|
|
|
+ t.moduleNo,
|
|
|
t.id,
|
|
|
t.NAME,
|
|
|
IF ( t.isConcept = 0, t.retrievalName, '' ) AS retrievalName,
|
|
@@ -220,6 +224,7 @@
|
|
|
FROM
|
|
|
(
|
|
|
SELECT
|
|
|
+ concat( '2', b.lib_type ) AS moduleNo,
|
|
|
a.NAME AS retrievalName,
|
|
|
a.spell AS spell,
|
|
|
a.is_concept AS isConcept,
|
|
@@ -250,6 +255,7 @@
|
|
|
) t left join kl_disease t1 on t.id = t1.concept_id and t1.is_deleted='N'
|
|
|
UNION
|
|
|
SELECT
|
|
|
+ t.moduleNo,
|
|
|
t.id,
|
|
|
t.NAME,
|
|
|
IF ( t.isConcept = 0, t.retrievalName, '' ) AS retrievalName,
|
|
@@ -260,6 +266,7 @@
|
|
|
FROM
|
|
|
(
|
|
|
SELECT
|
|
|
+ concat( '3', b.lib_type ) AS moduleNo,
|
|
|
a.NAME AS retrievalName,
|
|
|
a.spell AS spell,
|
|
|
a.is_concept AS isConcept,
|
|
@@ -291,6 +298,7 @@
|
|
|
<if test="typeIds.contains(107) or typeIds.contains(108)">
|
|
|
UNION
|
|
|
SELECT DISTINCT
|
|
|
+ concat( '1', e.lib_type ) AS moduleNo,
|
|
|
e.id AS id,
|
|
|
e.lib_name AS NAME,
|
|
|
b.lib_name AS retrievalName,
|
|
@@ -323,6 +331,7 @@
|
|
|
</if>
|
|
|
UNION
|
|
|
SELECT DISTINCT
|
|
|
+ concat( '2', e.lib_type ) AS moduleNo,
|
|
|
e.id AS id,
|
|
|
e.lib_name AS NAME,
|
|
|
b.lib_name AS retrievalName,
|
|
@@ -355,6 +364,7 @@
|
|
|
</if>
|
|
|
UNION
|
|
|
SELECT DISTINCT
|
|
|
+ concat( '3', e.lib_type ) AS moduleNo,
|
|
|
e.id AS id,
|
|
|
e.lib_name AS NAME,
|
|
|
b.lib_name AS retrievalName,
|
|
@@ -389,6 +399,7 @@
|
|
|
<if test="typeIds.contains(100) ">
|
|
|
UNION
|
|
|
SELECT
|
|
|
+ t.moduleNo,
|
|
|
t.id,
|
|
|
t.NAME,
|
|
|
IF ( t.isConcept = 0, t.retrievalName, '' ) AS retrievalName,
|
|
@@ -399,6 +410,7 @@
|
|
|
FROM
|
|
|
(
|
|
|
SELECT
|
|
|
+ concat( '1', b.lib_type ) AS moduleNo,
|
|
|
a.NAME AS retrievalName,
|
|
|
a.spell AS spell,
|
|
|
a.is_concept AS isConcept,
|
|
@@ -428,6 +440,7 @@
|
|
|
</if>
|
|
|
UNION
|
|
|
SELECT
|
|
|
+ t.moduleNo,
|
|
|
t.id,
|
|
|
t.NAME,
|
|
|
IF ( t.isConcept = 0, t.retrievalName, '' ) AS retrievalName,
|
|
@@ -438,6 +451,7 @@
|
|
|
FROM
|
|
|
(
|
|
|
SELECT
|
|
|
+ concat( '2', b.lib_type ) AS moduleNo,
|
|
|
a.NAME AS retrievalName,
|
|
|
a.spell AS spell,
|
|
|
a.is_concept AS isConcept,
|
|
@@ -467,6 +481,7 @@
|
|
|
</if>
|
|
|
UNION
|
|
|
SELECT
|
|
|
+ t.moduleNo,
|
|
|
t.id,
|
|
|
t.NAME,
|
|
|
IF ( t.isConcept = 0, t.retrievalName, '' ) AS retrievalName,
|
|
@@ -477,6 +492,7 @@
|
|
|
FROM
|
|
|
(
|
|
|
SELECT
|
|
|
+ concat( '3', b.lib_type ) AS moduleNo,
|
|
|
a.NAME AS retrievalName,
|
|
|
a.spell AS spell,
|
|
|
a.is_concept AS isConcept,
|
|
@@ -524,7 +540,7 @@
|
|
|
</when>
|
|
|
</choose>
|
|
|
</if>
|
|
|
- order by f.type asc,f.isConcept DESC
|
|
|
+ order by f.type asc,f.moduleNo ASC,f.isConcept DESC
|
|
|
<if test="size!=null">
|
|
|
LIMIT #{size}
|
|
|
</if>
|