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,