From 3b16fd1b9c5f6a25141fdee61132f881bea35e40 Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期五, 17 七月 2026 17:38:09 +0800
Subject: [PATCH] 【景宁】JZ_ZY_LiQiang 离抢死亡标记

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

diff --git a/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml b/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
index f09a861..76e7d8d 100644
--- a/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
@@ -2636,7 +2636,6 @@
         <if test="longSendTime != null">
             AND DATE_FORMAT(long_send_time,'%y%m%d') &lt;= DATE_FORMAT(#{longSendTime},'%y%m%d')
         </if>
-                       //
         <if test="deptOrDistrict == 1">
             <if test="leavehospitaldistrictcodes != null and leavehospitaldistrictcodes.size() > 0">
                 AND leavehospitaldistrictcode IN
@@ -2879,7 +2878,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>
@@ -2956,10 +2955,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">

--
Gitblit v1.9.3