From 020f61ac5771f212064ed989068c09abe9f10d91 Mon Sep 17 00:00:00 2001 From: wucongxing8150 <815046773@qq.com> Date: Tue, 16 Apr 2024 15:26:11 +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/PatientOrderService.php | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/app/Services/PatientOrderService.php b/app/Services/PatientOrderService.php index 8a53bd5..e593006 100644 --- a/app/Services/PatientOrderService.php +++ b/app/Services/PatientOrderService.php @@ -2817,9 +2817,7 @@ class PatientOrderService extends BaseService $result['order_inquiry'] = []; // 健康包问诊订单数据 $result['order_product'] = []; // 健康包药品订单数据 - // 获取服务包当月问诊次数 $OrderServicePackageService = new OrderServicePackageService(); - $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']); // 获取问诊订单数据 if (in_array($order_service_package['order_service_status'],[2,3,4,5])){ @@ -2832,6 +2830,19 @@ 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']; + } + } + // 健康包数据 if ($order_service_package['order_service_type'] == 1){ // 健康包商品数据 @@ -2893,11 +2904,6 @@ class PatientOrderService extends BaseService // 获取药品剩余数量 } - // 处理当月时间 - $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']; - return success($result); }