From 1ecb6109954d22e9be03518d64cdcfd89b599091 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期二, 02 六月 2026 18:20:11 +0800
Subject: [PATCH] 1.处理修改service_task时,子任务删除,未将出院数据还原的问题; 2.新增省立同德满意度接口 3.处理患者基本信息并发新增的问题

---
 smartor/src/main/resources/mapper/smartor/ServiceSubtaskDetailTraceMapper.xml |   45 +++++++++++++++++++++++++++++++++++++++++----
 1 files changed, 41 insertions(+), 4 deletions(-)

diff --git a/smartor/src/main/resources/mapper/smartor/ServiceSubtaskDetailTraceMapper.xml b/smartor/src/main/resources/mapper/smartor/ServiceSubtaskDetailTraceMapper.xml
index 3d10b0a..c3220e6 100644
--- a/smartor/src/main/resources/mapper/smartor/ServiceSubtaskDetailTraceMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/ServiceSubtaskDetailTraceMapper.xml
@@ -53,11 +53,15 @@
         <result property="pid" column="pid"/>
         <result property="categoryid" column="categoryid"/>
         <result property="templateType" column="template_type"/>
+        <result property="isMydException" column="is_myd_exception"/>
+        <result property="dimension" column="dimension"/>
     </resultMap>
 
     <sql id="selectServiceSubtaskDetailTtraceVo">
         select id,
                detail_id,
+               is_myd_exception,
+               dimension,
                template_type,
                sub_id,
                taskid,
@@ -108,7 +112,7 @@
         from service_subtask_detail_trace
     </sql>
 
-    <select id="selectServiceSubtaskDetailTtraceList" parameterType="com.smartor.domain.ServiceSubtaskDetailTrace"
+    <select id="selectServiceSubtaskDetailTtraceList" parameterType="com.smartor.domain.VO.ServiceSubtaskDetailTraceVO"
             resultMap="ServiceSubtaskDetailTtraceResult">
         <include refid="selectServiceSubtaskDetailTtraceVo"/>
         where del_flag=0
@@ -160,8 +164,14 @@
         <if test="valueType != null  and valueType != ''">
             and value_type = #{valueType}
         </if>
-        <if test="scriptid != null ">
+        <if test="scriptid != null and scriptids==null ">
             and scriptid = #{scriptid}
+        </if>
+        <if test="scriptids != null ">
+            and scriptid in
+            <foreach item="scriptid" collection="scriptids" open="(" separator="," close=")">
+                #{scriptid}
+            </foreach>
         </if>
         <if test="answerps != null  and answerps != ''">
             and answerps = #{answerps}
@@ -241,6 +251,12 @@
         <if test="type != null  and type != ''">
             and type = #{type}
         </if>
+        <if test="dimension != null  and dimension != ''">
+            and dimension = #{dimension}
+        </if>
+        <if test="isMydException != null ">
+            and is_myd_exception = #{isMydException}
+        </if>
     </select>
 
     <select id="tracedeallist" parameterType="com.smartor.domain.VO.DetailTraceDealVO"
@@ -268,9 +284,16 @@
         <if test="type != null  and type != ''">
             and type = #{type}
         </if>
+        <if test="templateType != null">
+            and template_type = #{templateType}
+        </if>
+        <if test="isMydException != null ">
+            and is_myd_exception = #{isMydException}
+        </if>
+        <if test="dimension != null  and dimension != ''">
+            and dimension = #{dimension}
+        </if>
     </select>
-
-
 
 
     <select id="selectServiceSubtaskDetailTtraceById" parameterType="Long"
@@ -379,6 +402,10 @@
             </if>
             <if test="templateType != null">template_type,
             </if>
+            <if test="dimension != null">dimension,
+            </if>
+            <if test="isMydException != null">is_myd_exception,
+            </if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="detailId != null">#{detailId},
@@ -476,6 +503,10 @@
             <if test="type != null">#{type},
             </if>
             <if test="templateType != null">#{templateType},
+            </if>
+            <if test="dimension != null">#{dimension},
+            </if>
+            <if test="isMydException != null">#{isMydException},
             </if>
         </trim>
     </insert>
@@ -627,6 +658,12 @@
             <if test="templateType != null">template_type =
                 #{templateType},
             </if>
+            <if test="dimension != null">dimension =
+                #{dimension},
+            </if>
+            <if test="isMydException != null">is_myd_exception =
+                #{isMydException},
+            </if>
         </trim>
         where id = #{id}
     </update>

--
Gitblit v1.9.3