From a0e46d75fd50924c8e9ac0cf24a8daa0471bbed2 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期三, 19 二月 2025 10:53:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml b/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
index 694d527..924ba33 100644
--- a/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
@@ -311,7 +311,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 +385,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 +463,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 +542,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>
@@ -622,7 +622,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 +701,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>
--
Gitblit v1.9.3