From 1468abbfadd8ba623c85e0c871aade69607ce085 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期二, 25 二月 2025 14:24:54 +0800
Subject: [PATCH] 代码提交
---
smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml | 21 +++++++++++----------
1 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml b/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
index 694d527..547a221 100644
--- a/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
@@ -154,7 +154,8 @@
stop_state,
leavehospitaldistrictcode,
leavehospitaldistrictname,
- leavediagname,leaveicd10code
+ leavediagname,
+ leaveicd10code
from service_subtask
</sql>
@@ -311,7 +312,7 @@
<if test="hospno != null and hospno != ''">hospno,</if>
<if test="wechat != null and wechat != ''">wechat,</if>
<if test="roomno != null and roomno != ''">roomno,</if>
- <if test="admindate != null and admindate != ''">admindate,</if>
+ <if test="admindate != null">admindate,</if>
<if test="deptname != null and deptname != ''">deptname,</if>
<if test="leaveicd10code != null and leaveicd10code != ''">leaveicd10code,</if>
<if test="leavediagname != null and leavediagname != ''">leavediagname,</if>
@@ -385,7 +386,7 @@
<if test="hospno != null and hospno != ''">#{hospno},</if>
<if test="wechat != null and wechat != ''">#{wechat},</if>
<if test="roomno != null and roomno != ''">#{roomno},</if>
- <if test="admindate != null and admindate != ''">#{admindate},</if>
+ <if test="admindate != null ">#{admindate},</if>
<if test="deptname != null and deptname != ''">#{deptname},</if>
<if test="leaveicd10code != null and leaveicd10code != ''">#{leaveicd10code},</if>
<if test="leavediagname != null and leavediagname != ''">#{leavediagname},</if>
@@ -463,7 +464,7 @@
<if test="hospno != null and hospno != ''">hospno = #{hospno},</if>
<if test="wechat != null and wechat != ''">wechat = #{wechat},</if>
<if test="roomno != null and roomno != ''">roomno = #{roomno},</if>
- <if test="admindate != null and admindate != ''">admindate = #{admindate},</if>
+ <if test="admindate != null ">admindate = #{admindate},</if>
<if test="deptname != null and deptname != ''">deptname = #{deptname},</if>
<if test="leaveicd10code != null and leaveicd10code != ''">leaveicd10code = #{leaveicd10code},</if>
<if test="leavediagname != null and leavediagname != ''">leavediagname = #{leavediagname},</if>
@@ -542,7 +543,7 @@
<if test="hospno != null and hospno != ''">hospno = #{hospno},</if>
<if test="wechat != null and wechat != ''">wechat = #{wechat},</if>
<if test="roomno != null and roomno != ''">roomno = #{roomno},</if>
- <if test="admindate != null and admindate != ''">admindate = #{admindate},</if>
+ <if test="admindate != null">admindate = #{admindate},</if>
<if test="deptname != null and deptname != ''">deptname = #{deptname},</if>
<if test="leaveicd10code != null and leaveicd10code != ''">leaveicd10code = #{leaveicd10code},</if>
<if test="leavediagname != null and leavediagname != ''">leavediagname = #{leavediagname},</if>
@@ -574,7 +575,8 @@
<if test="patfrom != null ">patfrom=#{patfrom},</if>
<if test="taskGuid != null ">taskGuid=#{taskGuid},</if>
</trim>
- where patid = #{patid} and taskid = #{taskid}
+ <if test="patid != null ">and patid = #{patid}</if>
+ <if test="taskid != null ">and taskid = #{taskid}</if>
</update>
<update id="updateServiceSubtaskByCondition" parameterType="com.smartor.domain.ServiceSubtask">
@@ -622,7 +624,7 @@
<if test="hospno != null and hospno != ''">hospno = #{hospno},</if>
<if test="wechat != null and wechat != ''">wechat = #{wechat},</if>
<if test="roomno != null and roomno != ''">roomno = #{roomno},</if>
- <if test="admindate != null and admindate != ''">admindate = #{admindate},</if>
+ <if test="admindate != null">admindate = #{admindate},</if>
<if test="deptname != null and deptname != ''">deptname = #{deptname},</if>
<if test="leaveicd10code != null and leaveicd10code != ''">leaveicd10code = #{leaveicd10code},</if>
<if test="leavediagname != null and leavediagname != ''">leavediagname = #{leavediagname},</if>
@@ -701,7 +703,7 @@
<if test="hospno != null and hospno != ''">hospno = #{hospno},</if>
<if test="wechat != null and wechat != ''">wechat = #{wechat},</if>
<if test="roomno != null and roomno != ''">roomno = #{roomno},</if>
- <if test="admindate != null and admindate != ''">admindate = #{admindate},</if>
+ <if test="admindate != null ">admindate = #{admindate},</if>
<if test="deptname != null and deptname != ''">deptname = #{deptname},</if>
<if test="leaveicd10code != null and leaveicd10code != ''">leaveicd10code = #{leaveicd10code},</if>
<if test="leavediagname != null and leavediagname != ''">leavediagname = #{leavediagname},</if>
@@ -732,9 +734,8 @@
<if test="patfrom != null ">patfrom=#{patfrom},</if>
<if test="taskGuid != null ">task_guid=#{taskGuid},</if>
</trim>
- where task_guid = #{taskGuid}
+ where task_guid = #{taskGuid} and task_name = #{taskName}
</update>
-
<update id="deleteServiceSubtaskById" parameterType="Long">
--
Gitblit v1.9.3