From 34a4da1c76088a474278f58759d63783a57757a0 Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期五, 05 七月 2024 09:23:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
inspect-server/src/main/resources/mapper/StandardTreeMapper.xml | 31 ++++++++++++++++++-------------
1 files changed, 18 insertions(+), 13 deletions(-)
diff --git a/inspect-server/src/main/resources/mapper/StandardTreeMapper.xml b/inspect-server/src/main/resources/mapper/StandardTreeMapper.xml
index d7fcdae..47e1cc0 100644
--- a/inspect-server/src/main/resources/mapper/StandardTreeMapper.xml
+++ b/inspect-server/src/main/resources/mapper/StandardTreeMapper.xml
@@ -167,7 +167,7 @@
OR sample LIKE CONCAT('%[', #{tree}, ']%')
)
and (laboratory is null
- or laboratory=''
+ or laboratory = ''
or laboratory = #{laboratory})
order by case
when man_hour_group is NULL then 1
@@ -213,9 +213,9 @@
id structure_item_parameter_id
from structure_item_parameter
where sample LIKE CONCAT('%[', #{tree}, ']%')
- and (laboratory is null
- or laboratory=''
- or laboratory = #{laboratory})
+ and (laboratory is null
+ or laboratory = ''
+ or laboratory = #{laboratory})
order by case
when man_hour_group is NULL then 1
when man_hour_group = '' then 1
@@ -269,14 +269,14 @@
id structure_item_parameter_id
from structure_item_parameter
where (
- sample is NULL
- OR sample = ''
- or sample = '[]'
- OR sample LIKE CONCAT('%', #{tree}, '%')
- )
- and (laboratory is null
- or laboratory=''
- or laboratory = #{laboratory})
+ sample is NULL
+ OR sample = ''
+ or sample = '[]'
+ OR sample LIKE CONCAT('%', #{tree}, '%')
+ )
+ and (laboratory is null
+ or laboratory = ''
+ or laboratory = #{laboratory})
order by case
when man_hour_group is NULL then 1
when man_hour_group = '' then 1
@@ -289,7 +289,7 @@
, id asc
</select>
<select id="getStandardTree3" resultType="com.yuanchu.mom.dto.SampleDto">
- select model label,
+ select model label,
model value
from standard_tree
where sample_type = #{sampleType}
@@ -319,4 +319,9 @@
where sto.specimen_name = #{name}
order by p.id
</select>
+ <select id="selSample" resultType="java.lang.String">
+ select name
+ from product
+ where name = #{name}
+ </select>
</mapper>
--
Gitblit v1.9.3