- | {{ $item->building->name }}-{{ $item->room->name }}
- -{{ $item->bed->name }}床
+ | {{ ($item->building ? $item->building->name : "") }}-{{ ($item->room ? $item->room->name : "") }}
+ -{{ ($item->bed ? $item->bed->name : "") }}床
|
{{ $item->service_date }} |
{{ $item->paramedic ? $item->paramedic->name : "" }} |
diff --git a/resources/views/admin/statistics/salary.blade.php b/resources/views/admin/statistics/salary.blade.php
index 3e55666..7c92049 100755
--- a/resources/views/admin/statistics/salary.blade.php
+++ b/resources/views/admin/statistics/salary.blade.php
@@ -103,9 +103,9 @@
{{ $item->service_date }} |
{{ $item->service_date_in_this_month == \App\Models\OrderItems::PREV_MONTH ? "是" : "" }} |
{{ $item->order ? $item->order->contact."/".$item->order->mobile : "" }} |
- {{ $item->building->name }} |
- {{ $item->area->name }} |
- {{ ($item->room ? $item->room->name : "")."_".$item->bed->name }} |
+ {{ $item->building ? $item->building->name : "" }} |
+ {{ $item->area ? $item->area->name : "" }} |
+ {{ ($item->room ? $item->room->name : "")."_".($item->bed ? $item->bed->name : "") }} |
{!! implode(" ",$item->factor_texts) !!} |
{{ $item->total }} |
{{ $item->paramedic_total }} |