From 586a386b2d779e94002c8099ff62271b0e684d88 Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期三, 06 五月 2026 11:35:19 +0800
Subject: [PATCH] Merge branch 'master' into master-手术随访

---
 smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java |  171 ++++++++++++++++++++++++++++++++++++++++++--------------
 1 files changed, 127 insertions(+), 44 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 9b04a47..61d3e86 100644
--- a/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java
@@ -165,6 +165,12 @@
     @Value("${phoneEndHour}")
     private Integer phoneEndHour;
 
+    @Autowired
+    private Icd10Mapper icd10Mapper;
+
+    @Value("${spring.profiles.active}")
+    private String active;
+
     /**
      * 鏌ヨ鍗曚竴浠诲姟锛堥殢璁匡級
      *
@@ -615,10 +621,19 @@
                     ServiceTaskdiag serviceTaskdiag = new ServiceTaskdiag();
                     serviceTaskdiag.setTaskId(serviceTask.getTaskid());
                     serviceTaskdiag.setTaskName(serviceTask.getTaskName());
+                    serviceTaskdiag.setServiceType(serviceTaskVO.getServiceType());
                     serviceTaskdiag.setLongtask(Long.valueOf(serviceTask.getLongTask()));
                     if (serviceTaskVO.getLongTask() == 1) serviceTaskdiag.setLongtask(1L);
                     serviceTaskdiag.setIcd10code(serviceTaskVO.getIcd10code());
                     serviceTaskdiag.setIcd10name(serviceTaskVO.getIcd10name());
+                    //鍗楀崕闄勪竴鐨刬cd10code鏄湁閲嶅鐨勶紝鎵�浠ヤ笉鑳界敤鍗楀崕闄勪竴鐨刬cd10code鍘绘煡璇�
+                    if (!active.equals("nhfy") && StringUtils.isEmpty(serviceTaskVO.getIcd10name())) {
+                        Icd10 icd10 = new Icd10();
+                        icd10.setIcdcode(serviceTaskVO.getIcd10code());
+                        List<Icd10> icd10s = icd10Mapper.selectIcd10List(icd10);
+                        if (CollectionUtils.isNotEmpty(icd10s))
+                            serviceTaskdiag.setIcd10name(icd10s.get(0).getIcdname());
+                    }
                     serviceTaskdiag.setGuid(serviceTask.getGuid());
                     serviceTaskdiag.setOrgid(serviceTask.getOrgid());
                     serviceTaskdiag.setCreateTime(new Date());
@@ -756,7 +771,8 @@
                 }
             }
 
-        } else if (serviceTaskVO.getIsoperation() != null && serviceTaskVO.getIsoperation() == 2) {
+        }
+        else if (serviceTaskVO.getIsoperation() != null && serviceTaskVO.getIsoperation() == 2) {
             //浠诲姟淇敼
             if (ObjectUtils.isNotEmpty(serviceTaskVO.getSendTimeslot()))
                 serviceTask.setSendTimeSlot(JSON.toJSONString(serviceTaskVO.getSendTimeslot()));
@@ -2477,7 +2493,7 @@
         return jsRates;
     }
 
-    @Override
+
     public List<ServiceSubtaskStatistic> getSfStatisticsExport(ServiceSubtaskCountReq serviceSubtaskCountReq) {
         List<ServiceSubtaskStatistic> sfStatistics = getSfStatistics(serviceSubtaskCountReq);
         // 娣诲姞鎬昏琛�
@@ -2489,6 +2505,12 @@
         }
 
         return sfStatistics;
+    }
+
+    @Override
+    public List<ServiceSubtaskIsAbnormalStatistic> getSfStatisticsIsAbnormalExport(ServiceSubtaskCountReq serviceSubtaskCountReq){
+
+        return null;
     }
 
     /**
@@ -2703,6 +2725,8 @@
             List<ServiceSubtask> followUpFailInfo = new ArrayList<>();
             //璁板綍棣栨闅忚浜哄伐璇︽儏
             List<ServiceSubtask> manualInfo = new ArrayList<>();
+            //璁板綍棣栨闅忚璇煶璇︽儏
+            List<ServiceSubtask> voiceInfo = new ArrayList<>();
             //璁板綍棣栨闅忚鐭俊璇︽儏
             List<ServiceSubtask> smsInfo = new ArrayList<>();
             //璁板綍棣栨闅忚寰俊璇︽儏
@@ -2716,11 +2740,13 @@
             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<>();
 
             for (ServiceSubtask serviceSubtask : serviceSubtaskList) {
@@ -2765,17 +2791,22 @@
                             followUpSuccessInfo.add(serviceSubtask);
                         }
                         //棣栨闅忚浜哄伐 (涓嶇粺璁′笉鎵ц)
-                        if (serviceSubtask.getSendstate() != null && !serviceSubtask.getSendstate().equals(4L) && serviceSubtask.getPreachform().equals("1")) {
+                        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) && serviceSubtask.getPreachform().equals("4")) {
+                        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) && serviceSubtask.getPreachform().equals("5")) {
+                        if (serviceSubtask.getSendstate() != null && !serviceSubtask.getSendstate().equals(4L) && ObjectUtils.isNotEmpty(serviceSubtask.getCurrentPreachform()) && serviceSubtask.getCurrentPreachform().equals("5")) {
                             serviceSubtaskStatistic.setWeChat(serviceSubtaskStatistic.getWeChat() + 1L);
                             wechatInfo.add(serviceSubtask);
                         }
@@ -2786,17 +2817,22 @@
                             followUpSuccessInfo.add(serviceSubtask);
                         }
                         //棣栨闅忚浜哄伐 (缁熻涓嶆墽琛�)
-                        if (serviceSubtask.getSendstate() != null && serviceSubtask.getPreachform().equals("1")) {
+                        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 && serviceSubtask.getPreachform().equals("4")) {
+                        if (serviceSubtask.getSendstate() != null && ObjectUtils.isNotEmpty(serviceSubtask.getCurrentPreachform()) && serviceSubtask.getCurrentPreachform().equals("4")) {
                             serviceSubtaskStatistic.setSms(serviceSubtaskStatistic.getSms() + 1L);
                             smsInfo.add(serviceSubtask);
                         }
                         //棣栨闅忚寰俊(缁熻涓嶆墽琛�)
-                        if (serviceSubtask.getSendstate() != null && serviceSubtask.getPreachform().equals("5")) {
+                        if (serviceSubtask.getSendstate() != null && ObjectUtils.isNotEmpty(serviceSubtask.getCurrentPreachform()) && serviceSubtask.getCurrentPreachform().equals("5")) {
                             serviceSubtaskStatistic.setWeChat(serviceSubtaskStatistic.getWeChat() + 1L);
                             wechatInfo.add(serviceSubtask);
                         }
@@ -2838,17 +2874,22 @@
                             followUpSuccessAgainInfo.add(serviceSubtask);
                         }
                         //鍐嶆闅忚浜哄伐(涓嶇粺璁′笉鎵ц)
-                        if (serviceSubtask.getSendstate() != null && !serviceSubtask.getSendstate().equals(4L) && serviceSubtask.getPreachform().equals("1")) {
+                        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) && serviceSubtask.getPreachform().equals("4")) {
+                        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) && serviceSubtask.getPreachform().equals("5")) {
+                        if (serviceSubtask.getSendstate() != null && !serviceSubtask.getSendstate().equals(4L) && ObjectUtils.isNotEmpty(serviceSubtask.getCurrentPreachform()) && serviceSubtask.getCurrentPreachform().equals("5")) {
                             serviceSubtaskStatistic.setWeChatAgain(serviceSubtaskStatistic.getWeChatAgain() + 1L);
                             wechatAgainInfo.add(serviceSubtask);
                         }
@@ -2859,17 +2900,22 @@
                             followUpSuccessAgainInfo.add(serviceSubtask);
                         }
                         //鍐嶆闅忚浜哄伐(缁熻涓嶆墽琛�)
-                        if (serviceSubtask.getSendstate() != null && serviceSubtask.getPreachform().equals("1")) {
+                        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 && serviceSubtask.getPreachform().equals("4")) {
+                        if (serviceSubtask.getSendstate() != null && ObjectUtils.isNotEmpty(serviceSubtask.getCurrentPreachform()) && serviceSubtask.getCurrentPreachform().equals("4")) {
                             serviceSubtaskStatistic.setSmsAgain(serviceSubtaskStatistic.getSmsAgain() + 1L);
                             smsAgainInfo.add(serviceSubtask);
                         }
                         //鍐嶆闅忚寰俊(缁熻涓嶆墽琛�)
-                        if (serviceSubtask.getSendstate() != null && serviceSubtask.getPreachform().equals("5")) {
+                        if (serviceSubtask.getSendstate() != null && ObjectUtils.isNotEmpty(serviceSubtask.getCurrentPreachform()) && serviceSubtask.getCurrentPreachform().equals("5")) {
                             serviceSubtaskStatistic.setWeChatAgain(serviceSubtaskStatistic.getWeChatAgain() + 1L);
                             wechatAgainInfo.add(serviceSubtask);
                         }
@@ -2918,6 +2964,8 @@
             serviceSubtaskStatistic.setFollowUpFailInfo(followUpFailInfo);
             //璁板綍棣栨闅忚浜哄伐璇︽儏
             serviceSubtaskStatistic.setManualInfo(manualInfo);
+            //璁板綍棣栨闅忚璇煶璇︽儏
+            serviceSubtaskStatistic.setVoiceInfo(voiceInfo);
             //璁板綍棣栨闅忚鐭俊璇︽儏
             serviceSubtaskStatistic.setSmsInfo(smsInfo);
             //璁板綍棣栨闅忚寰俊璇︽儏
@@ -2932,6 +2980,8 @@
             serviceSubtaskStatistic.setFollowUpFailAgainInfo(followUpFailAgainInfo);
             //璁板綍鍐嶆闅忚浜哄伐璇︽儏
             serviceSubtaskStatistic.setManualAgainInfo(manualAgainInfo);
+            //璁板綍鍐嶆闅忚璇煶璇︽儏
+            serviceSubtaskStatistic.setVoiceAgainInfo(voiceAgainInfo);
             //璁板綍鍐嶆闅忚鐭俊璇︽儏
             serviceSubtaskStatistic.setSmsAgainInfo(smsAgainInfo);
             //璁板綍鍐嶆闅忚寰俊璇︽儏
@@ -2974,6 +3024,8 @@
         List<ServiceSubtask> followUpFailInfo = new ArrayList<>();
         //璁板綍棣栨闅忚浜哄伐璇︽儏
         List<ServiceSubtask> manualInfo = new ArrayList<>();
+        //璁板綍棣栨闅忚璇煶璇︽儏
+        List<ServiceSubtask> voiceInfo = new ArrayList<>();
         //璁板綍棣栨闅忚鐭俊璇︽儏
         List<ServiceSubtask> smsInfo = new ArrayList<>();
         //璁板綍棣栨闅忚寰俊璇︽儏
@@ -3021,17 +3073,22 @@
                         followUpSuccessInfo.add(serviceSubtask);
                     }
                     //棣栨闅忚浜哄伐 (涓嶇粺璁′笉鎵ц)
-                    if (serviceSubtask.getSendstate() != null && !serviceSubtask.getSendstate().equals(4L) && serviceSubtask.getPreachform().equals("1")) {
+                    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) && serviceSubtask.getPreachform().equals("4")) {
+                    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) && serviceSubtask.getPreachform().equals("5")) {
+                    if (serviceSubtask.getSendstate() != null && !serviceSubtask.getSendstate().equals(4L) && ObjectUtils.isNotEmpty(serviceSubtask.getCurrentPreachform()) && serviceSubtask.getCurrentPreachform().equals("5")) {
                         serviceSubtaskStatistic.setWeChat(serviceSubtaskStatistic.getWeChat() + 1L);
                         wechatInfo.add(serviceSubtask);
                     }
@@ -3042,17 +3099,22 @@
                         followUpSuccessInfo.add(serviceSubtask);
                     }
                     //棣栨闅忚浜哄伐 (缁熻涓嶆墽琛�)
-                    if (serviceSubtask.getSendstate() != null && serviceSubtask.getPreachform().equals("1")) {
+                    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 && serviceSubtask.getPreachform().equals("4")) {
+                    if (serviceSubtask.getSendstate() != null && ObjectUtils.isNotEmpty(serviceSubtask.getCurrentPreachform()) && serviceSubtask.getCurrentPreachform().equals("4")) {
                         serviceSubtaskStatistic.setSms(serviceSubtaskStatistic.getSms() + 1L);
                         smsInfo.add(serviceSubtask);
                     }
                     //棣栨闅忚寰俊(缁熻涓嶆墽琛�)
-                    if (serviceSubtask.getSendstate() != null && serviceSubtask.getPreachform().equals("5")) {
+                    if (serviceSubtask.getSendstate() != null && ObjectUtils.isNotEmpty(serviceSubtask.getCurrentPreachform()) && serviceSubtask.getCurrentPreachform().equals("5")) {
                         serviceSubtaskStatistic.setWeChat(serviceSubtaskStatistic.getWeChat() + 1L);
                         wechatInfo.add(serviceSubtask);
                     }
@@ -3101,6 +3163,8 @@
         serviceSubtaskStatistic.setFollowUpFailInfo(followUpFailInfo);
         //璁板綍棣栨闅忚浜哄伐璇︽儏
         serviceSubtaskStatistic.setManualInfo(manualInfo);
+        //璁板綍棣栨闅忚璇煶璇︽儏
+        serviceSubtaskStatistic.setVoiceInfo(voiceInfo);
         //璁板綍棣栨闅忚鐭俊璇︽儏
         serviceSubtaskStatistic.setSmsInfo(smsInfo);
         //璁板綍棣栨闅忚寰俊璇︽儏
@@ -3142,6 +3206,8 @@
         List<ServiceSubtask> followUpFailAgainInfo = new ArrayList<>();
         //璁板綍鍐嶆闅忚浜哄伐璇︽儏
         List<ServiceSubtask> manualAgainInfo = new ArrayList<>();
+        //璁板綍鍐嶆闅忚璇煶璇︽儏
+        List<ServiceSubtask> voiceAgainInfo = new ArrayList<>();
         //璁板綍鍐嶆闅忚鐭俊璇︽儏
         List<ServiceSubtask> smsAgainInfo = new ArrayList<>();
         //璁板綍鍐嶆闅忚寰俊璇︽儏
@@ -3189,17 +3255,22 @@
                         followUpSuccessAgainInfo.add(serviceSubtask);
                     }
                     //鍐嶆闅忚浜哄伐(涓嶇粺璁′笉鎵ц)
-                    if (serviceSubtask.getSendstate() != null && !serviceSubtask.getSendstate().equals(4L) && serviceSubtask.getPreachform().equals("1")) {
+                    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) && serviceSubtask.getPreachform().equals("4")) {
+                    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) && serviceSubtask.getPreachform().equals("5")) {
+                    if (serviceSubtask.getSendstate() != null && !serviceSubtask.getSendstate().equals(4L) && ObjectUtils.isNotEmpty(serviceSubtask.getCurrentPreachform()) && serviceSubtask.getCurrentPreachform().equals("5")) {
                         serviceSubtaskStatistic.setWeChatAgain(serviceSubtaskStatistic.getWeChatAgain() + 1L);
                         wechatAgainInfo.add(serviceSubtask);
                     }
@@ -3210,17 +3281,22 @@
                         followUpSuccessAgainInfo.add(serviceSubtask);
                     }
                     //鍐嶆闅忚浜哄伐(缁熻涓嶆墽琛�)
-                    if (serviceSubtask.getSendstate() != null && serviceSubtask.getPreachform().equals("1")) {
+                    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 && serviceSubtask.getPreachform().equals("4")) {
+                    if (serviceSubtask.getSendstate() != null && ObjectUtils.isNotEmpty(serviceSubtask.getCurrentPreachform()) && serviceSubtask.getCurrentPreachform().equals("4")) {
                         serviceSubtaskStatistic.setSmsAgain(serviceSubtaskStatistic.getSmsAgain() + 1L);
                         smsAgainInfo.add(serviceSubtask);
                     }
                     //鍐嶆闅忚寰俊(缁熻涓嶆墽琛�)
-                    if (serviceSubtask.getSendstate() != null && serviceSubtask.getPreachform().equals("5")) {
+                    if (serviceSubtask.getSendstate() != null && ObjectUtils.isNotEmpty(serviceSubtask.getCurrentPreachform()) && serviceSubtask.getCurrentPreachform().equals("5")) {
                         serviceSubtaskStatistic.setWeChatAgain(serviceSubtaskStatistic.getWeChatAgain() + 1L);
                         wechatAgainInfo.add(serviceSubtask);
                     }
@@ -3269,6 +3345,8 @@
         serviceSubtaskStatistic.setFollowUpFailAgainInfo(followUpFailAgainInfo);
         //璁板綍鍐嶆闅忚浜哄伐璇︽儏
         serviceSubtaskStatistic.setManualAgainInfo(manualAgainInfo);
+        //璁板綍鍐嶆闅忚璇煶璇︽儏
+        serviceSubtaskStatistic.setVoiceAgainInfo(voiceAgainInfo);
         //璁板綍鍐嶆闅忚鐭俊璇︽儏
         serviceSubtaskStatistic.setSmsAgainInfo(smsAgainInfo);
         //璁板綍鍐嶆闅忚寰俊璇︽儏
@@ -3329,13 +3407,13 @@
                 } else {
                     serviceSubtaskStatistic.setFollowUpRate("0.00%");
                 }
-                if (serviceSubtask.getSendstate() != null && serviceSubtask.getPreachform().equals("1")) {
+                if (serviceSubtask.getSendstate() != null && ObjectUtils.isNotEmpty(serviceSubtask.getCurrentPreachform()) && serviceSubtask.getCurrentPreachform().equals("1")) {
                     serviceSubtaskStatistic.setManual(serviceSubtaskStatistic.getManual() + 1L);
                 }
-                if (serviceSubtask.getSendstate() != null && serviceSubtask.getPreachform().equals("4")) {
+                if (serviceSubtask.getSendstate() != null && ObjectUtils.isNotEmpty(serviceSubtask.getCurrentPreachform()) && serviceSubtask.getCurrentPreachform().equals("4")) {
                     serviceSubtaskStatistic.setSms(serviceSubtaskStatistic.getSms() + 1L);
                 }
-                if (serviceSubtask.getSendstate() != null && serviceSubtask.getPreachform().equals("5")) {
+                if (serviceSubtask.getSendstate() != null && ObjectUtils.isNotEmpty(serviceSubtask.getCurrentPreachform()) && serviceSubtask.getCurrentPreachform().equals("5")) {
                     serviceSubtaskStatistic.setWeChat(serviceSubtaskStatistic.getWeChat() + 1L);
                 }
                 if (serviceSubtask.getSendstate() != null && serviceSubtask.getExcep().equals("1")) {
@@ -3361,13 +3439,13 @@
                 } else {
                     serviceSubtaskStatistic.setFollowUpRateAgain("0.00%");
                 }
-                if (serviceSubtask.getSendstate() != null && serviceSubtask.getPreachform().equals("1")) {
+                if (serviceSubtask.getSendstate() != null && ObjectUtils.isNotEmpty(serviceSubtask.getCurrentPreachform()) && serviceSubtask.getCurrentPreachform().equals("1")) {
                     serviceSubtaskStatistic.setManualAgain(serviceSubtaskStatistic.getManualAgain() + 1L);
                 }
-                if (serviceSubtask.getSendstate() != null && serviceSubtask.getPreachform().equals("4")) {
+                if (serviceSubtask.getSendstate() != null && ObjectUtils.isNotEmpty(serviceSubtask.getCurrentPreachform()) && serviceSubtask.getCurrentPreachform().equals("4")) {
                     serviceSubtaskStatistic.setSmsAgain(serviceSubtaskStatistic.getSmsAgain() + 1L);
                 }
-                if (serviceSubtask.getSendstate() != null && serviceSubtask.getPreachform().equals("5")) {
+                if (serviceSubtask.getSendstate() != null && ObjectUtils.isNotEmpty(serviceSubtask.getCurrentPreachform()) && serviceSubtask.getCurrentPreachform().equals("5")) {
                     serviceSubtaskStatistic.setWeChatAgain(serviceSubtaskStatistic.getWeChatAgain() + 1L);
                 }
                 if (serviceSubtask.getSendstate() != null && serviceSubtask.getExcep().equals("1")) {
@@ -3447,13 +3525,13 @@
                 } else {
                     serviceSubtaskStatistic.setFollowUpRate("0.00%");
                 }
-                if (serviceSubtask.getSendstate() != null && serviceSubtask.getPreachform().equals("1")) {
+                if (serviceSubtask.getSendstate() != null && ObjectUtils.isNotEmpty(serviceSubtask.getCurrentPreachform()) && serviceSubtask.getCurrentPreachform().equals("1")) {
                     serviceSubtaskStatistic.setManual(serviceSubtaskStatistic.getManual() + 1L);
                 }
-                if (serviceSubtask.getSendstate() != null && serviceSubtask.getPreachform().equals("4")) {
+                if (serviceSubtask.getSendstate() != null && ObjectUtils.isNotEmpty(serviceSubtask.getCurrentPreachform()) && serviceSubtask.getCurrentPreachform().equals("4")) {
                     serviceSubtaskStatistic.setSms(serviceSubtaskStatistic.getSms() + 1L);
                 }
-                if (serviceSubtask.getSendstate() != null && serviceSubtask.getPreachform().equals("5")) {
+                if (serviceSubtask.getSendstate() != null && ObjectUtils.isNotEmpty(serviceSubtask.getCurrentPreachform()) && serviceSubtask.getCurrentPreachform().equals("5")) {
                     serviceSubtaskStatistic.setWeChat(serviceSubtaskStatistic.getWeChat() + 1L);
                 }
                 if (serviceSubtask.getSendstate() != null && serviceSubtask.getExcep().equals("1")) {
@@ -3479,13 +3557,13 @@
                 } else {
                     serviceSubtaskStatistic.setFollowUpRateAgain("0.00%");
                 }
-                if (serviceSubtask.getSendstate() != null && serviceSubtask.getPreachform().equals("1")) {
+                if (serviceSubtask.getSendstate() != null && ObjectUtils.isNotEmpty(serviceSubtask.getCurrentPreachform()) && serviceSubtask.getCurrentPreachform().equals("1")) {
                     serviceSubtaskStatistic.setManualAgain(serviceSubtaskStatistic.getManualAgain() + 1L);
                 }
-                if (serviceSubtask.getSendstate() != null && serviceSubtask.getPreachform().equals("4")) {
+                if (serviceSubtask.getSendstate() != null && ObjectUtils.isNotEmpty(serviceSubtask.getCurrentPreachform()) && serviceSubtask.getCurrentPreachform().equals("4")) {
                     serviceSubtaskStatistic.setSmsAgain(serviceSubtaskStatistic.getSmsAgain() + 1L);
                 }
-                if (serviceSubtask.getSendstate() != null && serviceSubtask.getPreachform().equals("5")) {
+                if (serviceSubtask.getSendstate() != null && ObjectUtils.isNotEmpty(serviceSubtask.getCurrentPreachform()) && serviceSubtask.getCurrentPreachform().equals("5")) {
                     serviceSubtaskStatistic.setWeChatAgain(serviceSubtaskStatistic.getWeChatAgain() + 1L);
                 }
                 if (serviceSubtask.getSendstate() != null && serviceSubtask.getExcep().equals("1")) {
@@ -3870,13 +3948,18 @@
             serviceSubtaskPreachform1.setRemark(remark);
             serviceSubtaskPreachformMapper.updateServiceSubtaskPreachform(serviceSubtaskPreachform1);
 
+
             //濡傛灉褰撳墠鐨刾reachform宸茬粡鏄渶鍚庝竴涓簡锛岄偅鐩存帴灏唖erviceSubtask鐨剆endstate鐘舵�佹敼鎴�5灏辫浜�(鍏ㄥけ璐ヤ簡)
             if (serviceSubtaskPreachform1.getSort() == spSize.size() && failSendstate.equals("4")) {
                 serviceSubtask.setCurrentPreachform(preachform);
                 serviceSubtask.setSendstate(5L);
-                serviceSubtask.setRemark("鎵�鏈夊彂閫佹柟寮忓潎鏈幏鍙栫粨鏋滐紝浠诲姟澶辫触");
+                serviceSubtask.setRemark(remark + ";鎵�鏈夊彂閫佹柟寮忓潎鏈幏鍙栫粨鏋滐紝浠诲姟澶辫触");
                 serviceSubtaskMapper.updateServiceSubtask(serviceSubtask);
                 return true;
+            }else {
+                //鍔犲叆鐩墠琛ュ伩閲岀殑 remark
+                serviceSubtask.setRemark(StringUtils.isNotEmpty(serviceSubtask.getRemark()) ? serviceSubtask.getRemark() + "," + remark : remark);
+                serviceSubtaskMapper.updateServiceSubtask(serviceSubtask);
             }
         }
 
@@ -4182,7 +4265,7 @@
         }
         // 1. 鏌ヨ鍒嗙粍缁熻锛堝彂閫佹�婚噺銆佸彂閫佹垚鍔熼噺銆佸凡璇婚噺锛�
         List<Map<String, Object>> groupStats = serviceSubtaskMapper.getHeLibraryCount(heLibraryCountVO);
-    
+
         // 2. 璁＄畻鍚勭粍鐨勫彂閫佹垚鍔熺巼鍜屽凡璇荤巼
         List<Map<String, Object>> result = new ArrayList<>();
         if (CollectionUtils.isNotEmpty(groupStats)) {
@@ -4199,7 +4282,7 @@
                 result.add(row);
             }
         }
-    
+
         Map<String, Object> resultMap = new HashMap<>();
         resultMap.put("list", result);
         resultMap.put("total", result.size());

--
Gitblit v1.9.3