From 2720d3c4bd02be69167e72b9a744d1175a4e05ca Mon Sep 17 00:00:00 2001
From: liyinglin <liyl@langye.net>
Date: Wed, 3 Jan 2024 14:07:13 +0800
Subject: [PATCH] 1

---
 app/Http/Controllers/Admin/OrdersController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Http/Controllers/Admin/OrdersController.php b/app/Http/Controllers/Admin/OrdersController.php
index 8b04f24..2e8c774 100755
--- a/app/Http/Controllers/Admin/OrdersController.php
+++ b/app/Http/Controllers/Admin/OrdersController.php
@@ -234,7 +234,7 @@ class OrdersController extends CommonController
                 if ($has_ongoing_order) {
                     $query->has("onGoingOrder");
                 }
-                $query->with(["onGoingOrder" => function ($query) {
+                $query->whereHas('onGoingOrder')->with(["onGoingOrder" => function ($query) {
                     $query->leftJoin("paramedic", "orders.paramedic_id", "=", "paramedic.id")
                         ->select("orders.id", "orders.bed_id", "orders.paramedic_id", "orders.status", "paramedic.name as paramedic_name");
                 }])->select("bed.id", "bed.name", "bed.room_id", "bed.area_id", "bed.myindex")