From 1820d6ad697afea705c8006490198bab80352aee Mon Sep 17 00:00:00 2001 From: wucongxing <815046773@qq.com> Date: Mon, 22 Jan 2024 11:21:08 +0800 Subject: [PATCH] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E6=88=91=E7=9A=84=E8=B4=A6?= =?UTF-8?q?=E6=88=B7=E6=9C=88=E8=B4=A6=E5=8D=95=E6=98=8E=E7=BB=86=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=20=E5=A2=9E=E5=8A=A0=E5=9D=90=E7=8F=AD=E5=8C=BB?= =?UTF-8?q?=E7=94=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Model/OrderInquiry.php | 6 +++++- app/Services/DoctorAccountService.php | 15 ++++++++++++++- 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/app/Model/OrderInquiry.php b/app/Model/OrderInquiry.php index ef0a297..6de8916 100644 --- a/app/Model/OrderInquiry.php +++ b/app/Model/OrderInquiry.php @@ -182,14 +182,18 @@ class OrderInquiry extends Model * @param array $params * @param array $reception_time 接诊时间区间 ['2023-01','2023-01'] * @param array $inquiry_status_params + * @param array $inquiry_type_not_params * @param array $fields * @param int|null $page * @param int|null $per_page * @return int|mixed|string */ - public static function getDoctorCreatedDateOrderInquiryPage(array $params, array $reception_time, array $inquiry_status_params,array $fields = ["*"], int $page = null, ?int $per_page = 10): mixed + public static function getDoctorCreatedDateOrderInquiryPage(array $params, array $reception_time, array $inquiry_status_params,array $inquiry_type_not_params = [],array $fields = ["*"], int $page = null, ?int $per_page = 10): mixed { $raw = self::where($params) + ->when($inquiry_type_not_params, function ($query, $inquiry_type_not_params) { + $query->whereNotIn('inquiry_type', $inquiry_type_not_params); + }) ->whereIn('inquiry_status', $inquiry_status_params) ->whereBetween('reception_time', $reception_time) ->orderBy('reception_time') diff --git a/app/Services/DoctorAccountService.php b/app/Services/DoctorAccountService.php index f361b91..60fe9d2 100644 --- a/app/Services/DoctorAccountService.php +++ b/app/Services/DoctorAccountService.php @@ -114,6 +114,14 @@ class DoctorAccountService extends BaseService $page = $this->request->input('page', 1); $per_page = $this->request->input('per_page', 10); + // 获取医生数据 + $params = array(); + $params['doctor_id'] = $user_info['client_user_id']; + $user_doctor = UserDoctor::getOne($params); + if (empty($user_doctor)){ + return fail(); + } + // 获取当月开始时间 $start_date = date('Y-m-01 00:00:00', strtotime($date)); @@ -146,7 +154,12 @@ class DoctorAccountService extends BaseService $params = array(); $params['doctor_id'] = $user_info['client_user_id']; $inquiry_status_params = [4,5,6,7]; // 问诊订单状态(1:待支付 2:待分配 3:待接诊 4:已接诊 5:已完成 6:已结束 7:已取消) - $order_inquiry = OrderInquiry:: getDoctorCreatedDateOrderInquiryPage($params, $reception_time, $inquiry_status_params,$fields,$page,$per_page); + + if ($user_doctor['is_platform_deep_cooperation'] == 0){ + $order_inquiry = OrderInquiry:: getDoctorCreatedDateOrderInquiryPage($params, $reception_time, $inquiry_status_params,[],$fields,$page,$per_page); + }else{ + $order_inquiry = OrderInquiry:: getDoctorCreatedDateOrderInquiryPage($params, $reception_time, $inquiry_status_params,[2,4],$fields,$page,$per_page); + } if (!empty($order_inquiry['data'])) { foreach ($order_inquiry['data'] as &$item) { $item['estimate_income'] = bcmul($item['amount_total'],0.75,2);