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/InsOrderFileMapper.xml | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/inspect-server/src/main/resources/mapper/InsOrderFileMapper.xml b/inspect-server/src/main/resources/mapper/InsOrderFileMapper.xml
index eba5dc6..b9648dc 100644
--- a/inspect-server/src/main/resources/mapper/InsOrderFileMapper.xml
+++ b/inspect-server/src/main/resources/mapper/InsOrderFileMapper.xml
@@ -5,6 +5,7 @@
<resultMap id="BaseResultMap" type="com.yuanchu.mom.pojo.InsOrderFile">
<id column="id" property="id"/>
<result column="ins_order_id" property="insOrderId"/>
+ <result property="insSampleId" column="ins_sample_id" />
<result column="type" property="type"/>
<result column="file_url" property="fileUrl"/>
<result column="file_name" property="fileName"/>
@@ -21,8 +22,12 @@
left join user u on iof.create_user = u.id
where ins_order_id=#{insOrderId}
<if test="sonLaboratory!=null and sonLaboratory!=''">
- and son_laboratory=#{sonLaboratory}
- or son_laboratory is null
+ and (son_laboratory=#{sonLaboratory}
+ or son_laboratory is null)
+ </if>
+ <if test="sampleId!=null and sampleId!=''">
+ and (ins_sample_id=#{sampleId}
+ or ins_sample_id is null)
</if>
) A
<if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
--
Gitblit v1.9.3