From 12e35c60f9be4403b5cdec5f0d87c2d0f7384dd3 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期二, 18 六月 2024 10:28:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
inspect-server/src/main/resources/mapper/StandardTreeMapper.xml | 41 +++++++++++++++++++++++++++++++++++------
1 files changed, 35 insertions(+), 6 deletions(-)
diff --git a/inspect-server/src/main/resources/mapper/StandardTreeMapper.xml b/inspect-server/src/main/resources/mapper/StandardTreeMapper.xml
index bdb8cfd..b0072ed 100644
--- a/inspect-server/src/main/resources/mapper/StandardTreeMapper.xml
+++ b/inspect-server/src/main/resources/mapper/StandardTreeMapper.xml
@@ -56,10 +56,9 @@
from laboratory l
left join structure_test_object sto on sto.laboratory_id = l.id
left join product p on p.object_id = sto.id
- left join standard_tree st on st.laboratory = l.laboratory_name
- and st.sample_type = sto.specimen_name
+ left join standard_tree st on st.sample_type = sto.specimen_name
and st.sample = p.name
- order by l.id,CAST(sto.code AS DECIMAL),st.id
+ order by l.id,CAST(sto.code AS DECIMAL),p.id,ISNULL(st.id),st.id
</select>
<select id="selectStandardProductById" resultType="com.yuanchu.mom.pojo.StandardProductList">
@@ -137,6 +136,8 @@
inspection_item_en,
inspection_item_subclass,
inspection_item_subclass_en,
+ inspection_item_class,
+ inspection_item_class_en,
method,
son_laboratory,
unit,
@@ -157,7 +158,8 @@
0 state,
#{model} model,
#{sample} sample,
- #{trees} tree
+ #{trees} tree,
+ id structure_item_parameter_id
from structure_item_parameter
where (
sample is NULL
@@ -173,6 +175,8 @@
inspection_item_en,
inspection_item_subclass,
inspection_item_subclass_en,
+ inspection_item_class,
+ inspection_item_class_en,
method,
son_laboratory,
unit,
@@ -193,7 +197,8 @@
0 state,
#{model} model,
#{sample} sample,
- #{trees} tree
+ #{trees} tree,
+ id structure_item_parameter_id
from structure_item_parameter
where sample LIKE CONCAT('%[', #{tree}, ']%')
</select>
@@ -213,6 +218,8 @@
inspection_item_en,
inspection_item_subclass,
inspection_item_subclass_en,
+ inspection_item_class,
+ inspection_item_class_en,
method,
son_laboratory,
unit,
@@ -233,7 +240,8 @@
0 state,
#{model} model,
#{sample} sample,
- #{trees} tree
+ #{trees} tree,
+ id structure_item_parameter_id
from structure_item_parameter
where (
sample is NULL
@@ -242,4 +250,25 @@
OR sample LIKE CONCAT('%', #{tree}, '%')
)
</select>
+ <select id="getStandardTree3" resultType="com.yuanchu.mom.dto.SampleDto">
+ select model label,
+ model value
+ from standard_tree
+ where sample_type = #{sampleType}
+ and sample is null
+ </select>
+ <select id="getLaboratory" resultType="java.lang.String">
+ select l.laboratory_name
+ from structure_test_object sto
+ left join laboratory l on sto.laboratory_id = l.id
+ where sto.specimen_name = #{str}
+ </select>
+ <select id="getStructureItemParameterId" resultType="java.lang.Integer">
+ select id from structure_item_parameter
+ where sample like concat('%', #{sampleType}, '%')
+ and inspection_item = #{item}
+ <if test="itemChild != null and itemChild != ''">
+ and inspection_item_subclass = #{itemChild}
+ </if>
+ </select>
</mapper>
--
Gitblit v1.9.3