From df13f27e9cae2d7b112ef0dda85cba456ecef32b Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期三, 26 二月 2025 16:45:09 +0800
Subject: [PATCH] 远场和近场的数据解析的单位和指标需要重新对应+报告生成放在复核结束里面
---
inspect-server/src/main/resources/mapper/InsOrderUserMapper.xml | 30 ++++++++++++++++++++++++++++--
1 files changed, 28 insertions(+), 2 deletions(-)
diff --git a/inspect-server/src/main/resources/mapper/InsOrderUserMapper.xml b/inspect-server/src/main/resources/mapper/InsOrderUserMapper.xml
index 697c500..85237a3 100644
--- a/inspect-server/src/main/resources/mapper/InsOrderUserMapper.xml
+++ b/inspect-server/src/main/resources/mapper/InsOrderUserMapper.xml
@@ -24,7 +24,7 @@
ios.laboratory sonLaboratory,
sample_code,
sample sampleName,
- IFNULL(TIMESTAMPDIFF(HOUR, iou.ins_time, submit_time), 0) AS hours
+ IFNULL(TIMESTAMPDIFF(MINUTE, iou.ins_time, submit_time), 0) AS hours
from ins_order_user iou
left join ins_order_state ios on iou.ins_order_state_id = ios.id
left join ins_sample isa on ios.ins_sample_id = isa.id
@@ -40,6 +40,32 @@
from ins_order_user iou
left join ins_order_state ios on iou.ins_order_state_id = ios.id
left join ins_sample isa on ios.ins_sample_id = isa.id
- where ios.id= #{id}
+ where 1=1
+ and ios.id in
+ <foreach collection="ids" open="(" close=")" item="id" separator=",">
+ #{id}
+ </foreach>
+ </select>
+
+
+ <resultMap id="InsReportDto1Map" type="com.yuanchu.mom.dto.InsReportDto1">
+ <id property="sampleId" column="sampleId" jdbcType="INTEGER"/>
+ <collection property="insReportDto2s" resultMap="insReportDto2s"/>
+ </resultMap>
+ <resultMap id="insReportDto2s" type="com.yuanchu.mom.dto.InsReportDto2">
+ <result column="laboratory" property="laboratory"/>
+ <result column="num" property="num"/>
+ <result column="insOrderUsersId" property="insOrderUsersId"/>
+ </resultMap>
+ <select id="selectInsReportDto1" resultMap="InsReportDto1Map">
+ select isa.id sampleId,
+ ios.laboratory ,
+ iou.num,
+ iou.id insOrderUsersId
+ from ins_sample isa
+ left join ins_order_state ios on isa.id = ios.ins_sample_id
+ left join ins_order_user iou on ios.id = iou.ins_order_state_id
+ where isa.ins_order_id=#{id}
+ order by isa.id,ios.laboratory
</select>
</mapper>
--
Gitblit v1.9.3