From 37580eb152ea4e10b0a641c5ca7abf04e94f8ec5 Mon Sep 17 00:00:00 2001
From: wucongxing8150 <815046773@qq.com>
Date: Fri, 24 May 2024 09:00:43 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=20=E6=A3=80=E6=B5=8B?=
 =?UTF-8?q?=E5=8C=BB=E7=94=9F=E6=98=AF=E5=90=A6=E5=8F=AF=E8=A2=AB=E5=88=86?=
 =?UTF-8?q?=E9=85=8D=E3=80=81=E6=A3=80=E6=B5=8B=E6=98=AF=E5=90=A6=E5=8F=AF?=
 =?UTF-8?q?=E4=BB=A5=E6=8E=A5=E8=AF=8A=E7=9A=84=E6=AF=8F=E6=97=A5=E9=97=AE?=
 =?UTF-8?q?=E8=AF=8A=E6=AC=A1=E6=95=B0=E8=AE=A1=E7=AE=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Services/PatientDoctorService.php |  5 +++--
 app/Services/UserDoctorService.php    | 11 ++++-------
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/app/Services/PatientDoctorService.php b/app/Services/PatientDoctorService.php
index 55fa931..29b3ab6 100644
--- a/app/Services/PatientDoctorService.php
+++ b/app/Services/PatientDoctorService.php
@@ -317,8 +317,9 @@ class PatientDoctorService extends BaseService
                 $UserDoctorService = new UserDoctorService();
                 $max_work_num_day = $UserDoctorService->getDoctorInquiryDayMaxNum($doctor_id,$inquiry_type,$inquiry_mode);
 
-                // 获取医生未接诊订单数量(包含未接诊、未支付、已接诊)
-                $order_inquiry_count = $UserDoctorService->getDoctorUnInquiryOrderNum($doctor_id,$inquiry_type,$inquiry_mode);
+                // 获取医生当日有效问诊数量
+                $inquiryService = new InquiryService();
+                $order_inquiry_count = $inquiryService->getDoctorDayInquiryCount($doctor_id, $inquiry_type);
 
                 // 计算剩余未接诊数量 = 最大数量-
                 $access_inquiry_num = $max_work_num_day - $order_inquiry_count;
diff --git a/app/Services/UserDoctorService.php b/app/Services/UserDoctorService.php
index 6c31c9a..a342328 100644
--- a/app/Services/UserDoctorService.php
+++ b/app/Services/UserDoctorService.php
@@ -2859,12 +2859,14 @@ class UserDoctorService extends BaseService
             $UserDoctorService = new UserDoctorService();
 
             // 检测接诊数量
+            $order_inquiry_count = 0;
             if ($is_check_inquiry_num){
                 // 获取医生每日最大接诊数量
                 $max_work_num_day = $UserDoctorService->getDoctorInquiryDayMaxNum($item,$inquiry_type,1);
 
-                // 获取医生未接诊订单数量(包含未接诊、未支付、已接诊)
-                $order_inquiry_count = $UserDoctorService->getDoctorUnInquiryOrderNum($item,$inquiry_type,1);
+                // 获取医生当日有效问诊数量
+                $inquiryService = new InquiryService();
+                $order_inquiry_count = $inquiryService->getDoctorDayInquiryCount($item, $inquiry_type);
 
                 // 计算剩余未接诊数量 = 最大数量-
                 $access_inquiry_num = $max_work_num_day - $order_inquiry_count;
@@ -2876,11 +2878,6 @@ class UserDoctorService extends BaseService
                 }
             }
 
-            if (!isset($order_inquiry_count)){
-                // 获取医生未接诊订单数量(包含未接诊、未支付、已接诊)
-                $order_inquiry_count = $UserDoctorService->getDoctorUnInquiryOrderNum($item,$inquiry_type,1);
-            }
-
             $data = array();
             $data['doctor_id'] = $item;
             $data['order_inquiry_count'] = $order_inquiry_count;