From 13f9867df6fc7de535670169c190df4ec9012968 Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期四, 05 二月 2026 10:56:04 +0800
Subject: [PATCH] 【市一】随访任务发送报错补充remark信息

---
 smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java |  274 ++++++++++++++++++++++++++++++++++--------------------
 1 files changed, 171 insertions(+), 103 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 c1605f2..2739c70 100644
--- a/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java
@@ -2228,33 +2228,43 @@
     @Override
     @Cacheable(value = "sfStatistics", key = "T(org.springframework.util.DigestUtils).md5DigestAsHex(#serviceSubtaskCountReq.toString().getBytes())", unless = "#result == null or #result.isEmpty()")
     public List<ServiceSubtaskStatistic> getSfStatistics(ServiceSubtaskCountReq serviceSubtaskCountReq) {
-        //todo
         log.info("getSfStatistics鐨勫叆鍙備负锛歿}", serviceSubtaskCountReq);
-        List<ServiceSubtaskStatistic> serviceSubtaskStatistics = new ArrayList<>();
-        List<ServiceSubtask> rawData = serviceSubtaskMapper.getSfStatistics(serviceSubtaskCountReq);
-
-        // 鏍规嵁鏉′欢杩涜鍒嗙粍
-        Map<String, List<ServiceSubtask>> collect = new HashMap<>();
-
-        String groupKeyType = "";
+        String groupKey = "drcode";
         if (serviceSubtaskCountReq.getLeavehospitaldistrictcodes() != null && !serviceSubtaskCountReq.getLeavehospitaldistrictcodes().isEmpty()) {
             if (serviceSubtaskCountReq.getDrcode() != null && !serviceSubtaskCountReq.getDrcode().isEmpty()) {
-                groupKeyType = "drCode";
-                collect = rawData.stream().collect(Collectors.groupingBy(subtask -> Optional.ofNullable(subtask.getDrcode()).orElse("Unknown")));
+                groupKey = "drcode";
             } else {
-                groupKeyType = "leaveHospitalDistrictCode";
-                collect = rawData.stream().collect(Collectors.groupingBy(subtask -> Optional.ofNullable(subtask.getLeavehospitaldistrictcode()).orElse("Unknown")));
+                groupKey = "leavehospitaldistrictcode";
             }
         } else if (serviceSubtaskCountReq.getDeptcodes() != null && !serviceSubtaskCountReq.getDeptcodes().isEmpty()) {
             if (serviceSubtaskCountReq.getDrcode() != null && !serviceSubtaskCountReq.getDrcode().isEmpty()) {
-                groupKeyType = "drCode";
-                collect = rawData.stream().collect(Collectors.groupingBy(subtask -> Optional.ofNullable(subtask.getDrcode()).orElse("Unknown")));
+                groupKey = "drcode";
             } else {
-                groupKeyType = "deptCode";
-                collect = rawData.stream().collect(Collectors.groupingBy(subtask -> Optional.ofNullable(subtask.getDeptcode()).orElse("Unknown")));
+                groupKey = "deptcode";
             }
         }
-        serviceSubtaskCountReq.setGroupKeyType(groupKeyType);
+        List<ServiceSubtaskStatistic> serviceSubtaskStatistics = new ArrayList<>();
+        // 鏍规嵁鏉′欢杩涜鍒嗙粍
+        Map<String, List<ServiceSubtask>> collect = new HashMap<>();
+        serviceSubtaskCountReq.setGroupKey(groupKey);
+        List<String> groupKeyList = serviceSubtaskMapper.getSfStatisticsGroupKey(serviceSubtaskCountReq);
+        serviceSubtaskCountReq.setGroupKeyList(groupKeyList);
+        List<ServiceSubtask> rawData = serviceSubtaskMapper.getSfStatistics(serviceSubtaskCountReq);
+        switch (groupKey)
+        {
+            case "deptcode":
+                collect = rawData.stream().collect(Collectors.groupingBy(subtask -> Optional.ofNullable(subtask.getDeptcode()).orElse("Unknown")));
+                break;
+            case "drcode":
+                collect = rawData.stream().collect(Collectors.groupingBy(subtask -> Optional.ofNullable(subtask.getDrcode()).orElse("Unknown")));
+                break;
+            case "leavehospitaldistrictcode":
+                collect = rawData.stream().collect(Collectors.groupingBy(subtask -> Optional.ofNullable(subtask.getLeavehospitaldistrictcode()).orElse("Unknown")));
+                break;
+            default:
+                collect = rawData.stream().collect(Collectors.groupingBy(subtask -> Optional.ofNullable(subtask.getDrcode()).orElse("Unknown")));
+                break;
+        }
         //鑾峰彇鍙婃椂鐜囩粺璁″悎闆�
         Map<String, Map<String, Object>> jsRates = getSsRateForSfStatistics(serviceSubtaskCountReq, collect);
         for (String collectKey : collect.keySet()) {
@@ -2262,7 +2272,7 @@
             if (CollectionUtils.isEmpty(serviceSubtaskList)) {
                 continue;
             }
-            ServiceSubtaskStatistic statistic = getStatistic(serviceSubtaskList);
+            ServiceSubtaskStatistic statistic = getStatistic(serviceSubtaskList, serviceSubtaskCountReq.getFollowUpCountStyle());
             if(ObjectUtils.isNotEmpty(jsRates)){
                 Map<String, Object> jsRateMap = jsRates.get(collectKey);
                 BigDecimal jsRate = new BigDecimal("0");
@@ -2290,8 +2300,8 @@
         if(ObjectUtils.isEmpty(serviceSubtaskCountReq)){
             return null;
         }
-        String groupKeyType = serviceSubtaskCountReq.getGroupKeyType();
-        if(StringUtils.isEmpty(groupKeyType)){
+        String groupKey = serviceSubtaskCountReq.getGroupKey();
+        if(StringUtils.isEmpty(groupKey)){
             return null;
         }
         List<String> groupKeyList = new ArrayList<>(collect.keySet());
@@ -2306,25 +2316,8 @@
         if (serviceSubtaskCountReq.getEndTime() != null && new Date().before(serviceSubtaskCountReq.getEndTime())) {
             ssRate.setEndtime(new Date());
         }
-        switch (groupKeyType)
-        {
-            case "deptCode":
-                ssRate.setGroupKey("deptcode");
-                ssRate.setGroupKeyList(groupKeyList);
-                break;
-            case "drCode":
-                ssRate.setGroupKey("drcode");
-                ssRate.setGroupKeyList(groupKeyList);
-                break;
-            case "leaveHospitalDistrictCode":
-                ssRate.setGroupKey("leavehospitaldistrictcode");
-                ssRate.setGroupKeyList(groupKeyList);
-                break;
-            default:
-                ssRate.setGroupKey("drcode");
-                ssRate.setGroupKeyList(groupKeyList);
-                break;
-        }
+        ssRate.setGroupKey(groupKey);
+        ssRate.setGroupKeyList(groupKeyList);
         Map<String, Map<String, Object>> jsRates = new HashMap<>();
         if(!collect.isEmpty()){
             jsRates = serviceSubtaskMapper.selectTimelyRateBatch(ssRate);
@@ -2526,7 +2519,7 @@
     }
 
 
-    private ServiceSubtaskStatistic getStatistic(List<ServiceSubtask> serviceSubtaskList) {
+    private ServiceSubtaskStatistic getStatistic(List<ServiceSubtask> serviceSubtaskList, String followUpCountStyle) {
         ServiceSubtaskStatistic serviceSubtaskStatistic = new ServiceSubtaskStatistic();
         //鏍煎紡鍖栦负涓や綅灏忔暟鐨勭櫨鍒嗘瘮
         DecimalFormat percentFormat = new DecimalFormat("##.##%");
@@ -2596,42 +2589,72 @@
                     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) {
                     serviceSubtaskStatistic.setFollowUpFail(serviceSubtaskStatistic.getFollowUpFail() + 1L);
                     followUpFailInfo.add(serviceSubtask);
+                }
+                /**
+                 * 涓嶅悓缁熻鏂瑰紡涓嬩笉鍚岀殑闅忚鎴愬姛鏁� 鍙傛暟 followUpCountStyle 鎺у埗
+                 */
+                if(StringUtils.isNotEmpty(followUpCountStyle) && followUpCountStyle.equals("1")){
+                    //棣栨闅忚鎴愬姛
+                    if (serviceSubtask.getSendstate() != null && (serviceSubtask.getSendstate() == 6L)) {
+                        serviceSubtaskStatistic.setFollowUpSuccess(serviceSubtaskStatistic.getFollowUpSuccess() + 1L);
+                        followUpSuccessInfo.add(serviceSubtask);
+                    }
+                    //棣栨闅忚浜哄伐 (涓嶇粺璁′笉鎵ц)
+                    if (serviceSubtask.getSendstate() != null
+                            && !serviceSubtask.getSendstate().equals(4L)
+                            && serviceSubtask.getPreachform().equals("1")) {
+                        serviceSubtaskStatistic.setManual(serviceSubtaskStatistic.getManual() + 1L);
+                        manualInfo.add(serviceSubtask);
+                    }
+                    //棣栨闅忚鐭俊(涓嶇粺璁′笉鎵ц)
+                    if (serviceSubtask.getSendstate() != null
+                            && !serviceSubtask.getSendstate().equals(4L)
+                            && serviceSubtask.getPreachform().equals("4")) {
+                        serviceSubtaskStatistic.setSms(serviceSubtaskStatistic.getSms() + 1L);
+                        smsInfo.add(serviceSubtask);
+                    }
+                    //棣栨闅忚寰俊(涓嶇粺璁′笉鎵ц)
+                    if (serviceSubtask.getSendstate() != null
+                            && !serviceSubtask.getSendstate().equals(4L)
+                            && serviceSubtask.getPreachform().equals("5")) {
+                        serviceSubtaskStatistic.setWeChat(serviceSubtaskStatistic.getWeChat() + 1L);
+                        wechatInfo.add(serviceSubtask);
+                    }
+                }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
+                            && serviceSubtask.getPreachform().equals("1")) {
+                        serviceSubtaskStatistic.setManual(serviceSubtaskStatistic.getManual() + 1L);
+                        manualInfo.add(serviceSubtask);
+                    }
+                    //棣栨闅忚鐭俊(缁熻涓嶆墽琛�)
+                    if (serviceSubtask.getSendstate() != null
+                            && serviceSubtask.getPreachform().equals("4")) {
+                        serviceSubtaskStatistic.setSms(serviceSubtaskStatistic.getSms() + 1L);
+                        smsInfo.add(serviceSubtask);
+                    }
+                    //棣栨闅忚寰俊(缁熻涓嶆墽琛�)
+                    if (serviceSubtask.getSendstate() != null
+                            && serviceSubtask.getPreachform().equals("5")) {
+                        serviceSubtaskStatistic.setWeChat(serviceSubtaskStatistic.getWeChat() + 1L);
+                        wechatInfo.add(serviceSubtask);
+                    }
                 }
                 if (serviceSubtaskStatistic.getNeedFollowUp() > 0) {
                     double rate = (double) (serviceSubtaskStatistic.getFollowUpSuccess() + serviceSubtaskStatistic.getFollowUpFail()) / serviceSubtaskStatistic.getNeedFollowUp();
                     serviceSubtaskStatistic.setFollowUpRate(percentFormat.format(rate));
                 } else {
                     serviceSubtaskStatistic.setFollowUpRate("0.00%");
-                }
-                //棣栨闅忚浜哄伐 (涓嶇粺璁′笉鎵ц)
-                if (serviceSubtask.getSendstate() != null
-                        && !serviceSubtask.getSendstate().equals(4L)
-                        && serviceSubtask.getPreachform().equals("1")) {
-                    serviceSubtaskStatistic.setManual(serviceSubtaskStatistic.getManual() + 1L);
-                    manualInfo.add(serviceSubtask);
-                }
-                //棣栨闅忚鐭俊(涓嶇粺璁′笉鎵ц)
-                if (serviceSubtask.getSendstate() != null
-                        && !serviceSubtask.getSendstate().equals(4L)
-                        && serviceSubtask.getPreachform().equals("4")) {
-                    serviceSubtaskStatistic.setSms(serviceSubtaskStatistic.getSms() + 1L);
-                    smsInfo.add(serviceSubtask);
-                }
-                //棣栨闅忚寰俊(涓嶇粺璁′笉鎵ц)
-                if (serviceSubtask.getSendstate() != null
-                        && !serviceSubtask.getSendstate().equals(4L)
-                        && serviceSubtask.getPreachform().equals("5")) {
-                    serviceSubtaskStatistic.setWeChat(serviceSubtaskStatistic.getWeChat() + 1L);
-                    wechatInfo.add(serviceSubtask);
                 }
                 //缁撴灉寮傚父
                 if (serviceSubtask.getSendstate() != null && serviceSubtask.getExcep().equals("1")) {
@@ -2649,42 +2672,73 @@
                     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);
+                }
+                /**
+                 * 涓嶅悓缁熻鏂瑰紡涓嬩笉鍚岀殑闅忚鎴愬姛鏁� 鍙傛暟 followUpCountStyle 鎺у埗
+                 */
+                if(StringUtils.isNotEmpty(followUpCountStyle) && followUpCountStyle.equals("1")){
+                    //鍐嶆闅忚鎴愬姛
+                    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().equals(4L)
+                            && serviceSubtask.getPreachform().equals("1")) {
+                        serviceSubtaskStatistic.setManualAgain(serviceSubtaskStatistic.getManualAgain() + 1L);
+                        manualAgainInfo.add(serviceSubtask);
+                    }
+                    //鍐嶆闅忚鐭俊(涓嶇粺璁′笉鎵ц)
+                    if (serviceSubtask.getSendstate() != null
+                            && !serviceSubtask.getSendstate().equals(4L)
+                            && serviceSubtask.getPreachform().equals("4")) {
+                        serviceSubtaskStatistic.setSmsAgain(serviceSubtaskStatistic.getSmsAgain() + 1L);
+                        smsAgainInfo.add(serviceSubtask);
+                    }
+                    //鍐嶆闅忚寰俊(涓嶇粺璁′笉鎵ц)
+                    if (serviceSubtask.getSendstate() != null
+                            && !serviceSubtask.getSendstate().equals(4L)
+                            && serviceSubtask.getPreachform().equals("5")) {
+                        serviceSubtaskStatistic.setWeChatAgain(serviceSubtaskStatistic.getWeChatAgain() + 1L);
+                        wechatAgainInfo.add(serviceSubtask);
+                    }
+                }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
+                            && serviceSubtask.getPreachform().equals("1")) {
+                        serviceSubtaskStatistic.setManualAgain(serviceSubtaskStatistic.getManualAgain() + 1L);
+                        manualAgainInfo.add(serviceSubtask);
+                    }
+                    //鍐嶆闅忚鐭俊(缁熻涓嶆墽琛�)
+                    if (serviceSubtask.getSendstate() != null
+                            && serviceSubtask.getPreachform().equals("4")) {
+                        serviceSubtaskStatistic.setSmsAgain(serviceSubtaskStatistic.getSmsAgain() + 1L);
+                        smsAgainInfo.add(serviceSubtask);
+                    }
+                    //鍐嶆闅忚寰俊(缁熻涓嶆墽琛�)
+                    if (serviceSubtask.getSendstate() != null
+                            && serviceSubtask.getPreachform().equals("5")) {
+                        serviceSubtaskStatistic.setWeChatAgain(serviceSubtaskStatistic.getWeChatAgain() + 1L);
+                        wechatAgainInfo.add(serviceSubtask);
+                    }
                 }
                 if (serviceSubtaskStatistic.getNeedFollowUp() > 0) {
                     double rate = (double) (serviceSubtaskStatistic.getFollowUpSuccessAgain() + serviceSubtaskStatistic.getFollowUpFailAgain()) / serviceSubtaskStatistic.getNeedFollowUpAgain();
                     serviceSubtaskStatistic.setFollowUpRateAgain(percentFormat.format(rate));
                 } else {
                     serviceSubtaskStatistic.setFollowUpRateAgain("0.00%");
-                }
-                //鍐嶆闅忚浜哄伐(涓嶇粺璁′笉鎵ц)
-                if (serviceSubtask.getSendstate() != null
-                        && !serviceSubtask.getSendstate().equals(4L)
-                        && serviceSubtask.getPreachform().equals("1")) {
-                    serviceSubtaskStatistic.setManualAgain(serviceSubtaskStatistic.getManualAgain() + 1L);
-                    manualAgainInfo.add(serviceSubtask);
-                }
-                //鍐嶆闅忚鐭俊(涓嶇粺璁′笉鎵ц)
-                if (serviceSubtask.getSendstate() != null
-                        && !serviceSubtask.getSendstate().equals(4L)
-                        && serviceSubtask.getPreachform().equals("4")) {
-                    serviceSubtaskStatistic.setSmsAgain(serviceSubtaskStatistic.getSmsAgain() + 1L);
-                    smsAgainInfo.add(serviceSubtask);
-                }
-                //鍐嶆闅忚寰俊(涓嶇粺璁′笉鎵ц)
-                if (serviceSubtask.getSendstate() != null
-                        && !serviceSubtask.getSendstate().equals(4L)
-                        && serviceSubtask.getPreachform().equals("5")) {
-                    serviceSubtaskStatistic.setWeChatAgain(serviceSubtaskStatistic.getWeChatAgain() + 1L);
-                    wechatAgainInfo.add(serviceSubtask);
                 }
                 //鍐嶆寮傚父
                 if (serviceSubtask.getSendstate() != null && serviceSubtask.getExcep().equals("1")) {
@@ -3131,29 +3185,42 @@
     public List<ServiceSubtaskStatistic> getSfStatisticsScript(ServiceSubtaskCountReq serviceSubtaskCountReq) {
         log.info("getSfStatisticsScript鐨勫叆鍙備负锛歿}", serviceSubtaskCountReq);
         List<ServiceSubtaskStatistic> serviceSubtaskStatistics = new ArrayList<>();
-        List<ServiceSubtask> rawData = serviceSubtaskMapper.getSfStatistics(serviceSubtaskCountReq);
 
         // 鏍规嵁鏉′欢杩涜鍒嗙粍
         Map<String, List<ServiceSubtask>> collect = new HashMap<>();
-        String groupKeyType = "";
+        String groupKey = "drcode";
         if (serviceSubtaskCountReq.getLeavehospitaldistrictcodes() != null && !serviceSubtaskCountReq.getLeavehospitaldistrictcodes().isEmpty()) {
             if (serviceSubtaskCountReq.getDrcode() != null && !serviceSubtaskCountReq.getDrcode().isEmpty()) {
-                groupKeyType = "drCode";
-                collect = rawData.stream().collect(Collectors.groupingBy(subtask -> Optional.ofNullable(subtask.getDrcode()).orElse("Unknown")));
+                groupKey = "drcode";
             } else {
-                groupKeyType = "leaveHospitalDistrictCode";
-                collect = rawData.stream().collect(Collectors.groupingBy(subtask -> Optional.ofNullable(subtask.getLeavehospitaldistrictcode()).orElse("Unknown")));
+                groupKey = "leavehospitaldistrictcode";
             }
         } else if (serviceSubtaskCountReq.getDeptcodes() != null && !serviceSubtaskCountReq.getDeptcodes().isEmpty()) {
             if (serviceSubtaskCountReq.getDrcode() != null && !serviceSubtaskCountReq.getDrcode().isEmpty()) {
-                groupKeyType = "drCode";
-                collect = rawData.stream().collect(Collectors.groupingBy(subtask -> Optional.ofNullable(subtask.getDrcode()).orElse("Unknown")));
+                groupKey = "drcode";
             } else {
-                groupKeyType = "deptCode";
-                collect = rawData.stream().collect(Collectors.groupingBy(subtask -> Optional.ofNullable(subtask.getDeptcode()).orElse("Unknown")));
+                groupKey = "deptcode";
             }
         }
-        serviceSubtaskCountReq.setGroupKeyType(groupKeyType);
+        serviceSubtaskCountReq.setGroupKey(groupKey);
+        List<String> groupKeyList = serviceSubtaskMapper.getSfStatisticsGroupKey(serviceSubtaskCountReq);
+        serviceSubtaskCountReq.setGroupKeyList(groupKeyList);
+        List<ServiceSubtask> rawData = serviceSubtaskMapper.getSfStatistics(serviceSubtaskCountReq);
+        switch (groupKey)
+        {
+            case "deptcode":
+                collect = rawData.stream().collect(Collectors.groupingBy(subtask -> Optional.ofNullable(subtask.getDeptcode()).orElse("Unknown")));
+                break;
+            case "drcode":
+                collect = rawData.stream().collect(Collectors.groupingBy(subtask -> Optional.ofNullable(subtask.getDrcode()).orElse("Unknown")));
+                break;
+            case "leavehospitaldistrictcode":
+                collect = rawData.stream().collect(Collectors.groupingBy(subtask -> Optional.ofNullable(subtask.getLeavehospitaldistrictcode()).orElse("Unknown")));
+                break;
+            default:
+                collect = rawData.stream().collect(Collectors.groupingBy(subtask -> Optional.ofNullable(subtask.getDrcode()).orElse("Unknown")));
+                break;
+        }
         //鑾峰彇鍙婃椂鐜囩粺璁″悎闆�
         Map<String, Map<String, Object>> jsRates = getSsRateForSfStatistics(serviceSubtaskCountReq, collect);
         for (String collectKey : collect.keySet()) {
@@ -3326,6 +3393,7 @@
             if (serviceSubtaskPreachform1.getSort() == spSize.size() && failSendstate.equals("4")) {
                 serviceSubtask.setCurrentPreachform(preachform);
                 serviceSubtask.setSendstate(5L);
+                serviceSubtask.setRemark("setFailPreachForm鏂规硶 褰撳墠鐨刾reachform宸茬粡鏄渶鍚庝竴涓簡锛屽叏澶辫触浜�");
                 serviceSubtaskMapper.updateServiceSubtask(serviceSubtask);
                 return true;
             }

--
Gitblit v1.9.3