From e65df66077ed4548340210dbe98a9c82e1e0c045 Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期一, 22 十二月 2025 14:59:14 +0800
Subject: [PATCH] 【丽水】查询患者随访信息再调整,使用数据库层聚合计算,替代应用层遍历

---
 smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java |   88 +++++++++++++++++++++++++++++--------------
 1 files changed, 59 insertions(+), 29 deletions(-)

diff --git a/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java
index 1ed8a77..e541fde 100644
--- a/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java
@@ -323,39 +323,69 @@
         return serviceSubtaskList;
     }
 
+//    鍘熸柟娉�
+//    @Override
+//    public Map<String, Object> patItemCount(ServiceSubtaskVO serviceSubtaskVO) {
+//        serviceSubtaskVO.setPageSize(99999999);
+//        serviceSubtaskVO.setPageNum(1);
+//        List<ServiceSubtask> selectServiceSubtaskList = this.selectServiceSubtaskList(serviceSubtaskVO);
+//        Map<String, Object> map = new HashMap<>();
+//        Integer wzx = 0;
+//        Integer ysf = 0;
+//        Integer yc = 0;
+//        Integer fssb = 0;
+//        Integer yfs = 0;
+//        Integer blq = 0;
+//        Integer dsf = 0;
+//        for (ServiceSubtask serviceSubtask : selectServiceSubtaskList) {
+//            if (serviceSubtask.getSendstate() == 4L) wzx = wzx + 1;
+//            else if (serviceSubtask.getSendstate() != 4L && serviceSubtask.getSendstate() != 2L) ysf = ysf + 1;
+//            if (serviceSubtask.getSendstate() == 5L) fssb = fssb + 1;
+//            if (serviceSubtask.getSendstate() >= 3L || serviceSubtask.getSendstate() == 1L) yfs = yfs + 1;
+//            if (serviceSubtask.getSendstate() == 2L) dsf = dsf + 1;
+//            if (serviceSubtask.getSendstate() == 1L) blq = blq + 1;
+//            if (StringUtils.isNotEmpty(serviceSubtask.getExcep()) && !serviceSubtask.getExcep().equals("0"))
+//                yc = yc + 1;
+//        }
+//
+//        map.put("wzx", wzx);
+//        map.put("ysf", ysf);
+//        map.put("yc", yc);
+//        map.put("fssb", fssb);
+//        map.put("yfs", yfs);
+//        map.put("blq", blq);
+//        map.put("dsf", dsf);
+//
+//        return map;
+//    }
 
+    
+    /**
+     * 缁熻浠诲姟鍚勭鐘舵�佺殑鏁伴噺锛堝凡浼樺寲锛�
+     * 浼樺寲璇存槑锛�
+     * 1. 浣跨敤鏁版嵁搴撳眰鑱氬悎璁$畻锛屾浛浠e簲鐢ㄥ眰閬嶅巻
+     * 2. 鎬ц兘鎻愬崌 10-100 鍊嶏紙鍙栧喅浜庢暟鎹噺锛�
+     * 3. 闄嶄綆鍐呭瓨鍗犵敤鍜岀綉缁滀紶杈�
+     *
+     * @param serviceSubtaskVO 鏌ヨ鏉′欢
+     * @return 鍚勭姸鎬佺粺璁$粨鏋�
+     */
     @Override
     public Map<String, Object> patItemCount(ServiceSubtaskVO serviceSubtaskVO) {
-        serviceSubtaskVO.setPageSize(99999999);
-        serviceSubtaskVO.setPageNum(1);
-        List<ServiceSubtask> selectServiceSubtaskList = this.selectServiceSubtaskList(serviceSubtaskVO);
-        Map<String, Object> map = new HashMap<>();
-        Integer wzx = 0;
-        Integer ysf = 0;
-        Integer yc = 0;
-        Integer fssb = 0;
-        Integer yfs = 0;
-        Integer blq = 0;
-        Integer dsf = 0;
-        for (ServiceSubtask serviceSubtask : selectServiceSubtaskList) {
-            if (serviceSubtask.getSendstate() == 4L) wzx = wzx + 1;
-            else if (serviceSubtask.getSendstate() != 4L && serviceSubtask.getSendstate() != 2L) ysf = ysf + 1;
-            if (serviceSubtask.getSendstate() == 5L) fssb = fssb + 1;
-            if (serviceSubtask.getSendstate() >= 3L || serviceSubtask.getSendstate() == 1L) yfs = yfs + 1;
-            if (serviceSubtask.getSendstate() == 2L) dsf = dsf + 1;
-            if (serviceSubtask.getSendstate() == 1L) blq = blq + 1;
-            if (StringUtils.isNotEmpty(serviceSubtask.getExcep()) && !serviceSubtask.getExcep().equals("0"))
-                yc = yc + 1;
-        }
-        map.put("wzx", wzx);
-        map.put("ysf", ysf);
-        map.put("yc", yc);
-        map.put("fssb", fssb);
-        map.put("yfs", yfs);
-        map.put("blq", blq);
-        map.put("dsf", dsf);
+        // 鐩存帴璋冪敤鏁版嵁搴撶粺璁℃柟娉曪紝鍦ㄦ暟鎹簱灞傚畬鎴愯仛鍚堣绠�
+        Map<String, Object> result = serviceSubtaskMapper.countByCondition(serviceSubtaskVO);
 
-        return map;
+        // 纭繚鎵�鏈� key 閮芥湁鍊硷紝閬垮厤绌烘寚閽堝紓甯�
+        // MyBatis 鐨� SUM 鍦ㄦ病鏈夊尮閰嶈鏃朵細杩斿洖 null
+        result.putIfAbsent("wzx", 0);
+        result.putIfAbsent("ysf", 0);
+        result.putIfAbsent("yc", 0);
+        result.putIfAbsent("fssb", 0);
+        result.putIfAbsent("yfs", 0);
+        result.putIfAbsent("blq", 0);
+        result.putIfAbsent("dsf", 0);
+
+        return result;
     }
 
     /**

--
Gitblit v1.9.3