|
@@ -1067,9 +1067,9 @@
|
|
|
)
|
|
|
</if>
|
|
|
|
|
|
- -- 量表匹配静态知识,如果只有量表,也同时搜索诊断有关的量表;如果还有其他类型,不搜索诊断相关的量表
|
|
|
+ -- 量表匹配静态知识同时搜索诊断有关的量表;
|
|
|
<if test="hasGauge == true">
|
|
|
- <if test="typesIn != null and typesIn.size() > 0 || hasLis == true">
|
|
|
+ <if test="typesIn != null and typesIn.size() > 0 or hasLis == true">
|
|
|
union
|
|
|
</if>
|
|
|
(
|
|
@@ -1191,11 +1191,10 @@
|
|
|
b2.is_deleted = 'N'
|
|
|
AND b1.selfId = b2.concept_id
|
|
|
)
|
|
|
- </if>
|
|
|
|
|
|
- -- 只有量表时还需要根据诊断去查询量表
|
|
|
- <if test="onlyGauge">
|
|
|
+
|
|
|
UNION
|
|
|
+ (
|
|
|
SELECT distinct
|
|
|
b2.id conceptId,
|
|
|
b2.lib_name `name`,
|
|
@@ -1237,6 +1236,7 @@
|
|
|
AND b1.selfId = b3.start_id
|
|
|
AND b2.id = b3.end_id
|
|
|
AND b2.id = b4.concept_id
|
|
|
+ )
|
|
|
</if>
|
|
|
|
|
|
) a1
|