up

app/Http/Controllers/Manager/StatisticsController.php

@@ -5,6 +5,7 @@ namespace App\Http\Controllers\Manager;
 use App\Models\Area;
 use App\Models\Bed;
 use Illuminate\Http\Request;
+use Illuminate\Support\Facades\DB;
 
 class StatisticsController extends CommonController
 {
@@ -25,16 +26,26 @@ class StatisticsController extends CommonController
 
     public function beds(Request $request)
     {
-        $areas = Area::with(["beds" => function ($query) use ($request) {
+        DB::enableQueryLog();
+        $areas = Area::with([
+            "beds" => function ($query) use ($request) {
                 if ($request->has_ongoing_order) {
                     $query->has("onGoingOrder");
                 }
                 $query->with(["onGoingOrder" => function ($query) {
-                $query->with(["paramedic" => function ($query) {
+                    $query->leftJoin("paramedic", "orders.paramedic_id", "=", "paramedic.id")
-                    $query->select("id", "name");
+                        ->select("orders.id", "orders.bed_id", "orders.paramedic_id", "orders.status", "paramedic.name as paramedic_name");
-                }])->select("id", "bed_id", "paramedic_id", "status");
+                }])->select("bed.id", "bed.name", "bed.room_id", "bed.area_id")
-            }]);
+                    ->leftJoin("room", "bed.room_id", "=", "room.id")
-        }])->with("building")->where("project_id", $request->project_id)->orderBy("building_id")->orderBy("myindex")->get();
+                    ->addSelect("room.name as room_name");
+            }])
+            ->whereRaw("`area`.`project_id` = '{$request->project_id}'")
+            ->orderBy("building.myindex")
+            ->orderBy("area.myindex")
+            ->select("area.id", "area.name", "area.building_id", "area.project_id")
+            ->leftJoin("building", "area.building_id", "=", "building.id")
+            ->addSelect("building.name as building_name")
+            ->get();
 
         return response()->json($areas->toArray());
     }

app/Models/Bed.php

@@ -33,6 +33,6 @@ class Bed extends SoftDeletesModel
 
     public function onGoingOrder()
     {
-        return $this->hasOne(Orders::class, "bed_id")->where("status", Orders::STATUS_ONGOING);
+        return $this->hasOne(Orders::class, "bed_id")->where("orders.status", Orders::STATUS_ONGOING);
     }
 }