diff --git a/app/Http/Controllers/Admin/StatisticsController.php b/app/Http/Controllers/Admin/StatisticsController.php index 4afcb31..fbacd68 100755 --- a/app/Http/Controllers/Admin/StatisticsController.php +++ b/app/Http/Controllers/Admin/StatisticsController.php @@ -409,12 +409,12 @@ class StatisticsController extends CommonController // 获取所有床位id $bedIds = Bed::where('area_id', $item->id)->pluck('id'); $order = Orders::whereIn('bed_id', $bedIds)->where('status', 100)->get(); + $item->orderTotal = $order->sum('total'); $item->lies = $this->getLies($project_id, $order->pluck('id')); } // 获取所有列 $lie = array_column($data[0]->lies,'name'); - dd($data->toArray()); - return view($this->bladePath . ".huli", compact("data")); + return view($this->bladePath . ".huli", compact("data","lie")); } /** diff --git a/resources/views/admin/statistics/huli.blade.php b/resources/views/admin/statistics/huli.blade.php index 6f90b07..36cc2a7 100644 --- a/resources/views/admin/statistics/huli.blade.php +++ b/resources/views/admin/statistics/huli.blade.php @@ -5,51 +5,44 @@
| - 日期 + 楼层 | -名字 | -医院 | -详情 | -建议 | -总分 | -操作 | +病区 | +总收入 | + @foreach ($lie as $row) +{{$row}} | + @endforeach
|---|---|---|---|---|---|---|---|---|---|
| - {{ $row->date }} - | -- {{ $row->admin->name }} - | -{{ $row->project->name }} | -
- @foreach ($row->content as $item)
- {{ $item['ask'] }}:{{ $item['score'] }} - @endforeach - |
- {{ $row->tip }} | -{{ $row->score }} | -- @lang("icons.action_edit") @lang("actions.edit") - @lang("icons.action_delete") @lang("actions.delete") - | -|||
| --}} +{{-- {{ $row->date }}--}} +{{-- | --}} +{{----}} +{{-- {{ $row->admin->name }}--}} +{{-- | --}} +{{--{{ $row->project->name }} | --}} +{{----}}
+{{-- @foreach ($row->content as $item)--}}
+{{-- {{ $item['ask'] }}:{{ $item['score'] }} --}} +{{-- @endforeach--}} +{{-- | --}}
+{{-- {{ $row->tip }} | --}} +{{--{{ $row->score }} | --}} +{{----}} +{{-- @lang("icons.action_edit") @lang("actions.edit")--}} +{{-- @lang("icons.action_delete") @lang("actions.delete")--}} +{{-- | --}} +{{--