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;