From 3c46b264b86bb38984370f685c6866c5f7784808 Mon Sep 17 00:00:00 2001
From: zhs <zhs18203887318@163.com>
Date: 星期三, 16 四月 2025 21:42:39 +0800
Subject: [PATCH] 04-16改_手术病人分页and患者信息子页面时间查询
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceTaskController.java | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceTaskController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceTaskController.java
index 43786ea..1c075bd 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceTaskController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceTaskController.java
@@ -90,13 +90,14 @@
serviceSubtaskVO.setEndOutHospTime(serviceTask.getEndOutHospTime());
List<ServiceSubtask> ServiceTaskcalls = iServiceTaskCallService.selectServiceSubtaskList(serviceSubtaskVO);
if (CollectionUtils.isNotEmpty(ServiceTaskcalls)) {
- //宸插彂閫�
- long yfs = ServiceTaskcalls.stream().filter(serviceTaskcall1 -> serviceTaskcall1.getSendstate() != null && serviceTaskcall1.getSendstate() == 3L).collect(Collectors.toList()).stream().count();
+ //宸插彂閫侊紙瀛愪换鍔′腑鐨� sendstate=1涓鸿棰嗗彇锛�
+ long yfs = ServiceTaskcalls.stream().filter(serviceTaskcall1 -> (serviceTaskcall1.getSendstate() != null && serviceTaskcall1.getSendstate() >= 3L) || (serviceTaskcall1.getSendstate() != null && serviceTaskcall1.getSendstate() == 1L)).collect(Collectors.toList()).stream().count();
//鏈彂閫�
long wfs = ServiceTaskcalls.stream().filter(serviceTaskcall1 -> serviceTaskcall1.getSendstate() != null && serviceTaskcall1.getSendstate() == 2L).collect(Collectors.toList()).stream().count();
ServiceTaskVO.setYfs(yfs);
ServiceTaskVO.setWfs(wfs);
}
+
}
//鑾峰彇total
long total = PageUtils.count(new ISelect() {
@@ -104,7 +105,7 @@
public void doSelect() {
serviceTask.setPageNum(null);
serviceTask.setPageSize(null);
- serviceTaskService.selectServiceTaskList(serviceTask);
+ serviceTaskService.selectServiceTaskAndtaskDeptList(serviceTask);
}
});
--
Gitblit v1.9.3