From 0892d843cd394f383ff50f480f7f22f2ec3829bc Mon Sep 17 00:00:00 2001
From: zhaowenxuan <chacca165@163.com>
Date: 星期五, 27 六月 2025 20:24:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ltkj-hosp/src/main/resources/mapper/TjOrderDetailMapper.xml | 17 ++++++++++++++++-
1 files changed, 16 insertions(+), 1 deletions(-)
diff --git a/ltkj-hosp/src/main/resources/mapper/TjOrderDetailMapper.xml b/ltkj-hosp/src/main/resources/mapper/TjOrderDetailMapper.xml
index 015eb72..5f53ba9 100644
--- a/ltkj-hosp/src/main/resources/mapper/TjOrderDetailMapper.xml
+++ b/ltkj-hosp/src/main/resources/mapper/TjOrderDetailMapper.xml
@@ -64,6 +64,21 @@
<include refid="selectTjOrderDetailVo"/>
where order_detail_id = #{orderDetailId}
</select>
+ <select id="getDetailByOrderIdAndParIds" resultType="com.ltkj.hosp.domain.TjOrderDetail">
+ SELECT CONCAT(t.update_by,',',p.pro_parent_id) AS update_by,
+ t.order_detail_id,t.order_id,t.pro_id,t.pro_type,t.stan_id,t.pro_result,t.pro_advice,t.tj_status,t.create_time,t.create_by,t.update_time,t.exception_desc,t.is_addition,t.is_return,t.flowing_water_id,t.is_sampling,t.result_type,t.yq_deadline,t.create_id,t.update_id,t.conclusion,t.advice,t.is_positive
+ FROM tj_order_detail t
+ JOIN(
+ SELECT pro_id,pro_parent_id
+ FROM tj_project
+ WHERE pro_parent_id IN
+ <foreach collection="proParentIds" item="proParentId" open="(" separator="," close=")">
+ #{proParentId}
+ </foreach>
+ ) p
+ ON t.pro_id = p.pro_id
+ WHERE t.order_id = #{orderId}
+ </select>
<insert id="insertTjOrderDetail" parameterType="TjOrderDetail">
insert into tj_order_detail
@@ -139,7 +154,7 @@
<delete id="deleteTjOrderDetailByOrderDetailId" parameterType="String">
delete
from tj_order_detail
- where order_detail_id = #{orderDetailId}
+ where order_id = #{orderDetailId}
</delete>
<delete id="deleteTjOrderDetailByOrderDetailIds" parameterType="String">
--
Gitblit v1.8.0