From 1bbfd3e6d633eeb9a7180ab0f30ce2382d413d40 Mon Sep 17 00:00:00 2001
From: wucongxing8150 <815046773@qq.com>
Date: Tue, 16 Apr 2024 15:35:28 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=8E=B7=E5=8F=96=E6=82=A3?=
 =?UTF-8?q?=E8=80=85=E6=9C=8D=E5=8A=A1=E5=8C=85=E8=AE=A2=E5=8D=95=E6=9C=8D?=
 =?UTF-8?q?=E5=8A=A1=E6=9D=83=E7=9B=8A=E8=AF=A6=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Services/OrderServicePackageService.php | 6 +++---
 app/Services/PatientOrderService.php        | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/Services/OrderServicePackageService.php b/app/Services/OrderServicePackageService.php
index 5beb30a..caad73e 100644
--- a/app/Services/OrderServicePackageService.php
+++ b/app/Services/OrderServicePackageService.php
@@ -172,7 +172,7 @@ class OrderServicePackageService extends BaseService
         // 处理当月问诊次数
         // 3.5号购买，每月2次问诊次数。今天5.3，属于第几个月，这个月的开始时间和结束时间
         if ($order_service_package_detail['monthly_frequency'] != 0) {
-            // 获取服务包当月问诊次数
+            // 获取服务包当月已问诊次数
             $month_inquiry_count = $this->getCurrentMonthInquiryCount($order_service_package['start_time'],$service_type,$user_info['client_user_id'], $doctor_id);
 
             if ($month_inquiry_count >= $order_service_package_detail['monthly_frequency']) {
@@ -694,7 +694,7 @@ class OrderServicePackageService extends BaseService
             // 检测问诊次数
             // 3.5号购买，每月2次问诊次数。今天5.3，属于第几个月，这个月的开始时间和结束时间
             if ($order_service_package_detail['monthly_frequency'] != 0) {
-                // 获取服务包当月问诊次数
+                // 获取服务包当月已问诊次数
                 $month_inquiry_count = $this->getCurrentMonthInquiryCount($order_service_package['start_time'],$order_service_package['order_service_type'],$user_info['client_user_id'], $order_service_package['doctor_id']);
 
                 if ($month_inquiry_count >= $order_service_package_detail['monthly_frequency']) {
@@ -1088,7 +1088,7 @@ class OrderServicePackageService extends BaseService
     }
 
     /**
-     * 获取服务包当月问诊次数
+     * 获取服务包当月已问诊次数
      * @param string $start_time
      * @param string|int $service_type
      * @param string|int $user_id
diff --git a/app/Services/PatientOrderService.php b/app/Services/PatientOrderService.php
index e593006..236a73e 100644
--- a/app/Services/PatientOrderService.php
+++ b/app/Services/PatientOrderService.php
@@ -2833,13 +2833,13 @@ class PatientOrderService extends BaseService
         if (in_array($order_service_package['order_service_status'],[3,4,5])){
             // 订单状态（1:待支付 2:未开始 3:服务中 4:服务完成 5:服务取消）
             if (!empty($order_service_package['start_time'])){
-                // 当月问诊次数
-                $result['order_service_package']['month_inquiry_count'] = $OrderServicePackageService->getCurrentMonthInquiryCount($order_service_package['start_time'],$order_service_package['order_service_type'],$user_info['client_user_id'], $order_service_package['doctor_id']);
-
-                // 处理当月时间
+                // 当月时间
                 $current_month_date = $OrderServicePackageService->getCurrentMonthDate($order_service_package['start_time']);
                 $result['order_service_package']['current_month_start_date'] = $current_month_date['current_month_start_date'];
                 $result['order_service_package']['current_month_finish_date'] = $current_month_date['current_month_finish_date'];
+
+                // 获取服务包当月已问诊次数
+                $result['order_service_package']['month_inquiry_count'] = $OrderServicePackageService->getCurrentMonthInquiryCount($order_service_package['start_time'],$order_service_package['order_service_type'],$user_info['client_user_id'], $order_service_package['doctor_id']);
             }
         }