From 74bfaf2f3a8c2661e2c8a512f61f40bfd43b48f3 Mon Sep 17 00:00:00 2001
From: yxh <172933527@qq.com>
Date: 星期一, 17 二月 2025 18:54:19 +0800
Subject: [PATCH] Merge branch 'master' of http://116.62.18.175:6699/r/smartor
---
smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml | 91 +++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 90 insertions(+), 1 deletions(-)
diff --git a/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml b/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
index f636f09..4d04ed1 100644
--- a/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
@@ -38,6 +38,7 @@
<result property="orgid" column="orgid"/>
<result property="pid" column="pid"/>
<result property="guid" column="guid"/>
+ <result property="taskGuid" column="task_guid"/>
<result property="textParam" column="text_param"/>
<result property="preachform" column="preachform"/>
<result property="bedNo" column="bed_no"/>
@@ -85,6 +86,7 @@
<sql id="selectServiceSubtaskVo">
select id,
hosp_type,
+ task_guid,
patfrom,
inhospid,
suggest,
@@ -248,13 +250,14 @@
<if test="remark != null">and remark = #{remark}</if>
<if test="suggest != null">and suggest = #{suggest}</if>
<if test="createBy != null">and create_by = #{createBy}</if>
+ <if test="taskGuid != null">and task_guid = #{taskGuid}</if>
</where>
<if test="serviceType != null and serviceType != ''and serviceType != '2'and serviceType != '3'">order by
long_send_time desc
</if>
<if test="serviceType != null and serviceType != ''and serviceType == '2'">order by endtime desc</if>
<if test="serviceType != null and serviceType != ''and serviceType == '3'">order by admindate desc</if>
- -- order by update_time desc,id desc
+ <!-- order by update_time desc,id desc -->
</select>
<select id="selectServiceSubtaskById" parameterType="Long" resultMap="ServiceSubtaskResult">
@@ -336,6 +339,7 @@
<if test="sendstate != null ">sendstate,</if>
<if test="inhospid != null ">inhospid,</if>
<if test="patfrom != null ">patfrom,</if>
+ <if test="taskGuid != null ">task_guid,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="sendname != null">#{sendname},</if>
@@ -408,6 +412,7 @@
<if test="sendstate != null ">#{sendstate},</if>
<if test="inhospid != null ">#{inhospid},</if>
<if test="patfrom != null ">#{patfrom},</if>
+ <if test="taskGuid != null ">#{taskGuid},</if>
</trim>
</insert>
@@ -484,6 +489,7 @@
<if test="suggest != null ">suggest=#{suggest},</if>
<if test="inhospid != null ">inhospid=#{inhospid},</if>
<if test="patfrom != null ">patfrom=#{patfrom},</if>
+ <if test="taskGuid != null ">task_guid=#{taskGuid},</if>
</trim>
where id = #{id}
</update>
@@ -561,6 +567,7 @@
<if test="suggest != null ">suggest=#{suggest},</if>
<if test="inhospid != null ">inhospid=#{inhospid},</if>
<if test="patfrom != null ">patfrom=#{patfrom},</if>
+ <if test="taskGuid != null ">taskGuid=#{taskGuid},</if>
</trim>
where patid = #{patid} and taskid = #{taskid}
</update>
@@ -638,9 +645,90 @@
<if test="suggest != null ">suggest=#{suggest},</if>
<if test="inhospid != null ">inhospid=#{inhospid},</if>
<if test="patfrom != null ">patfrom=#{patfrom},</if>
+ <if test="taskGuid != null ">task_guid=#{taskGuid},</if>
</trim>
where patid = #{patid} and taskid = #{taskid}
</update>
+
+ <update id="updateServiceSubtaskByTaskGuid" parameterType="com.smartor.domain.ServiceSubtask">
+ update service_subtask
+ <trim prefix="SET" suffixOverrides=",">
+ <if test="sendname != null">sendname = #{sendname},</if>
+ <if test="phone != null">phone = #{phone},</if>
+ <if test="sex != null">sex = #{sex},</if>
+ <if test="sendstate != null ">sendstate = #{sendstate},</if>
+ <if test="age != null">age = #{age},</if>
+ <if test="sfzh != null">sfzh = #{sfzh},</if>
+ <if test="addr != null">addr = #{addr},</if>
+ <if test="senderdetail != null">senderdetail = #{senderdetail},</if>
+ <if test="type != null">type = #{type},</if>
+ <if test="taskid != null">taskid = #{taskid},</if>
+ <if test="templateid != null">templateid = #{templateid},</if>
+ <if test="templatename != null">templatename = #{templatename},</if>
+ <if test="senddate != null">senddate = #{senddate},</if>
+ <if test="senduuid != null">senduuid = #{senduuid},</if>
+ <if test="result != null">result = #{result},</if>
+ <if test="finishtime != null">finishtime = #{finishtime},</if>
+ <if test="recordid != null">recordid = #{recordid},</if>
+ <if test="exrecallcount != null">exrecallcount = #{exrecallcount},</if>
+ <if test="pulltime != null">pulltime = #{pulltime},</if>
+ <if test="deptcode != null">deptcode = #{deptcode},</if>
+ <if test="labelstatus != null">labelstatus = #{labelstatus},</if>
+ <if test="updateBy != null">update_by = #{updateBy},</if>
+ <if test="updateTime != null">update_time = #{updateTime},</if>
+ <if test="createBy != null">create_by = #{createBy},</if>
+ <if test="createTime != null">create_time = #{createTime},</if>
+ <if test="isupload != null">isupload = #{isupload},</if>
+ <if test="uploadTime != null">upload_time = #{uploadTime},</if>
+ <if test="orgid != null">orgid = #{orgid},</if>
+ <if test="pid != null">pid = #{pid},</if>
+ <if test="guid != null">guid = #{guid},</if>
+ <if test="textParam != null">text_param = #{textParam},</if>
+ <if test="preachform != null">preachform = #{preachform},</if>
+ <if test="bedNo != null">bed_no = #{bedNo},</if>
+ <if test="sendType != null and sendType != ''">send_type = #{sendType},</if>
+ <if test="taskName != null and taskName != ''">task_name = #{taskName},</if>
+ <if test="taskDesc != null and taskDesc != ''">task_desc = #{taskDesc},</if>
+ <if test="operatorNo != null and operatorNo != ''">operator_no = #{operatorNo},</if>
+ <if test="operator != null and operator != ''">operator = #{operator},</if>
+ <if test="hospType != null and hospType != ''">hosp_type = #{hospType},</if>
+ <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="deptname != null and deptname != ''">deptname = #{deptname},</if>
+ <if test="diagname != null and diagname != ''">diagname = #{diagname},</if>
+ <if test="libtemplateid != null ">libtemplateid = #{libtemplateid},</if>
+ <if test="libtemplatename != null ">libtemplatename = #{libtemplatename},</if>
+ <if test="patid != null ">patid = #{patid},</if>
+ <if test="openid != null ">openid = #{openid},</if>
+ <if test="longSendTime != null ">long_send_time = #{longSendTime},</if>
+ <if test="serviceType != null ">service_type = #{serviceType},</if>
+ <if test="score != null ">score = #{score},</if>
+ <if test="submit != null ">submit = #{submit},</if>
+ <if test="leavehospitaldistrictcode != null and leavehospitaldistrictcode != ''">leavehospitaldistrictcode
+ = #{leavehospitaldistrictcode},
+ </if>
+ <if test="leavehospitaldistrictname != null and leavehospitaldistrictname != ''">leavehospitaldistrictname
+ = #{leavehospitaldistrictname},
+ </if>
+ <if test="drname != null ">drname = #{drname},</if>
+ <if test="drcode != null ">drcode = #{drcode},</if>
+ <if test="endtime != null ">endtime = #{endtime},</if>
+ <if test="starttime != null ">starttime = #{starttime},</if>
+ <if test="excep != null ">excep = #{excep},</if>
+ <if test="nurseName != null ">nurse_name=#{nurseName},</if>
+ <if test="nurseId != null ">nurse_id=#{nurseId},</if>
+ <if test="remark != null ">remark=#{remark},</if>
+ <if test="suggest != null ">suggest=#{suggest},</if>
+ <if test="inhospid != null ">inhospid=#{inhospid},</if>
+ <if test="patfrom != null ">patfrom=#{patfrom},</if>
+ <if test="taskGuid != null ">task_guid=#{taskGuid},</if>
+ </trim>
+ where task_guid = #{taskGuid}
+ </update>
+
+
<update id="deleteServiceSubtaskById" parameterType="Long">
update service_subtask
@@ -749,6 +837,7 @@
remark,
inhospid,
patfrom,
+ task_guid,
diagname
FROM service_subtask,
JSON_TABLE(send_time_slot, '$[*]' COLUMNS (
--
Gitblit v1.9.3