From 1f66eb9a6353d638f5b9cb33b934bd4705e4efed Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期三, 29 七月 2026 17:35:56 +0800
Subject: [PATCH] Merge branch 'master-任务组'
---
smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml b/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
index f2a3b85..49d4fda 100644
--- a/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
@@ -1504,6 +1504,8 @@
orgid,
drcode,
drname,
+ management_doctor_code,
+ management_doctor,
leavehospitaldistrictcode,
leavehospitaldistrictname,
deptcode,
@@ -2906,8 +2908,8 @@
<if test="sendstate != null">
AND sendstate = #{sendstate}
</if>
- <if test="isFinished != null and isFinished == '1'">
- AND finishtime is not null
+ <if test="isFinished != null and isFinished != ''">
+ and finishtime is not null
</if>
<if test="starttime != null">AND starttime >= #{starttime}</if>
<if test="endtime != null">AND endtime <= #{endtime}</if>
@@ -2955,7 +2957,7 @@
order by schedule_seq asc, id asc
</select>
- <select id="gethelibraryCountHyperlink" parameterType="com.smartor.domain.ServiceSubtaskCountReq"
+ <select id="gethelibraryCountHyperlink" parameterType="com.smartor.domain.VO.HeLibraryCountVO"
resultMap="ServiceSubtaskResult">
select id,
visit_count,
@@ -3005,8 +3007,8 @@
<if test="sendstate != null">
AND sendstate = #{sendstate}
</if>
- <if test="isFinished != null and isFinished == '1'">
- AND finishtime is not null
+ <if test="isFinished != null and isFinished != ''">
+ and finishtime is not null
</if>
<if test="hospitaldistrictcodes != null and hospitaldistrictcodes.size() > 0">
AND leavehospitaldistrictcode IN
--
Gitblit v1.9.3