From 5aebdcd55024a3b475ead61c34b89b9605af6055 Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期六, 20 十二月 2025 11:37:30 +0800
Subject: [PATCH] 【丽水】获取随访比例接口再调整，扩展再次随访以及人工短信微信详情
---
smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java | 135 ++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 134 insertions(+), 1 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 3c14caa..6a7256f 100644
--- a/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java
@@ -14,6 +14,7 @@
import com.smartor.mapper.*;
import com.smartor.service.*;
import com.sun.org.apache.bcel.internal.generic.NEW;
+import io.swagger.annotations.ApiModelProperty;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.ObjectUtils;
@@ -183,6 +184,10 @@
List<ServiceSubtask> list = selectServiceSubtaskList(serviceSubtaskVO);
ServiceTask serviceTask = serviceTaskService.selectServiceTaskByTaskid(serviceSubtask.getTaskid());
+ if(ObjectUtils.isEmpty(serviceTask)){
+ log.error("鎵句笉鍒板搴旂殑serviceTask, orgid锛歿}, taskid: {}", serviceSubtask.getOrgid(), serviceSubtask.getTaskid());
+ return null;
+ }
if (CollectionUtils.isEmpty(list) || list.size() == 0) {
ServiceTaskVO serviceTaskVO = DtoConversionUtils.sourceToTarget(serviceTask, ServiceTaskVO.class);
ObjectMapper objectMapper = new ObjectMapper();
@@ -2431,6 +2436,36 @@
serviceSubtaskStatistic.setDischargeCount(serviceSubtaskList.size());
//璁板綍杩囨护鎮ｈ�呰鎯�
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> 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) {
//鏃犻渶闅忚浜烘
if (serviceSubtask.getSendstate() != null && serviceSubtask.getSendstate() == 4) {
@@ -2447,17 +2482,25 @@
//棣栨鍑洪櫌闅忚
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) {
serviceSubtaskStatistic.setFollowUpFail(serviceSubtaskStatistic.getFollowUpFail() + 1L);
+ followUpFailInfo.add(serviceSubtask);
}
if (serviceSubtaskStatistic.getNeedFollowUp() > 0) {
double rate = (double) (serviceSubtaskStatistic.getFollowUpSuccess() + serviceSubtaskStatistic.getFollowUpFail()) / serviceSubtaskStatistic.getNeedFollowUp();
@@ -2465,31 +2508,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();
@@ -2497,15 +2555,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);
}
@@ -2531,7 +2596,34 @@
}
}
serviceSubtaskStatistic.setFilterCountList(filterServiceSubtasks);
-
+ //璁板綍棣栨搴旈殢璁胯鎯�
+ serviceSubtaskStatistic.setNeedFollowUpInfo(needFollowUpInfo);
+ //璁板綍棣栨寰呴殢璁胯鎯�
+ serviceSubtaskStatistic.setPendingFollowUpInfo(pendingFollowUpInfo);
+ //璁板綍棣栨闅忚鎴愬姛璇︽儏
+ 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;
}
@@ -2947,4 +3039,45 @@
return total;
}
+
+ /**
+ * 鍘嗗彶闅忚璁板綍瀵煎嚭绫诲皝瑁�
+ * ServiceSubtask 杞崲涓� ServiceSubtaskDiagname
+ */
+ public List<ServiceSubtaskDiagname> convertToDiagnameList(List<ServiceSubtask> subtaskList) {
+ if (CollectionUtils.isEmpty(subtaskList)) {
+ return new ArrayList<>();
+ }
+
+ return subtaskList.stream().map(subtask -> {
+ ServiceSubtaskDiagname diagname = new ServiceSubtaskDiagname();
+
+ diagname.setTaskName(subtask.getTaskName());
+ diagname.setSendstate(subtask.getSendstate());
+ diagname.setSendname(subtask.getSendname());
+ diagname.setLeavediagname(subtask.getLeavediagname());
+ diagname.setSuggest(subtask.getSuggest());
+ diagname.setOperator(subtask.getOperator());
+ diagname.setFinishtime(subtask.getFinishtime());
+ diagname.setLongSendTime(subtask.getLongSendTime());
+ diagname.setEndtime(subtask.getEndtime());
+ //璁＄畻鍑洪櫌澶╂暟
+ if(!Objects.isNull(diagname.getEndtime())){
+ Integer endDay = DateUtils.differentDaysByMillisecond(diagname.getEndtime(),new Date());
+ diagname.setEndDay(endDay);
+ }
+ diagname.setSfzh(subtask.getSfzh());
+ diagname.setPhone(subtask.getPhone());
+ diagname.setNurseName(subtask.getNurseName());
+ diagname.setDrname(subtask.getDrname());
+ diagname.setDeptname(subtask.getDeptname());
+ diagname.setLeavehospitaldistrictname(subtask.getLeavehospitaldistrictname());
+ diagname.setTemplatename(subtask.getTemplatename());
+ diagname.setPreachform(subtask.getPreachform());
+ diagname.setResult(subtask.getResult());
+
+ return diagname;
+ }).collect(Collectors.toList());
+ }
+
}
--
Gitblit v1.9.3