From d86a37f36ec375f8aa3d3eaee18ea1ad323eba0b Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期五, 26 四月 2024 09:13:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
inspect-server/src/main/resources/mapper/StandardTreeMapper.xml | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/inspect-server/src/main/resources/mapper/StandardTreeMapper.xml b/inspect-server/src/main/resources/mapper/StandardTreeMapper.xml
index 34c8d68..1e6fdd4 100644
--- a/inspect-server/src/main/resources/mapper/StandardTreeMapper.xml
+++ b/inspect-server/src/main/resources/mapper/StandardTreeMapper.xml
@@ -94,7 +94,9 @@
sample,
bsm,
template_id,
- dic
+ dic,
+ ask,
+ ask_tell as tell
from structure_item_parameter sp
left join structure_test_object sto on sto.id = sp.sample
where sto.specimen_name = #{sampleType}
@@ -103,6 +105,7 @@
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 sto.specimen_name = #{sampleType}
+ and is_use = 1
and is_product = 1
</select>
</mapper>
--
Gitblit v1.9.3