From 3b8681034a2a019519fa4c9cfeb6f0daffe8db80 Mon Sep 17 00:00:00 2001
From: wucongxing <815046773@qq.com>
Date: Wed, 30 Aug 2023 13:44:25 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=93=E6=9D=9F=E8=AE=A2=E5=8D=95=E6=8E=92?=
 =?UTF-8?q?=E5=BA=8F=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Model/OrderInquiry.php      | 5 +++--
 app/Services/InquiryService.php | 2 ++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/app/Model/OrderInquiry.php b/app/Model/OrderInquiry.php
index eb0d3a1..08b4449 100644
--- a/app/Model/OrderInquiry.php
+++ b/app/Model/OrderInquiry.php
@@ -446,7 +446,7 @@ class OrderInquiry extends Model
      */
     public static function getInquiryEndPage(array $params, array $fields = ["*"], int $page = null, ?int $per_page = 10): array
     {
-        $query = self::select("user_id")
+        $query = self::select(["user_id","family_id"])
             ->whereNotIn('user_id', function ($query) use ($params){
                 $query->select('user_id')
                     ->from('order_inquiry')
@@ -457,7 +457,8 @@ class OrderInquiry extends Model
             ->whereIn('inquiry_status', [5,6])
             ->where($params)
             ->orderBy('complete_time')
-            ->groupBy(["user_id"]);
+            ->groupBy(["user_id","family_id"]);
+
 
         $result = $query->paginate($per_page, $fields, "page", $page);
 
diff --git a/app/Services/InquiryService.php b/app/Services/InquiryService.php
index ac0f993..d2fe832 100644
--- a/app/Services/InquiryService.php
+++ b/app/Services/InquiryService.php
@@ -869,11 +869,13 @@ class InquiryService extends BaseService
                 $params = array();
                 $params['doctor_id'] = $user_info['client_user_id'];
                 $params['user_id'] = $item['user_id'];
+                $params['family_id'] = $item['family_id'];
 
                 $inquiry_status_params = [5,6];
                 $order_inquiry = OrderInquiry::getInquiryStatusLastOne($params,$inquiry_status_params,$fields);
 
                 unset($item['user_id']);
+                unset($item['family_id']);
                 if (!empty($order_inquiry)){
                     $item = $order_inquiry->toArray();