diff --git a/app/Http/Controllers/Admin/OrdersController.php b/app/Http/Controllers/Admin/OrdersController.php index c29e7e1..dabace4 100755 --- a/app/Http/Controllers/Admin/OrdersController.php +++ b/app/Http/Controllers/Admin/OrdersController.php @@ -249,11 +249,6 @@ class OrdersController extends CommonController ->addSelect("building.name as building_name") ->withCount("beds") ->paginate(10); -// if ($has_ongoing_order) { -// $data = $data->filter(function ($item) { -// return $item->beds->count(); -// }); -// } $projects = (new StatisticsController())->_checkProjects(); // dd($data->toArray()); return view($this->bladePath . ".artboard", compact("data", "projects", "project_id")); diff --git a/resources/views/admin/orders/artboard.blade.php b/resources/views/admin/orders/artboard.blade.php index 8766b09..86fe24d 100644 --- a/resources/views/admin/orders/artboard.blade.php +++ b/resources/views/admin/orders/artboard.blade.php @@ -19,7 +19,6 @@ - @@ -28,12 +27,11 @@ @foreach ($data as $row) -
ID 所属项目/医院 所在病区 客户信息
{{ $row->id }} {{ $row->project->name }} {{ $row->name }} @foreach ($row->beds as $r) - {{$r->name}}-{{$r->on_going_order??''}} + {{$r->name}}-{{$r->on_going_order->paramedic_name}}
@endforeach