From d866e43afbe901bfc640776e02f767b9045acbc2 Mon Sep 17 00:00:00 2001
From: 赵文轩 <1652863494@qq.com>
Date: 星期三, 12 六月 2024 09:04:56 +0800
Subject: [PATCH] Merge branch 'master' of http://101.42.27.146:5001/r/ltkj_peis
---
ltkj-hosp/src/main/resources/mapper/TjOrderDetailMapper.xml | 21 ++++++++++++++++++++-
1 files changed, 20 insertions(+), 1 deletions(-)
diff --git a/ltkj-hosp/src/main/resources/mapper/TjOrderDetailMapper.xml b/ltkj-hosp/src/main/resources/mapper/TjOrderDetailMapper.xml
index 4570b3e..2a6c481 100644
--- a/ltkj-hosp/src/main/resources/mapper/TjOrderDetailMapper.xml
+++ b/ltkj-hosp/src/main/resources/mapper/TjOrderDetailMapper.xml
@@ -25,6 +25,7 @@
<result property="isSampling" column="is_sampling"/>
<result property="conclusion" column="conclusion"/>
<result property="advice" column="advice"/>
+ <result property="isPositive" column="is_positive"/>
</resultMap>
<sql id="selectTjOrderDetailVo">
@@ -46,7 +47,7 @@
is_return,
flowing_water_id,
is_sampling,
- conclusion,advice
+ conclusion,advice,is_positive
from tj_order_detail
</sql>
@@ -62,6 +63,21 @@
<select id="selectTjOrderDetailByOrderDetailId" parameterType="String" resultMap="TjOrderDetailResult">
<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">
@@ -85,6 +101,7 @@
<if test="isSampling != null">is_sampling,</if>
<if test="conclusion != null">conclusion,</if>
<if test="advice != null">advice,</if>
+ <if test="isPositive != null">is_positive,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="orderDetailId != null">#{orderDetailId},</if>
@@ -105,6 +122,7 @@
<if test="isSampling != null">#{is_sampling},</if>
<if test="conclusion != null">#{conclusion},</if>
<if test="advice != null">#{advice},</if>
+ <if test="isPositive != null">#{is_positive},</if>
</trim>
</insert>
@@ -128,6 +146,7 @@
<if test="isSampling != null">is_sampling = #{isSampling},</if>
<if test="conclusion != null">conclusion = #{conclusion},</if>
<if test="advice != null">advice = #{advice},</if>
+ <if test="isPositive != null">is_positive = #{isPositive},</if>
</trim>
where order_detail_id = #{orderDetailId}
</update>
--
Gitblit v1.8.0