From af7dd07dc1521f3c0012e9e0eea836de3260f374 Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期一, 08 六月 2026 15:37:04 +0800
Subject: [PATCH] 【丽水】随访查询页面-统计调整 * total: 患者服务总量                      * wxsf: 无需随访数量 sendstate != 4                      * xsf: 需随访数量 sendstate = 4                      * dsf: 待随访数量 sendstate = 1L, 2L, 3L, 5L, 7L                      * ywc: 已完成数量 sendstate = 6L                      * yc: 异常数量 excep = '1'                      * yc: 警告数量 excep = '2'

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

diff --git a/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml b/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
index b77ca33..1927131 100644
--- a/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
@@ -2426,12 +2426,10 @@
     <!-- 浼樺寲鐨勭粺璁℃煡璇細鐩存帴鍦ㄦ暟鎹簱灞傚畬鎴愯仛鍚堣绠� -->
     <select id="countByCondition" parameterType="com.smartor.domain.entity.ServiceSubtaskEntity" resultType="map">
         SELECT
-        SUM(CASE WHEN sendstate = 4 THEN 1 ELSE 0 END) AS wzx,
-        SUM(CASE WHEN sendstate != 4 AND sendstate != 2 THEN 1 ELSE 0 END) AS ysf,
-        SUM(CASE WHEN sendstate = 5 THEN 1 ELSE 0 END) AS fssb,
-        SUM(CASE WHEN sendstate >= 3 OR sendstate = 1 THEN 1 ELSE 0 END) AS yfs,
-        SUM(CASE WHEN sendstate = 2 THEN 1 ELSE 0 END) AS dsf,
-        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 = 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,
         COUNT(1) as total

--
Gitblit v1.9.3