From a99c1cb29b649a8de6c97cf63e568d95b6543ae2 Mon Sep 17 00:00:00 2001
From: sa0ChunLuyu <sa0Chun_luyu@aliyun.com>
Date: Sun, 26 Jul 2026 13:37:01 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A2=84=E7=BA=A6=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Laravel/app/Services/Admin/YeWu/PlanListService.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Laravel/app/Services/Admin/YeWu/PlanListService.php b/Laravel/app/Services/Admin/YeWu/PlanListService.php
index 45699e9..a0bb3d3 100644
--- a/Laravel/app/Services/Admin/YeWu/PlanListService.php
+++ b/Laravel/app/Services/Admin/YeWu/PlanListService.php
@@ -710,6 +710,9 @@ private function doSameDaySlotAssign($startDate, $endDate, $regnum, $entrustids,
 
                             if (($remaining - $used) <= 0) continue;
 
+                            // 冲突检查：同一科室组内，不同排班时间不能重叠
+                            if ($this->isTimeConflict($assignedPlans, $plan)) continue;
+
                             $result[] = [
                                 'id' => $item['id'],
                                 'plan_id' => $planId,