变更

app/Http/Controllers/Manager/OrdersController.php

@@ -210,7 +210,7 @@ class OrdersController extends CommonController
             $order = $order->refreshTotal();
             $order->balance = $order->customer->balance;
             // 是否需要签订协议，0否1是
-            $order->need_agreements = $order->needAgreements($order);
+            $order->need_agreements = $order->needAgreements();
         }
         return response()->json($data->toArray());
     }
@@ -341,7 +341,7 @@ class OrdersController extends CommonController
         }
         $order->group_by_paramedic = collect($group_by_paramedic);
         // 是否需要签订协议，0否1是
-        $order->need_agreements = $order->needAgreements();
+        $order->need_agreements = $order->needAgreements($order);
         if ($ajax === true) {
             return response()->json($order->toArray());
         }
@@ -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")

app/Models/Orders.php

@@ -29,12 +29,13 @@ class Orders extends SoftDeletesModel
     /**
      * 判断是否要签协议
      */
-    public function needAgreements($order)
+    public function needAgreements()
     {
-        if ($order->paramedic_id
-            && $order->project->agreement == 1
-            && strtotime($order->created_at) >= strtotime(Orders::AGREEMENT_START_DATE)
-            && ($order->orderAgreements->isEmpty() || ($order->orderAgreements->isNotEmpty() && $order->orderAgreements[0]->paramedic_id != $order->paramedic_id))) {
+        dd($this->paramedic_id,$this->project->agreement);
+        if ($this->paramedic_id
+            && $this->project->agreement == 1
+            && strtotime($this->created_at) >= strtotime(Orders::AGREEMENT_START_DATE)
+            && ($this->orderAgreements->isEmpty() || ($this->orderAgreements->isNotEmpty() && $this->orderAgreementByLast()->paramedic_id != $this->paramedic_id))) {
             return 1;
         }
         return 0;