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 | 18 ++++++++++++++----
1 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/inspect-server/src/main/resources/mapper/StandardTreeMapper.xml b/inspect-server/src/main/resources/mapper/StandardTreeMapper.xml
index 12edc0e..1e6fdd4 100644
--- a/inspect-server/src/main/resources/mapper/StandardTreeMapper.xml
+++ b/inspect-server/src/main/resources/mapper/StandardTreeMapper.xml
@@ -76,7 +76,6 @@
</select>
<select id="getStandardProductListBySample" resultType="com.yuanchu.mom.pojo.StandardProductList">
select inspection_item,
- inspection_item_classify,
inspection_item_subclass,
laboratory,
son_laboratory,
@@ -94,8 +93,19 @@
man_day,
sample,
bsm,
- template_id
- from structure_item_parameter
- where sample = #{sample}
+ template_id,
+ 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}
+ </select>
+ <select id="getStandardMethodListBySample" resultType="com.yuanchu.mom.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 sto.specimen_name = #{sampleType}
+ and is_use = 1
+ and is_product = 1
</select>
</mapper>
--
Gitblit v1.9.3