From 53da067c76ca7d4406b57c1a78565bd7b990868d Mon Sep 17 00:00:00 2001
From: 李林 <z1292839451@163.com>
Date: 星期五, 22 三月 2024 17:58:50 +0800
Subject: [PATCH] 功能大调整
---
inspect-server/src/main/resources/mapper/InsOrderMapper.xml | 22 ++++++++++++++++------
1 files changed, 16 insertions(+), 6 deletions(-)
diff --git a/inspect-server/src/main/resources/mapper/InsOrderMapper.xml b/inspect-server/src/main/resources/mapper/InsOrderMapper.xml
index 3a6a8cb..8bbe137 100644
--- a/inspect-server/src/main/resources/mapper/InsOrderMapper.xml
+++ b/inspect-server/src/main/resources/mapper/InsOrderMapper.xml
@@ -78,17 +78,27 @@
<select id="selectInsOrderPage" resultType="com.yuanchu.mom.dto.SampleOrderDto">
select *
from (
- select io.*,isa.id sampleId,isa.sample_code,isa.sample,isa.ins_progress,ir.id report_id,isa.send_time
- from ins_order io
- left join ins_sample isa on io.id = isa.ins_order_id
- left join (select id, ins_order_id, is_ratify
- from ins_report
- where is_ratify = 1) ir on io.id = ir.ins_order_id
+ SELECT
+ io.*,
+ ir.id report_id,
+ concat(ROUND((select count(*) from ins_sample isa2
+ where ins_state = 5 and isa2.ins_order_id = io.id) / (select count(*) from ins_sample isa2
+ where isa2.ins_order_id = io.id) * 100, 2), '%') insProgress
+ FROM
+ ins_order io
+ LEFT JOIN ins_sample isa ON io.id = isa.ins_order_id
+ LEFT JOIN ( SELECT id, ins_order_id, is_ratify FROM ins_report WHERE is_ratify = 1 ) ir ON io.id = ir.ins_order_id
+ GROUP BY
+ io.id
) a
<if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
${ew.customSqlSegment}
</if>
</select>
+ <select id="getLaboratoryCode" resultType="java.lang.String">
+ select laboratory_number from laboratory
+ where laboratory_name = #{name}
+ </select>
<update id="upInsOrderParameter" parameterType="com.yuanchu.mom.pojo.InsOrder">
UPDATE ins_order
--
Gitblit v1.9.3