first commit

resources/views/admin/orders/index.blade.php

@@ -88,8 +88,8 @@
                                     </td>
 
                                     <td>{{ $row->project->name }}</td>
-                                    <td>{{ $row->bed->building->name }}</td>
-                                    <td>{{ $row->bed->area->name }}</td>
+                                    <td>{{ $row->bed && $row->bed->building ? $row->bed->building->name : "" }}</td>
+                                    <td>{{ $row->bed && $row->bed->area ? $row->bed->area->name : "" }}</td>
                                     {{-- <td>{{ $row->department }}</td>--}}
                                     <td>{{ $row->customer->name ?: $row->patient->name }}</td>
                                     <td>{{ $row->customer->balance }}</td>
@@ -130,8 +130,8 @@
                                             <tbody>
                                                 @foreach($row->orderItems as $item)
                                                     <tr data-id="{{ $item->id }}" data-item-id="{{ $item->id }}">
-                                                        <td>{{ $item->building->name }}-{{ $item->room->name }}
-                                                            -{{ $item->bed->name }}床
+                                                        <td>{{ ($item->building ? $item->building->name : "") }}-{{ ($item->room ? $item->room->name : "") }}
+                                                            -{{ ($item->bed ? $item->bed->name : "") }}床
                                                         </td>
                                                         <td>{{ $item->service_date }}</td>
                                                         <td>{{ $item->paramedic ? $item->paramedic->name : "" }}</td>

resources/views/admin/statistics/salary.blade.php

@@ -103,9 +103,9 @@
                                 <td class="p-1">{{ $item->service_date }}</td>
                                 <td class="p-1">{{ $item->service_date_in_this_month == \App\Models\OrderItems::PREV_MONTH ? "是" : "" }}</td>
                                 <td class="p-1">{{ $item->order ? $item->order->contact."/".$item->order->mobile : "" }}</td>
-                                <td class="p-1">{{ $item->building->name }}</td>
-                                <td class="p-1">{{ $item->area->name }}</td>
-                                <td class="p-1">{{ ($item->room ? $item->room->name : "")."_".$item->bed->name }}</td>
+                                <td class="p-1">{{ $item->building ? $item->building->name : "" }}</td>
+                                <td class="p-1">{{ $item->area ? $item->area->name : "" }}</td>
+                                <td class="p-1">{{ ($item->room ? $item->room->name : "")."_".($item->bed ? $item->bed->name : "") }}</td>
                                 <td class="p-1">{!! implode("<br>",$item->factor_texts) !!}</td>
                                 <td class="p-1">{{ $item->total }}</td>
                                 <td class="p-1">{{ $item->paramedic_total }}</td>