From 27df1079c1d230fab29f565f5209f2a02e0def8a Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期一, 20 七月 2026 16:56:51 +0800
Subject: [PATCH] 省立同德的功能

---
 smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml |   33 +++++++++++++++++++++------------
 1 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml b/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
index 70b2679..a2c1e63 100644
--- a/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
@@ -355,7 +355,7 @@
                 #{state}
             </foreach>
         </if>
-        <if test="subIdList != null  and sendstates.size() > 0">
+        <if test="subIdList != null  and subIdList.size() > 0">
             AND id IN
             <foreach collection="subIdList" item="subId" open="(" separator="," close=")">
                 #{subId}
@@ -385,7 +385,6 @@
         <if test="endSendDateTime != null">
             AND date_format(visit_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>
@@ -422,7 +421,8 @@
                          close=")">
                     #{leaveldeptcode}
                 </foreach>
-            </if>)
+            </if>
+            )
         </if>
         <if test="deptOrDistrict==3">
             AND (1=1
@@ -443,7 +443,6 @@
             </if>
             )
         </if>
-
         <if test="deptOrDistrict==4">
             AND (1=1
             <if test="leavehospitaldistrictcodes != null and leavehospitaldistrictcodes.size() > 0">
@@ -463,7 +462,6 @@
             </if>
             )
         </if>
-
         <if test="visitTime != null">
             AND date_format(visit_time,'%y%m%d') = date_format(#{visitTime},'%y%m%d')
         </if>
@@ -494,7 +492,6 @@
         <if test="libtemplateid != null ">and libtemplateid = #{libtemplateid}</if>
         <if test="libtemplatename != null ">and libtemplatename = #{libtemplatename}</if>
         <if test="openid != null ">and openid = #{openid}</if>
-        <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="taskName != null  and taskName != ''">and task_name like concat('%', #{taskName}, '%')</if>
@@ -1352,7 +1349,13 @@
             <if test="continueTimeNext != null ">continue_time_next = #{continueTimeNext,jdbcType=TIMESTAMP},</if>
             <if test="continueContent != null ">continue_content = #{continueContent},</if>
         </trim>
-        where patid = #{patid} and taskid = #{taskid}
+        where
+        <if test="patid != null ">
+            patid = #{patid}
+        </if>
+        <if test="taskid != null ">
+            and taskid = #{taskid}
+        </if>
         <if test="id != null ">
             and id = #{id}
         </if>
@@ -2508,8 +2511,8 @@
         SUM(CASE WHEN excep IS NOT NULL AND excep = '2' THEN 1 ELSE 0 END) AS jg,
         COUNT(1) as total
         FROM service_subtask
-        where 1=1
-        and del_flag = 0
+        where del_flag = 0
+        <if test="continueFlag != null ">and continue_flag = #{continueFlag}</if>
         <if test="sendname != null and sendname != ''">
             AND sendname LIKE CONCAT('%', #{sendname}, '%')
         </if>
@@ -2878,7 +2881,7 @@
         <if test="sendstate != null">
             AND sendstate = #{sendstate}
         </if>
-        <if test="isFinished != null and isFinished != '0'">
+        <if test="isFinished != null and isFinished == '1'">
             AND finishtime is not null
         </if>
         <if test="starttime != null">AND starttime &gt;= #{starttime}</if>
@@ -2955,10 +2958,10 @@
         <if test="orgid != null and orgid != ''">
             and orgid = #{orgid}
         </if>
-        <if test="sendstate != null and isFinished != '0'">
+        <if test="sendstate != null">
             AND sendstate = #{sendstate}
         </if>
-        <if test="isFinished != null">
+        <if test="isFinished != null and isFinished == '1'">
             AND finishtime is not null
         </if>
         <if test="hospitaldistrictcodes != null and hospitaldistrictcodes.size() > 0">
@@ -3020,6 +3023,12 @@
             #{taskId}
         </foreach>
         AND s.sendstate = 6
+      <if test="startOutHospTime != null">
+        AND date_format(s.endtime,'%y%m%d') &gt;= date_format(#{startOutHospTime},'%y%m%d')
+    </if>
+        <if test="endOutHospTime != null">
+            AND date_format(s.endtime,'%y%m%d') &lt;= date_format(#{endOutHospTime},'%y%m%d')
+        </if>
         GROUP BY
         t.taskid,
         d.questiontext,

--
Gitblit v1.9.3