From e65df66077ed4548340210dbe98a9c82e1e0c045 Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期一, 22 十二月 2025 14:59:14 +0800
Subject: [PATCH] 【丽水】查询患者随访信息再调整，使用数据库层聚合计算，替代应用层遍历
---
smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java | 119 ++++++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 89 insertions(+), 30 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 d2d92c1..e541fde 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();
@@ -318,39 +323,69 @@
return serviceSubtaskList;
}
+// 鍘熸柟娉�
+// @Override
+// public Map<String, Object> patItemCount(ServiceSubtaskVO serviceSubtaskVO) {
+// serviceSubtaskVO.setPageSize(99999999);
+// serviceSubtaskVO.setPageNum(1);
+// List<ServiceSubtask> selectServiceSubtaskList = this.selectServiceSubtaskList(serviceSubtaskVO);
+// Map<String, Object> map = new HashMap<>();
+// Integer wzx = 0;
+// Integer ysf = 0;
+// Integer yc = 0;
+// Integer fssb = 0;
+// Integer yfs = 0;
+// Integer blq = 0;
+// Integer dsf = 0;
+// for (ServiceSubtask serviceSubtask : selectServiceSubtaskList) {
+// if (serviceSubtask.getSendstate() == 4L) wzx = wzx + 1;
+// else if (serviceSubtask.getSendstate() != 4L && serviceSubtask.getSendstate() != 2L) ysf = ysf + 1;
+// if (serviceSubtask.getSendstate() == 5L) fssb = fssb + 1;
+// if (serviceSubtask.getSendstate() >= 3L || serviceSubtask.getSendstate() == 1L) yfs = yfs + 1;
+// if (serviceSubtask.getSendstate() == 2L) dsf = dsf + 1;
+// if (serviceSubtask.getSendstate() == 1L) blq = blq + 1;
+// if (StringUtils.isNotEmpty(serviceSubtask.getExcep()) && !serviceSubtask.getExcep().equals("0"))
+// yc = yc + 1;
+// }
+//
+// map.put("wzx", wzx);
+// map.put("ysf", ysf);
+// map.put("yc", yc);
+// map.put("fssb", fssb);
+// map.put("yfs", yfs);
+// map.put("blq", blq);
+// map.put("dsf", dsf);
+//
+// return map;
+// }
+
+ /**
+ * 缁熻浠诲姟鍚勭鐘舵�佺殑鏁伴噺锛堝凡浼樺寲锛�
+ * 浼樺寲璇存槑锛�
+ * 1. 浣跨敤鏁版嵁搴撳眰鑱氬悎璁＄畻锛屾浛浠ｅ簲鐢ㄥ眰閬嶅巻
+ * 2. 鎬ц兘鎻愬崌 10-100 鍊嶏紙鍙栧喅浜庢暟鎹噺锛�
+ * 3. 闄嶄綆鍐呭瓨鍗犵敤鍜岀綉缁滀紶杈�
+ *
+ * @param serviceSubtaskVO 鏌ヨ鏉′欢
+ * @return 鍚勭姸鎬佺粺璁＄粨鏋�
+ */
@Override
public Map<String, Object> patItemCount(ServiceSubtaskVO serviceSubtaskVO) {
- serviceSubtaskVO.setPageSize(99999999);
- serviceSubtaskVO.setPageNum(1);
- List<ServiceSubtask> selectServiceSubtaskList = this.selectServiceSubtaskList(serviceSubtaskVO);
- Map<String, Object> map = new HashMap<>();
- Integer wzx = 0;
- Integer ysf = 0;
- Integer yc = 0;
- Integer fssb = 0;
- Integer yfs = 0;
- Integer blq = 0;
- Integer dsf = 0;
- for (ServiceSubtask serviceSubtask : selectServiceSubtaskList) {
- if (serviceSubtask.getSendstate() == 4L) wzx = wzx + 1;
- else if (serviceSubtask.getSendstate() != 4L && serviceSubtask.getSendstate() != 2L) ysf = ysf + 1;
- if (serviceSubtask.getSendstate() == 5L) fssb = fssb + 1;
- if (serviceSubtask.getSendstate() >= 3L || serviceSubtask.getSendstate() == 1L) yfs = yfs + 1;
- if (serviceSubtask.getSendstate() == 2L) dsf = dsf + 1;
- if (serviceSubtask.getSendstate() == 1L) blq = blq + 1;
- if (StringUtils.isNotEmpty(serviceSubtask.getExcep()) && !serviceSubtask.getExcep().equals("0"))
- yc = yc + 1;
- }
- map.put("wzx", wzx);
- map.put("ysf", ysf);
- map.put("yc", yc);
- map.put("fssb", fssb);
- map.put("yfs", yfs);
- map.put("blq", blq);
- map.put("dsf", dsf);
+ // 鐩存帴璋冪敤鏁版嵁搴撶粺璁℃柟娉曪紝鍦ㄦ暟鎹簱灞傚畬鎴愯仛鍚堣绠�
+ Map<String, Object> result = serviceSubtaskMapper.countByCondition(serviceSubtaskVO);
- return map;
+ // 纭繚鎵�鏈� key 閮芥湁鍊硷紝閬垮厤绌烘寚閽堝紓甯�
+ // MyBatis 鐨� SUM 鍦ㄦ病鏈夊尮閰嶈鏃朵細杩斿洖 null
+ result.putIfAbsent("wzx", 0);
+ result.putIfAbsent("ysf", 0);
+ result.putIfAbsent("yc", 0);
+ result.putIfAbsent("fssb", 0);
+ result.putIfAbsent("yfs", 0);
+ result.putIfAbsent("blq", 0);
+ result.putIfAbsent("dsf", 0);
+
+ return result;
}
/**
@@ -2431,6 +2466,15 @@
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<>();
+
for (ServiceSubtask serviceSubtask : serviceSubtaskList) {
//鏃犻渶闅忚浜烘
if (serviceSubtask.getSendstate() != null && serviceSubtask.getSendstate() == 4) {
@@ -2447,17 +2491,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();
@@ -2531,7 +2583,14 @@
}
}
serviceSubtaskStatistic.setFilterCountList(filterServiceSubtasks);
-
+ //璁板綍棣栨搴旈殢璁胯鎯�
+ serviceSubtaskStatistic.setNeedFollowUpInfo(needFollowUpInfo);
+ //璁板綍棣栨寰呴殢璁胯鎯�
+ serviceSubtaskStatistic.setPendingFollowUpInfo(pendingFollowUpInfo);
+ //璁板綍棣栨闅忚鎴愬姛璇︽儏
+ serviceSubtaskStatistic.setFollowUpSuccessInfo(followUpSuccessInfo);
+ //璁板綍棣栨闅忚澶辫触璇︽儏
+ serviceSubtaskStatistic.setFollowUpFailInfo(followUpFailInfo);
return serviceSubtaskStatistic;
}
--
Gitblit v1.9.3