From d3b362de432a32c10ccd039dfc417d8c6233f543 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期五, 28 三月 2025 18:10:21 +0800
Subject: [PATCH] 代码提交
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceTaskController.java | 26 +++++++++++++-------------
1 files changed, 13 insertions(+), 13 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 289091a..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
@@ -84,19 +84,19 @@
if (CollectionUtils.isNotEmpty(serviceTaskVOS)) {
for (ServiceTaskVO ServiceTaskVO : serviceTaskVOS) {
- ServiceSubtaskVO serviceSubtaskVO = new ServiceSubtaskVO();
- serviceSubtaskVO.setTaskid(ServiceTaskVO.getTaskid());
- serviceSubtaskVO.setStartOutHospTime(serviceTask.getStartOutHospTime());
- 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();
- //鏈彂閫�
- long wfs = ServiceTaskcalls.stream().filter(serviceTaskcall1 -> serviceTaskcall1.getSendstate() != null && serviceTaskcall1.getSendstate() == 2L).collect(Collectors.toList()).stream().count();
- ServiceTaskVO.setYfs(yfs);
- ServiceTaskVO.setWfs(wfs);
- }
+ ServiceSubtaskVO serviceSubtaskVO = new ServiceSubtaskVO();
+ serviceSubtaskVO.setTaskid(ServiceTaskVO.getTaskid());
+ serviceSubtaskVO.setStartOutHospTime(serviceTask.getStartOutHospTime());
+ serviceSubtaskVO.setEndOutHospTime(serviceTask.getEndOutHospTime());
+ List<ServiceSubtask> ServiceTaskcalls = iServiceTaskCallService.selectServiceSubtaskList(serviceSubtaskVO);
+ if (CollectionUtils.isNotEmpty(ServiceTaskcalls)) {
+ //宸插彂閫侊紙瀛愪换鍔′腑鐨� 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
--
Gitblit v1.9.3