From 18a48c5c23bf1c8547165cb2bb3162f2c2172016 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期三, 27 五月 2026 18:07:44 +0800
Subject: [PATCH] bug修改，task新增时，tase_diag表的dept_code、ward_code没有新增成功
---
smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java | 533 ++++++++++++++++++++++++++++++++---------------------------
1 files changed, 288 insertions(+), 245 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 b731d40..d521079 100644
--- a/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java
@@ -166,7 +166,7 @@
private Integer phoneEndHour;
@Autowired
- private Icd10Mapper icd10Mapper;
+ private IPatMedOuthospService patMedOuthospService;
@Value("${spring.profiles.active}")
private String active;
@@ -348,6 +348,15 @@
@Override
public List<ServiceSubtaskRes> patItem(ServiceSubtaskEntity serviceSubtaskEntity) {
+ if (serviceSubtaskEntity.getSendstateView() != null) {
+ // 1锛氬緟闅忚锛�2 寰呭彂閫侊級锛�2锛氶殢璁夸腑锛�3 宸插彂閫併��1 琚鍙栵級銆�3锛氭湭瀹屾垚锛�5 鍙戦�佸け璐ャ��7銆佽秴鏃讹級銆�4锛氬凡瀹屾垚锛� 6 宸插畬鎴愶級銆�5锛氭棤闇�闅忚锛�4 涓嶆墽琛岋級
+ if (serviceSubtaskEntity.getSendstateView() == 1) serviceSubtaskEntity.setSendstates(new ArrayList<>(Arrays.asList(2L)));
+ if (serviceSubtaskEntity.getSendstateView() == 2) serviceSubtaskEntity.setSendstates(new ArrayList<>(Arrays.asList(1L, 3L)));
+ if (serviceSubtaskEntity.getSendstateView() == 3) serviceSubtaskEntity.setSendstates(new ArrayList<>(Arrays.asList(5L, 7L)));
+ if (serviceSubtaskEntity.getSendstateView() == 4) serviceSubtaskEntity.setSendstates(new ArrayList<>(Arrays.asList(6L)));
+ if (serviceSubtaskEntity.getSendstateView() == 5) serviceSubtaskEntity.setSendstates(new ArrayList<>(Arrays.asList(4L)));
+ }
+
List<ServiceSubtask> selectServiceSubtaskList = this.selectServiceSubtaskList(serviceSubtaskEntity);
List<ServiceSubtaskRes> serviceSubtaskResList = new ArrayList<>();
@@ -356,6 +365,14 @@
if (ObjectUtils.isNotEmpty(serviceSubtask.getContinueContent())) {
serviceSubtaskRes.setContinueContent(serviceSubtask.getContinueContent());
}
+// 1锛氬緟闅忚锛�2 寰呭彂閫侊級锛�2锛氶殢璁夸腑锛�3 宸插彂閫併��1 琚鍙栵級銆�3锛氭湭瀹屾垚锛�5 鍙戦�佸け璐ャ��7銆佽秴鏃讹級銆�4锛氬凡瀹屾垚锛� 6 宸插畬鎴愶級銆�5锛氭棤闇�闅忚锛�4 涓嶆墽琛岋級
+ if (serviceSubtaskRes.getSendstate() == 2) serviceSubtaskRes.setSendstateView(1L);
+ if (serviceSubtaskRes.getSendstate() == 1 || serviceSubtaskRes.getSendstate() == 3L)
+ serviceSubtaskRes.setSendstateView(2L);
+ if (serviceSubtaskRes.getSendstate() == 5 || serviceSubtaskRes.getSendstate() == 7L)
+ serviceSubtaskRes.setSendstateView(3L);
+ if (serviceSubtaskRes.getSendstate() == 6) serviceSubtaskRes.setSendstateView(4L);
+ if (serviceSubtaskRes.getSendstate() == 4) serviceSubtaskRes.setSendstateView(5L);
serviceSubtaskResList.add(serviceSubtaskRes);
}
return serviceSubtaskResList;
@@ -643,22 +660,21 @@
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());
+ serviceTaskdiag.setDeptCode(serviceTaskVO.getDeptcode());
+ serviceTaskdiag.setDeptName(serviceTaskVO.getDeptname());
+ serviceTaskdiag.setWardCode(serviceTaskVO.getLeavehospitaldistrictcode());
+ serviceTaskdiag.setWardName(serviceTaskVO.getLeavehospitaldistrictname());
+ //鍗楀崕闄勪竴鐨刬cd10code鏄湁閲嶅鐨勶紝鎵�浠ヤ笉鑳界敤鍗楀崕闄勪竴鐨刬cd10code鍘绘煡璇�
log.info("----serviceTaskdiag鐨勫�间负锛歿}", serviceTaskdiag);
- if (StringUtils.isNotEmpty(serviceTaskVO.getIcd10code())) {
+ if (!StringUtils.isEmpty(serviceTaskVO.getIcd10name())) {
+ String[] Icd10Names = serviceTaskVO.getIcd10name().split(",");
String[] Icd10codes = serviceTaskVO.getIcd10code().split(",");
- for (String icd10code : Icd10codes) {
- serviceTaskdiag.setIcd10code(icd10code);
+ for (int i = 0; i < Icd10Names.length; i++) {
+ serviceTaskdiag.setIcd10code(Icd10codes[i]);
+ serviceTaskdiag.setIcd10name(Icd10Names[i]);
serviceTaskdiagService.insertServiceTaskdiag(serviceTaskdiag);
}
}
@@ -788,7 +804,6 @@
serviceTask.setSendTimeSlot(JSON.toJSONString(serviceTaskVO.getSendTimeslot()));
//淇敼鎿嶄綔锛岄渶瑕佸皢stopState鐘舵��+1
ServiceTask serviceTask1 = serviceTaskService.selectServiceTaskByTaskid(serviceTask.getTaskid());
- //鑾峰彇鍒拌浠诲姟鎵�鏈夌殑鏈嶅姟锛屽苟浠庨槦鍒楅噷鍒犻櫎
ServiceSubtaskEntity serviceSubtaskVO = new ServiceSubtaskEntity();
serviceSubtaskVO.setTaskid(serviceTask1.getTaskid());
serviceSubtaskVO.setSendstate(2L);
@@ -810,6 +825,27 @@
redisCache.removeElementFromList("cache-2", serviceSubtask.getId().toString());
redisCache.removeElementFromList("cache-3", serviceSubtask.getId().toString());
redisCache.removeElementFromList("cache-4", serviceSubtask.getId().toString());
+ //灏嗗嚭鍏ラ櫌琛ㄧ殑鏁版嵁锛岃繕鍘熸垚杩樻湭澶勭悊鐨勭姸鎬�
+ if(serviceSubtask.getServiceType().equals("2")) {
+ PatMedInhosp patMedInhosp = new PatMedInhosp();
+ patMedInhosp.setDeptcheckFlag("0");
+ patMedInhosp.setWardcheckFlag("0");
+ patMedInhosp.setDiagcheckFlag("0");
+ patMedInhosp.setInhospid(serviceSubtask.getInhospid());
+ patMedInhospMapper.updatePatMedInhosp(patMedInhosp);
+ }else if(serviceSubtask.getServiceType().equals("3")) {
+
+ if(serviceSubtask.getInhospid()!=null) {
+ PatMedOuthospQueryReq req=new PatMedOuthospQueryReq();
+ req.setOuthospno(serviceSubtask.getHospno());
+ List<PatMedOuthosp> patMedOuthosps = patMedOuthospMapper.callSpQueryOuthosp(req);
+ if(CollectionUtils.isNotEmpty(patMedOuthosps)) {
+ PatMedOuthosp patMedOuthosp = patMedOuthosps.get(0);
+ patMedOuthosp.setServerState("0");
+ patMedOuthospService.updatePatMedOuthosp(patMedOuthosp);
+ }
+ }
+ }
}
}
@@ -875,8 +911,13 @@
}
serviceTaskdiag.setLongtask(Long.valueOf(serviceTask.getLongTask()));
serviceTaskdiag.setIcd10name(serviceTaskVO.getIcd10name());
- serviceTaskdiag.setGuid(serviceTask.getGuid());
- serviceTaskdiag.setOrgid(serviceTask.getOrgid());
+ serviceTaskdiag.setGuid(serviceTask1.getGuid());
+ serviceTaskdiag.setServiceType(serviceTask1.getServiceType());
+ serviceTaskdiag.setOrgid(serviceTask1.getOrgid());
+ serviceTaskdiag.setDeptCode(serviceTask1.getDeptcode());
+ serviceTaskdiag.setDeptName(serviceTask1.getDeptname());
+ serviceTaskdiag.setWardCode(serviceTask1.getLeavehospitaldistrictcode());
+ serviceTaskdiag.setWardName(serviceTask1.getLeavehospitaldistrictname());
serviceTaskdiag.setUpdateTime(new Date());
if (StringUtils.isNotEmpty(serviceTaskVO.getIcd10code())) {
String[] icd10codes = serviceTaskVO.getIcd10code().split(",");
@@ -2407,7 +2448,7 @@
* @return
*/
@Override
-// @Cacheable(value = "sfStatistics", key = "T(org.springframework.util.DigestUtils).md5DigestAsHex(#serviceSubtaskCountReq.toString().getBytes())", unless = "#result == null or #result.isEmpty()")
+ @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) {
log.info("getSfStatistics鐨勫叆鍙備负锛歿}", serviceSubtaskCountReq);
String groupKey = "drcode";
@@ -2548,7 +2589,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")));
}
@@ -2727,52 +2767,12 @@
serviceSubtaskStatistic.setDrname(serviceSubtaskList.get(0).getDrname());
//鍑洪櫌浜烘
serviceSubtaskStatistic.setDischargeCount(serviceSubtaskList.size());
- //鏃犻渶闅忚璇︽儏
- 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<>();
-
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);
}
}
//搴旈殢璁夸汉娆�
@@ -2785,17 +2785,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 鎺у埗
@@ -2804,53 +2801,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) {
@@ -2868,17 +2855,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 鎺у埗
@@ -2887,53 +2871,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) {
@@ -2967,41 +2941,6 @@
serviceSubtaskStatistic.setTaskSituation6(serviceSubtaskStatistic.getTaskSituation6() + 1);
}
}
- 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);
return serviceSubtaskStatistic;
}
return serviceSubtaskStatistic;
@@ -3026,35 +2965,13 @@
serviceSubtaskStatistic.setDrname(serviceSubtaskList.get(0).getDrname());
//鍑洪櫌浜烘
serviceSubtaskStatistic.setDischargeCount(serviceSubtaskList.size());
- //鏃犻渶闅忚璇︽儏
- 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<>();
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);
}
}
//搴旈殢璁夸汉娆�
@@ -3067,17 +2984,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 鎺у埗
@@ -3086,53 +3000,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) {
@@ -3166,25 +3070,6 @@
serviceSubtaskStatistic.setTaskSituation6(serviceSubtaskStatistic.getTaskSituation6() + 1);
}
}
- 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);
return serviceSubtaskStatistic;
}
@@ -3207,36 +3092,12 @@
serviceSubtaskStatistic.setDrname(serviceSubtaskList.get(0).getDrname());
//鍑洪櫌浜烘
serviceSubtaskStatistic.setDischargeCount(serviceSubtaskList.size());
- //鏃犻渶闅忚璇︽儏
- 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<>();
-
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);
}
}
//搴旈殢璁夸汉娆�
@@ -3249,17 +3110,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 鎺у埗
@@ -3268,53 +3126,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) {
@@ -3348,25 +3196,6 @@
serviceSubtaskStatistic.setTaskSituation6(serviceSubtaskStatistic.getTaskSituation6() + 1);
}
}
- 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);
return serviceSubtaskStatistic;
}
@@ -3383,6 +3212,8 @@
serviceSubtaskStatistic.setDrname(serviceSubtaskList.get(0).getDrname());
//鍑洪櫌浜烘
serviceSubtaskStatistic.setDischargeCount(serviceSubtaskList.size());
+ //鍑洪櫌浜烘璇︽儏
+ serviceSubtaskStatistic.setDischargeCountInfo(serviceSubtaskList);
serviceSubtaskStatistic.setJoyCount(0);
serviceSubtaskStatistic.setJoyAllCount(0);
for (ServiceSubtask serviceSubtask : serviceSubtaskList) {
@@ -3474,7 +3305,7 @@
return serviceSubtaskStatistic;
}
- private ServiceSubtaskStatistic getStatisticCategory(List<ServiceSubtask> serviceSubtaskList, ServiceSubtaskCountReq serviceSubtaskCountReq) {
+ private ServiceSubtaskStatistic getStatisticCategory(List<ServiceSubtask> serviceSubtaskList, ServiceSubtaskCountReq serviceSubtaskCountReq, List<ServiceSubtaskCount> subCounts) {
ServiceSubtaskStatistic serviceSubtaskStatistic = new ServiceSubtaskStatistic();
//鏍煎紡鍖栦负涓や綅灏忔暟鐨勭櫨鍒嗘瘮
DecimalFormat percentFormat = new DecimalFormat("##.##%");
@@ -3484,23 +3315,14 @@
serviceSubtaskStatistic.setLeavehospitaldistrictcode(serviceSubtaskList.get(0).getLeavehospitaldistrictcode());
serviceSubtaskStatistic.setDrcode(serviceSubtaskList.get(0).getDrcode());
serviceSubtaskStatistic.setDrname(serviceSubtaskList.get(0).getDrname());
- //鍑洪櫌浜烘
- serviceSubtaskStatistic.setDischargeCount(serviceSubtaskList.size());
serviceSubtaskStatistic.setJoyCount(0);
serviceSubtaskStatistic.setJoyAllCount(0);
//鑾峰彇闅忚缁熻
- List<Long> subTaskIds = new ArrayList<>();
- if (ObjectUtils.isNotEmpty(serviceSubtaskList)) {
- subTaskIds = serviceSubtaskList.stream().map(ServiceSubtask::getId) // 鎻愬彇瀛楁
- .filter(Objects::nonNull) // 杩囨护 null 鍊�
- .filter(id -> ObjectUtils.isNotEmpty(id)) // 杩囨护绌哄瓧绗︿覆锛堝彲閫夛級
- .distinct() // 鍘婚噸
- .collect(Collectors.toList()); // 鏀堕泦鍒� List
- serviceSubtaskCountReq.setSubTaskIds(subTaskIds);
+ if (subCounts == null) {
+ subCounts = new ArrayList<>();
}
- List<ServiceSubtaskCount> subCounts = new ArrayList<>();
- subCounts = serviceSubtaskMapper.getSfStatisticsCategory(serviceSubtaskCountReq);
+
for (ServiceSubtask serviceSubtask : serviceSubtaskList) {
List<ServiceSubtaskCount> subCountTemp = subCounts.stream().filter(r -> r.getSubTaskId().equals(serviceSubtask.getId())).collect(Collectors.toList());
@@ -3544,6 +3366,9 @@
if (serviceSubtask.getSendstate() != null && ObjectUtils.isNotEmpty(serviceSubtask.getCurrentPreachform()) && serviceSubtask.getCurrentPreachform().equals("1")) {
serviceSubtaskStatistic.setManual(serviceSubtaskStatistic.getManual() + 1L);
}
+ if (serviceSubtask.getSendstate() != null && ObjectUtils.isNotEmpty(serviceSubtask.getCurrentPreachform()) && serviceSubtask.getCurrentPreachform().equals("3")) {
+ serviceSubtaskStatistic.setVoice(serviceSubtaskStatistic.getVoice() + 1L);
+ }
if (serviceSubtask.getSendstate() != null && ObjectUtils.isNotEmpty(serviceSubtask.getCurrentPreachform()) && serviceSubtask.getCurrentPreachform().equals("4")) {
serviceSubtaskStatistic.setSms(serviceSubtaskStatistic.getSms() + 1L);
}
@@ -3576,6 +3401,10 @@
if (serviceSubtask.getSendstate() != null && ObjectUtils.isNotEmpty(serviceSubtask.getCurrentPreachform()) && serviceSubtask.getCurrentPreachform().equals("1")) {
serviceSubtaskStatistic.setManualAgain(serviceSubtaskStatistic.getManualAgain() + 1L);
}
+ //鍐嶆闅忚璇煶(缁熻涓嶆墽琛�)
+ if (serviceSubtask.getSendstate() != null && ObjectUtils.isNotEmpty(serviceSubtask.getCurrentPreachform()) && serviceSubtask.getCurrentPreachform().equals("3")) {
+ serviceSubtaskStatistic.setVoiceAgain(serviceSubtaskStatistic.getVoiceAgain() + 1L);
+ }
if (serviceSubtask.getSendstate() != null && ObjectUtils.isNotEmpty(serviceSubtask.getCurrentPreachform()) && serviceSubtask.getCurrentPreachform().equals("4")) {
serviceSubtaskStatistic.setSmsAgain(serviceSubtaskStatistic.getSmsAgain() + 1L);
}
@@ -3586,9 +3415,7 @@
serviceSubtaskStatistic.setAbnormalAgain(serviceSubtaskStatistic.getAbnormalAgain() + 1L);
}
}
-
}
-
return serviceSubtaskStatistic;
}
@@ -3752,13 +3579,186 @@
}
/**
+ * 鑾峰彇闅忚缁熻瓒呴摼鎺�
+ * dischargeCountInfo
+ * followUpNeededAllInfo - sendstate != 4 (1,2,3,5,6,7)
+ * nonFollowUpInfo - sendstate = 4
+ * needFollowUpInfo - visitCount = 1 && sendstate != 4
+ * pendingFollowUpInfo - visitCount = 1 && sendstate = 2
+ * followUpSuccessInfo - visitCount = 1 && sendstate = 6
+ * followUpFailInfo - visitCount = 1 && (sendstate = 5 || sendstate = 7)
+ * manualInfo - visitCount = 1 && currentPreachForm = "1"
+ * voiceInfo - visitCount = 1 && currentPreachForm = "3"
+ * smsInfo - visitCount = 1 && currentPreachForm = "4"
+ * wechatInfo - visitCount = 1 && currentPreachForm = "5"
+ * abnormalInfo - visitCount = 1 && excep = "1"
+ * needFollowUpAgainInfo - visitCount > 1 && sendstate != 4
+ * pendingFollowUpAgainInfo - visitCount > 1 && sendstate = 2
+ * followUpSuccessAgainInfo - visitCount > 1 && sendstate =6
+ * followUpFailAgainInfo - visitCount > 1 && (sendstate = 5 || sendstate = 7)
+ * manualAgainInfo - visitCount > 1 && currentPreachForm = "1"
+ * voiceAgainInfo - visitCount > 1 && currentPreachForm = "3"
+ * smsAgainInfo - visitCount > 1 && currentPreachForm = "4"
+ * wechatAgainInfo - visitCount > 1 && currentPreachForm = "5"
+ * abnormalAgainInfo- visitCount = 1 && excep = "1"
+ * taskSituation1Info - taskSituation = 1
+ * taskSituation2Info - taskSituation = 2
+ * taskSituation3Info - taskSituation = 3
+ * taskSituation4Info - taskSituation = 4
+ * taskSituation5Info - taskSituation = 5
+ * taskSituation6Info - taskSituation = 7
+ * filterCountList - taskSituation = 6 && sendstate = 4
+ *
+ */
+ @Override
+ public List<ServiceSubtask> getSfStatisticsHyperlink(ServiceSubtaskCountReq serviceSubtaskCountReq) {
+ String hyperLinkInfoType = serviceSubtaskCountReq.getHyperLinkInfoType();
+ if (StringUtils.isNotEmpty(hyperLinkInfoType)) {
+ applyHyperLinkInfoType(serviceSubtaskCountReq, hyperLinkInfoType);
+ }
+
+ String followUpCountStyle = serviceSubtaskCountReq.getFollowUpCountStyle();
+ /**
+ * 缁熻鏃剁畻涓婁笉鍙戦�佺殑
+ */
+ if (StringUtils.isNotEmpty(followUpCountStyle) && followUpCountStyle.equals("2")) {
+ List<Long> sendstates = serviceSubtaskCountReq.getSendstates();
+ if(CollectionUtils.isNotEmpty(sendstates) && sendstates.get(0).equals(6L)){
+ List<Long> sendstates1 =new ArrayList<>();
+ sendstates1.add(3L);
+ sendstates1.add(4L);
+ sendstates1.add(6L);
+ serviceSubtaskCountReq.setSendstates(sendstates1);
+ }
+ }
+ List<ServiceSubtask> serviceSubtasks = serviceSubtaskMapper.getSfStatisticsHyperlink(serviceSubtaskCountReq);
+ return serviceSubtasks;
+ }
+
+ private void applyHyperLinkInfoType(ServiceSubtaskCountReq serviceSubtaskCountReq, String hyperLinkInfoType) {
+ serviceSubtaskCountReq.setVisitCount(null);
+ serviceSubtaskCountReq.setSendstates(null);
+ serviceSubtaskCountReq.setCurrentPreachform(null);
+ serviceSubtaskCountReq.setExcep(null);
+ serviceSubtaskCountReq.setTaskSituation(null);
+
+ switch (hyperLinkInfoType) {
+ case "dischargeCountInfo":
+ break;
+ case "followUpNeededAllInfo":
+ serviceSubtaskCountReq.setSendstates(new ArrayList<>(Arrays.asList(1L, 2L, 3L, 5L, 6L, 7L)));
+ break;
+ case "nonFollowUpInfo":
+ serviceSubtaskCountReq.setSendstates(new ArrayList<>(Collections.singletonList(4L)));
+ break;
+ case "needFollowUpInfo":
+ serviceSubtaskCountReq.setVisitCount(1);
+ serviceSubtaskCountReq.setSendstates(new ArrayList<>(Arrays.asList(1L, 2L, 3L, 5L, 6L, 7L)));
+ break;
+ case "pendingFollowUpInfo":
+ serviceSubtaskCountReq.setVisitCount(1);
+ serviceSubtaskCountReq.setSendstates(new ArrayList<>(Collections.singletonList(2L)));
+ break;
+ case "followUpSuccessInfo":
+ serviceSubtaskCountReq.setVisitCount(1);
+ serviceSubtaskCountReq.setSendstates(new ArrayList<>(Collections.singletonList(6L)));
+ break;
+ case "followUpFailInfo":
+ serviceSubtaskCountReq.setVisitCount(1);
+ serviceSubtaskCountReq.setSendstates(new ArrayList<>(Arrays.asList(5L, 7L)));
+ break;
+ case "manualInfo":
+ serviceSubtaskCountReq.setVisitCount(1);
+ serviceSubtaskCountReq.setCurrentPreachform("1");
+ break;
+ case "voiceInfo":
+ serviceSubtaskCountReq.setVisitCount(1);
+ serviceSubtaskCountReq.setCurrentPreachform("3");
+ break;
+ case "smsInfo":
+ serviceSubtaskCountReq.setVisitCount(1);
+ serviceSubtaskCountReq.setCurrentPreachform("4");
+ break;
+ case "wechatInfo":
+ serviceSubtaskCountReq.setVisitCount(1);
+ serviceSubtaskCountReq.setCurrentPreachform("5");
+ break;
+ case "abnormalInfo":
+ serviceSubtaskCountReq.setVisitCount(1);
+ serviceSubtaskCountReq.setExcep("1");
+ break;
+ case "needFollowUpAgainInfo":
+ serviceSubtaskCountReq.setVisitCount(2);
+ serviceSubtaskCountReq.setSendstates(new ArrayList<>(Arrays.asList(1L, 2L, 3L, 5L, 6L, 7L)));
+ break;
+ case "pendingFollowUpAgainInfo":
+ serviceSubtaskCountReq.setVisitCount(2);
+ serviceSubtaskCountReq.setSendstates(new ArrayList<>(Collections.singletonList(2L)));
+ break;
+ case "followUpSuccessAgainInfo":
+ serviceSubtaskCountReq.setVisitCount(2);
+ serviceSubtaskCountReq.setSendstates(new ArrayList<>(Collections.singletonList(6L)));
+ break;
+ case "followUpFailAgainInfo":
+ serviceSubtaskCountReq.setVisitCount(2);
+ serviceSubtaskCountReq.setSendstates(new ArrayList<>(Arrays.asList(5L, 7L)));
+ break;
+ case "manualAgainInfo":
+ serviceSubtaskCountReq.setVisitCount(2);
+ serviceSubtaskCountReq.setCurrentPreachform("1");
+ break;
+ case "voiceAgainInfo":
+ serviceSubtaskCountReq.setVisitCount(2);
+ serviceSubtaskCountReq.setCurrentPreachform("3");
+ break;
+ case "smsAgainInfo":
+ serviceSubtaskCountReq.setVisitCount(2);
+ serviceSubtaskCountReq.setCurrentPreachform("4");
+ break;
+ case "wechatAgainInfo":
+ serviceSubtaskCountReq.setVisitCount(2);
+ serviceSubtaskCountReq.setCurrentPreachform("5");
+ break;
+ case "abnormalAgainInfo":
+ serviceSubtaskCountReq.setVisitCount(2);
+ serviceSubtaskCountReq.setExcep("1");
+ break;
+ case "taskSituation1Info":
+ serviceSubtaskCountReq.setTaskSituation(1);
+ break;
+ case "taskSituation2Info":
+ serviceSubtaskCountReq.setTaskSituation(2);
+ break;
+ case "taskSituation3Info":
+ serviceSubtaskCountReq.setTaskSituation(3);
+ break;
+ case "taskSituation4Info":
+ serviceSubtaskCountReq.setTaskSituation(4);
+ break;
+ case "taskSituation5Info":
+ serviceSubtaskCountReq.setTaskSituation(5);
+ break;
+ case "taskSituation6Info":
+ serviceSubtaskCountReq.setTaskSituation(7);
+ break;
+ case "filterCountList":
+ serviceSubtaskCountReq.setTaskSituation(6);
+ serviceSubtaskCountReq.setSendstates(new ArrayList<>(Collections.singletonList(4L)));
+ break;
+ default:
+ break;
+ }
+ }
+
+
+ /**
* 鑾峰彇闅忚缁熻姣斾緥
*
* @param serviceSubtaskCountReq
* @return
*/
@Override
-// @Cacheable(value = "getSfStatisticsScript", key = "T(org.springframework.util.DigestUtils).md5DigestAsHex(#serviceSubtaskCountReq.toString().getBytes())", unless = "#result == null or #result.isEmpty()")
+ @Cacheable(value = "getSfStatisticsScript", key = "T(org.springframework.util.DigestUtils).md5DigestAsHex(#serviceSubtaskCountReq.toString().getBytes())", unless = "#result == null or #result.isEmpty()")
public List<ServiceSubtaskStatistic> getSfStatisticsScript(ServiceSubtaskCountReq serviceSubtaskCountReq) {
log.info("getSfStatisticsScript鐨勫叆鍙備负锛歿}", serviceSubtaskCountReq);
List<ServiceSubtaskStatistic> serviceSubtaskStatistics = new ArrayList<>();
@@ -3799,12 +3799,22 @@
}
//鑾峰彇鍙婃椂鐜囩粺璁″悎闆�
Map<String, Map<String, Object>> jsRates = getSsRateForSfStatistics(serviceSubtaskCountReq, collect);
+ //涓�娆℃�ф煡璇㈡墍鏈夊垎缁勭殑棰樼洰缁熻锛岄伩鍏嶆瘡涓垎缁勪竴娆QL锛圢+1锛�
+ List<Long> allSubTaskIds = rawData.stream().map(ServiceSubtask::getId)
+ .filter(Objects::nonNull)
+ .distinct()
+ .collect(Collectors.toList());
+ List<ServiceSubtaskCount> subCounts = new ArrayList<>();
+ if (CollectionUtils.isNotEmpty(allSubTaskIds)) {
+ serviceSubtaskCountReq.setSubTaskIds(allSubTaskIds);
+ subCounts = serviceSubtaskMapper.getSfStatisticsCategory(serviceSubtaskCountReq);
+ }
for (String collectKey : collect.keySet()) {
List<ServiceSubtask> serviceSubtaskList = collect.get(collectKey);
if (CollectionUtils.isEmpty(serviceSubtaskList)) {
continue;
}
- ServiceSubtaskStatistic statistic = getStatisticCategory(serviceSubtaskList, serviceSubtaskCountReq);
+ ServiceSubtaskStatistic statistic = getStatisticCategory(serviceSubtaskList, serviceSubtaskCountReq, subCounts);
if (ObjectUtils.isNotEmpty(jsRates)) {
Map<String, Object> jsRateMap = jsRates.get(collectKey);
BigDecimal jsRate = new BigDecimal("0");
@@ -3841,12 +3851,45 @@
serviceSubtaskStatistic.setJoyAllCount(sum.intValue());
serviceSubtaskStatistic.setJoyCount(finishedSum.intValue());
serviceSubtaskStatistic.setJoyTotal(finishedPercentage);
+ clearStatisticDetailInfo(serviceSubtaskStatistic);
}
}
return serviceSubtaskStatistics;
}
+ /**
+ * Trim detail lists for summary response to avoid oversized payloads.
+ */
+ private void clearStatisticDetailInfo(ServiceSubtaskStatistic serviceSubtaskStatistic) {
+ serviceSubtaskStatistic.setDischargeCountInfo(null);
+ serviceSubtaskStatistic.setNonFollowUpInfo(null);
+ serviceSubtaskStatistic.setFollowUpNeededAllInfo(null);
+ serviceSubtaskStatistic.setNeedFollowUpInfo(null);
+ serviceSubtaskStatistic.setPendingFollowUpInfo(null);
+ serviceSubtaskStatistic.setFollowUpSuccessInfo(null);
+ serviceSubtaskStatistic.setFollowUpFailInfo(null);
+ serviceSubtaskStatistic.setManualInfo(null);
+ serviceSubtaskStatistic.setVoiceInfo(null);
+ serviceSubtaskStatistic.setSmsInfo(null);
+ serviceSubtaskStatistic.setWechatInfo(null);
+ serviceSubtaskStatistic.setNeedFollowUpAgainInfo(null);
+ serviceSubtaskStatistic.setPendingFollowUpAgainInfo(null);
+ serviceSubtaskStatistic.setFollowUpSuccessAgainInfo(null);
+ serviceSubtaskStatistic.setFollowUpFailAgainInfo(null);
+ serviceSubtaskStatistic.setManualAgainInfo(null);
+ serviceSubtaskStatistic.setVoiceAgainInfo(null);
+ serviceSubtaskStatistic.setSmsAgainInfo(null);
+ serviceSubtaskStatistic.setWechatAgainInfo(null);
+ serviceSubtaskStatistic.setTaskSituation1Info(null);
+ serviceSubtaskStatistic.setTaskSituation2Info(null);
+ serviceSubtaskStatistic.setTaskSituation3Info(null);
+ serviceSubtaskStatistic.setTaskSituation4Info(null);
+ serviceSubtaskStatistic.setTaskSituation5Info(null);
+ serviceSubtaskStatistic.setTaskSituation6Info(null);
+ serviceSubtaskStatistic.setFilterCountList(null);
+ }
+
@Override
public Map<String, ServiceSubtaskScriptCount> getSfStatisticsScriptDetails(ServiceSubtaskCountReq serviceSubtaskCountReq) {
Map<String, ServiceSubtaskScriptCount> result = new HashMap<>();
--
Gitblit v1.9.3