From f67aa8b146f0fa901ce4ae183be511d8615cde77 Mon Sep 17 00:00:00 2001
From: zhuo <2089219845@qq.com>
Date: 星期四, 17 四月 2025 14:49:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_ztzb' into dev_ztzb
---
basic-server/src/main/resources/mapper/StandardTreeMapper.xml | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/basic-server/src/main/resources/mapper/StandardTreeMapper.xml b/basic-server/src/main/resources/mapper/StandardTreeMapper.xml
index ded9337..39c9d07 100644
--- a/basic-server/src/main/resources/mapper/StandardTreeMapper.xml
+++ b/basic-server/src/main/resources/mapper/StandardTreeMapper.xml
@@ -154,15 +154,7 @@
or sp.sample = ''
or sp.sample = '[]'
</select>
- <select id="getStandardMethodListBySample" resultType="com.ruoyi.basic.pojo.StandardMethodList">
- select sm.code,sm.name,sm.remark from standard_method sm
- left join structure_test_object sto on sm.structure_test_object_id = sto.id
- where is_use = 1
- and is_product = 1
- <if test="sampleType != null">
- and sto.specimen_name = #{sampleType}
- </if>
- </select>
+
<select id="selectStandardTreeList2" resultType="com.ruoyi.basic.pojo.StandardTree">
select '涓ぉ绉戞妧妫�娴嬩腑蹇�' factory,
l.laboratory_name laboratory,
@@ -389,4 +381,12 @@
</foreach>
</if>
</select>
+
+ <select id="getStandardTree3" resultType="com.ruoyi.basic.dto.SampleDto">
+ select model label,
+ model value
+ from standard_tree
+ where sample_type = #{sampleType}
+ and sample is null
+ </select>
</mapper>
--
Gitblit v1.9.3