diff --git a/app/Http/Controllers/Manager/OrdersController.php b/app/Http/Controllers/Manager/OrdersController.php index da71463..ede4472 100644 --- a/app/Http/Controllers/Manager/OrdersController.php +++ b/app/Http/Controllers/Manager/OrdersController.php @@ -204,7 +204,7 @@ class OrdersController extends CommonController //do nothing } - $page_size = 1; + $page_size = request()->page_size ?? 5; $data = $model->orderBy("id", "desc")->paginate($page_size); foreach ($data as $order) { $order = $order->refreshTotal(); @@ -424,19 +424,19 @@ class OrdersController extends CommonController "project" => function ($query) { $query->select("id", "name", "range_mobile", "complaint_mobile", "content"); }, - "bed" => function ($query) { - $query->select("bed.id", "bed.name", "bed.building_id", "bed.area_id") - ->leftJoin("building", "building.id", "=", "bed.building_id") - ->leftJoin("area", "area.id", "=", "bed.area_id") - ->leftJoin("room", "room.id", "=", "bed.room_id") - ->addSelect("room.name as room_name", "area.name as area_name", "building.name as building_name"); - }, - "customer" => function ($query) { - $query->select("id", "name", "balance"); - }, - "patient" => function ($query) { - $query->select("id", "name", "sex", "age", "mobile"); - }, +// "bed" => function ($query) { +// $query->select("bed.id", "bed.name", "bed.building_id", "bed.area_id") +// ->leftJoin("building", "building.id", "=", "bed.building_id") +// ->leftJoin("area", "area.id", "=", "bed.area_id") +// ->leftJoin("room", "room.id", "=", "bed.room_id") +// ->addSelect("room.name as room_name", "area.name as area_name", "building.name as building_name"); +// }, +// "customer" => function ($query) { +// $query->select("id", "name", "balance"); +// }, +// "patient" => function ($query) { +// $query->select("id", "name", "sex", "age", "mobile"); +// }, "paramedic" => function ($query) { $query->select("paramedic.id", "paramedic.name", "paramedic.mobile") ->leftJoin("paramedic_level", "paramedic_level.id", "=", "paramedic.paramedic_level_id")