From 3722a3ef0fe4dff48eee37c4476e743fcbbea543 Mon Sep 17 00:00:00 2001
From: weizong song <sdswz@qq.com>
Date: Thu, 4 Mar 2021 16:43:53 +0800
Subject: [PATCH] up

---
 .../Controllers/Customer/OrdersController.php | 25 +++++++++++--------
 routes/web.php                                |  2 +-
 2 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/app/Http/Controllers/Customer/OrdersController.php b/app/Http/Controllers/Customer/OrdersController.php
index acf8a7e..a97f005 100644
--- a/app/Http/Controllers/Customer/OrdersController.php
+++ b/app/Http/Controllers/Customer/OrdersController.php
@@ -3,6 +3,7 @@
 
 namespace App\Http\Controllers\Customer;
 
+use App\Models\Area;
 use App\Models\Balance;
 use App\Models\Building;
 use App\Models\Factor;
@@ -90,30 +91,32 @@ class OrdersController extends CommonController
     {
         $buildings = (new Building())->where("project_id", $id)->with(["areas" => function ($query) {
             $query->select("id","building_id","name","myindex")->orderBy("myindex");
-        }])->select("id","name","myindex")->orderBy("myindex")->get();
+        }])->select("id","project_id","name","myindex")->orderBy("myindex")->get();
         return response()->json($buildings->toArray());
     }
 
     /**
      * @OA\Get(
-     *     path="/customer/get-beds-by-project/{id}",
-     *     summary="获取医院床位",
-     *     description="获取医院床位",
+     *     path="/customer/get-beds-by-area/{id}",
+     *     summary="V2-根据病区获取病床",
+     *     description="根据病区获取病床",
      *     @OA\Parameter(name="token", in="query", @OA\Schema(type="string"), required=true, description="token"),
-     *     @OA\Parameter(name="id", in="path", @OA\Schema(type="integer"), required=true, description="project id"),
+     *     @OA\Parameter(name="id", in="path", @OA\Schema(type="integer"), required=true, description="area id"),
      *     @OA\Response(
      *      response="200",
-     *      description="获取医院床位"
+     *      description="根据病区获取病床"
      *     )
      * )
      */
 
-    public function getBedsByProject($id)
+    public function getBedsByArea($id)
     {
-        $buildings = (new Building())->where("project_id", $id)->with(["areas" => function ($query) {
-            $query->with("beds");
-        }])->get();
-        return response()->json($buildings->toArray());
+        $area = (new Area())->with(["beds"=>function($query) {
+            $query->with(["room"=>function($query) {
+                $query->select("id","name");
+            }])->select("id","name","area_id","room_id");
+        }])->first();
+        return response()->json($area->beds->toArray());
     }
 
     /**
diff --git a/routes/web.php b/routes/web.php
index b3c8536..ca3ecc6 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -99,7 +99,7 @@ Route::group(["namespace" => "Customer", "prefix" => "customer"], function () {
         Route::get('get-projects', 'OrdersController@getProjects');
         Route::get('get-product/{id}', 'OrdersController@getProduct');
         Route::get('get-areas-by-project/{id}', 'OrdersController@getAreasByProject');
-        Route::get('get-beds-by-project/{id}', 'OrdersController@getBedsByProject');
+        Route::get('get-beds-by-area/{id}', 'OrdersController@getBedsByArea');
         Route::get('get-orders', 'OrdersController@list');
         Route::get('get-order/{id}', 'OrdersController@getOrder');
         Route::get('get-paramedic/{id}', 'OrdersController@getParamedic');