From 34f23b9bc07281df4bd454cbfcd3c12a98230afb Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期四, 29 一月 2026 15:51:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceTaskController.java | 8 +++++---
1 files changed, 5 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 3cba63a..3feee46 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
@@ -29,6 +29,7 @@
import java.util.Collections;
import java.util.List;
import java.util.Map;
+import java.util.Optional;
import java.util.stream.Collectors;
/**
@@ -77,15 +78,16 @@
serviceSubtaskVO.setStartOutHospTime(serviceTask.getStartOutHospTime());
serviceSubtaskVO.setEndOutHospTime(serviceTask.getEndOutHospTime());
// 鎵归噺鏌ヨ鎵�鏈夊瓙浠诲姟
- Map<Long, List<ServiceSubtask>> subtaskMap = iServiceSubtaskService
+ Map<String, List<ServiceSubtask>> subtaskMap = iServiceSubtaskService
.selectServiceSubtaskList(serviceSubtaskVO)
.stream()
- .collect(Collectors.groupingBy(ServiceSubtask::getTaskid));
+ .filter(subtask -> subtask.getTaskid() != null) // 娣诲姞杩囨护
+ .collect(Collectors.groupingBy(subtask -> Optional.ofNullable(subtask.getLeavehospitaldistrictcode()).orElse("Unknown")));
if (CollectionUtils.isNotEmpty(serviceTaskVOS)) {
for (ServiceTaskVO taskVO : serviceTaskVOS) {
- List<ServiceSubtask> subtasks = subtaskMap.getOrDefault(taskVO.getTaskid(), Collections.emptyList());
+ List<ServiceSubtask> subtasks = subtaskMap.getOrDefault(taskVO.getTaskid().toString(), Collections.emptyList());
if (CollectionUtils.isNotEmpty(subtasks)) {
//宸插彂閫侊紙瀛愪换鍔′腑鐨� sendstate=1涓鸿棰嗗彇锛�
--
Gitblit v1.9.3