From 6b1886314fd18f34740c96bb4fd86046600dd2c0 Mon Sep 17 00:00:00 2001
From: 晏有为 <13214124+yan-youwei@user.noreply.gitee.com>
Date: 星期四, 16 五月 2024 17:08:36 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/center-lims-after
---
inspect-server/src/main/resources/mapper/StandardTreeMapper.xml | 79 +++++++++++++++++++++++++++++++++++++--
1 files changed, 75 insertions(+), 4 deletions(-)
diff --git a/inspect-server/src/main/resources/mapper/StandardTreeMapper.xml b/inspect-server/src/main/resources/mapper/StandardTreeMapper.xml
index fecb954..23b0adc 100644
--- a/inspect-server/src/main/resources/mapper/StandardTreeMapper.xml
+++ b/inspect-server/src/main/resources/mapper/StandardTreeMapper.xml
@@ -51,13 +51,15 @@
l.laboratory_name laboratory,
sto.specimen_name sample_type,
p.name sample,
- st.model
+ st.model,
+ sto.code
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
and st.sample = p.name
+ 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">
@@ -130,7 +132,7 @@
group by sto.specimen_name
</select>
<select id="selectStandardProductListByTree" resultType="com.yuanchu.mom.pojo.StandardProductList">
- select sample,
+ select sample sample2,
inspection_item,
inspection_item_en,
inspection_item_subclass,
@@ -152,14 +154,48 @@
checkout_number,
section,
dic,
- 0 state
+ 0 state,
+ #{model} model,
+ #{sample} sample,
+ #{trees} tree
from structure_item_parameter
where (
sample is NULL
OR sample = ''
or sample = '[]'
- OR sample LIKE CONCAT('%', #{tree}, '%')
+ OR sample LIKE CONCAT('%[', #{tree}, ']%')
)
+ </select>
+
+ <select id="selectStandardProductListByTree2" resultType="com.yuanchu.mom.pojo.StandardProductList">
+ select sample sample2,
+ inspection_item,
+ inspection_item_en,
+ inspection_item_subclass,
+ inspection_item_subclass_en,
+ method,
+ son_laboratory,
+ unit,
+ ask_tell tell,
+ ask,
+ price,
+ man_hour,
+ man_hour_group,
+ man_day,
+ inspection_item_type,
+ inspection_value_type,
+ bsm,
+ template_id,
+ laboratory,
+ checkout_number,
+ section,
+ dic,
+ 0 state,
+ #{model} model,
+ #{sample} sample,
+ #{trees} tree
+ from structure_item_parameter
+ where sample LIKE CONCAT('%[', #{tree}, ']%')
</select>
<select id="getStandardTree2" resultMap="SampleTypeDto">
@@ -171,4 +207,39 @@
left join standard_tree st on st.sample_type = sto.specimen_name
and st.sample = p.name
</select>
+ <select id="selectStandardProductListByTree3" resultType="com.yuanchu.mom.pojo.StandardProductList">
+ select sample sample2,
+ inspection_item,
+ inspection_item_en,
+ inspection_item_subclass,
+ inspection_item_subclass_en,
+ method,
+ son_laboratory,
+ unit,
+ ask_tell tell,
+ ask,
+ price,
+ man_hour,
+ man_hour_group,
+ man_day,
+ inspection_item_type,
+ inspection_value_type,
+ bsm,
+ template_id,
+ laboratory,
+ checkout_number,
+ section,
+ dic,
+ 0 state,
+ #{model} model,
+ #{sample} sample,
+ #{trees} tree
+ from structure_item_parameter
+ where (
+ sample is NULL
+ OR sample = ''
+ or sample = '[]'
+ OR sample LIKE CONCAT('%', #{tree}, '%')
+ )
+ </select>
</mapper>
--
Gitblit v1.9.3