From 44f899cf5f435f2c7cd39e1a04c1d2bb2a8b888e Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期一, 25 五月 2026 17:58:22 +0800
Subject: [PATCH] 【丽水】超链接影响查询

---
 ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskController.java |    3 
 smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java            |  239 +++++++++++++++++++++++++++--------------------
 2 files changed, 138 insertions(+), 104 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskController.java
index 0e34fb3..78df8b0 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskController.java
@@ -657,7 +657,8 @@
             log.error(logInfo);
             return error(logInfo);
         }
-        return success(serviceSubtaskService.getSfStatisticsScript(serviceSubtaskCountReq));
+        List<ServiceSubtaskStatistic> serviceSubtaskStatistics = serviceSubtaskService.getSfStatisticsScript(serviceSubtaskCountReq);
+        return success(serviceSubtaskStatistics);
     }
 
     @ApiOperation("鑾峰彇闅忚鍒嗙被缁熻鏄庣粏璇︽儏")
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 2bc4f4a..a6a8563 100644
--- a/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java
@@ -3578,10 +3578,10 @@
         serviceSubtaskStatistic.setLeavehospitaldistrictcode(serviceSubtaskList.get(0).getLeavehospitaldistrictcode());
         serviceSubtaskStatistic.setDrcode(serviceSubtaskList.get(0).getDrcode());
         serviceSubtaskStatistic.setDrname(serviceSubtaskList.get(0).getDrname());
-        //鍑洪櫌浜烘
-        serviceSubtaskStatistic.setDischargeCount(serviceSubtaskList.size());
-        //鍑洪櫌浜烘璇︽儏
-        serviceSubtaskStatistic.setDischargeCountInfo(serviceSubtaskList);
+//        //鍑洪櫌浜烘
+//        serviceSubtaskStatistic.setDischargeCount(serviceSubtaskList.size());
+//        //鍑洪櫌浜烘璇︽儏
+//        serviceSubtaskStatistic.setDischargeCountInfo(serviceSubtaskList);
         serviceSubtaskStatistic.setJoyCount(0);
         serviceSubtaskStatistic.setJoyAllCount(0);
 
@@ -3590,48 +3590,48 @@
             subCounts = new ArrayList<>();
         }
 
-        //鏃犻渶闅忚璇︽儏
-        List<ServiceSubtask> nonFollowUpInfo = new ArrayList<>();
-        //搴旈殢璁胯鎯�
-        List<ServiceSubtask> followUpNeededAllInfo = new ArrayList<>();
-        //璁板綍棣栨搴旈殢璁胯鎯�
-        List<ServiceSubtask> needFollowUpInfo = new ArrayList<>();
-        //璁板綍棣栨寰呴殢璁胯鎯�
-        List<ServiceSubtask> pendingFollowUpInfo = new ArrayList<>();
-        //璁板綍棣栨闅忚鎴愬姛璇︽儏
-        List<ServiceSubtask> followUpSuccessInfo = new ArrayList<>();
-        //璁板綍棣栨闅忚澶辫触璇︽儏
-        List<ServiceSubtask> followUpFailInfo = new ArrayList<>();
-        //璁板綍棣栨闅忚浜哄伐璇︽儏
-        List<ServiceSubtask> manualInfo = new ArrayList<>();
-        //璁板綍棣栨闅忚璇煶璇︽儏
-        List<ServiceSubtask> voiceInfo = new ArrayList<>();
-        //璁板綍棣栨闅忚鐭俊璇︽儏
-        List<ServiceSubtask> smsInfo = new ArrayList<>();
-        //璁板綍棣栨闅忚寰俊璇︽儏
-        List<ServiceSubtask> wechatInfo = new ArrayList<>();
-
-        //璁板綍棣栨缁撴灉寮傚父璇︽儏
-        List<ServiceSubtask> abnormalInfo = new ArrayList<>();
-
-        //璁板綍鍐嶆搴旈殢璁胯鎯�
-        List<ServiceSubtask> needFollowUpAgainInfo = new ArrayList<>();
-        //璁板綍鍐嶆寰呴殢璁胯鎯�
-        List<ServiceSubtask> pendingFollowUpAgainInfo = new ArrayList<>();
-        //璁板綍鍐嶆闅忚鎴愬姛璇︽儏
-        List<ServiceSubtask> followUpSuccessAgainInfo = new ArrayList<>();
-        //璁板綍鍐嶆闅忚澶辫触璇︽儏
-        List<ServiceSubtask> followUpFailAgainInfo = new ArrayList<>();
-        //璁板綍鍐嶆闅忚浜哄伐璇︽儏
-        List<ServiceSubtask> manualAgainInfo = new ArrayList<>();
-        //璁板綍鍐嶆闅忚璇煶璇︽儏
-        List<ServiceSubtask> voiceAgainInfo = new ArrayList<>();
-        //璁板綍鍐嶆闅忚鐭俊璇︽儏
-        List<ServiceSubtask> smsAgainInfo = new ArrayList<>();
-        //璁板綍鍐嶆闅忚寰俊璇︽儏
-        List<ServiceSubtask> wechatAgainInfo = new ArrayList<>();
-        //璁板綍鍐嶆缁撴灉寮傚父璇︽儏
-        List<ServiceSubtask> abnormalAgainInfo = new ArrayList<>();
+//        //鏃犻渶闅忚璇︽儏
+//        List<ServiceSubtask> nonFollowUpInfo = new ArrayList<>();
+//        //搴旈殢璁胯鎯�
+//        List<ServiceSubtask> followUpNeededAllInfo = new ArrayList<>();
+//        //璁板綍棣栨搴旈殢璁胯鎯�
+//        List<ServiceSubtask> needFollowUpInfo = new ArrayList<>();
+//        //璁板綍棣栨寰呴殢璁胯鎯�
+//        List<ServiceSubtask> pendingFollowUpInfo = new ArrayList<>();
+//        //璁板綍棣栨闅忚鎴愬姛璇︽儏
+//        List<ServiceSubtask> followUpSuccessInfo = new ArrayList<>();
+//        //璁板綍棣栨闅忚澶辫触璇︽儏
+//        List<ServiceSubtask> followUpFailInfo = new ArrayList<>();
+//        //璁板綍棣栨闅忚浜哄伐璇︽儏
+//        List<ServiceSubtask> manualInfo = new ArrayList<>();
+//        //璁板綍棣栨闅忚璇煶璇︽儏
+//        List<ServiceSubtask> voiceInfo = new ArrayList<>();
+//        //璁板綍棣栨闅忚鐭俊璇︽儏
+//        List<ServiceSubtask> smsInfo = new ArrayList<>();
+//        //璁板綍棣栨闅忚寰俊璇︽儏
+//        List<ServiceSubtask> wechatInfo = new ArrayList<>();
+//
+//        //璁板綍棣栨缁撴灉寮傚父璇︽儏
+//        List<ServiceSubtask> abnormalInfo = new ArrayList<>();
+//
+//        //璁板綍鍐嶆搴旈殢璁胯鎯�
+//        List<ServiceSubtask> needFollowUpAgainInfo = new ArrayList<>();
+//        //璁板綍鍐嶆寰呴殢璁胯鎯�
+//        List<ServiceSubtask> pendingFollowUpAgainInfo = new ArrayList<>();
+//        //璁板綍鍐嶆闅忚鎴愬姛璇︽儏
+//        List<ServiceSubtask> followUpSuccessAgainInfo = new ArrayList<>();
+//        //璁板綍鍐嶆闅忚澶辫触璇︽儏
+//        List<ServiceSubtask> followUpFailAgainInfo = new ArrayList<>();
+//        //璁板綍鍐嶆闅忚浜哄伐璇︽儏
+//        List<ServiceSubtask> manualAgainInfo = new ArrayList<>();
+//        //璁板綍鍐嶆闅忚璇煶璇︽儏
+//        List<ServiceSubtask> voiceAgainInfo = new ArrayList<>();
+//        //璁板綍鍐嶆闅忚鐭俊璇︽儏
+//        List<ServiceSubtask> smsAgainInfo = new ArrayList<>();
+//        //璁板綍鍐嶆闅忚寰俊璇︽儏
+//        List<ServiceSubtask> wechatAgainInfo = new ArrayList<>();
+//        //璁板綍鍐嶆缁撴灉寮傚父璇︽儏
+//        List<ServiceSubtask> abnormalAgainInfo = new ArrayList<>();
 
 
         for (ServiceSubtask serviceSubtask : serviceSubtaskList) {
@@ -3647,31 +3647,31 @@
             //鏃犻渶闅忚浜烘
             if (serviceSubtask.getSendstate() != null && serviceSubtask.getSendstate() == 4) {
                 serviceSubtaskStatistic.setNonFollowUp(serviceSubtaskStatistic.getNonFollowUp() + 1L);
-                nonFollowUpInfo.add(serviceSubtask);
+//                nonFollowUpInfo.add(serviceSubtask);
             }
             //搴旈殢璁夸汉娆�
             if (serviceSubtask.getSendstate() != null && serviceSubtask.getSendstate() != 4) {
                 serviceSubtaskStatistic.setFollowUpNeeded(serviceSubtaskStatistic.getFollowUpNeeded() + 1L);
-                followUpNeededAllInfo.add(serviceSubtask);
+//                followUpNeededAllInfo.add(serviceSubtask);
             }
 
             //棣栨鍑洪櫌闅忚
             if (serviceSubtask.getVisitCount() != null && serviceSubtask.getVisitCount() == 1) {
                 if (serviceSubtask.getSendstate() != null && serviceSubtask.getSendstate() != 4) {
                     serviceSubtaskStatistic.setNeedFollowUp(serviceSubtaskStatistic.getNeedFollowUp() + 1L);
-                    needFollowUpInfo.add(serviceSubtask);
+//                    needFollowUpInfo.add(serviceSubtask);
                 }
                 if (serviceSubtask.getSendstate() != null && serviceSubtask.getSendstate() == 2) {
                     serviceSubtaskStatistic.setPendingFollowUp(serviceSubtaskStatistic.getPendingFollowUp() + 1L);
-                    pendingFollowUpInfo.add(serviceSubtask);
+//                    pendingFollowUpInfo.add(serviceSubtask);
                 }
                 if (serviceSubtask.getSendstate() != null && (serviceSubtask.getSendstate() == 6)) {
                     serviceSubtaskStatistic.setFollowUpSuccess(serviceSubtaskStatistic.getFollowUpSuccess() + 1L);
-                    followUpSuccessInfo.add(serviceSubtask);
+//                    followUpSuccessInfo.add(serviceSubtask);
                 }
                 if (serviceSubtask.getSendstate() != null && (serviceSubtask.getSendstate() == 5 || serviceSubtask.getSendstate() == 7)) {
                     serviceSubtaskStatistic.setFollowUpFail(serviceSubtaskStatistic.getFollowUpFail() + 1L);
-                    followUpFailInfo.add(serviceSubtask);
+//                    followUpFailInfo.add(serviceSubtask);
                 }
                 if (serviceSubtaskStatistic.getNeedFollowUp() > 0) {
                     double rate = (double) (serviceSubtaskStatistic.getFollowUpSuccess() + serviceSubtaskStatistic.getFollowUpFail()) / serviceSubtaskStatistic.getNeedFollowUp();
@@ -3681,41 +3681,41 @@
                 }
                 if (serviceSubtask.getSendstate() != null && ObjectUtils.isNotEmpty(serviceSubtask.getCurrentPreachform()) && serviceSubtask.getCurrentPreachform().equals("1")) {
                     serviceSubtaskStatistic.setManual(serviceSubtaskStatistic.getManual() + 1L);
-                    manualInfo.add(serviceSubtask);
+//                    manualInfo.add(serviceSubtask);
                 }
                 if (serviceSubtask.getSendstate() != null && ObjectUtils.isNotEmpty(serviceSubtask.getCurrentPreachform()) && serviceSubtask.getCurrentPreachform().equals("3")) {
                     serviceSubtaskStatistic.setVoice(serviceSubtaskStatistic.getVoice() + 1L);
-                    voiceInfo.add(serviceSubtask);
+//                    voiceInfo.add(serviceSubtask);
                 }
                 if (serviceSubtask.getSendstate() != null && ObjectUtils.isNotEmpty(serviceSubtask.getCurrentPreachform()) && serviceSubtask.getCurrentPreachform().equals("4")) {
                     serviceSubtaskStatistic.setSms(serviceSubtaskStatistic.getSms() + 1L);
-                    smsInfo.add(serviceSubtask);
+//                    smsInfo.add(serviceSubtask);
                 }
                 if (serviceSubtask.getSendstate() != null && ObjectUtils.isNotEmpty(serviceSubtask.getCurrentPreachform()) && serviceSubtask.getCurrentPreachform().equals("5")) {
                     serviceSubtaskStatistic.setWeChat(serviceSubtaskStatistic.getWeChat() + 1L);
-                    wechatInfo.add(serviceSubtask);
+//                    wechatInfo.add(serviceSubtask);
                 }
                 if (serviceSubtask.getSendstate() != null && serviceSubtask.getExcep().equals("1")) {
                     serviceSubtaskStatistic.setAbnormal(serviceSubtaskStatistic.getAbnormal() + 1L);
-                    abnormalInfo.add(serviceSubtask);
+//                    abnormalInfo.add(serviceSubtask);
                 }
             }//浜屾鍑洪櫌闅忚
             else if (serviceSubtask.getVisitCount() != null && serviceSubtask.getVisitCount() > 1) {
                 if (serviceSubtask.getSendstate() != null && serviceSubtask.getSendstate() != 4) {
                     serviceSubtaskStatistic.setNeedFollowUpAgain(serviceSubtaskStatistic.getNeedFollowUpAgain() + 1L);
-                    needFollowUpAgainInfo.add(serviceSubtask);
+//                    needFollowUpAgainInfo.add(serviceSubtask);
                 }
                 if (serviceSubtask.getSendstate() != null && serviceSubtask.getSendstate() == 2) {
                     serviceSubtaskStatistic.setPendingFollowUpAgain(serviceSubtaskStatistic.getPendingFollowUpAgain() + 1L);
-                    pendingFollowUpAgainInfo.add(serviceSubtask);
+//                    pendingFollowUpAgainInfo.add(serviceSubtask);
                 }
                 if (serviceSubtask.getSendstate() != null && (serviceSubtask.getSendstate() == 1 || serviceSubtask.getSendstate() == 3 || serviceSubtask.getSendstate() == 6)) {
                     serviceSubtaskStatistic.setFollowUpSuccessAgain(serviceSubtaskStatistic.getFollowUpSuccessAgain() + 1L);
-                    followUpSuccessAgainInfo.add(serviceSubtask);
+//                    followUpSuccessAgainInfo.add(serviceSubtask);
                 }
                 if (serviceSubtask.getSendstate() != null && serviceSubtask.getSendstate() == 5) {
                     serviceSubtaskStatistic.setFollowUpFailAgain(serviceSubtaskStatistic.getFollowUpFailAgain() + 1L);
-                    followUpFailAgainInfo.add(serviceSubtask);
+//                    followUpFailAgainInfo.add(serviceSubtask);
                 }
                 if (serviceSubtaskStatistic.getNeedFollowUp() > 0) {
                     double rate = (double) (serviceSubtaskStatistic.getFollowUpSuccessAgain() + serviceSubtaskStatistic.getFollowUpFailAgain()) / serviceSubtaskStatistic.getNeedFollowUpAgain();
@@ -3725,64 +3725,64 @@
                 }
                 if (serviceSubtask.getSendstate() != null && ObjectUtils.isNotEmpty(serviceSubtask.getCurrentPreachform()) && serviceSubtask.getCurrentPreachform().equals("1")) {
                     serviceSubtaskStatistic.setManualAgain(serviceSubtaskStatistic.getManualAgain() + 1L);
-                    manualAgainInfo.add(serviceSubtask);
+//                    manualAgainInfo.add(serviceSubtask);
                 }
                 //鍐嶆闅忚璇煶(缁熻涓嶆墽琛�)
                 if (serviceSubtask.getSendstate() != null && ObjectUtils.isNotEmpty(serviceSubtask.getCurrentPreachform()) && serviceSubtask.getCurrentPreachform().equals("3")) {
                     serviceSubtaskStatistic.setVoiceAgain(serviceSubtaskStatistic.getVoiceAgain() + 1L);
-                    voiceAgainInfo.add(serviceSubtask);
+//                    voiceAgainInfo.add(serviceSubtask);
                 }
                 if (serviceSubtask.getSendstate() != null && ObjectUtils.isNotEmpty(serviceSubtask.getCurrentPreachform()) && serviceSubtask.getCurrentPreachform().equals("4")) {
                     serviceSubtaskStatistic.setSmsAgain(serviceSubtaskStatistic.getSmsAgain() + 1L);
-                    smsAgainInfo.add(serviceSubtask);
+//                    smsAgainInfo.add(serviceSubtask);
                 }
                 if (serviceSubtask.getSendstate() != null && ObjectUtils.isNotEmpty(serviceSubtask.getCurrentPreachform()) && serviceSubtask.getCurrentPreachform().equals("5")) {
                     serviceSubtaskStatistic.setWeChatAgain(serviceSubtaskStatistic.getWeChatAgain() + 1L);
-                    wechatAgainInfo.add(serviceSubtask);
+//                    wechatAgainInfo.add(serviceSubtask);
                 }
                 if (serviceSubtask.getSendstate() != null && serviceSubtask.getExcep().equals("1")) {
                     serviceSubtaskStatistic.setAbnormalAgain(serviceSubtaskStatistic.getAbnormalAgain() + 1L);
-                    abnormalAgainInfo.add(serviceSubtask);
+//                    abnormalAgainInfo.add(serviceSubtask);
                 }
             }
         }
 
-        //璁板綍鏃犻渶闅忚璇︽儏
-        serviceSubtaskStatistic.setNonFollowUpInfo(nonFollowUpInfo);
-        //璁板綍闇�闅忚璇︽儏
-        serviceSubtaskStatistic.setFollowUpNeededAllInfo(followUpNeededAllInfo);
-        //璁板綍棣栨搴旈殢璁胯鎯�
-        serviceSubtaskStatistic.setNeedFollowUpInfo(needFollowUpInfo);
-        //璁板綍棣栨寰呴殢璁胯鎯�
-        serviceSubtaskStatistic.setPendingFollowUpInfo(pendingFollowUpInfo);
-        //璁板綍棣栨闅忚鎴愬姛璇︽儏
-        serviceSubtaskStatistic.setFollowUpSuccessInfo(followUpSuccessInfo);
-        //璁板綍棣栨闅忚澶辫触璇︽儏
-        serviceSubtaskStatistic.setFollowUpFailInfo(followUpFailInfo);
-        //璁板綍棣栨闅忚浜哄伐璇︽儏
-        serviceSubtaskStatistic.setManualInfo(manualInfo);
-        //璁板綍棣栨闅忚璇煶璇︽儏
-        serviceSubtaskStatistic.setVoiceInfo(voiceInfo);
-        //璁板綍棣栨闅忚鐭俊璇︽儏
-        serviceSubtaskStatistic.setSmsInfo(smsInfo);
-        //璁板綍棣栨闅忚寰俊璇︽儏
-        serviceSubtaskStatistic.setWechatInfo(wechatInfo);
-        //璁板綍鍐嶆搴旈殢璁胯鎯�
-        serviceSubtaskStatistic.setNeedFollowUpAgainInfo(needFollowUpAgainInfo);
-        //璁板綍鍐嶆寰呴殢璁胯鎯�
-        serviceSubtaskStatistic.setPendingFollowUpAgainInfo(pendingFollowUpAgainInfo);
-        //璁板綍鍐嶆闅忚鎴愬姛璇︽儏
-        serviceSubtaskStatistic.setFollowUpSuccessAgainInfo(followUpSuccessAgainInfo);
-        //璁板綍鍐嶆闅忚澶辫触璇︽儏
-        serviceSubtaskStatistic.setFollowUpFailAgainInfo(followUpFailAgainInfo);
-        //璁板綍鍐嶆闅忚浜哄伐璇︽儏
-        serviceSubtaskStatistic.setManualAgainInfo(manualAgainInfo);
-        //璁板綍鍐嶆闅忚璇煶璇︽儏
-        serviceSubtaskStatistic.setVoiceAgainInfo(voiceAgainInfo);
-        //璁板綍鍐嶆闅忚鐭俊璇︽儏
-        serviceSubtaskStatistic.setSmsAgainInfo(smsAgainInfo);
-        //璁板綍鍐嶆闅忚寰俊璇︽儏
-        serviceSubtaskStatistic.setWechatAgainInfo(wechatAgainInfo);
+//        //璁板綍鏃犻渶闅忚璇︽儏
+//        serviceSubtaskStatistic.setNonFollowUpInfo(nonFollowUpInfo);
+//        //璁板綍闇�闅忚璇︽儏
+//        serviceSubtaskStatistic.setFollowUpNeededAllInfo(followUpNeededAllInfo);
+//        //璁板綍棣栨搴旈殢璁胯鎯�
+//        serviceSubtaskStatistic.setNeedFollowUpInfo(needFollowUpInfo);
+//        //璁板綍棣栨寰呴殢璁胯鎯�
+//        serviceSubtaskStatistic.setPendingFollowUpInfo(pendingFollowUpInfo);
+//        //璁板綍棣栨闅忚鎴愬姛璇︽儏
+//        serviceSubtaskStatistic.setFollowUpSuccessInfo(followUpSuccessInfo);
+//        //璁板綍棣栨闅忚澶辫触璇︽儏
+//        serviceSubtaskStatistic.setFollowUpFailInfo(followUpFailInfo);
+//        //璁板綍棣栨闅忚浜哄伐璇︽儏
+//        serviceSubtaskStatistic.setManualInfo(manualInfo);
+//        //璁板綍棣栨闅忚璇煶璇︽儏
+//        serviceSubtaskStatistic.setVoiceInfo(voiceInfo);
+//        //璁板綍棣栨闅忚鐭俊璇︽儏
+//        serviceSubtaskStatistic.setSmsInfo(smsInfo);
+//        //璁板綍棣栨闅忚寰俊璇︽儏
+//        serviceSubtaskStatistic.setWechatInfo(wechatInfo);
+//        //璁板綍鍐嶆搴旈殢璁胯鎯�
+//        serviceSubtaskStatistic.setNeedFollowUpAgainInfo(needFollowUpAgainInfo);
+//        //璁板綍鍐嶆寰呴殢璁胯鎯�
+//        serviceSubtaskStatistic.setPendingFollowUpAgainInfo(pendingFollowUpAgainInfo);
+//        //璁板綍鍐嶆闅忚鎴愬姛璇︽儏
+//        serviceSubtaskStatistic.setFollowUpSuccessAgainInfo(followUpSuccessAgainInfo);
+//        //璁板綍鍐嶆闅忚澶辫触璇︽儏
+//        serviceSubtaskStatistic.setFollowUpFailAgainInfo(followUpFailAgainInfo);
+//        //璁板綍鍐嶆闅忚浜哄伐璇︽儏
+//        serviceSubtaskStatistic.setManualAgainInfo(manualAgainInfo);
+//        //璁板綍鍐嶆闅忚璇煶璇︽儏
+//        serviceSubtaskStatistic.setVoiceAgainInfo(voiceAgainInfo);
+//        //璁板綍鍐嶆闅忚鐭俊璇︽儏
+//        serviceSubtaskStatistic.setSmsAgainInfo(smsAgainInfo);
+//        //璁板綍鍐嶆闅忚寰俊璇︽儏
+//        serviceSubtaskStatistic.setWechatAgainInfo(wechatAgainInfo);
         return serviceSubtaskStatistic;
     }
 
@@ -3952,7 +3952,7 @@
      * @return
      */
     @Override
-    @Cacheable(value = "getSfStatisticsScript", key = "T(org.springframework.util.DigestUtils).md5DigestAsHex(#serviceSubtaskCountReq.toString().getBytes())", unless = "#result == null or #result.isEmpty()")
+//    @Cacheable(value = "getSfStatisticsScript", key = "T(org.springframework.util.DigestUtils).md5DigestAsHex(#serviceSubtaskCountReq.toString().getBytes())", unless = "#result == null or #result.isEmpty()")
     public List<ServiceSubtaskStatistic> getSfStatisticsScript(ServiceSubtaskCountReq serviceSubtaskCountReq) {
         log.info("getSfStatisticsScript鐨勫叆鍙備负锛歿}", serviceSubtaskCountReq);
         List<ServiceSubtaskStatistic> serviceSubtaskStatistics = new ArrayList<>();
@@ -4045,12 +4045,45 @@
                 serviceSubtaskStatistic.setJoyAllCount(sum.intValue());
                 serviceSubtaskStatistic.setJoyCount(finishedSum.intValue());
                 serviceSubtaskStatistic.setJoyTotal(finishedPercentage);
+                clearStatisticDetailInfo(serviceSubtaskStatistic);
             }
         }
 
         return serviceSubtaskStatistics;
     }
 
+    /**
+     * Trim detail lists for summary response to avoid oversized payloads.
+     */
+    private void clearStatisticDetailInfo(ServiceSubtaskStatistic serviceSubtaskStatistic) {
+        serviceSubtaskStatistic.setDischargeCountInfo(null);
+        serviceSubtaskStatistic.setNonFollowUpInfo(null);
+        serviceSubtaskStatistic.setFollowUpNeededAllInfo(null);
+        serviceSubtaskStatistic.setNeedFollowUpInfo(null);
+        serviceSubtaskStatistic.setPendingFollowUpInfo(null);
+        serviceSubtaskStatistic.setFollowUpSuccessInfo(null);
+        serviceSubtaskStatistic.setFollowUpFailInfo(null);
+        serviceSubtaskStatistic.setManualInfo(null);
+        serviceSubtaskStatistic.setVoiceInfo(null);
+        serviceSubtaskStatistic.setSmsInfo(null);
+        serviceSubtaskStatistic.setWechatInfo(null);
+        serviceSubtaskStatistic.setNeedFollowUpAgainInfo(null);
+        serviceSubtaskStatistic.setPendingFollowUpAgainInfo(null);
+        serviceSubtaskStatistic.setFollowUpSuccessAgainInfo(null);
+        serviceSubtaskStatistic.setFollowUpFailAgainInfo(null);
+        serviceSubtaskStatistic.setManualAgainInfo(null);
+        serviceSubtaskStatistic.setVoiceAgainInfo(null);
+        serviceSubtaskStatistic.setSmsAgainInfo(null);
+        serviceSubtaskStatistic.setWechatAgainInfo(null);
+        serviceSubtaskStatistic.setTaskSituation1Info(null);
+        serviceSubtaskStatistic.setTaskSituation2Info(null);
+        serviceSubtaskStatistic.setTaskSituation3Info(null);
+        serviceSubtaskStatistic.setTaskSituation4Info(null);
+        serviceSubtaskStatistic.setTaskSituation5Info(null);
+        serviceSubtaskStatistic.setTaskSituation6Info(null);
+        serviceSubtaskStatistic.setFilterCountList(null);
+    }
+
     @Override
     public Map<String, ServiceSubtaskScriptCount> getSfStatisticsScriptDetails(ServiceSubtaskCountReq serviceSubtaskCountReq) {
         Map<String, ServiceSubtaskScriptCount> result = new HashMap<>();

--
Gitblit v1.9.3