From 93ccad2946da67826a35cc545aef1c69e90b274a Mon Sep 17 00:00:00 2001
From: wucongxing8150 <815046773@qq.com>
Date: Thu, 18 Apr 2024 15:47:19 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E6=9D=83=E7=9B=8A=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E5=8E=BB=E9=99=A4=E4=BA=86=E9=97=AE=E8=AF=8A=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Model/OrderServicePackageInquiry.php |  3 +--
 app/Services/PatientOrderService.php     | 17 ++++++++++++++---
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/app/Model/OrderServicePackageInquiry.php b/app/Model/OrderServicePackageInquiry.php
index 5d06ccd..7810957 100644
--- a/app/Model/OrderServicePackageInquiry.php
+++ b/app/Model/OrderServicePackageInquiry.php
@@ -16,7 +16,6 @@ use Hyperf\Snowflake\Concern\Snowflake;
  * @property int $order_inquiry_id 订单-问诊id
  * @property string $order_service_no 服务包系统订单编号
  * @property string $inquiry_no 问诊系统订单编号
- * @property int $inquiry_status 问诊订单状态（1:待支付 2:待分配 3:待接诊 4:已接诊 5:已完成 6:已结束 7:已取消）
  * @property Carbon $created_at 创建时间
  * @property Carbon $updated_at 修改时间
  */
@@ -32,7 +31,7 @@ class OrderServicePackageInquiry extends Model
     /**
      * The attributes that are mass assignable.
      */
-    protected array $fillable = ['service_inquiry_id', 'order_service_id', 'order_inquiry_id', 'order_service_no', 'inquiry_no', 'inquiry_status', 'created_at', 'updated_at'];
+    protected array $fillable = ['service_inquiry_id', 'order_service_id', 'order_inquiry_id', 'order_service_no', 'inquiry_no', 'created_at', 'updated_at'];
 
     protected string $primaryKey = "service_inquiry_id";
 
diff --git a/app/Services/PatientOrderService.php b/app/Services/PatientOrderService.php
index 3a37949..03f9266 100644
--- a/app/Services/PatientOrderService.php
+++ b/app/Services/PatientOrderService.php
@@ -2866,9 +2866,20 @@ class PatientOrderService extends BaseService
             // 订单状态（1:待支付 2:未开始 3:服务中 4:服务完成 5:服务取消）
             $params = array();
             $params['order_service_id'] = $order_service_package['order_service_id'];
-            $order_service_package_inquiry = OrderServicePackageInquiry::getList($params);
-            if (!empty($order_service_package_inquiry)){
-                $result['order_inquiry'] = $order_service_package_inquiry->toArray();
+            $order_service_package_inquirys = OrderServicePackageInquiry::getList($params);
+            foreach ($order_service_package_inquirys as $order_service_package_inquiry){
+                // 获取问诊订单数据
+                $fields = [
+                    'order_inquiry_id',
+                    'inquiry_status',
+                ];
+
+                $params = array();
+                $params['order_inquiry_id'] = $order_service_package_inquiry['order_inquiry_id'];
+                $order_inquiry = OrderInquiry::getOne($params,$fields);
+                if (!empty($order_inquiry)){
+                    $result['order_inquiry'] = $order_inquiry->toArray();
+                }
             }
         }