From 2419489565056f772f81133a3ab6d8b3d8674af2 Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期二, 26 五月 2026 11:43:42 +0800
Subject: [PATCH] 【丽水】超链接新增接口 工厂模式
---
smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java | 563 +++++++++++++++++--------------------------------------
1 files changed, 174 insertions(+), 389 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..766111f 100644
--- a/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java
@@ -2568,7 +2568,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 +2746,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,17 +2764,14 @@
//棣栨搴旈殢璁�
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 鎺у埗
@@ -2834,53 +2780,43 @@
//棣栨闅忚鎴愬姛
if (serviceSubtask.getSendstate() != null && (serviceSubtask.getSendstate() == 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 (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,17 +2834,14 @@
//鍐嶆搴旈殢璁�
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 鎺у埗
@@ -2917,53 +2850,43 @@
//鍐嶆闅忚鎴愬姛
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) && 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 (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 +2903,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 +2944,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,17 +2963,14 @@
//棣栨搴旈殢璁�
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 鎺у埗
@@ -3140,53 +2979,43 @@
//棣栨闅忚鎴愬姛
if (serviceSubtask.getSendstate() != null && (serviceSubtask.getSendstate() == 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 (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 +3032,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 +3071,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,17 +3089,14 @@
//鍐嶆搴旈殢璁�
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 鎺у埗
@@ -3346,53 +3105,43 @@
//鍐嶆闅忚鎴愬姛
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) && 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 (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 +3158,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 +3294,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 +3301,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 +3316,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 +3344,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 +3379,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 +3558,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> subtasks = serviceSubtaskMapper.getSfStatistics(serviceSubtaskCountReq);
+ return subtasks;
+ }
+
+ 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<>();
--
Gitblit v1.9.3