From 76fb5d8b5249d74a77ca3e44ca9cf98b57b31ace Mon Sep 17 00:00:00 2001
From: zhs <zhs18203887318@163.com>
Date: 星期五, 30 五月 2025 14:00:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml | 11 +++++++++++
1 files changed, 11 insertions(+), 0 deletions(-)
diff --git a/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml b/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
index e76a4e5..fe1048b 100644
--- a/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
@@ -79,6 +79,7 @@
<result property="visitCount" column="visit_count"/>
<result property="isVisitAgain" column="is_visit_again"/>
<result property="upid" column="upid"/>
+ <result property="visitTime" column="visit_time"/>
</resultMap>
<resultMap type="com.smartor.domain.ServiceSubtaskCount" id="ServiceSubtaskResult2">
@@ -94,6 +95,7 @@
task_guid,
patfrom,
upid,
+ visit_time,
inhospid,
visit_count,
is_visit_again,
@@ -299,6 +301,7 @@
<if test="createBy != null">and create_by = #{createBy}</if>
<if test="taskGuid != null">and task_guid = #{taskGuid}</if>
<if test="isVisitAgain != null">and is_visit_again = #{isVisitAgain}</if>
+ <if test="visitTime != null">and visit_time = #{visitTime}</if>
</where>
<if test="sort != null and sort==0">order by endtime asc</if>
<if test="sort != null and sort==1">order by endtime desc</if>
@@ -376,6 +379,7 @@
<if test="endtime != null ">and endtime = #{endtime}</if>
<if test="excep != null ">and excep = #{excep}</if>
<if test="nurseName != null ">and nurse_name = #{nurseName}</if>
+ <if test="visitTime != null ">and visit_time = #{visitTime}</if>
</where>
</select>
@@ -473,6 +477,7 @@
<if test="visitCount != null ">visit_count,</if>
<if test="isVisitAgain != null ">is_visit_again,</if>
<if test="upid != null ">upid,</if>
+ <if test="visit_time != null ">visitTime,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="sendname != null">#{sendname},</if>
@@ -551,6 +556,7 @@
<if test="visitCount != null ">#{visitCount},</if>
<if test="isVisitAgain != null ">#{isVisitAgain},</if>
<if test="upid != null ">#{upid},</if>
+ <if test="visitTime != null ">#{visitTime},</if>
</trim>
</insert>
@@ -634,6 +640,7 @@
<if test="visitCount != null ">visit_count=#{visitCount},</if>
<if test="isVisitAgain != null ">is_visit_again=#{isVisitAgain},</if>
<if test="upid != null ">upid=#{upid},</if>
+ <if test="visitTime != null ">visit_time=#{visitTime},</if>
</trim>
where id = #{id}
</update>
@@ -718,6 +725,7 @@
<if test="patguid != null ">patguid=#{patguid},</if>
<if test="isVisitAgain != null ">is_visit_again=#{isVisitAgain},</if>
<if test="upid != null ">upid=#{upid},</if>
+ <if test="visitTime != null ">visit_time=#{visitTime},</if>
</trim>
<where>
<if test="patid != null ">and patid = #{patid}</if>
@@ -804,6 +812,7 @@
<if test="taskGuid != null ">task_guid=#{taskGuid},</if>
<if test="patguid != null ">patguid=#{patguid},</if>
<if test="upid != null ">upid=#{upid},</if>
+ <if test="visitTime != null ">visit_time=#{visitTime},</if>
</trim>
where patid = #{patid} and taskid = #{taskid}
</update>
@@ -887,6 +896,7 @@
<if test="taskGuid != null ">task_guid=#{taskGuid},</if>
<if test="patguid != null ">patguid=#{patguid},</if>
<if test="upid != null ">upid=#{upid},</if>
+ <if test="visitTime != null ">visit_time=#{visitTime},</if>
</trim>
where task_guid = #{taskGuid} and task_name = #{taskName}
</update>
@@ -949,6 +959,7 @@
senderdetail,
type,
taskid,
+ visit_time,
templateid,
templatename,
senddate,
--
Gitblit v1.9.3