From 608bdb9e55b95e9d4052f8c57ac4d92c9ecde5c3 Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期四, 02 七月 2026 17:17:20 +0800
Subject: [PATCH] 【市一】任务组调试

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

diff --git a/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml b/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
index 746a630..4899c45 100644
--- a/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
@@ -94,6 +94,10 @@
         <result property="continueCount" column="continue_count"/>
         <result property="continueTimeNext" column="continue_time_next"/>
         <result property="operationItemId" column="operation_item_id"/>
+        <result property="scheduleId" column="schedule_id"/>
+        <result property="scheduleDetailId" column="schedule_detail_id"/>
+        <result property="scheduleSeq" column="schedule_seq"/>
+        <result property="loopCount" column="loop_count"/>
     </resultMap>
 
     <resultMap type="com.smartor.domain.ServiceSubtaskCount" id="ServiceSubtaskResult2">
@@ -238,6 +242,10 @@
                continue_count,
                continue_time_next,
                operation_item_id,
+               schedule_id,
+               schedule_detail_id,
+               schedule_seq,
+               loop_count,
                task_situation
         from service_subtask
     </sql>
@@ -858,6 +866,12 @@
         <if test="continueTimeNow != null ">and continue_time_now = #{continueTimeNow,jdbcType=TIMESTAMP}</if>
         <if test="continueCount != null ">and continue_count = #{continueCount}</if>
         <if test="continueTimeNext != null ">and continue_time_next = #{continueTimeNext}</if>
+        <if test="startOutHospTime != null">
+            AND date_format(endtime,'%y%m%d') &gt;= date_format(#{startOutHospTime},'%y%m%d')
+        </if>
+        <if test="endOutHospTime != null">
+            AND date_format(endtime,'%y%m%d') &lt;= date_format(#{endOutHospTime},'%y%m%d')
+        </if>
         GROUP BY sendname,sendstate,starttime,endtime,nurse_name,phone,sex,task_name,leavediagname,visit_time
         ORDER BY sendname,visit_time
         <if test="pageSize != null  and pageNum != null">limit ${pageSize} OFFSET ${pageNum}</if>
@@ -957,6 +971,10 @@
             <if test="continueTimeNext != null ">continue_time_next,</if>
             <if test="continueContent != null ">continue_content,</if>
             <if test="operationItemId != null ">operation_item_id,</if>
+            <if test="scheduleId != null ">schedule_id,</if>
+            <if test="scheduleDetailId != null ">schedule_detail_id,</if>
+            <if test="scheduleSeq != null ">schedule_seq,</if>
+            <if test="loopCount != null ">loop_count,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="sendname != null">#{sendname},</if>
@@ -1049,6 +1067,10 @@
             <if test="continueTimeNext != null ">#{continueTimeNext,jdbcType=TIMESTAMP},</if>
             <if test="continueContent != null ">#{continueContent},</if>
             <if test="operationItemId != null ">#{operationItemId},</if>
+            <if test="scheduleId != null ">#{scheduleId},</if>
+            <if test="scheduleDetailId != null ">#{scheduleDetailId},</if>
+            <if test="scheduleSeq != null ">#{scheduleSeq},</if>
+            <if test="loopCount != null ">#{loopCount},</if>
         </trim>
     </insert>
 
@@ -1146,6 +1168,10 @@
             <if test="continueTimeNext != null ">continue_time_next = #{continueTimeNext,jdbcType=TIMESTAMP},</if>
             <if test="continueContent != null ">continue_content = #{continueContent},</if>
             <if test="operationItemId != null ">operation_item_id = #{operationItemId},</if>
+            <if test="scheduleId != null ">schedule_id = #{scheduleId},</if>
+            <if test="scheduleDetailId != null ">schedule_detail_id = #{scheduleDetailId},</if>
+            <if test="scheduleSeq != null ">schedule_seq = #{scheduleSeq},</if>
+            <if test="loopCount != null ">loop_count = #{loopCount},</if>
         </trim>
         where id = #{id}
     </update>
@@ -2890,5 +2916,24 @@
         </choose>
     </select>
 
+    <!-- 浠诲姟缁勶紙appltype=5锛夋粴鍔ㄨ皟搴︾敤锛氭湰杞粛鍦ㄨ窇鐨勬暟閲� -->
+    <select id="countActiveByScheduleIdAndLoop" resultType="int">
+        select count(1)
+        from service_subtask
+        where schedule_id = #{scheduleId}
+          and loop_count = #{loopCount}
+          and (del_flag is null or del_flag = '0')
+          and sendstate in (1, 2, 3)
+    </select>
+
+    <!-- 浠诲姟缁勶紙appltype=5锛夋粴鍔ㄨ皟搴︾敤锛氭媺鏈疆鍏ㄩ噺 subtask锛屼綔涓轰笅涓�杞殑鍏嬮殕妯℃澘 -->
+    <select id="selectByScheduleIdAndLoop" resultMap="ServiceSubtaskResult">
+        <include refid="selectServiceSubtaskVo"/>
+        where schedule_id = #{scheduleId}
+          and loop_count = #{loopCount}
+          and (del_flag is null or del_flag = '0')
+        order by schedule_seq asc, id asc
+    </select>
+
 </mapper>
 

--
Gitblit v1.9.3