From fce30cf9f7692d49c3d408475dfb72d289b1cd4f Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期五, 25 四月 2025 17:41:50 +0800
Subject: [PATCH] 代码提交

---
 smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml |  256 ++++++++++++++++++++++++++++++++++++++++++++------
 1 files changed, 222 insertions(+), 34 deletions(-)

diff --git a/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml b/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
index f636f09..e11d89f 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"/>
@@ -49,7 +50,8 @@
         <result property="hospno" column="hospno"/>
         <result property="hospType" column="hosp_type"/>
         <result property="wechat" column="wechat"/>
-        <result property="diagname" column="diagname"/>
+        <result property="leaveicd10code" column="leaveicd10code"/>
+        <result property="leavediagname" column="leavediagname"/>
         <result property="deptname" column="deptname"/>
         <result property="admindate" column="admindate"/>
         <result property="roomno" column="roomno"/>
@@ -73,6 +75,9 @@
         <result property="sendstate" column="sendstate"/>
         <result property="inhospid" column="inhospid"/>
         <result property="patfrom" column="patfrom"/>
+        <result property="patguid" column="patguid"/>
+        <result property="visitCount" column="visit_count"/>
+        <result property="isVisitAgain" column="is_visit_again"/>
     </resultMap>
 
     <resultMap type="com.smartor.domain.ServiceSubtaskCount" id="ServiceSubtaskResult2">
@@ -85,8 +90,12 @@
     <sql id="selectServiceSubtaskVo">
         select id,
                hosp_type,
+               task_guid,
                patfrom,
                inhospid,
+               visit_count,
+               is_visit_again,
+               patguid,
                suggest,
                sendstate,
                endtime,
@@ -151,7 +160,8 @@
                stop_state,
                leavehospitaldistrictcode,
                leavehospitaldistrictname,
-               diagname
+               leavediagname,
+               leaveicd10code
         from service_subtask
     </sql>
 
@@ -170,6 +180,7 @@
             </if>
             <if test="sex != null  and sex != ''">and sex = #{sex}</if>
             <if test="age != null ">and age = #{age}</if>
+            <if test="patguid != null ">and patguid = #{patguid}</if>
             <if test="subId != null ">and id = #{subId}</if>
             <if test="inhospid != null ">and inhospid = #{inhospid}</if>
             <if test="submit != null ">and submit = #{submit}</if>
@@ -191,22 +202,49 @@
             <if test="endOutHospTime != null">
                 AND date_format(endtime,'%y%m%d') &lt;= date_format(#{endOutHospTime},'%y%m%d')
             </if>
+            <if test="startSendDateTime != null">
+                AND date_format(long_send_time,'%y%m%d') &gt;= date_format(#{startSendDateTime},'%y%m%d')
+            </if>
+            <if test="endSendDateTime != null">
+                AND date_format(long_send_time,'%y%m%d') &lt;= date_format(#{endSendDateTime},'%y%m%d')
+            </if>
+
             <if test="longSendTime != null">
                 AND date_format(long_send_time,'%y%m%d') &lt;= date_format(#{longSendTime},'%y%m%d')
             </if>
-            <if test="leavehospitaldistrictcodes != null and leavehospitaldistrictcodes.size() > 0">
-                AND leavehospitaldistrictcode IN
-                <foreach collection="leavehospitaldistrictcodes" item="leavehospitaldistrictcode" open="(" separator=","
-                         close=")">
-                    #{leavehospitaldistrictcode}
-                </foreach>
+            <if test="deptOrDistrict==1">
+                <if test="leavehospitaldistrictcodes != null and leavehospitaldistrictcodes.size() > 0">
+                    AND leavehospitaldistrictcode IN
+                    <foreach collection="leavehospitaldistrictcodes" item="leavehospitaldistrictcode" open="("
+                             separator=","
+                             close=")">
+                        #{leavehospitaldistrictcode}
+                    </foreach>
+                </if>
+                <if test=" leaveldeptcodes != null and leaveldeptcodes.size()>0">
+                    AND deptcode IN
+                    <foreach collection="leaveldeptcodes" item="leaveldeptcode" open="(" separator=","
+                             close=")">
+                        #{leaveldeptcode}
+                    </foreach>
+                </if>
             </if>
-            <if test=" leaveldeptcodes != null and leaveldeptcodes.size()>0">
-                AND deptcode IN
-                <foreach collection="leaveldeptcodes" item="leaveldeptcode" open="(" separator=","
-                         close=")">
-                    #{leaveldeptcode}
-                </foreach>
+            <if test="deptOrDistrict==2">
+                <if test="leavehospitaldistrictcodes != null and leavehospitaldistrictcodes.size() > 0">
+                    AND (leavehospitaldistrictcode IN
+                    <foreach collection="leavehospitaldistrictcodes" item="leavehospitaldistrictcode" open="("
+                             separator=","
+                             close=")">
+                        #{leavehospitaldistrictcode}
+                    </foreach>
+                </if>
+                <if test=" leaveldeptcodes != null and leaveldeptcodes.size()>0">
+                    OR deptcode IN
+                    <foreach collection="leaveldeptcodes" item="leaveldeptcode" open="(" separator=","
+                             close="))">
+                        #{leaveldeptcode}
+                    </foreach>
+                </if>
             </if>
 
             <if test="senddate != null ">and senddate = #{senddate}</if>
@@ -238,23 +276,55 @@
             <if test="longSendTime != null ">and long_send_time = #{longSendTime}</if>
             <if test="sendstate != null ">and sendstate = #{sendstate}</if>
             <if test="drname != null  and drname != ''">and drname like concat('%', #{drname}, '%')</if>
-            <if test="drcode != null ">and drcode = #{drcode}</if>
+            <if test="taskName != null  and taskName != ''">and task_name like concat('%', #{taskName}, '%')</if>
+            <if test="drcode != null and drcode != ''">and (drcode = #{drcode}</if>
+            <if test="nurseId != null  and nurseId != ''">or nurse_id = #{nurseId})</if>
             <if test="starttime != null ">and starttime = #{starttime}</if>
             <if test="endtime != null ">and endtime = #{endtime}</if>
             <if test="excep != null ">and excep = #{excep}</if>
-            <if test="nurseId != null ">and nurse_id = #{nurseId}</if>
             <if test="nurseName != null ">and nurse_name = #{nurseName}</if>
             <if test="score != null">and score = #{score}</if>
+            <if test="visitCount != null">and visit_count = #{visitCount}</if>
             <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>
+            <if test="isVisitAgain != null">and is_visit_again = #{isVisitAgain}</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
+        <if test="sort != null  and sort==0">order by endtime asc</if>
+        <if test="sort != null  and sort==1">order by endtime desc</if>
+        <if test="sort != null  and sort==2">order by long_send_time asc</if>
+        <if test="sort != null  and sort==3">order by long_send_time desc</if>
+        <if test="sort != null  and sort==5">order by admindate asc</if>
+        <if test="sort != null  and sort==6">order by admindate desc</if>
+
+        <!-- order by update_time desc,id desc -->
+    </select>
+
+    <select id="selectServiceSubtaskListByCreateTime" parameterType="com.smartor.domain.ServiceSubtaskVO"
+            resultMap="ServiceSubtaskResult">
+        <include refid="selectServiceSubtaskVo"/>
+        <where>
+            del_flag=0
+            <if test="createStartTime != null  and createEndTime != null">and create_time BETWEEN #{createStartTime} AND
+                #{createEndTime}
+            </if>
+            <if test="createBy != null ">and create_by = #{createBy}</if>
+            <if test="sendname != null ">and sendname = #{sendname}</if>
+            <if test="sfzh != null ">and sfzh = #{sfzh}</if>
+            <if test="patguid != null ">and patguid = #{patguid}</if>
+            <if test="visitCount != null ">and visit_count = #{visitCount}</if>
+            <if test="isVisitAgain != null ">and is_visit_again = #{isVisitAgain}</if>
+        </where>
+
+    </select>
+
+    <select id="selectSendstateByCondition" parameterType="com.smartor.domain.ServiceSubtask" resultType="Integer">
+        SELECT b.sendstate
+        from service_task a
+                 JOIN service_subtask b on a.taskid = b.taskid and a.pat_cycle = 0 and b.del_flag = 0
+        where b.taskid = #{taskid}
+          and b.patid = #{patid}
     </select>
 
     <select id="selectServiceSubtaskById" parameterType="Long" resultMap="ServiceSubtaskResult">
@@ -307,9 +377,10 @@
             <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="diagname != null  and diagname != ''">diagname,</if>
+            <if test="leaveicd10code != null  and leaveicd10code != ''">leaveicd10code,</if>
+            <if test="leavediagname != null  and leavediagname != ''">leavediagname,</if>
             <if test="libtemplateid != null ">libtemplateid,</if>
             <if test="libtemplatename != null ">libtemplatename,</if>
             <if test="patid != null ">patid,</if>
@@ -336,6 +407,10 @@
             <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>
+            <if test="patguid != null ">patguid,</if>
+            <if test="visitCount != null ">visit_count,</if>
+            <if test="isVisitAgain != null ">is_visit_again,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="sendname != null">#{sendname},</if>
@@ -379,9 +454,10 @@
             <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="diagname != null  and diagname != ''">#{diagname},</if>
+            <if test="leaveicd10code != null  and leaveicd10code != ''">#{leaveicd10code},</if>
+            <if test="leavediagname != null  and leavediagname != ''">#{leavediagname},</if>
             <if test="libtemplateid != null ">#{libtemplateid},</if>
             <if test="libtemplatename != null ">#{libtemplatename},</if>
             <if test="patid != null ">#{patid},</if>
@@ -408,6 +484,10 @@
             <if test="sendstate != null ">#{sendstate},</if>
             <if test="inhospid != null ">#{inhospid},</if>
             <if test="patfrom != null ">#{patfrom},</if>
+            <if test="taskGuid != null ">#{taskGuid},</if>
+            <if test="patguid != null ">#{patguid},</if>
+            <if test="visitCount != null ">#{visitCount},</if>
+            <if test="isVisitAgain != null ">#{isVisitAgain},</if>
         </trim>
     </insert>
 
@@ -417,6 +497,7 @@
             <if test="sendname != null">sendname = #{sendname},</if>
             <if test="phone != null">phone = #{phone},</if>
             <if test="sex != null">sex = #{sex},</if>
+            <if test="delFlag != null">del_flag = #{delFlag},</if>
             <if test="age != null">age = #{age},</if>
             <if test="sfzh != null">sfzh = #{sfzh},</if>
             <if test="addr != null">addr = #{addr},</if>
@@ -455,9 +536,10 @@
             <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="diagname != null  and diagname != ''">diagname = #{diagname},</if>
+            <if test="leaveicd10code != null  and leaveicd10code != ''">leaveicd10code = #{leaveicd10code},</if>
+            <if test="leavediagname != null  and leavediagname != ''">leavediagname = #{leavediagname},</if>
             <if test="libtemplateid != null ">libtemplateid = #{libtemplateid},</if>
             <if test="libtemplatename != null ">libtemplatename = #{libtemplatename},</if>
             <if test="patid != null ">patid = #{patid},</if>
@@ -484,6 +566,10 @@
             <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>
+            <if test="patguid != null ">patguid=#{patguid},</if>
+            <if test="visitCount != null ">visit_count=#{visitCount},</if>
+            <if test="isVisitAgain != null ">is_visit_again=#{isVisitAgain},</if>
         </trim>
         where id = #{id}
     </update>
@@ -494,6 +580,7 @@
             <if test="sendname != null">sendname = #{sendname},</if>
             <if test="phone != null">phone = #{phone},</if>
             <if test="sex != null">sex = #{sex},</if>
+            <if test="delFlag != null">del_flag = #{delFlag},</if>
             <if test="age != null">age = #{age},</if>
             <if test="sfzh != null">sfzh = #{sfzh},</if>
             <if test="addr != null">addr = #{addr},</if>
@@ -532,9 +619,10 @@
             <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="diagname != null  and diagname != ''">diagname = #{diagname},</if>
+            <if test="leaveicd10code != null  and leaveicd10code != ''">leaveicd10code = #{leaveicd10code},</if>
+            <if test="leavediagname != null  and leavediagname != ''">leavediagname = #{leavediagname},</if>
             <if test="libtemplateid != null ">libtemplateid = #{libtemplateid},</if>
             <if test="libtemplatename != null ">libtemplatename = #{libtemplatename},</if>
             <if test="patid != null ">patid = #{patid},</if>
@@ -543,6 +631,7 @@
             <if test="sendstate != null ">sendstate = #{sendstate},</if>
             <if test="serviceType != null ">service_type = #{serviceType},</if>
             <if test="score != null ">score = #{score},</if>
+            <if test="visitCount != null ">visit_count = #{visitCount},</if>
             <if test="submit != null ">submit = #{submit},</if>
             <if test="leavehospitaldistrictcode != null  and leavehospitaldistrictcode != ''">leavehospitaldistrictcode
                 = #{leavehospitaldistrictcode},
@@ -561,8 +650,14 @@
             <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>
+            <if test="patguid != null ">patguid=#{patguid},</if>
+            <if test="isVisitAgain != null ">is_visit_again=#{isVisitAgain},</if>
         </trim>
-        where patid = #{patid} and taskid = #{taskid}
+        <where>
+            <if test="patid != null ">and patid = #{patid}</if>
+            <if test="taskid != null ">and taskid = #{taskid}</if>
+        </where>
     </update>
 
     <update id="updateServiceSubtaskByCondition" parameterType="com.smartor.domain.ServiceSubtask">
@@ -598,6 +693,8 @@
             <if test="orgid != null">orgid = #{orgid},</if>
             <if test="pid != null">pid = #{pid},</if>
             <if test="guid != null">guid = #{guid},</if>
+            <if test="visitCount != null">visit_count = #{visitCount},</if>
+            <if test="isVisitAgain != null">is_visit_again = #{isVisitAgain},</if>
             <if test="textParam != null">text_param = #{textParam},</if>
             <if test="preachform != null">preachform = #{preachform},</if>
             <if test="bedNo != null">bed_no = #{bedNo},</if>
@@ -610,9 +707,10 @@
             <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="diagname != null  and diagname != ''">diagname = #{diagname},</if>
+            <if test="leaveicd10code != null  and leaveicd10code != ''">leaveicd10code = #{leaveicd10code},</if>
+            <if test="leavediagname != null  and leavediagname != ''">leavediagname = #{leavediagname},</if>
             <if test="libtemplateid != null ">libtemplateid = #{libtemplateid},</if>
             <if test="libtemplatename != null ">libtemplatename = #{libtemplatename},</if>
             <if test="patid != null ">patid = #{patid},</if>
@@ -638,9 +736,94 @@
             <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>
+            <if test="patguid != null ">patguid=#{patguid},</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 ">admindate = #{admindate},</if>
+            <if test="visitCount != null ">visit_count = #{visitCount},</if>
+            <if test="isVisitAgain != null ">is_visit_again = #{isVisitAgain},</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>
+            <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>
+            <if test="patguid != null ">patguid=#{patguid},</if>
+        </trim>
+        where task_guid = #{taskGuid} and task_name = #{taskName}
+    </update>
+
 
     <update id="deleteServiceSubtaskById" parameterType="Long">
         update service_subtask
@@ -719,6 +902,8 @@
                upload_time,
                orgid,
                pid,
+               visit_count,
+               is_visit_again,
                guid,
                text_param,
                preachform,
@@ -749,7 +934,10 @@
                remark,
                inhospid,
                patfrom,
-               diagname
+               task_guid,
+               leavediagname,
+               patguid,
+               leaveicd10code
         FROM service_subtask,
              JSON_TABLE(send_time_slot, '$[*]' COLUMNS (
         begantime DATETIME PATH '$.begantime',

--
Gitblit v1.9.3