From 30a143f368dd2ff6e9c27b9d5dd17923ffed03ae Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期四, 01 八月 2024 18:59:12 +0800
Subject: [PATCH] 检验单增加外部委托编号+报告批量下载批量上传
---
inspect-server/src/main/resources/mapper/InsSampleMapper.xml | 60 ++++++++++++++++++------------------------------------------
1 files changed, 18 insertions(+), 42 deletions(-)
diff --git a/inspect-server/src/main/resources/mapper/InsSampleMapper.xml b/inspect-server/src/main/resources/mapper/InsSampleMapper.xml
index 81acae6..3d68d42 100644
--- a/inspect-server/src/main/resources/mapper/InsSampleMapper.xml
+++ b/inspect-server/src/main/resources/mapper/InsSampleMapper.xml
@@ -56,7 +56,7 @@
ORDER BY ins_sample_id, id
) isu ON isu.ins_sample_id = io.id
LEFT JOIN ins_product ip ON ip.ins_sample_id = isa.id
- LEFT JOIN user ON isu.user_id = user.id
+ LEFT JOIN user ON isu.user_id = user.id
WHERE
io.state = 1
# AND io.ins_state != 5
@@ -94,41 +94,6 @@
select * from(
SELECT
a.*,ios.ins_state,ios.verify_tell,isu2.order_user_id,<!--(ios.verify_user = #{userId})--> verify_user
- <!--FROM
- (
- SELECT
- io.id,
- io.entrust_code,
- io.type,
- io.appointed,
- io.send_time,
- io.sample_type,
- isu.user_id,
- ip.son_laboratory,
- io.ins_time
- FROM
- ins_order io
- LEFT JOIN ins_sample isa ON isa.ins_order_id = io.id
- LEFT JOIN ( SELECT * FROM ins_sample_user GROUP BY ins_sample_id, user_id ) isu ON isu.ins_sample_id = io.id
- LEFT JOIN ins_product ip ON ip.ins_sample_id = isa.id
- WHERE
- io.state = 1
- # AND io.ins_state != 5
- and send_time is not null
- and (isu.user_id = #{userId} OR isu.user_id is NULL)
- GROUP BY
- ip.son_laboratory,
- io.id
- ) a
- LEFT JOIN ins_order_state ios ON ios.ins_order_id = a.id AND ios.laboratory = a.son_laboratory
- left join (SELECT td.user_id order_user_id, td.ins_sample_id FROM ins_sample_user td,(SELECT max(id) id FROM
- ins_sample_user GROUP BY ins_sample_id) md where td.id = md.id and user_id = #{userId}) isu2 on
- isu2.ins_sample_id = a.id
- ORDER BY
- a.user_id DESC,
- a.type DESC,
- a.id
- ) b-->
FROM
(
SELECT
@@ -157,7 +122,7 @@
ORDER BY ins_sample_id, id
) isu ON isu.ins_sample_id = io.id
LEFT JOIN ins_product ip ON ip.ins_sample_id = isa.id
- LEFT JOIN user ON isu.user_id = user.id
+ LEFT JOIN user ON isu.user_id = user.id
WHERE
io.state = 1
# AND io.ins_state != 5
@@ -185,7 +150,7 @@
a.type DESC,
a.id
) b
- where ins_state is not null)A
+ where ins_state is not null )A
<if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
${ew.customSqlSegment}
</if>
@@ -241,7 +206,7 @@
and state = 1
and ins_fiber_id is null
and ins_fibers_id is null
- and isa.sample_code NOT REGEXP '/'
+ and isa.sample_code NOT REGEXP '/'
</select>
<select id="getInsOrderAndSample" resultMap="sampleDto">
select isa.*,
@@ -303,6 +268,7 @@
select name_en
from `center-lims`.product
where name = #{sample}
+ limit 1
</select>
<select id="selectSampleProductListByOrderId2" resultMap="sampleDto">
select isa.*,
@@ -332,7 +298,8 @@
method,
man_day,
bsm,
- tell as ask,
+ ask,
+ tell ,
`last_value`,
ip.ins_result ip_ins_result,
state,
@@ -350,7 +317,7 @@
left join ins_product ip on isa.id = ip.ins_sample_id
left join ins_product_result ipr on ip.id = ipr.ins_product_id
where ins_order_id = #{id}
- and ip.standard_method_list_id is not null
+ and ip.standard_method_list_id is not null
and state = 1
</select>
@@ -431,6 +398,7 @@
and ip.son_laboratory = #{laboratory}
and ins_fiber_id is null
and ins_fibers_id is null
+ and standard_method_list_id is not null
</select>
<select id="getInsProduct2" resultMap="product">
select ip.id ip_id,
@@ -481,6 +449,7 @@
where ins_fibers_id = #{id}
and state = 1
and ins_fiber_id is null
+ and standard_method_list_id is not null
</select>
<select id="getInsProduct3" resultMap="product">
select ip.id ip_id,
@@ -531,6 +500,7 @@
where ins_fiber_id = #{id}
and state = 1
and ins_fibers_id is null
+ and standard_method_list_id is not null
</select>
<select id="getReportModel" resultType="java.util.Map">
</select>
@@ -668,6 +638,12 @@
code methodName
from ins_sample is2
inner join standard_method sm on standard_method_list_id = sm.id
- where is2.id=#{sampleId}
+ where is2.id = #{sampleId}
+ </select>
+
+ <select id="selMethodById" resultType="java.lang.String">
+ select code
+ from standard_method
+ where id = (select standard_method_list_id from ins_sample where id = #{sampleId})
</select>
</mapper>
--
Gitblit v1.9.3