From ec4be3ab73ccfcdc57a019ac146bd3147133b87d Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期五, 06 二月 2026 15:04:58 +0800
Subject: [PATCH] 【丽水】首次、再次随访人数调整

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

diff --git a/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml b/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
index a479da0..65db861 100644
--- a/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
@@ -567,6 +567,8 @@
         SUM(CASE WHEN DATE(visit_time) &lt; DATE(IFNULL(finishtime, NOW())) THEN 1 ELSE 0 END) / COUNT(*) as rate
         FROM service_subtask
         WHERE del_flag = 0
+        AND visit_time IS NOT NULL
+        AND finishtime IS NOT NULL
         <if test="orgid != null">AND orgid = #{orgid}</if>
         <if test="starttime == null and endtime==null">
             AND visit_time &lt; NOW()
@@ -1216,7 +1218,39 @@
 
     <select id="getSfStatistics" parameterType="com.smartor.domain.ServiceSubtaskCountReq"
             resultMap="ServiceSubtaskResult">
-        <include refid="selectServiceSubtaskVo"/>
+        select id,
+        visit_count,
+        is_visit_again,
+        type,
+        orgid,
+        drcode,
+        drname,
+        leavehospitaldistrictcode,
+        leavehospitaldistrictname,
+        deptcode,
+        deptname,
+        sendstate,
+        preachform,
+        excep,
+        nurse_id,
+        nurse_name,
+        taskid,
+        task_name,
+        visit_time,
+        finishtime,
+        endtime,
+        senddate,
+        suggest,
+        result,
+        templateid,
+        templatename,
+        patid,
+        sendname,
+        send_type,
+        recordid,
+        exrecallcount,
+        task_situation
+        from service_subtask
         where 1=1
         and del_flag = 0
         <if test="orgid != null and orgid != ''">

--
Gitblit v1.9.3