From e65df66077ed4548340210dbe98a9c82e1e0c045 Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期一, 22 十二月 2025 14:59:14 +0800
Subject: [PATCH] 【丽水】查询患者随访信息再调整，使用数据库层聚合计算，替代应用层遍历
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskController.java | 21 +++-------
smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java | 72 ++++++++++++++++++------------------
smartor/src/main/java/com/smartor/service/IServiceSubtaskService.java | 2 -
3 files changed, 43 insertions(+), 52 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskController.java
index e9d9fd6..b274e73 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskController.java
@@ -100,17 +100,9 @@
if (ObjectUtils.isNotEmpty(serviceTask)) serviceSubtask.setPreachform(serviceTask.getPreachform());
}
- /**
- * 浠ｇ爜浼樺寲 鍒嗙缁熻
- Map<String, Object> map = new HashMap<>();
- map.put("serviceSubtaskList", serviceSubtaskList);
- List<Map<String, Object>> list = new ArrayList<>();
- list.add(map);
- **/
- //Map<String, Object> map = serviceSubtaskService.patItemCount(serviceSubtaskVO);
- //patItemCount 璋冪敤redisCache璁板綍缁熻鏁版嵁
-// Map<String, Object> map = patItemCount(serviceSubtaskVO);
- Map<String, Object> map = serviceSubtaskService.patItemCount1(serviceSubtaskVO);
+// patItemCount 璋冪敤redisCache璁板綍缁熻鏁版嵁
+// Map<String, Object> map = patItemCount(serviceSubtaskVO);
+ Map<String, Object> map = serviceSubtaskService.patItemCount(serviceSubtaskVO);
map.put("serviceSubtaskList", serviceSubtaskList);
List<Map<String, Object>> list = new ArrayList<>();
list.add(map);
@@ -127,7 +119,7 @@
}
/**
- * 缁熻闅忚鏁版嵁
+ * 缁熻闅忚鏁版嵁 -- cache鐗�
*/
@ApiOperation("缁熻闅忚鏁版嵁")
@PostMapping("/patItemCount")
@@ -235,9 +227,10 @@
serviceSubtaskRecord.setTaskid(serviceSubtask.getTaskid().toString());
serviceSubtask.setServiceSubtaskRecordList(serviceSubtaskRecordService.selectServiceSubtaskRecordList(serviceSubtaskRecord));
}
- //todo 浠ｇ爜浼樺寲
+// patItemCount 璋冪敤redisCache璁板綍缁熻鏁版嵁
+// Map<String, Object> map = patItemCount(serviceSubtaskVO);
Map<String, Object> map = serviceSubtaskService.patItemCount(serviceSubtaskVO);
-// Map<String, Object> map = patItemCount(serviceSubtaskVO);
+
map.put("serviceSubtaskList", serviceSubtaskList);
List<Map<String, Object>> list = new ArrayList<>();
list.add(map);
diff --git a/smartor/src/main/java/com/smartor/service/IServiceSubtaskService.java b/smartor/src/main/java/com/smartor/service/IServiceSubtaskService.java
index 003f600..aa1eca1 100644
--- a/smartor/src/main/java/com/smartor/service/IServiceSubtaskService.java
+++ b/smartor/src/main/java/com/smartor/service/IServiceSubtaskService.java
@@ -52,8 +52,6 @@
public Map<String, Object> patItemCount(ServiceSubtaskVO serviceSubtaskVO);
- public Map<String, Object> patItemCount1(ServiceSubtaskVO serviceSubtaskVO);
-
/**
* 鏂板鍗曚竴浠诲姟锛堥殢璁匡級
*
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 dabea21..e541fde 100644
--- a/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java
@@ -323,41 +323,41 @@
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;
- }
+// 鍘熸柟娉�
+// @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;
+// }
/**
@@ -371,7 +371,7 @@
* @return 鍚勭姸鎬佺粺璁＄粨鏋�
*/
@Override
- public Map<String, Object> patItemCount1(ServiceSubtaskVO serviceSubtaskVO) {
+ public Map<String, Object> patItemCount(ServiceSubtaskVO serviceSubtaskVO) {
// 鐩存帴璋冪敤鏁版嵁搴撶粺璁℃柟娉曪紝鍦ㄦ暟鎹簱灞傚畬鎴愯仛鍚堣绠�
Map<String, Object> result = serviceSubtaskMapper.countByCondition(serviceSubtaskVO);
--
Gitblit v1.9.3