From 7303db54c1a2b672e4623cd022939b56882685ca Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期二, 23 十二月 2025 13:33:02 +0800
Subject: [PATCH] 【丽水】获取随访统计比例 优化
---
smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java | 105 ++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 92 insertions(+), 13 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 e541fde..cde04a1 100644
--- a/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java
@@ -17,6 +17,7 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.collections4.MapUtils;
import org.apache.commons.lang3.ObjectUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
@@ -374,7 +375,10 @@
public Map<String, Object> patItemCount(ServiceSubtaskVO serviceSubtaskVO) {
// 鐩存帴璋冪敤鏁版嵁搴撶粺璁℃柟娉曪紝鍦ㄦ暟鎹簱灞傚畬鎴愯仛鍚堣绠�
Map<String, Object> result = serviceSubtaskMapper.countByCondition(serviceSubtaskVO);
-
+ // 澶勭悊绌哄紓甯�
+ if(MapUtils.isEmpty(result)){
+ result = new HashMap<>();
+ }
// 纭繚鎵�鏈� key 閮芥湁鍊硷紝閬垮厤绌烘寚閽堝紓甯�
// MyBatis 鐨� SUM 鍦ㄦ病鏈夊尮閰嶈鏃朵細杩斿洖 null
result.putIfAbsent("wzx", 0);
@@ -2194,7 +2198,7 @@
}
/**
- * 鑾峰彇闅忚缁熻姣斾緥
+ * 鑾峰彇闅忚缁熻姣斾緥锛堜紭鍖栫増鏈級
*
* @param serviceSubtaskCountReq
* @return
@@ -2204,22 +2208,28 @@
public List<ServiceSubtaskStatistic> getSfStatistics(ServiceSubtaskCountReq serviceSubtaskCountReq) {
log.info("getSfStatistics鐨勫叆鍙備负锛歿}", serviceSubtaskCountReq);
List<ServiceSubtaskStatistic> serviceSubtaskStatistics = new ArrayList<>();
-// List<ServiceSubtask> rawData = serviceSubtaskMapper.getSfStatistics(serviceSubtaskCountReq);
+
+ // 浼樺寲锛氬彧鏌ヨ涓�娆℃暟鎹簱锛岄伩鍏嶉噸澶嶆煡璇�
+ List<ServiceSubtask> rawData = serviceSubtaskMapper.getSfStatistics(serviceSubtaskCountReq);
+
+ if (CollectionUtils.isEmpty(rawData)) {
+ return serviceSubtaskStatistics;
+ }
// 鏍规嵁鏉′欢杩涜鍒嗙粍
Map<String, List<ServiceSubtask>> collect = new HashMap<>();
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")));
+ collect = rawData.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")));
+ collect = rawData.stream().collect(Collectors.groupingBy(subtask -> Optional.ofNullable(subtask.getLeavehospitaldistrictname()).orElse("Unknown")));
}
} else if (serviceSubtaskCountReq.getDeptcodes() != null && serviceSubtaskCountReq.getDeptcodes().size() > 0) {
if (serviceSubtaskCountReq.getDrcode() != null && !serviceSubtaskCountReq.getDrcode().isEmpty()) {
- collect = serviceSubtaskMapper.getSfStatistics(serviceSubtaskCountReq).stream().collect(Collectors.groupingBy(subtask -> Optional.ofNullable(subtask.getDrname()).orElse("Unknown")));
+ collect = rawData.stream().collect(Collectors.groupingBy(subtask -> Optional.ofNullable(subtask.getDrname()).orElse("Unknown")));
} else {
- collect = serviceSubtaskMapper.getSfStatistics(serviceSubtaskCountReq).stream().collect(Collectors.groupingBy(subtask -> Optional.ofNullable(subtask.getDeptname()).orElse("Unknown")));
+ collect = rawData.stream().collect(Collectors.groupingBy(subtask -> Optional.ofNullable(subtask.getDeptname()).orElse("Unknown")));
}
}
@@ -2274,7 +2284,7 @@
}
/**
- * 鑾峰彇闅忚缁熻姣斾緥
+ * 鑾峰彇闅忚缁熻姣斾緥锛堜紭鍖栫増鏈級
*
* @param serviceSubtaskCountReq
* @return
@@ -2285,22 +2295,28 @@
log.error("getSfStatistics鐨勫叆鍙備负锛歿}", serviceSubtaskCountReq);
List<ServiceSubtaskStatistic> serviceSubtaskStatistics = new ArrayList<>();
+ // 浼樺寲锛氬彧鏌ヨ涓�娆℃暟鎹簱锛岄伩鍏嶉噸澶嶆煡璇�
+ List<ServiceSubtask> rawData = serviceSubtaskMapper.getSfStatistics(serviceSubtaskCountReq);
+
+ if (CollectionUtils.isEmpty(rawData)) {
+ return serviceSubtaskStatistics;
+ }
+
// 鏍规嵁鏉′欢杩涜鍒嗙粍
Map<String, List<ServiceSubtask>> collect = new HashMap<>();
String orgid = null;
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")));
-
+ collect = rawData.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")));
+ collect = rawData.stream().collect(Collectors.groupingBy(subtask -> Optional.ofNullable(subtask.getLeavehospitaldistrictname()).orElse("Unknown")));
}
} else if (serviceSubtaskCountReq.getDeptcodes() != null && serviceSubtaskCountReq.getDeptcodes().size() > 0) {
if (serviceSubtaskCountReq.getDrcode() != null && !serviceSubtaskCountReq.getDrcode().isEmpty()) {
- collect = serviceSubtaskMapper.getSfStatistics(serviceSubtaskCountReq).stream().collect(Collectors.groupingBy(subtask -> Optional.ofNullable(subtask.getDrname()).orElse("Unknown")));
+ collect = rawData.stream().collect(Collectors.groupingBy(subtask -> Optional.ofNullable(subtask.getDrname()).orElse("Unknown")));
} else {
- collect = serviceSubtaskMapper.getSfStatistics(serviceSubtaskCountReq).stream().collect(Collectors.groupingBy(subtask -> Optional.ofNullable(subtask.getDeptname()).orElse("Unknown")));
+ collect = rawData.stream().collect(Collectors.groupingBy(subtask -> Optional.ofNullable(subtask.getDeptname()).orElse("Unknown")));
}
}
List<ServiceSubtaskCount> joySubCount = serviceSubtaskMapper.getSfStatisticsJoy(serviceSubtaskCountReq);
@@ -2474,6 +2490,27 @@
List<ServiceSubtask> followUpSuccessInfo = new ArrayList<>();
//璁板綍棣栨闅忚澶辫触璇︽儏
List<ServiceSubtask> followUpFailInfo = new ArrayList<>();
+ //璁板綍棣栨闅忚浜哄伐璇︽儏
+ List<ServiceSubtask> manualInfo = 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> smsAgainInfo = new ArrayList<>();
+ //璁板綍棣栨闅忚寰俊璇︽儏
+ List<ServiceSubtask> wechatAgainInfo= new ArrayList<>();
for (ServiceSubtask serviceSubtask : serviceSubtaskList) {
//鏃犻渶闅忚浜烘
@@ -2517,31 +2554,46 @@
} else {
serviceSubtaskStatistic.setFollowUpRate("0.00%");
}
+ //棣栨闅忚浜哄伐
if (serviceSubtask.getSendstate() != null && serviceSubtask.getPreachform().equals("1")) {
serviceSubtaskStatistic.setManual(serviceSubtaskStatistic.getManual() + 1L);
+ manualInfo.add(serviceSubtask);
}
+ //棣栨闅忚鐭俊
if (serviceSubtask.getSendstate() != null && serviceSubtask.getPreachform().equals("4")) {
serviceSubtaskStatistic.setSms(serviceSubtaskStatistic.getSms() + 1L);
+ smsInfo.add(serviceSubtask);
}
+ //棣栨闅忚寰俊
if (serviceSubtask.getSendstate() != null && serviceSubtask.getPreachform().equals("5")) {
serviceSubtaskStatistic.setWeChat(serviceSubtaskStatistic.getWeChat() + 1L);
+ wechatInfo.add(serviceSubtask);
}
+ //缁撴灉寮傚父
if (serviceSubtask.getSendstate() != null && serviceSubtask.getExcep().equals("1")) {
serviceSubtaskStatistic.setAbnormal(serviceSubtaskStatistic.getAbnormal() + 1L);
}
}//浜屾鍑洪櫌闅忚
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();
@@ -2549,15 +2601,22 @@
} else {
serviceSubtaskStatistic.setFollowUpRateAgain("0.00%");
}
+ //鍐嶆闅忚浜哄伐
if (serviceSubtask.getSendstate() != null && serviceSubtask.getPreachform().equals("1")) {
serviceSubtaskStatistic.setManualAgain(serviceSubtaskStatistic.getManualAgain() + 1L);
+ manualAgainInfo.add(serviceSubtask);
}
+ //鍐嶆闅忚鐭俊
if (serviceSubtask.getSendstate() != null && serviceSubtask.getPreachform().equals("4")) {
serviceSubtaskStatistic.setSmsAgain(serviceSubtaskStatistic.getSmsAgain() + 1L);
+ smsAgainInfo.add(serviceSubtask);
}
+ //鍐嶆闅忚寰俊
if (serviceSubtask.getSendstate() != null && serviceSubtask.getPreachform().equals("5")) {
serviceSubtaskStatistic.setWeChatAgain(serviceSubtaskStatistic.getWeChatAgain() + 1L);
+ wechatAgainInfo.add(serviceSubtask);
}
+ //鍐嶆寮傚父
if (serviceSubtask.getSendstate() != null && serviceSubtask.getExcep().equals("1")) {
serviceSubtaskStatistic.setAbnormalAgain(serviceSubtaskStatistic.getAbnormalAgain() + 1L);
}
@@ -2591,6 +2650,26 @@
serviceSubtaskStatistic.setFollowUpSuccessInfo(followUpSuccessInfo);
//璁板綍棣栨闅忚澶辫触璇︽儏
serviceSubtaskStatistic.setFollowUpFailInfo(followUpFailInfo);
+ //璁板綍棣栨闅忚浜哄伐璇︽儏
+ serviceSubtaskStatistic.setManualInfo(manualInfo);
+ //璁板綍棣栨闅忚鐭俊璇︽儏
+ serviceSubtaskStatistic.setSmsInfo(smsInfo);
+ //璁板綍棣栨闅忚寰俊璇︽儏
+ serviceSubtaskStatistic.setWechatInfo(wechatInfo);
+ //璁板綍鍐嶆搴旈殢璁胯鎯�
+ serviceSubtaskStatistic.setNeedFollowUpAgainInfo(needFollowUpAgainInfo);
+ //璁板綍鍐嶆寰呴殢璁胯鎯�
+ serviceSubtaskStatistic.setPendingFollowUpAgainInfo(pendingFollowUpAgainInfo);
+ //璁板綍鍐嶆闅忚鎴愬姛璇︽儏
+ serviceSubtaskStatistic.setFollowUpSuccessAgainInfo(followUpSuccessAgainInfo);
+ //璁板綍鍐嶆闅忚澶辫触璇︽儏
+ serviceSubtaskStatistic.setFollowUpFailAgainInfo(followUpFailAgainInfo);
+ //璁板綍鍐嶆闅忚浜哄伐璇︽儏
+ serviceSubtaskStatistic.setManualAgainInfo(manualAgainInfo);
+ //璁板綍鍐嶆闅忚鐭俊璇︽儏
+ serviceSubtaskStatistic.setSmsAgainInfo(smsAgainInfo);
+ //璁板綍鍐嶆闅忚寰俊璇︽儏
+ serviceSubtaskStatistic.setWechatAgainInfo(wechatAgainInfo);
return serviceSubtaskStatistic;
}
--
Gitblit v1.9.3