From a0765e814de4526fdd4d949d7e34fcd7e8529ced Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期五, 02 八月 2024 23:11:07 +0800
Subject: [PATCH] 数采调整·完成
---
inspect-server/src/main/resources/mapper/InsSampleMapper.xml | 25 +++++++++++++++++--------
1 files changed, 17 insertions(+), 8 deletions(-)
diff --git a/inspect-server/src/main/resources/mapper/InsSampleMapper.xml b/inspect-server/src/main/resources/mapper/InsSampleMapper.xml
index ade36d6..0e895b1 100644
--- a/inspect-server/src/main/resources/mapper/InsSampleMapper.xml
+++ b/inspect-server/src/main/resources/mapper/InsSampleMapper.xml
@@ -40,7 +40,8 @@
isu.user_id,
user.name userName,
ip.son_laboratory,
- io.ins_time
+ io.ins_time,
+ io.laboratory
FROM
ins_order io
LEFT JOIN ins_sample isa ON isa.ins_order_id = io.id
@@ -84,7 +85,11 @@
a.type DESC,
a.id
) b
- where ins_state is not null)A
+ where ins_state is not null
+ <if test="laboratory!=null and laboratory!=''">
+ and laboratory=#{laboratory}
+ </if>
+ )A
<if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
${ew.customSqlSegment}
</if>
@@ -102,11 +107,12 @@
io.type,
io.appointed,
io.send_time,
- group_concat(distinct isa.sample,' ') sample,
+ group_concat(distinct isa.sample,' ') sampleType,
isu.user_id,
user.name userName,
ip.son_laboratory,
- io.ins_time
+ io.ins_time,
+ io.laboratory
FROM
ins_order io
LEFT JOIN ins_sample isa ON isa.ins_order_id = io.id
@@ -131,7 +137,6 @@
and (isu.user_id = #{userId} OR isu.user_id is NULL )
</if>
OR isu.user_id is NULL
-
GROUP BY
ip.son_laboratory,
io.id
@@ -145,12 +150,15 @@
OR user_id is NULL
) isu2 on
isu2.ins_sample_id = a.id
+ where ins_state is not null
+ <if test="laboratory != null and laboratory!=''">
+ and laboratory=#{laboratory}
+ </if>
ORDER BY
<!--a.user_id DESC,-->
a.type DESC,
a.id
) b
- where ins_state is not null )A
<if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
${ew.customSqlSegment}
</if>
@@ -268,6 +276,7 @@
select name_en
from `center-lims`.product
where name = #{sample}
+ limit 1
</select>
<select id="selectSampleProductListByOrderId2" resultMap="sampleDto">
select isa.*,
@@ -297,8 +306,8 @@
method,
man_day,
bsm,
- ask,
- tell ,
+ ask,
+ tell,
`last_value`,
ip.ins_result ip_ins_result,
state,
--
Gitblit v1.9.3