From 42b18fee88a3b12686ab010406a7d862db742b5d Mon Sep 17 00:00:00 2001
From: cody <648753004@qq.com>
Date: Mon, 27 Oct 2025 10:43:26 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=98=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Http/Controllers/Manager/OrdersController.php | 2 +-
 app/Models/Orders.php                             | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/Http/Controllers/Manager/OrdersController.php b/app/Http/Controllers/Manager/OrdersController.php
index b49eb71..897bd55 100644
--- a/app/Http/Controllers/Manager/OrdersController.php
+++ b/app/Http/Controllers/Manager/OrdersController.php
@@ -422,7 +422,7 @@ class OrdersController extends CommonController
                     $query->select("paramedic_level.id", "paramedic_level.name");
                 },
                 "project" => function ($query) {
-                    $query->select("id", "name", "range_mobile", "complaint_mobile", "content");
+                    $query->select("id", "name", "range_mobile", "complaint_mobile", "content","agreement");
                 },
                 "bed" => function ($query) {
                     $query->select("bed.id", "bed.name", "bed.building_id", "bed.area_id")
diff --git a/app/Models/Orders.php b/app/Models/Orders.php
index 7e9fb20..cc81255 100755
--- a/app/Models/Orders.php
+++ b/app/Models/Orders.php
@@ -35,7 +35,7 @@ class Orders extends SoftDeletesModel
         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))) {
+            && ($this->orderAgreements->isEmpty() || ($this->orderAgreements->isNotEmpty() && $this->orderAgreements[0]->paramedic_id != $this->paramedic_id))) {
             return 1;
         }
         return 0;