From d9a9b46a9c95cc1fa135fbc333d8d3c216d9e7c1 Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期四, 30 七月 2026 14:50:01 +0800
Subject: [PATCH] 【丽水】手术随访调整

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

diff --git a/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml b/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
index d19b011..49d4fda 100644
--- a/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
@@ -486,6 +486,7 @@
         <if test="isupload != null ">and isupload = #{isupload}</if>
         <if test="uploadTime != null ">and upload_time = #{uploadTime}</if>
         <if test="orgid != null  and orgid != ''">and orgid = #{orgid}</if>
+        <if test="campusid != null  and campusid != ''">and campusid = #{campusid}</if>
         <if test="pid != null ">and pid = #{pid}</if>
         <if test="preachform != null ">and preachform = #{preachform}</if>
         <if test="currentPreachform != null ">and current_preachform = #{currentPreachform}</if>
@@ -1503,6 +1504,8 @@
         orgid,
         drcode,
         drname,
+        management_doctor_code,
+        management_doctor,
         leavehospitaldistrictcode,
         leavehospitaldistrictname,
         deptcode,
@@ -2525,7 +2528,8 @@
         SUM(CASE WHEN sendstate = 1 THEN 1 ELSE 0 END) AS blq,
         SUM(CASE WHEN sendstate = 4 THEN 1 ELSE 0 END) AS wxsf,
         SUM(CASE WHEN sendstate != 4 THEN 1 ELSE 0 END) AS xsf,
-        SUM(CASE WHEN (sendstate = 1 OR sendstate = 2 OR sendstate = 3 OR sendstate = 5 OR sendstate = 7 ) THEN 1 ELSE 0 END) AS dsf,
+        SUM(CASE WHEN (sendstate = 1 OR sendstate = 2 OR sendstate = 3 OR sendstate = 5 OR sendstate = 7 ) THEN 1 ELSE 0
+        END) AS dsf,
         SUM(CASE WHEN sendstate = 6 THEN 1 ELSE 0 END) AS ywc,
         SUM(CASE WHEN excep IS NOT NULL AND excep = '1' THEN 1 ELSE 0 END) AS yc,
         SUM(CASE WHEN excep IS NOT NULL AND excep = '2' THEN 1 ELSE 0 END) AS jg,
@@ -2688,6 +2692,9 @@
         </if>
         <if test="orgid != null and orgid != ''">
             AND orgid = #{orgid}
+        </if>
+        <if test="campusid != null and campusid != ''">
+            AND campusid = #{campusid}
         </if>
         <if test="guid != null and guid != ''">
             AND guid = #{guid}
@@ -2901,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 &gt;= #{starttime}</if>
         <if test="endtime != null">AND endtime &lt;= #{endtime}</if>
@@ -2950,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,
@@ -3000,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