From 1ecb6109954d22e9be03518d64cdcfd89b599091 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期二, 02 六月 2026 18:20:11 +0800
Subject: [PATCH] 1.处理修改service_task时，子任务删除，未将出院数据还原的问题； 2.新增省立同德满意度接口 3.处理患者基本信息并发新增的问题

---
 smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java |  722 +++++++++++++++++++++++-------------------------------
 1 files changed, 309 insertions(+), 413 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 a6a8563..c6f675e 100644
--- a/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java
@@ -166,7 +166,7 @@
     private Integer phoneEndHour;
 
     @Autowired
-    private Icd10Mapper icd10Mapper;
+    private IPatMedOuthospService patMedOuthospService;
 
     @Value("${spring.profiles.active}")
     private String active;
@@ -350,11 +350,16 @@
     public List<ServiceSubtaskRes> patItem(ServiceSubtaskEntity serviceSubtaskEntity) {
         if (serviceSubtaskEntity.getSendstateView() != null) {
             //            1锛氬緟闅忚锛�2 寰呭彂閫侊級锛�2锛氶殢璁夸腑锛�3 宸插彂閫併��1 琚鍙栵級銆�3锛氭湭瀹屾垚锛�5 鍙戦�佸け璐ャ��7銆佽秴鏃讹級銆�4锛氬凡瀹屾垚锛� 6 宸插畬鎴愶級銆�5锛氭棤闇�闅忚锛�4 涓嶆墽琛岋級
-            if (serviceSubtaskEntity.getSendstateView() == 1) serviceSubtaskEntity.setSendstates(new ArrayList<>(Arrays.asList(2L)));
-            if (serviceSubtaskEntity.getSendstateView() == 2) serviceSubtaskEntity.setSendstates(new ArrayList<>(Arrays.asList(1L, 3L)));
-            if (serviceSubtaskEntity.getSendstateView() == 3) serviceSubtaskEntity.setSendstates(new ArrayList<>(Arrays.asList(5L, 7L)));
-            if (serviceSubtaskEntity.getSendstateView() == 4) serviceSubtaskEntity.setSendstates(new ArrayList<>(Arrays.asList(6L)));
-            if (serviceSubtaskEntity.getSendstateView() == 5) serviceSubtaskEntity.setSendstates(new ArrayList<>(Arrays.asList(4L)));
+            if (serviceSubtaskEntity.getSendstateView() == 1)
+                serviceSubtaskEntity.setSendstates(new ArrayList<>(Arrays.asList(2L)));
+            if (serviceSubtaskEntity.getSendstateView() == 2)
+                serviceSubtaskEntity.setSendstates(new ArrayList<>(Arrays.asList(1L, 3L)));
+            if (serviceSubtaskEntity.getSendstateView() == 3)
+                serviceSubtaskEntity.setSendstates(new ArrayList<>(Arrays.asList(5L, 7L)));
+            if (serviceSubtaskEntity.getSendstateView() == 4)
+                serviceSubtaskEntity.setSendstates(new ArrayList<>(Arrays.asList(6L)));
+            if (serviceSubtaskEntity.getSendstateView() == 5)
+                serviceSubtaskEntity.setSendstates(new ArrayList<>(Arrays.asList(4L)));
         }
 
         List<ServiceSubtask> selectServiceSubtaskList = this.selectServiceSubtaskList(serviceSubtaskEntity);
@@ -747,9 +752,8 @@
                     serviceSubtask.setPatid(patTaskRelevance.getPatid());
                     serviceSubtask.setCreateTime(DateUtils.getNowDate());
                     serviceSubtask.setInhospid(patTaskRelevance.getHospid());
-                    serviceSubtask.setSendstate(1L);
-                    if (serviceTaskVO.getLongTask() != null && serviceTaskVO.getLongTask() == 1)
-                        serviceSubtask.setSendstate(2L);
+                    //鏂板缓瀹屾垚灏辨槸寰呭彂閫佺姸鎬�
+                    serviceSubtask.setSendstate(2L);
                     serviceSubtask.setDeptcode(patTaskRelevance.getDeptcode());
                     serviceSubtask.setDeptname(patTaskRelevance.getDeptName());
                     serviceSubtask.setLeavehospitaldistrictcode(patTaskRelevance.getLeavehospitaldistrictcode());
@@ -804,7 +808,6 @@
                 serviceTask.setSendTimeSlot(JSON.toJSONString(serviceTaskVO.getSendTimeslot()));
             //淇敼鎿嶄綔锛岄渶瑕佸皢stopState鐘舵��+1
             ServiceTask serviceTask1 = serviceTaskService.selectServiceTaskByTaskid(serviceTask.getTaskid());
-            //鑾峰彇鍒拌浠诲姟鎵�鏈夌殑鏈嶅姟锛屽苟浠庨槦鍒楅噷鍒犻櫎
             ServiceSubtaskEntity serviceSubtaskVO = new ServiceSubtaskEntity();
             serviceSubtaskVO.setTaskid(serviceTask1.getTaskid());
             serviceSubtaskVO.setSendstate(2L);
@@ -826,6 +829,30 @@
                     redisCache.removeElementFromList("cache-2", serviceSubtask.getId().toString());
                     redisCache.removeElementFromList("cache-3", serviceSubtask.getId().toString());
                     redisCache.removeElementFromList("cache-4", serviceSubtask.getId().toString());
+                    //灏嗗嚭鍏ラ櫌琛ㄧ殑鏁版嵁锛岃繕鍘熸垚杩樻湭澶勭悊鐨勭姸鎬�
+                    if (serviceSubtask.getServiceType().equals("2")) {
+                        ServiceTask st = serviceTaskService.selectServiceTaskByTaskid(serviceSubtask.getTaskid());
+                        //濡傛灉浠诲姟鏄暱鏈熶换鍔★紝闇�瑕佸皢璇ユ偅鑰呯殑鍑哄叆闄㈡暟鎹繕鍘熸垚杩樻湭澶勭悊鐨勭姸鎬�
+                        if (st != null && st.getLongTask() == 1) {
+                            PatMedInhosp patMedInhosp = new PatMedInhosp();
+                            patMedInhosp.setDeptcheckFlag("0");
+                            patMedInhosp.setWardcheckFlag("0");
+                            patMedInhosp.setDiagcheckFlag("0");
+                            patMedInhosp.setInhospid(serviceSubtask.getInhospid());
+                            patMedInhospMapper.updatePatMedInhosp(patMedInhosp);
+                        }
+                    } else if (serviceSubtask.getServiceType().equals("3")) {
+                        if (serviceSubtask.getInhospid() != null) {
+                            PatMedOuthospQueryReq req = new PatMedOuthospQueryReq();
+                            req.setOuthospno(serviceSubtask.getHospno());
+                            List<PatMedOuthosp> patMedOuthosps = patMedOuthospMapper.callSpQueryOuthosp(req);
+                            if (CollectionUtils.isNotEmpty(patMedOuthosps)) {
+                                PatMedOuthosp patMedOuthosp = patMedOuthosps.get(0);
+                                patMedOuthosp.setServerState("0");
+                                patMedOuthospService.updatePatMedOuthosp(patMedOuthosp);
+                            }
+                        }
+                    }
                 }
             }
 
@@ -891,12 +918,13 @@
                     }
                     serviceTaskdiag.setLongtask(Long.valueOf(serviceTask.getLongTask()));
                     serviceTaskdiag.setIcd10name(serviceTaskVO.getIcd10name());
-                    serviceTaskdiag.setGuid(serviceTask.getGuid());
-                    serviceTaskdiag.setOrgid(serviceTask.getOrgid());
-                    serviceTaskdiag.setDeptCode(serviceTaskVO.getDeptcode());
-                    serviceTaskdiag.setDeptName(serviceTaskVO.getDeptname());
-                    serviceTaskdiag.setWardCode(serviceTaskVO.getLeavehospitaldistrictcode());
-                    serviceTaskdiag.setWardName(serviceTaskVO.getLeavehospitaldistrictname());
+                    serviceTaskdiag.setGuid(serviceTask1.getGuid());
+                    serviceTaskdiag.setServiceType(serviceTask1.getServiceType());
+                    serviceTaskdiag.setOrgid(serviceTask1.getOrgid());
+                    serviceTaskdiag.setDeptCode(serviceTask1.getDeptcode());
+                    serviceTaskdiag.setDeptName(serviceTask1.getDeptname());
+                    serviceTaskdiag.setWardCode(serviceTask1.getLeavehospitaldistrictcode());
+                    serviceTaskdiag.setWardName(serviceTask1.getLeavehospitaldistrictname());
                     serviceTaskdiag.setUpdateTime(new Date());
                     if (StringUtils.isNotEmpty(serviceTaskVO.getIcd10code())) {
                         String[] icd10codes = serviceTaskVO.getIcd10code().split(",");
@@ -2193,6 +2221,8 @@
                     IvrTaskTemplateScript ivrTaskTemplateScript = iIvrTaskTemplateScriptService.selectIvrTaskTemplateScriptByID(serviceSubtaskDetail.getScriptid());
                     if (ivrTaskTemplateScript != null)
                         serviceSubtaskDetail.setCategoryid(ivrTaskTemplateScript.getScriptAssortid());
+                    serviceSubtaskDetail.setIsMydException(ivrTaskTemplateScript.getIsMydException());
+                    serviceSubtaskDetail.setDimension(ivrTaskTemplateScript.getDimension());
                 }
 
                 serviceSubtaskDetail.setSubId(selectServiceSubtaskList.get(0).getId());
@@ -2568,7 +2598,6 @@
         if (serviceSubtaskCountReq.getLeavehospitaldistrictcodes() != null && serviceSubtaskCountReq.getLeavehospitaldistrictcodes().size() > 0) {
             if (serviceSubtaskCountReq.getDrcode() != null && !serviceSubtaskCountReq.getDrcode().isEmpty()) {
                 collect = serviceSubtaskMapper.getSfStatistics(serviceSubtaskCountReq).stream().collect(Collectors.groupingBy(subtask -> Optional.ofNullable(subtask.getDrname()).orElse("Unknown")));
-
             } else {
                 collect = serviceSubtaskMapper.getSfStatistics(serviceSubtaskCountReq).stream().collect(Collectors.groupingBy(subtask -> Optional.ofNullable(subtask.getLeavehospitaldistrictname()).orElse("Unknown")));
             }
@@ -2747,62 +2776,12 @@
             serviceSubtaskStatistic.setDrname(serviceSubtaskList.get(0).getDrname());
             //鍑洪櫌浜烘
             serviceSubtaskStatistic.setDischargeCount(serviceSubtaskList.size());
-            //鍑洪櫌浜烘璇︽儏
-            serviceSubtaskStatistic.setDischargeCountInfo(serviceSubtaskList);
-            //鏃犻渶闅忚璇︽儏
-            List<ServiceSubtask> nonFollowUpInfo = new ArrayList<>();
-            //璁板綍杩囨护鎮ｈ�呰鎯�
-            List<ServiceSubtask> filterServiceSubtasks = 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> 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> taskSituation1Info = new ArrayList<>();
-            List<ServiceSubtask> taskSituation2Info = new ArrayList<>();
-            List<ServiceSubtask> taskSituation3Info = new ArrayList<>();
-            List<ServiceSubtask> taskSituation4Info = new ArrayList<>();
-            List<ServiceSubtask> taskSituation5Info = new ArrayList<>();
-            List<ServiceSubtask> taskSituation6Info = new ArrayList<>();
-
             for (ServiceSubtask serviceSubtask : serviceSubtaskList) {
                 //鏃犻渶闅忚浜烘
                 if (serviceSubtask.getSendstate() != null && serviceSubtask.getSendstate() == 4) {
                     serviceSubtaskStatistic.setNonFollowUp(serviceSubtaskStatistic.getNonFollowUp() + 1L);
-                    nonFollowUpInfo.add(serviceSubtask);
                     if (serviceSubtask.getTaskSituation() != null && serviceSubtask.getTaskSituation() == 6) {
                         serviceSubtaskStatistic.setFilterCount(serviceSubtaskStatistic.getFilterCount() + 1L);
-                        filterServiceSubtasks.add(serviceSubtask);
                     }
                 }
                 //搴旈殢璁夸汉娆�
@@ -2815,72 +2794,80 @@
                     //棣栨搴旈殢璁�
                     if (serviceSubtask.getSendstate() != null && serviceSubtask.getSendstate() != 4) {
                         serviceSubtaskStatistic.setNeedFollowUp(serviceSubtaskStatistic.getNeedFollowUp() + 1L);
-                        needFollowUpInfo.add(serviceSubtask);
                     }
                     //棣栨寰呴殢璁�
                     if (serviceSubtask.getSendstate() != null && serviceSubtask.getSendstate() == 2) {
                         serviceSubtaskStatistic.setPendingFollowUp(serviceSubtaskStatistic.getPendingFollowUp() + 1L);
-                        pendingFollowUpInfo.add(serviceSubtask);
                     }
                     //棣栨闅忚澶辫触(鍖呮嫭闅忚澶辫触+浜哄伐瓒呮椂)
                     if (serviceSubtask.getSendstate() != null && (serviceSubtask.getSendstate() == 5 || serviceSubtask.getSendstate() == 7)) {
                         serviceSubtaskStatistic.setFollowUpFail(serviceSubtaskStatistic.getFollowUpFail() + 1L);
-                        followUpFailInfo.add(serviceSubtask);
                     }
                     /**
                      * 涓嶅悓缁熻鏂瑰紡涓嬩笉鍚岀殑闅忚鎴愬姛鏁� 鍙傛暟 followUpCountStyle 鎺у埗
                      */
                     if (StringUtils.isNotEmpty(followUpCountStyle) && followUpCountStyle.equals("1")) {
                         //棣栨闅忚鎴愬姛
-                        if (serviceSubtask.getSendstate() != null && (serviceSubtask.getSendstate() == 6L)) {
+                        if (serviceSubtask.getSendstate() != null && (serviceSubtask.getSendstate().equals(6L))) {
                             serviceSubtaskStatistic.setFollowUpSuccess(serviceSubtaskStatistic.getFollowUpSuccess() + 1L);
-                            followUpSuccessInfo.add(serviceSubtask);
                         }
                         //棣栨闅忚浜哄伐 (涓嶇粺璁′笉鎵ц)
                         if (serviceSubtask.getSendstate() != null && !serviceSubtask.getSendstate().equals(4L) && ObjectUtils.isNotEmpty(serviceSubtask.getCurrentPreachform()) && serviceSubtask.getCurrentPreachform().equals("1")) {
                             serviceSubtaskStatistic.setManual(serviceSubtaskStatistic.getManual() + 1L);
-                            manualInfo.add(serviceSubtask);
                         }
                         //棣栨闅忚璇煶 (涓嶇粺璁′笉鎵ц)
                         if (serviceSubtask.getSendstate() != null && !serviceSubtask.getSendstate().equals(4L) && ObjectUtils.isNotEmpty(serviceSubtask.getCurrentPreachform()) && serviceSubtask.getCurrentPreachform().equals("3")) {
                             serviceSubtaskStatistic.setVoice(serviceSubtaskStatistic.getVoice() + 1L);
-                            voiceInfo.add(serviceSubtask);
                         }
                         //棣栨闅忚鐭俊(涓嶇粺璁′笉鎵ц)
                         if (serviceSubtask.getSendstate() != null && !serviceSubtask.getSendstate().equals(4L) && ObjectUtils.isNotEmpty(serviceSubtask.getCurrentPreachform()) && serviceSubtask.getCurrentPreachform().equals("4")) {
                             serviceSubtaskStatistic.setSms(serviceSubtaskStatistic.getSms() + 1L);
-                            smsInfo.add(serviceSubtask);
                         }
                         //棣栨闅忚寰俊(涓嶇粺璁′笉鎵ц)
                         if (serviceSubtask.getSendstate() != null && !serviceSubtask.getSendstate().equals(4L) && ObjectUtils.isNotEmpty(serviceSubtask.getCurrentPreachform()) && serviceSubtask.getCurrentPreachform().equals("5")) {
                             serviceSubtaskStatistic.setWeChat(serviceSubtaskStatistic.getWeChat() + 1L);
-                            wechatInfo.add(serviceSubtask);
+                        }
+                    } else if (StringUtils.isNotEmpty(followUpCountStyle) && followUpCountStyle.equals("3")) {
+                        //棣栨闅忚鎴愬姛
+                        if (serviceSubtask.getSendstate() != null && (serviceSubtask.getSendstate().equals(6L))) {
+                            serviceSubtaskStatistic.setFollowUpSuccess(serviceSubtaskStatistic.getFollowUpSuccess() + 1L);
+                        }
+                        //棣栨闅忚浜哄伐 (鍙粺璁″凡瀹屾垚)
+                        if (serviceSubtask.getSendstate() != null && serviceSubtask.getSendstate().equals(6L) && ObjectUtils.isNotEmpty(serviceSubtask.getCurrentPreachform()) && serviceSubtask.getCurrentPreachform().equals("1")) {
+                            serviceSubtaskStatistic.setManual(serviceSubtaskStatistic.getManual() + 1L);
+                        }
+                        //棣栨闅忚璇煶 (鍙粺璁″凡瀹屾垚)
+                        if (serviceSubtask.getSendstate() != null && serviceSubtask.getSendstate().equals(6L) && ObjectUtils.isNotEmpty(serviceSubtask.getCurrentPreachform()) && serviceSubtask.getCurrentPreachform().equals("3")) {
+                            serviceSubtaskStatistic.setVoice(serviceSubtaskStatistic.getVoice() + 1L);
+                        }
+                        //棣栨闅忚鐭俊(鍙粺璁″凡瀹屾垚)
+                        if (serviceSubtask.getSendstate() != null && serviceSubtask.getSendstate().equals(6L) && ObjectUtils.isNotEmpty(serviceSubtask.getCurrentPreachform()) && serviceSubtask.getCurrentPreachform().equals("4")) {
+                            serviceSubtaskStatistic.setSms(serviceSubtaskStatistic.getSms() + 1L);
+                        }
+                        //棣栨闅忚寰俊(鍙粺璁″凡瀹屾垚)
+                        if (serviceSubtask.getSendstate() != null && serviceSubtask.getSendstate().equals(6L) && ObjectUtils.isNotEmpty(serviceSubtask.getCurrentPreachform()) && serviceSubtask.getCurrentPreachform().equals("5")) {
+                            serviceSubtaskStatistic.setWeChat(serviceSubtaskStatistic.getWeChat() + 1L);
                         }
                     } else {
                         //棣栨闅忚鎴愬姛 - 缁熻鏃跺�欏姞涓婁笉鎵ц鐨勶紝宸插彂閫佺殑
                         if (serviceSubtask.getSendstate() != null && (serviceSubtask.getSendstate().equals(6L) || serviceSubtask.getSendstate().equals(3L) || serviceSubtask.getSendstate().equals(4L))) {
                             serviceSubtaskStatistic.setFollowUpSuccess(serviceSubtaskStatistic.getFollowUpSuccess() + 1L);
-                            followUpSuccessInfo.add(serviceSubtask);
                         }
                         //棣栨闅忚浜哄伐 (缁熻涓嶆墽琛�)
                         if (serviceSubtask.getSendstate() != null && ObjectUtils.isNotEmpty(serviceSubtask.getCurrentPreachform()) && serviceSubtask.getCurrentPreachform().equals("1")) {
                             serviceSubtaskStatistic.setManual(serviceSubtaskStatistic.getManual() + 1L);
-                            manualInfo.add(serviceSubtask);
                         }
                         //棣栨闅忚璇煶 (缁熻涓嶆墽琛�)
                         if (serviceSubtask.getSendstate() != null && ObjectUtils.isNotEmpty(serviceSubtask.getCurrentPreachform()) && serviceSubtask.getCurrentPreachform().equals("3")) {
                             serviceSubtaskStatistic.setVoice(serviceSubtaskStatistic.getVoice() + 1L);
-                            voiceInfo.add(serviceSubtask);
                         }
                         //棣栨闅忚鐭俊(缁熻涓嶆墽琛�)
                         if (serviceSubtask.getSendstate() != null && ObjectUtils.isNotEmpty(serviceSubtask.getCurrentPreachform()) && serviceSubtask.getCurrentPreachform().equals("4")) {
                             serviceSubtaskStatistic.setSms(serviceSubtaskStatistic.getSms() + 1L);
-                            smsInfo.add(serviceSubtask);
                         }
                         //棣栨闅忚寰俊(缁熻涓嶆墽琛�)
                         if (serviceSubtask.getSendstate() != null && ObjectUtils.isNotEmpty(serviceSubtask.getCurrentPreachform()) && serviceSubtask.getCurrentPreachform().equals("5")) {
                             serviceSubtaskStatistic.setWeChat(serviceSubtaskStatistic.getWeChat() + 1L);
-                            wechatInfo.add(serviceSubtask);
                         }
                     }
                     if (serviceSubtaskStatistic.getNeedFollowUp() > 0) {
@@ -2898,72 +2885,80 @@
                     //鍐嶆搴旈殢璁�
                     if (serviceSubtask.getSendstate() != null && serviceSubtask.getSendstate() != 4) {
                         serviceSubtaskStatistic.setNeedFollowUpAgain(serviceSubtaskStatistic.getNeedFollowUpAgain() + 1L);
-                        needFollowUpAgainInfo.add(serviceSubtask);
                     }
                     //鍐嶆寰呴殢璁�
                     if (serviceSubtask.getSendstate() != null && serviceSubtask.getSendstate() == 2) {
                         serviceSubtaskStatistic.setPendingFollowUpAgain(serviceSubtaskStatistic.getPendingFollowUpAgain() + 1L);
-                        pendingFollowUpAgainInfo.add(serviceSubtask);
                     }
                     //鍐嶆闅忚澶辫触
                     if (serviceSubtask.getSendstate() != null && serviceSubtask.getSendstate() == 5) {
                         serviceSubtaskStatistic.setFollowUpFailAgain(serviceSubtaskStatistic.getFollowUpFailAgain() + 1L);
-                        followUpFailAgainInfo.add(serviceSubtask);
                     }
                     /**
                      * 涓嶅悓缁熻鏂瑰紡涓嬩笉鍚岀殑闅忚鎴愬姛鏁� 鍙傛暟 followUpCountStyle 鎺у埗
                      */
                     if (StringUtils.isNotEmpty(followUpCountStyle) && followUpCountStyle.equals("1")) {
                         //鍐嶆闅忚鎴愬姛
-                        if (serviceSubtask.getSendstate() != null && (serviceSubtask.getSendstate() == 1 || serviceSubtask.getSendstate() == 3 || serviceSubtask.getSendstate() == 6)) {
+                        if (serviceSubtask.getSendstate() != null && serviceSubtask.getSendstate().equals(6L)) {
                             serviceSubtaskStatistic.setFollowUpSuccessAgain(serviceSubtaskStatistic.getFollowUpSuccessAgain() + 1L);
-                            followUpSuccessAgainInfo.add(serviceSubtask);
                         }
                         //鍐嶆闅忚浜哄伐(涓嶇粺璁′笉鎵ц)
                         if (serviceSubtask.getSendstate() != null && !serviceSubtask.getSendstate().equals(4L) && ObjectUtils.isNotEmpty(serviceSubtask.getCurrentPreachform()) && serviceSubtask.getCurrentPreachform().equals("1")) {
                             serviceSubtaskStatistic.setManualAgain(serviceSubtaskStatistic.getManualAgain() + 1L);
-                            manualAgainInfo.add(serviceSubtask);
                         }
                         //鍐嶆闅忚璇煶(涓嶇粺璁′笉鎵ц)
                         if (serviceSubtask.getSendstate() != null && !serviceSubtask.getSendstate().equals(4L) && ObjectUtils.isNotEmpty(serviceSubtask.getCurrentPreachform()) && serviceSubtask.getCurrentPreachform().equals("3")) {
                             serviceSubtaskStatistic.setVoiceAgain(serviceSubtaskStatistic.getVoiceAgain() + 1L);
-                            voiceAgainInfo.add(serviceSubtask);
                         }
                         //鍐嶆闅忚鐭俊(涓嶇粺璁′笉鎵ц)
                         if (serviceSubtask.getSendstate() != null && !serviceSubtask.getSendstate().equals(4L) && ObjectUtils.isNotEmpty(serviceSubtask.getCurrentPreachform()) && serviceSubtask.getCurrentPreachform().equals("4")) {
                             serviceSubtaskStatistic.setSmsAgain(serviceSubtaskStatistic.getSmsAgain() + 1L);
-                            smsAgainInfo.add(serviceSubtask);
                         }
                         //鍐嶆闅忚寰俊(涓嶇粺璁′笉鎵ц)
                         if (serviceSubtask.getSendstate() != null && !serviceSubtask.getSendstate().equals(4L) && ObjectUtils.isNotEmpty(serviceSubtask.getCurrentPreachform()) && serviceSubtask.getCurrentPreachform().equals("5")) {
                             serviceSubtaskStatistic.setWeChatAgain(serviceSubtaskStatistic.getWeChatAgain() + 1L);
-                            wechatAgainInfo.add(serviceSubtask);
+                        }
+                    } else if (StringUtils.isNotEmpty(followUpCountStyle) && followUpCountStyle.equals("3")) {
+                        //鍐嶆闅忚鎴愬姛
+                        if (serviceSubtask.getSendstate() != null && (serviceSubtask.getSendstate().equals(6L))) {
+                            serviceSubtaskStatistic.setFollowUpSuccessAgain(serviceSubtaskStatistic.getFollowUpSuccessAgain() + 1L);
+                        }
+                        //鍐嶆闅忚浜哄伐 (鍙粺璁″凡瀹屾垚)
+                        if (serviceSubtask.getSendstate() != null && serviceSubtask.getSendstate().equals(6L) && ObjectUtils.isNotEmpty(serviceSubtask.getCurrentPreachform()) && serviceSubtask.getCurrentPreachform().equals("1")) {
+                            serviceSubtaskStatistic.setManualAgain(serviceSubtaskStatistic.getManualAgain() + 1L);
+                        }
+                        //鍐嶆闅忚璇煶 (鍙粺璁″凡瀹屾垚)
+                        if (serviceSubtask.getSendstate() != null && serviceSubtask.getSendstate().equals(6L) && ObjectUtils.isNotEmpty(serviceSubtask.getCurrentPreachform()) && serviceSubtask.getCurrentPreachform().equals("3")) {
+                            serviceSubtaskStatistic.setVoiceAgain(serviceSubtaskStatistic.getVoiceAgain() + 1L);
+                        }
+                        //鍐嶆闅忚鐭俊(鍙粺璁″凡瀹屾垚)
+                        if (serviceSubtask.getSendstate() != null && serviceSubtask.getSendstate().equals(6L) && ObjectUtils.isNotEmpty(serviceSubtask.getCurrentPreachform()) && serviceSubtask.getCurrentPreachform().equals("4")) {
+                            serviceSubtaskStatistic.setSmsAgain(serviceSubtaskStatistic.getSmsAgain() + 1L);
+                        }
+                        //鍐嶆闅忚寰俊(鍙粺璁″凡瀹屾垚)
+                        if (serviceSubtask.getSendstate() != null && serviceSubtask.getSendstate().equals(6L) && ObjectUtils.isNotEmpty(serviceSubtask.getCurrentPreachform()) && serviceSubtask.getCurrentPreachform().equals("5")) {
+                            serviceSubtaskStatistic.setWeChatAgain(serviceSubtaskStatistic.getWeChatAgain() + 1L);
                         }
                     } else {
                         //鍐嶆闅忚鎴愬姛
                         if (serviceSubtask.getSendstate() != null && (serviceSubtask.getSendstate().equals(1L) || serviceSubtask.getSendstate().equals(6L) || serviceSubtask.getSendstate().equals(3L) || serviceSubtask.getSendstate().equals(4L))) {
                             serviceSubtaskStatistic.setFollowUpSuccessAgain(serviceSubtaskStatistic.getFollowUpSuccessAgain() + 1L);
-                            followUpSuccessAgainInfo.add(serviceSubtask);
                         }
                         //鍐嶆闅忚浜哄伐(缁熻涓嶆墽琛�)
                         if (serviceSubtask.getSendstate() != null && ObjectUtils.isNotEmpty(serviceSubtask.getCurrentPreachform()) && serviceSubtask.getCurrentPreachform().equals("1")) {
                             serviceSubtaskStatistic.setManualAgain(serviceSubtaskStatistic.getManualAgain() + 1L);
-                            manualAgainInfo.add(serviceSubtask);
                         }
                         //鍐嶆闅忚璇煶(缁熻涓嶆墽琛�)
                         if (serviceSubtask.getSendstate() != null && ObjectUtils.isNotEmpty(serviceSubtask.getCurrentPreachform()) && serviceSubtask.getCurrentPreachform().equals("3")) {
                             serviceSubtaskStatistic.setVoiceAgain(serviceSubtaskStatistic.getVoiceAgain() + 1L);
-                            voiceAgainInfo.add(serviceSubtask);
                         }
                         //鍐嶆闅忚鐭俊(缁熻涓嶆墽琛�)
                         if (serviceSubtask.getSendstate() != null && ObjectUtils.isNotEmpty(serviceSubtask.getCurrentPreachform()) && serviceSubtask.getCurrentPreachform().equals("4")) {
                             serviceSubtaskStatistic.setSmsAgain(serviceSubtaskStatistic.getSmsAgain() + 1L);
-                            smsAgainInfo.add(serviceSubtask);
                         }
                         //鍐嶆闅忚寰俊(缁熻涓嶆墽琛�)
                         if (serviceSubtask.getSendstate() != null && ObjectUtils.isNotEmpty(serviceSubtask.getCurrentPreachform()) && serviceSubtask.getCurrentPreachform().equals("5")) {
                             serviceSubtaskStatistic.setWeChatAgain(serviceSubtaskStatistic.getWeChatAgain() + 1L);
-                            wechatAgainInfo.add(serviceSubtask);
                         }
                     }
                     if (serviceSubtaskStatistic.getNeedFollowUp() > 0) {
@@ -2980,72 +2975,23 @@
                 //闅忚鎯呭喌
                 if (serviceSubtask.getTaskSituation() != null && serviceSubtask.getTaskSituation() == 1) {
                     serviceSubtaskStatistic.setTaskSituation1(serviceSubtaskStatistic.getTaskSituation1() + 1);
-                    taskSituation1Info.add(serviceSubtask);
                 }
                 if (serviceSubtask.getTaskSituation() != null && serviceSubtask.getTaskSituation() == 2) {
                     serviceSubtaskStatistic.setTaskSituation2(serviceSubtaskStatistic.getTaskSituation2() + 1);
-                    taskSituation2Info.add(serviceSubtask);
                 }
                 if (serviceSubtask.getTaskSituation() != null && serviceSubtask.getTaskSituation() == 3) {
                     serviceSubtaskStatistic.setTaskSituation3(serviceSubtaskStatistic.getTaskSituation3() + 1);
-                    taskSituation3Info.add(serviceSubtask);
                 }
                 if (serviceSubtask.getTaskSituation() != null && serviceSubtask.getTaskSituation() == 4) {
                     serviceSubtaskStatistic.setTaskSituation4(serviceSubtaskStatistic.getTaskSituation4() + 1);
-                    taskSituation4Info.add(serviceSubtask);
                 }
                 if (serviceSubtask.getTaskSituation() != null && serviceSubtask.getTaskSituation() == 5) {
                     serviceSubtaskStatistic.setTaskSituation5(serviceSubtaskStatistic.getTaskSituation5() + 1);
-                    taskSituation5Info.add(serviceSubtask);
                 }
                 if (serviceSubtask.getTaskSituation() != null && serviceSubtask.getTaskSituation() == 7) {
                     serviceSubtaskStatistic.setTaskSituation6(serviceSubtaskStatistic.getTaskSituation6() + 1);
-                    taskSituation6Info.add(serviceSubtask);
                 }
             }
-            serviceSubtaskStatistic.setFilterCountList(filterServiceSubtasks);
-            //璁板綍鏃犻渶闅忚璇︽儏
-            serviceSubtaskStatistic.setNonFollowUpInfo(nonFollowUpInfo);
-            //璁板綍棣栨搴旈殢璁胯鎯�
-            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.setTaskSituation1Info(taskSituation1Info);
-            serviceSubtaskStatistic.setTaskSituation2Info(taskSituation2Info);
-            serviceSubtaskStatistic.setTaskSituation3Info(taskSituation3Info);
-            serviceSubtaskStatistic.setTaskSituation4Info(taskSituation4Info);
-            serviceSubtaskStatistic.setTaskSituation5Info(taskSituation5Info);
-            serviceSubtaskStatistic.setTaskSituation6Info(taskSituation6Info);
             return serviceSubtaskStatistic;
         }
         return serviceSubtaskStatistic;
@@ -3070,45 +3016,13 @@
         serviceSubtaskStatistic.setDrname(serviceSubtaskList.get(0).getDrname());
         //鍑洪櫌浜烘
         serviceSubtaskStatistic.setDischargeCount(serviceSubtaskList.size());
-        //鍑洪櫌浜烘璇︽儏
-        serviceSubtaskStatistic.setDischargeCountInfo(serviceSubtaskList);
-        //鏃犻渶闅忚璇︽儏
-        List<ServiceSubtask> nonFollowUpInfo = new ArrayList<>();
-        //璁板綍杩囨护鎮ｈ�呰鎯�
-        List<ServiceSubtask> filterServiceSubtasks = 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> taskSituation1Info = new ArrayList<>();
-        List<ServiceSubtask> taskSituation2Info = new ArrayList<>();
-        List<ServiceSubtask> taskSituation3Info = new ArrayList<>();
-        List<ServiceSubtask> taskSituation4Info = new ArrayList<>();
-        List<ServiceSubtask> taskSituation5Info = new ArrayList<>();
-        List<ServiceSubtask> taskSituation6Info = new ArrayList<>();
 
         for (ServiceSubtask serviceSubtask : serviceSubtaskList) {
             //鏃犻渶闅忚浜烘
             if (serviceSubtask.getSendstate() != null && serviceSubtask.getSendstate() == 4) {
                 serviceSubtaskStatistic.setNonFollowUp(serviceSubtaskStatistic.getNonFollowUp() + 1L);
-                nonFollowUpInfo.add(serviceSubtask);
                 if (serviceSubtask.getTaskSituation() != null && serviceSubtask.getTaskSituation() == 6) {
                     serviceSubtaskStatistic.setFilterCount(serviceSubtaskStatistic.getFilterCount() + 1L);
-                    filterServiceSubtasks.add(serviceSubtask);
                 }
             }
             //搴旈殢璁夸汉娆�
@@ -3121,72 +3035,80 @@
                 //棣栨搴旈殢璁�
                 if (serviceSubtask.getSendstate() != null && serviceSubtask.getSendstate() != 4) {
                     serviceSubtaskStatistic.setNeedFollowUp(serviceSubtaskStatistic.getNeedFollowUp() + 1L);
-                    needFollowUpInfo.add(serviceSubtask);
                 }
                 //棣栨寰呴殢璁�
                 if (serviceSubtask.getSendstate() != null && serviceSubtask.getSendstate() == 2) {
                     serviceSubtaskStatistic.setPendingFollowUp(serviceSubtaskStatistic.getPendingFollowUp() + 1L);
-                    pendingFollowUpInfo.add(serviceSubtask);
                 }
                 //棣栨闅忚澶辫触(鍖呮嫭闅忚澶辫触+浜哄伐瓒呮椂)
                 if (serviceSubtask.getSendstate() != null && (serviceSubtask.getSendstate() == 5 || serviceSubtask.getSendstate() == 7)) {
                     serviceSubtaskStatistic.setFollowUpFail(serviceSubtaskStatistic.getFollowUpFail() + 1L);
-                    followUpFailInfo.add(serviceSubtask);
                 }
                 /**
                  * 涓嶅悓缁熻鏂瑰紡涓嬩笉鍚岀殑闅忚鎴愬姛鏁� 鍙傛暟 followUpCountStyle 鎺у埗
                  */
                 if (StringUtils.isNotEmpty(followUpCountStyle) && followUpCountStyle.equals("1")) {
                     //棣栨闅忚鎴愬姛
-                    if (serviceSubtask.getSendstate() != null && (serviceSubtask.getSendstate() == 6L)) {
+                    if (serviceSubtask.getSendstate() != null && (serviceSubtask.getSendstate().equals(6L))) {
                         serviceSubtaskStatistic.setFollowUpSuccess(serviceSubtaskStatistic.getFollowUpSuccess() + 1L);
-                        followUpSuccessInfo.add(serviceSubtask);
                     }
                     //棣栨闅忚浜哄伐 (涓嶇粺璁′笉鎵ц)
                     if (serviceSubtask.getSendstate() != null && !serviceSubtask.getSendstate().equals(4L) && ObjectUtils.isNotEmpty(serviceSubtask.getCurrentPreachform()) && serviceSubtask.getCurrentPreachform().equals("1")) {
                         serviceSubtaskStatistic.setManual(serviceSubtaskStatistic.getManual() + 1L);
-                        manualInfo.add(serviceSubtask);
                     }
                     //棣栨闅忚璇煶 (涓嶇粺璁′笉鎵ц)
                     if (serviceSubtask.getSendstate() != null && !serviceSubtask.getSendstate().equals(4L) && ObjectUtils.isNotEmpty(serviceSubtask.getCurrentPreachform()) && serviceSubtask.getCurrentPreachform().equals("3")) {
                         serviceSubtaskStatistic.setVoice(serviceSubtaskStatistic.getVoice() + 1L);
-                        voiceInfo.add(serviceSubtask);
                     }
                     //棣栨闅忚鐭俊(涓嶇粺璁′笉鎵ц)
                     if (serviceSubtask.getSendstate() != null && !serviceSubtask.getSendstate().equals(4L) && ObjectUtils.isNotEmpty(serviceSubtask.getCurrentPreachform()) && serviceSubtask.getCurrentPreachform().equals("4")) {
                         serviceSubtaskStatistic.setSms(serviceSubtaskStatistic.getSms() + 1L);
-                        smsInfo.add(serviceSubtask);
                     }
                     //棣栨闅忚寰俊(涓嶇粺璁′笉鎵ц)
                     if (serviceSubtask.getSendstate() != null && !serviceSubtask.getSendstate().equals(4L) && ObjectUtils.isNotEmpty(serviceSubtask.getCurrentPreachform()) && serviceSubtask.getCurrentPreachform().equals("5")) {
                         serviceSubtaskStatistic.setWeChat(serviceSubtaskStatistic.getWeChat() + 1L);
-                        wechatInfo.add(serviceSubtask);
+                    }
+                } else if (StringUtils.isNotEmpty(followUpCountStyle) && followUpCountStyle.equals("3")) {
+                    //棣栨闅忚鎴愬姛
+                    if (serviceSubtask.getSendstate() != null && (serviceSubtask.getSendstate().equals(6L))) {
+                        serviceSubtaskStatistic.setFollowUpSuccess(serviceSubtaskStatistic.getFollowUpSuccess() + 1L);
+                    }
+                    //棣栨闅忚浜哄伐 (鍙粺璁″凡瀹屾垚)
+                    if (serviceSubtask.getSendstate() != null && serviceSubtask.getSendstate().equals(6L) && ObjectUtils.isNotEmpty(serviceSubtask.getCurrentPreachform()) && serviceSubtask.getCurrentPreachform().equals("1")) {
+                        serviceSubtaskStatistic.setManual(serviceSubtaskStatistic.getManual() + 1L);
+                    }
+                    //棣栨闅忚璇煶 (鍙粺璁″凡瀹屾垚)
+                    if (serviceSubtask.getSendstate() != null && serviceSubtask.getSendstate().equals(6L) && ObjectUtils.isNotEmpty(serviceSubtask.getCurrentPreachform()) && serviceSubtask.getCurrentPreachform().equals("3")) {
+                        serviceSubtaskStatistic.setVoice(serviceSubtaskStatistic.getVoice() + 1L);
+                    }
+                    //棣栨闅忚鐭俊(鍙粺璁″凡瀹屾垚)
+                    if (serviceSubtask.getSendstate() != null && serviceSubtask.getSendstate().equals(6L) && ObjectUtils.isNotEmpty(serviceSubtask.getCurrentPreachform()) && serviceSubtask.getCurrentPreachform().equals("4")) {
+                        serviceSubtaskStatistic.setSms(serviceSubtaskStatistic.getSms() + 1L);
+                    }
+                    //棣栨闅忚寰俊(鍙粺璁″凡瀹屾垚)
+                    if (serviceSubtask.getSendstate() != null && serviceSubtask.getSendstate().equals(6L) && ObjectUtils.isNotEmpty(serviceSubtask.getCurrentPreachform()) && serviceSubtask.getCurrentPreachform().equals("5")) {
+                        serviceSubtaskStatistic.setWeChat(serviceSubtaskStatistic.getWeChat() + 1L);
                     }
                 } else {
                     //棣栨闅忚鎴愬姛 - 缁熻鏃跺�欏姞涓婁笉鎵ц鐨勶紝宸插彂閫佺殑
                     if (serviceSubtask.getSendstate() != null && (serviceSubtask.getSendstate().equals(6L) || serviceSubtask.getSendstate().equals(3L) || serviceSubtask.getSendstate().equals(4L))) {
                         serviceSubtaskStatistic.setFollowUpSuccess(serviceSubtaskStatistic.getFollowUpSuccess() + 1L);
-                        followUpSuccessInfo.add(serviceSubtask);
                     }
                     //棣栨闅忚浜哄伐 (缁熻涓嶆墽琛�)
                     if (serviceSubtask.getSendstate() != null && ObjectUtils.isNotEmpty(serviceSubtask.getCurrentPreachform()) && serviceSubtask.getCurrentPreachform().equals("1")) {
                         serviceSubtaskStatistic.setManual(serviceSubtaskStatistic.getManual() + 1L);
-                        manualInfo.add(serviceSubtask);
                     }
                     //棣栨闅忚璇煶 (缁熻涓嶆墽琛�)
                     if (serviceSubtask.getSendstate() != null && ObjectUtils.isNotEmpty(serviceSubtask.getCurrentPreachform()) && serviceSubtask.getCurrentPreachform().equals("3")) {
                         serviceSubtaskStatistic.setVoice(serviceSubtaskStatistic.getVoice() + 1L);
-                        voiceInfo.add(serviceSubtask);
                     }
                     //棣栨闅忚鐭俊(缁熻涓嶆墽琛�)
                     if (serviceSubtask.getSendstate() != null && ObjectUtils.isNotEmpty(serviceSubtask.getCurrentPreachform()) && serviceSubtask.getCurrentPreachform().equals("4")) {
                         serviceSubtaskStatistic.setSms(serviceSubtaskStatistic.getSms() + 1L);
-                        smsInfo.add(serviceSubtask);
                     }
                     //棣栨闅忚寰俊(缁熻涓嶆墽琛�)
                     if (serviceSubtask.getSendstate() != null && ObjectUtils.isNotEmpty(serviceSubtask.getCurrentPreachform()) && serviceSubtask.getCurrentPreachform().equals("5")) {
                         serviceSubtaskStatistic.setWeChat(serviceSubtaskStatistic.getWeChat() + 1L);
-                        wechatInfo.add(serviceSubtask);
                     }
                 }
                 if (serviceSubtaskStatistic.getNeedFollowUp() > 0) {
@@ -3203,56 +3125,23 @@
             //闅忚鎯呭喌
             if (serviceSubtask.getTaskSituation() != null && serviceSubtask.getTaskSituation() == 1) {
                 serviceSubtaskStatistic.setTaskSituation1(serviceSubtaskStatistic.getTaskSituation1() + 1);
-                taskSituation1Info.add(serviceSubtask);
             }
             if (serviceSubtask.getTaskSituation() != null && serviceSubtask.getTaskSituation() == 2) {
                 serviceSubtaskStatistic.setTaskSituation2(serviceSubtaskStatistic.getTaskSituation2() + 1);
-                taskSituation2Info.add(serviceSubtask);
             }
             if (serviceSubtask.getTaskSituation() != null && serviceSubtask.getTaskSituation() == 3) {
                 serviceSubtaskStatistic.setTaskSituation3(serviceSubtaskStatistic.getTaskSituation3() + 1);
-                taskSituation3Info.add(serviceSubtask);
             }
             if (serviceSubtask.getTaskSituation() != null && serviceSubtask.getTaskSituation() == 4) {
                 serviceSubtaskStatistic.setTaskSituation4(serviceSubtaskStatistic.getTaskSituation4() + 1);
-                taskSituation4Info.add(serviceSubtask);
             }
             if (serviceSubtask.getTaskSituation() != null && serviceSubtask.getTaskSituation() == 5) {
                 serviceSubtaskStatistic.setTaskSituation5(serviceSubtaskStatistic.getTaskSituation5() + 1);
-                taskSituation5Info.add(serviceSubtask);
             }
             if (serviceSubtask.getTaskSituation() != null && serviceSubtask.getTaskSituation() == 7) {
                 serviceSubtaskStatistic.setTaskSituation6(serviceSubtaskStatistic.getTaskSituation6() + 1);
-                taskSituation6Info.add(serviceSubtask);
             }
         }
-        serviceSubtaskStatistic.setFilterCountList(filterServiceSubtasks);
-        //璁板綍鏃犻渶闅忚璇︽儏
-        serviceSubtaskStatistic.setNonFollowUpInfo(nonFollowUpInfo);
-        //璁板綍棣栨搴旈殢璁胯鎯�
-        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.setTaskSituation1Info(taskSituation1Info);
-        serviceSubtaskStatistic.setTaskSituation2Info(taskSituation2Info);
-        serviceSubtaskStatistic.setTaskSituation3Info(taskSituation3Info);
-        serviceSubtaskStatistic.setTaskSituation4Info(taskSituation4Info);
-        serviceSubtaskStatistic.setTaskSituation5Info(taskSituation5Info);
-        serviceSubtaskStatistic.setTaskSituation6Info(taskSituation6Info);
         return serviceSubtaskStatistic;
     }
 
@@ -3275,46 +3164,12 @@
         serviceSubtaskStatistic.setDrname(serviceSubtaskList.get(0).getDrname());
         //鍑洪櫌浜烘
         serviceSubtaskStatistic.setDischargeCount(serviceSubtaskList.size());
-        //鍑洪櫌浜烘璇︽儏
-        serviceSubtaskStatistic.setDischargeCountInfo(serviceSubtaskList);
-        //鏃犻渶闅忚璇︽儏
-        List<ServiceSubtask> nonFollowUpInfo = new ArrayList<>();
-        //璁板綍杩囨护鎮ｈ�呰鎯�
-        List<ServiceSubtask> filterServiceSubtasks = 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> taskSituation1Info = new ArrayList<>();
-        List<ServiceSubtask> taskSituation2Info = new ArrayList<>();
-        List<ServiceSubtask> taskSituation3Info = new ArrayList<>();
-        List<ServiceSubtask> taskSituation4Info = new ArrayList<>();
-        List<ServiceSubtask> taskSituation5Info = new ArrayList<>();
-        List<ServiceSubtask> taskSituation6Info = new ArrayList<>();
-
         for (ServiceSubtask serviceSubtask : serviceSubtaskList) {
             //鏃犻渶闅忚浜烘
             if (serviceSubtask.getSendstate() != null && serviceSubtask.getSendstate() == 4) {
                 serviceSubtaskStatistic.setNonFollowUp(serviceSubtaskStatistic.getNonFollowUp() + 1L);
-                nonFollowUpInfo.add(serviceSubtask);
                 if (serviceSubtask.getTaskSituation() != null && serviceSubtask.getTaskSituation() == 6) {
                     serviceSubtaskStatistic.setFilterCount(serviceSubtaskStatistic.getFilterCount() + 1L);
-                    filterServiceSubtasks.add(serviceSubtask);
                 }
             }
             //搴旈殢璁夸汉娆�
@@ -3327,72 +3182,80 @@
                 //鍐嶆搴旈殢璁�
                 if (serviceSubtask.getSendstate() != null && serviceSubtask.getSendstate() != 4) {
                     serviceSubtaskStatistic.setNeedFollowUpAgain(serviceSubtaskStatistic.getNeedFollowUpAgain() + 1L);
-                    needFollowUpAgainInfo.add(serviceSubtask);
                 }
                 //鍐嶆寰呴殢璁�
                 if (serviceSubtask.getSendstate() != null && serviceSubtask.getSendstate() == 2) {
                     serviceSubtaskStatistic.setPendingFollowUpAgain(serviceSubtaskStatistic.getPendingFollowUpAgain() + 1L);
-                    pendingFollowUpAgainInfo.add(serviceSubtask);
                 }
                 //鍐嶆闅忚澶辫触
                 if (serviceSubtask.getSendstate() != null && serviceSubtask.getSendstate() == 5) {
                     serviceSubtaskStatistic.setFollowUpFailAgain(serviceSubtaskStatistic.getFollowUpFailAgain() + 1L);
-                    followUpFailAgainInfo.add(serviceSubtask);
                 }
                 /**
                  * 涓嶅悓缁熻鏂瑰紡涓嬩笉鍚岀殑闅忚鎴愬姛鏁� 鍙傛暟 followUpCountStyle 鎺у埗
                  */
                 if (StringUtils.isNotEmpty(followUpCountStyle) && followUpCountStyle.equals("1")) {
                     //鍐嶆闅忚鎴愬姛
-                    if (serviceSubtask.getSendstate() != null && (serviceSubtask.getSendstate() == 1 || serviceSubtask.getSendstate() == 3 || serviceSubtask.getSendstate() == 6)) {
+                    if (serviceSubtask.getSendstate() != null && serviceSubtask.getSendstate().equals(6L)) {
                         serviceSubtaskStatistic.setFollowUpSuccessAgain(serviceSubtaskStatistic.getFollowUpSuccessAgain() + 1L);
-                        followUpSuccessAgainInfo.add(serviceSubtask);
                     }
                     //鍐嶆闅忚浜哄伐(涓嶇粺璁′笉鎵ц)
                     if (serviceSubtask.getSendstate() != null && !serviceSubtask.getSendstate().equals(4L) && ObjectUtils.isNotEmpty(serviceSubtask.getCurrentPreachform()) && serviceSubtask.getCurrentPreachform().equals("1")) {
                         serviceSubtaskStatistic.setManualAgain(serviceSubtaskStatistic.getManualAgain() + 1L);
-                        manualAgainInfo.add(serviceSubtask);
                     }
                     //鍐嶆闅忚璇煶(涓嶇粺璁′笉鎵ц)
                     if (serviceSubtask.getSendstate() != null && !serviceSubtask.getSendstate().equals(4L) && ObjectUtils.isNotEmpty(serviceSubtask.getCurrentPreachform()) && serviceSubtask.getCurrentPreachform().equals("3")) {
                         serviceSubtaskStatistic.setVoiceAgain(serviceSubtaskStatistic.getVoiceAgain() + 1L);
-                        voiceAgainInfo.add(serviceSubtask);
                     }
                     //鍐嶆闅忚鐭俊(涓嶇粺璁′笉鎵ц)
                     if (serviceSubtask.getSendstate() != null && !serviceSubtask.getSendstate().equals(4L) && ObjectUtils.isNotEmpty(serviceSubtask.getCurrentPreachform()) && serviceSubtask.getCurrentPreachform().equals("4")) {
                         serviceSubtaskStatistic.setSmsAgain(serviceSubtaskStatistic.getSmsAgain() + 1L);
-                        smsAgainInfo.add(serviceSubtask);
                     }
                     //鍐嶆闅忚寰俊(涓嶇粺璁′笉鎵ц)
                     if (serviceSubtask.getSendstate() != null && !serviceSubtask.getSendstate().equals(4L) && ObjectUtils.isNotEmpty(serviceSubtask.getCurrentPreachform()) && serviceSubtask.getCurrentPreachform().equals("5")) {
                         serviceSubtaskStatistic.setWeChatAgain(serviceSubtaskStatistic.getWeChatAgain() + 1L);
-                        wechatAgainInfo.add(serviceSubtask);
+                    }
+                } else if (StringUtils.isNotEmpty(followUpCountStyle) && followUpCountStyle.equals("3")) {
+                    //鍐嶆闅忚鎴愬姛
+                    if (serviceSubtask.getSendstate() != null && serviceSubtask.getSendstate().equals(6L)) {
+                        serviceSubtaskStatistic.setFollowUpSuccessAgain(serviceSubtaskStatistic.getFollowUpSuccessAgain() + 1L);
+                    }
+                    //鍐嶆闅忚浜哄伐 (鍙粺璁″凡瀹屾垚)
+                    if (serviceSubtask.getSendstate() != null && serviceSubtask.getSendstate().equals(6L) && ObjectUtils.isNotEmpty(serviceSubtask.getCurrentPreachform()) && serviceSubtask.getCurrentPreachform().equals("1")) {
+                        serviceSubtaskStatistic.setManualAgain(serviceSubtaskStatistic.getManualAgain() + 1L);
+                    }
+                    //鍐嶆闅忚璇煶 (鍙粺璁″凡瀹屾垚)
+                    if (serviceSubtask.getSendstate() != null && serviceSubtask.getSendstate().equals(6L) && ObjectUtils.isNotEmpty(serviceSubtask.getCurrentPreachform()) && serviceSubtask.getCurrentPreachform().equals("3")) {
+                        serviceSubtaskStatistic.setVoiceAgain(serviceSubtaskStatistic.getVoiceAgain() + 1L);
+                    }
+                    //鍐嶆闅忚鐭俊(鍙粺璁″凡瀹屾垚)
+                    if (serviceSubtask.getSendstate() != null && serviceSubtask.getSendstate().equals(6L) && ObjectUtils.isNotEmpty(serviceSubtask.getCurrentPreachform()) && serviceSubtask.getCurrentPreachform().equals("4")) {
+                        serviceSubtaskStatistic.setSmsAgain(serviceSubtaskStatistic.getSmsAgain() + 1L);
+                    }
+                    //棣栨闅忚寰俊(鍙粺璁″凡瀹屾垚)
+                    if (serviceSubtask.getSendstate() != null && serviceSubtask.getSendstate().equals(6L) && ObjectUtils.isNotEmpty(serviceSubtask.getCurrentPreachform()) && serviceSubtask.getCurrentPreachform().equals("5")) {
+                        serviceSubtaskStatistic.setWeChatAgain(serviceSubtaskStatistic.getWeChatAgain() + 1L);
                     }
                 } else {
                     //鍐嶆闅忚鎴愬姛
                     if (serviceSubtask.getSendstate() != null && (serviceSubtask.getSendstate().equals(1L) || serviceSubtask.getSendstate().equals(6L) || serviceSubtask.getSendstate().equals(3L) || serviceSubtask.getSendstate().equals(4L))) {
                         serviceSubtaskStatistic.setFollowUpSuccessAgain(serviceSubtaskStatistic.getFollowUpSuccessAgain() + 1L);
-                        followUpSuccessAgainInfo.add(serviceSubtask);
                     }
                     //鍐嶆闅忚浜哄伐(缁熻涓嶆墽琛�)
                     if (serviceSubtask.getSendstate() != null && ObjectUtils.isNotEmpty(serviceSubtask.getCurrentPreachform()) && serviceSubtask.getCurrentPreachform().equals("1")) {
                         serviceSubtaskStatistic.setManualAgain(serviceSubtaskStatistic.getManualAgain() + 1L);
-                        manualAgainInfo.add(serviceSubtask);
                     }
                     //鍐嶆闅忚璇煶(缁熻涓嶆墽琛�)
                     if (serviceSubtask.getSendstate() != null && ObjectUtils.isNotEmpty(serviceSubtask.getCurrentPreachform()) && serviceSubtask.getCurrentPreachform().equals("3")) {
                         serviceSubtaskStatistic.setVoiceAgain(serviceSubtaskStatistic.getVoiceAgain() + 1L);
-                        voiceAgainInfo.add(serviceSubtask);
                     }
                     //鍐嶆闅忚鐭俊(缁熻涓嶆墽琛�)
                     if (serviceSubtask.getSendstate() != null && ObjectUtils.isNotEmpty(serviceSubtask.getCurrentPreachform()) && serviceSubtask.getCurrentPreachform().equals("4")) {
                         serviceSubtaskStatistic.setSmsAgain(serviceSubtaskStatistic.getSmsAgain() + 1L);
-                        smsAgainInfo.add(serviceSubtask);
                     }
                     //鍐嶆闅忚寰俊(缁熻涓嶆墽琛�)
                     if (serviceSubtask.getSendstate() != null && ObjectUtils.isNotEmpty(serviceSubtask.getCurrentPreachform()) && serviceSubtask.getCurrentPreachform().equals("5")) {
                         serviceSubtaskStatistic.setWeChatAgain(serviceSubtaskStatistic.getWeChatAgain() + 1L);
-                        wechatAgainInfo.add(serviceSubtask);
                     }
                 }
                 if (serviceSubtaskStatistic.getNeedFollowUp() > 0) {
@@ -3409,56 +3272,23 @@
             //闅忚鎯呭喌
             if (serviceSubtask.getTaskSituation() != null && serviceSubtask.getTaskSituation() == 1) {
                 serviceSubtaskStatistic.setTaskSituation1(serviceSubtaskStatistic.getTaskSituation1() + 1);
-                taskSituation1Info.add(serviceSubtask);
             }
             if (serviceSubtask.getTaskSituation() != null && serviceSubtask.getTaskSituation() == 2) {
                 serviceSubtaskStatistic.setTaskSituation2(serviceSubtaskStatistic.getTaskSituation2() + 1);
-                taskSituation2Info.add(serviceSubtask);
             }
             if (serviceSubtask.getTaskSituation() != null && serviceSubtask.getTaskSituation() == 3) {
                 serviceSubtaskStatistic.setTaskSituation3(serviceSubtaskStatistic.getTaskSituation3() + 1);
-                taskSituation3Info.add(serviceSubtask);
             }
             if (serviceSubtask.getTaskSituation() != null && serviceSubtask.getTaskSituation() == 4) {
                 serviceSubtaskStatistic.setTaskSituation4(serviceSubtaskStatistic.getTaskSituation4() + 1);
-                taskSituation4Info.add(serviceSubtask);
             }
             if (serviceSubtask.getTaskSituation() != null && serviceSubtask.getTaskSituation() == 5) {
                 serviceSubtaskStatistic.setTaskSituation5(serviceSubtaskStatistic.getTaskSituation5() + 1);
-                taskSituation5Info.add(serviceSubtask);
             }
             if (serviceSubtask.getTaskSituation() != null && serviceSubtask.getTaskSituation() == 7) {
                 serviceSubtaskStatistic.setTaskSituation6(serviceSubtaskStatistic.getTaskSituation6() + 1);
-                taskSituation6Info.add(serviceSubtask);
             }
         }
-        serviceSubtaskStatistic.setFilterCountList(filterServiceSubtasks);
-        //璁板綍鏃犻渶闅忚璇︽儏
-        serviceSubtaskStatistic.setNonFollowUpInfo(nonFollowUpInfo);
-        //璁板綍鍐嶆搴旈殢璁胯鎯�
-        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.setTaskSituation1Info(taskSituation1Info);
-        serviceSubtaskStatistic.setTaskSituation2Info(taskSituation2Info);
-        serviceSubtaskStatistic.setTaskSituation3Info(taskSituation3Info);
-        serviceSubtaskStatistic.setTaskSituation4Info(taskSituation4Info);
-        serviceSubtaskStatistic.setTaskSituation5Info(taskSituation5Info);
-        serviceSubtaskStatistic.setTaskSituation6Info(taskSituation6Info);
         return serviceSubtaskStatistic;
     }
 
@@ -3578,10 +3408,6 @@
         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.setJoyCount(0);
         serviceSubtaskStatistic.setJoyAllCount(0);
 
@@ -3589,49 +3415,6 @@
         if (subCounts == null) {
             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<>();
 
 
         for (ServiceSubtask serviceSubtask : serviceSubtaskList) {
@@ -3647,31 +3430,25 @@
             //鏃犻渶闅忚浜烘
             if (serviceSubtask.getSendstate() != null && serviceSubtask.getSendstate() == 4) {
                 serviceSubtaskStatistic.setNonFollowUp(serviceSubtaskStatistic.getNonFollowUp() + 1L);
-//                nonFollowUpInfo.add(serviceSubtask);
             }
             //搴旈殢璁夸汉娆�
             if (serviceSubtask.getSendstate() != null && serviceSubtask.getSendstate() != 4) {
                 serviceSubtaskStatistic.setFollowUpNeeded(serviceSubtaskStatistic.getFollowUpNeeded() + 1L);
-//                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);
                 }
                 if (serviceSubtask.getSendstate() != null && serviceSubtask.getSendstate() == 2) {
                     serviceSubtaskStatistic.setPendingFollowUp(serviceSubtaskStatistic.getPendingFollowUp() + 1L);
-//                    pendingFollowUpInfo.add(serviceSubtask);
                 }
                 if (serviceSubtask.getSendstate() != null && (serviceSubtask.getSendstate() == 6)) {
                     serviceSubtaskStatistic.setFollowUpSuccess(serviceSubtaskStatistic.getFollowUpSuccess() + 1L);
-//                    followUpSuccessInfo.add(serviceSubtask);
                 }
                 if (serviceSubtask.getSendstate() != null && (serviceSubtask.getSendstate() == 5 || serviceSubtask.getSendstate() == 7)) {
                     serviceSubtaskStatistic.setFollowUpFail(serviceSubtaskStatistic.getFollowUpFail() + 1L);
-//                    followUpFailInfo.add(serviceSubtask);
                 }
                 if (serviceSubtaskStatistic.getNeedFollowUp() > 0) {
                     double rate = (double) (serviceSubtaskStatistic.getFollowUpSuccess() + serviceSubtaskStatistic.getFollowUpFail()) / serviceSubtaskStatistic.getNeedFollowUp();
@@ -3681,41 +3458,32 @@
                 }
                 if (serviceSubtask.getSendstate() != null && ObjectUtils.isNotEmpty(serviceSubtask.getCurrentPreachform()) && serviceSubtask.getCurrentPreachform().equals("1")) {
                     serviceSubtaskStatistic.setManual(serviceSubtaskStatistic.getManual() + 1L);
-//                    manualInfo.add(serviceSubtask);
                 }
                 if (serviceSubtask.getSendstate() != null && ObjectUtils.isNotEmpty(serviceSubtask.getCurrentPreachform()) && serviceSubtask.getCurrentPreachform().equals("3")) {
                     serviceSubtaskStatistic.setVoice(serviceSubtaskStatistic.getVoice() + 1L);
-//                    voiceInfo.add(serviceSubtask);
                 }
                 if (serviceSubtask.getSendstate() != null && ObjectUtils.isNotEmpty(serviceSubtask.getCurrentPreachform()) && serviceSubtask.getCurrentPreachform().equals("4")) {
                     serviceSubtaskStatistic.setSms(serviceSubtaskStatistic.getSms() + 1L);
-//                    smsInfo.add(serviceSubtask);
                 }
                 if (serviceSubtask.getSendstate() != null && ObjectUtils.isNotEmpty(serviceSubtask.getCurrentPreachform()) && serviceSubtask.getCurrentPreachform().equals("5")) {
                     serviceSubtaskStatistic.setWeChat(serviceSubtaskStatistic.getWeChat() + 1L);
-//                    wechatInfo.add(serviceSubtask);
                 }
                 if (serviceSubtask.getSendstate() != null && serviceSubtask.getExcep().equals("1")) {
                     serviceSubtaskStatistic.setAbnormal(serviceSubtaskStatistic.getAbnormal() + 1L);
-//                    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);
                 }
                 if (serviceSubtask.getSendstate() != null && serviceSubtask.getSendstate() == 2) {
                     serviceSubtaskStatistic.setPendingFollowUpAgain(serviceSubtaskStatistic.getPendingFollowUpAgain() + 1L);
-//                    pendingFollowUpAgainInfo.add(serviceSubtask);
                 }
                 if (serviceSubtask.getSendstate() != null && (serviceSubtask.getSendstate() == 1 || serviceSubtask.getSendstate() == 3 || serviceSubtask.getSendstate() == 6)) {
                     serviceSubtaskStatistic.setFollowUpSuccessAgain(serviceSubtaskStatistic.getFollowUpSuccessAgain() + 1L);
-//                    followUpSuccessAgainInfo.add(serviceSubtask);
                 }
                 if (serviceSubtask.getSendstate() != null && serviceSubtask.getSendstate() == 5) {
                     serviceSubtaskStatistic.setFollowUpFailAgain(serviceSubtaskStatistic.getFollowUpFailAgain() + 1L);
-//                    followUpFailAgainInfo.add(serviceSubtask);
                 }
                 if (serviceSubtaskStatistic.getNeedFollowUp() > 0) {
                     double rate = (double) (serviceSubtaskStatistic.getFollowUpSuccessAgain() + serviceSubtaskStatistic.getFollowUpFailAgain()) / serviceSubtaskStatistic.getNeedFollowUpAgain();
@@ -3725,64 +3493,22 @@
                 }
                 if (serviceSubtask.getSendstate() != null && ObjectUtils.isNotEmpty(serviceSubtask.getCurrentPreachform()) && serviceSubtask.getCurrentPreachform().equals("1")) {
                     serviceSubtaskStatistic.setManualAgain(serviceSubtaskStatistic.getManualAgain() + 1L);
-//                    manualAgainInfo.add(serviceSubtask);
                 }
                 //鍐嶆闅忚璇煶(缁熻涓嶆墽琛�)
                 if (serviceSubtask.getSendstate() != null && ObjectUtils.isNotEmpty(serviceSubtask.getCurrentPreachform()) && serviceSubtask.getCurrentPreachform().equals("3")) {
                     serviceSubtaskStatistic.setVoiceAgain(serviceSubtaskStatistic.getVoiceAgain() + 1L);
-//                    voiceAgainInfo.add(serviceSubtask);
                 }
                 if (serviceSubtask.getSendstate() != null && ObjectUtils.isNotEmpty(serviceSubtask.getCurrentPreachform()) && serviceSubtask.getCurrentPreachform().equals("4")) {
                     serviceSubtaskStatistic.setSmsAgain(serviceSubtaskStatistic.getSmsAgain() + 1L);
-//                    smsAgainInfo.add(serviceSubtask);
                 }
                 if (serviceSubtask.getSendstate() != null && ObjectUtils.isNotEmpty(serviceSubtask.getCurrentPreachform()) && serviceSubtask.getCurrentPreachform().equals("5")) {
                     serviceSubtaskStatistic.setWeChatAgain(serviceSubtaskStatistic.getWeChatAgain() + 1L);
-//                    wechatAgainInfo.add(serviceSubtask);
                 }
                 if (serviceSubtask.getSendstate() != null && serviceSubtask.getExcep().equals("1")) {
                     serviceSubtaskStatistic.setAbnormalAgain(serviceSubtaskStatistic.getAbnormalAgain() + 1L);
-//                    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);
         return serviceSubtaskStatistic;
     }
 
@@ -3946,13 +3672,186 @@
     }
 
     /**
+     * 鑾峰彇闅忚缁熻瓒呴摼鎺�
+     * dischargeCountInfo
+     * followUpNeededAllInfo - sendstate != 4 (1,2,3,5,6,7)
+     * nonFollowUpInfo - sendstate = 4
+     * needFollowUpInfo - visitCount = 1 && sendstate != 4
+     * pendingFollowUpInfo - visitCount = 1 && sendstate = 2
+     * followUpSuccessInfo - visitCount = 1 && sendstate = 6
+     * followUpFailInfo - visitCount = 1 && (sendstate = 5 || sendstate = 7)
+     * manualInfo - visitCount = 1 && currentPreachForm = "1"
+     * voiceInfo - visitCount = 1 && currentPreachForm = "3"
+     * smsInfo - visitCount = 1 && currentPreachForm = "4"
+     * wechatInfo - visitCount = 1 && currentPreachForm = "5"
+     * abnormalInfo - visitCount = 1 && excep = "1"
+     * needFollowUpAgainInfo - visitCount > 1 && sendstate != 4
+     * pendingFollowUpAgainInfo -  visitCount > 1 && sendstate = 2
+     * followUpSuccessAgainInfo - visitCount > 1 && sendstate =6
+     * followUpFailAgainInfo - visitCount > 1 && (sendstate = 5 || sendstate = 7)
+     * manualAgainInfo - visitCount > 1 && currentPreachForm = "1"
+     * voiceAgainInfo - visitCount > 1 && currentPreachForm = "3"
+     * smsAgainInfo - visitCount > 1 && currentPreachForm = "4"
+     * wechatAgainInfo -  visitCount > 1 && currentPreachForm = "5"
+     * abnormalAgainInfo- visitCount = 1 && excep = "1"
+     * taskSituation1Info - taskSituation = 1
+     * taskSituation2Info - taskSituation = 2
+     * taskSituation3Info - taskSituation = 3
+     * taskSituation4Info - taskSituation = 4
+     * taskSituation5Info - taskSituation = 5
+     * taskSituation6Info - taskSituation = 7
+     * filterCountList - taskSituation = 6 && sendstate = 4
+     *
+     */
+    @Override
+    public List<ServiceSubtask> getSfStatisticsHyperlink(ServiceSubtaskCountReq serviceSubtaskCountReq) {
+        String hyperLinkInfoType = serviceSubtaskCountReq.getHyperLinkInfoType();
+        if (StringUtils.isNotEmpty(hyperLinkInfoType)) {
+            applyHyperLinkInfoType(serviceSubtaskCountReq, hyperLinkInfoType);
+        }
+
+        String followUpCountStyle = serviceSubtaskCountReq.getFollowUpCountStyle();
+        /**
+         * 缁熻鏃剁畻涓婁笉鍙戦�佺殑
+         */
+        if (StringUtils.isNotEmpty(followUpCountStyle) && followUpCountStyle.equals("2")) {
+            List<Long> sendstates = serviceSubtaskCountReq.getSendstates();
+            if (CollectionUtils.isNotEmpty(sendstates) && sendstates.get(0).equals(6L)) {
+                List<Long> sendstates1 = new ArrayList<>();
+                sendstates1.add(3L);
+                sendstates1.add(4L);
+                sendstates1.add(6L);
+                serviceSubtaskCountReq.setSendstates(sendstates1);
+            }
+        }
+        List<ServiceSubtask> serviceSubtasks = serviceSubtaskMapper.getSfStatisticsHyperlink(serviceSubtaskCountReq);
+        return serviceSubtasks;
+    }
+
+    private void applyHyperLinkInfoType(ServiceSubtaskCountReq serviceSubtaskCountReq, String hyperLinkInfoType) {
+        serviceSubtaskCountReq.setVisitCount(null);
+        serviceSubtaskCountReq.setSendstates(null);
+        serviceSubtaskCountReq.setCurrentPreachform(null);
+        serviceSubtaskCountReq.setExcep(null);
+        serviceSubtaskCountReq.setTaskSituation(null);
+
+        switch (hyperLinkInfoType) {
+            case "dischargeCountInfo":
+                break;
+            case "followUpNeededAllInfo":
+                serviceSubtaskCountReq.setSendstates(new ArrayList<>(Arrays.asList(1L, 2L, 3L, 5L, 6L, 7L)));
+                break;
+            case "nonFollowUpInfo":
+                serviceSubtaskCountReq.setSendstates(new ArrayList<>(Collections.singletonList(4L)));
+                break;
+            case "needFollowUpInfo":
+                serviceSubtaskCountReq.setVisitCount(1);
+                serviceSubtaskCountReq.setSendstates(new ArrayList<>(Arrays.asList(1L, 2L, 3L, 5L, 6L, 7L)));
+                break;
+            case "pendingFollowUpInfo":
+                serviceSubtaskCountReq.setVisitCount(1);
+                serviceSubtaskCountReq.setSendstates(new ArrayList<>(Collections.singletonList(2L)));
+                break;
+            case "followUpSuccessInfo":
+                serviceSubtaskCountReq.setVisitCount(1);
+                serviceSubtaskCountReq.setSendstates(new ArrayList<>(Collections.singletonList(6L)));
+                break;
+            case "followUpFailInfo":
+                serviceSubtaskCountReq.setVisitCount(1);
+                serviceSubtaskCountReq.setSendstates(new ArrayList<>(Arrays.asList(5L, 7L)));
+                break;
+            case "manualInfo":
+                serviceSubtaskCountReq.setVisitCount(1);
+                serviceSubtaskCountReq.setCurrentPreachform("1");
+                break;
+            case "voiceInfo":
+                serviceSubtaskCountReq.setVisitCount(1);
+                serviceSubtaskCountReq.setCurrentPreachform("3");
+                break;
+            case "smsInfo":
+                serviceSubtaskCountReq.setVisitCount(1);
+                serviceSubtaskCountReq.setCurrentPreachform("4");
+                break;
+            case "wechatInfo":
+                serviceSubtaskCountReq.setVisitCount(1);
+                serviceSubtaskCountReq.setCurrentPreachform("5");
+                break;
+            case "abnormalInfo":
+                serviceSubtaskCountReq.setVisitCount(1);
+                serviceSubtaskCountReq.setExcep("1");
+                break;
+            case "needFollowUpAgainInfo":
+                serviceSubtaskCountReq.setVisitCount(2);
+                serviceSubtaskCountReq.setSendstates(new ArrayList<>(Arrays.asList(1L, 2L, 3L, 5L, 6L, 7L)));
+                break;
+            case "pendingFollowUpAgainInfo":
+                serviceSubtaskCountReq.setVisitCount(2);
+                serviceSubtaskCountReq.setSendstates(new ArrayList<>(Collections.singletonList(2L)));
+                break;
+            case "followUpSuccessAgainInfo":
+                serviceSubtaskCountReq.setVisitCount(2);
+                serviceSubtaskCountReq.setSendstates(new ArrayList<>(Collections.singletonList(6L)));
+                break;
+            case "followUpFailAgainInfo":
+                serviceSubtaskCountReq.setVisitCount(2);
+                serviceSubtaskCountReq.setSendstates(new ArrayList<>(Arrays.asList(5L, 7L)));
+                break;
+            case "manualAgainInfo":
+                serviceSubtaskCountReq.setVisitCount(2);
+                serviceSubtaskCountReq.setCurrentPreachform("1");
+                break;
+            case "voiceAgainInfo":
+                serviceSubtaskCountReq.setVisitCount(2);
+                serviceSubtaskCountReq.setCurrentPreachform("3");
+                break;
+            case "smsAgainInfo":
+                serviceSubtaskCountReq.setVisitCount(2);
+                serviceSubtaskCountReq.setCurrentPreachform("4");
+                break;
+            case "wechatAgainInfo":
+                serviceSubtaskCountReq.setVisitCount(2);
+                serviceSubtaskCountReq.setCurrentPreachform("5");
+                break;
+            case "abnormalAgainInfo":
+                serviceSubtaskCountReq.setVisitCount(2);
+                serviceSubtaskCountReq.setExcep("1");
+                break;
+            case "taskSituation1Info":
+                serviceSubtaskCountReq.setTaskSituation(1);
+                break;
+            case "taskSituation2Info":
+                serviceSubtaskCountReq.setTaskSituation(2);
+                break;
+            case "taskSituation3Info":
+                serviceSubtaskCountReq.setTaskSituation(3);
+                break;
+            case "taskSituation4Info":
+                serviceSubtaskCountReq.setTaskSituation(4);
+                break;
+            case "taskSituation5Info":
+                serviceSubtaskCountReq.setTaskSituation(5);
+                break;
+            case "taskSituation6Info":
+                serviceSubtaskCountReq.setTaskSituation(7);
+                break;
+            case "filterCountList":
+                serviceSubtaskCountReq.setTaskSituation(6);
+                serviceSubtaskCountReq.setSendstates(new ArrayList<>(Collections.singletonList(4L)));
+                break;
+            default:
+                break;
+        }
+    }
+
+
+    /**
      * 鑾峰彇闅忚缁熻姣斾緥
      *
      * @param serviceSubtaskCountReq
      * @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<>();
@@ -3994,10 +3893,7 @@
         //鑾峰彇鍙婃椂鐜囩粺璁″悎闆�
         Map<String, Map<String, Object>> jsRates = getSsRateForSfStatistics(serviceSubtaskCountReq, collect);
         //涓�娆℃�ф煡璇㈡墍鏈夊垎缁勭殑棰樼洰缁熻锛岄伩鍏嶆瘡涓垎缁勪竴娆QL锛圢+1锛�
-        List<Long> allSubTaskIds = rawData.stream().map(ServiceSubtask::getId)
-                .filter(Objects::nonNull)
-                .distinct()
-                .collect(Collectors.toList());
+        List<Long> allSubTaskIds = rawData.stream().map(ServiceSubtask::getId).filter(Objects::nonNull).distinct().collect(Collectors.toList());
         List<ServiceSubtaskCount> subCounts = new ArrayList<>();
         if (CollectionUtils.isNotEmpty(allSubTaskIds)) {
             serviceSubtaskCountReq.setSubTaskIds(allSubTaskIds);

--
Gitblit v1.9.3