diff --git a/app/Controller/UserDoctorController.php b/app/Controller/UserDoctorController.php index f761ac1..c79b839 100644 --- a/app/Controller/UserDoctorController.php +++ b/app/Controller/UserDoctorController.php @@ -342,4 +342,20 @@ class UserDoctorController extends AbstractController $data = $UserDoctorService->getDoctorMessageAttrList(); return $this->response->json($data); } + + /** + * 新增医生接诊 + * @return ResponseInterface + * @throws ContainerExceptionInterface + * @throws NotFoundExceptionInterface + */ + public function addDoctorInquiry(): ResponseInterface + { + $request = $this->container->get(UserDoctorRequest::class); + $request->scene('addPrescription')->validateResolved(); + + $UserDoctorService = new UserDoctorService(); + $data = $UserDoctorService->addPrescription(); + return $this->response->json($data); + } } \ No newline at end of file diff --git a/app/Services/PatientOrderService.php b/app/Services/PatientOrderService.php index 33560f6..faeb6ca 100644 --- a/app/Services/PatientOrderService.php +++ b/app/Services/PatientOrderService.php @@ -99,7 +99,7 @@ class PatientOrderService extends BaseService ]; $order_inquiry = OrderInquiry::getPatientOrderInquiryPage($params, $inquiry_status_params, $fields, $page, $per_page); if (empty($order_inquiry['data'])) { - return success(); + return success($order_inquiry); } foreach ($order_inquiry['data'] as &$item) { diff --git a/app/Services/UserDoctorService.php b/app/Services/UserDoctorService.php index b91cf75..3d59dbe 100644 --- a/app/Services/UserDoctorService.php +++ b/app/Services/UserDoctorService.php @@ -375,7 +375,7 @@ class UserDoctorService extends BaseService // 获取医生详情数据 $params = array(); - $params['doctor_id'] = $user_doctor['doctor_id']; + $params['doctor_id'] = $user_info['client_user_id']; $user_doctor_info = UserDoctorInfo::getOne($params); if (empty($user_doctor_info)){ return fail(); diff --git a/config/routes.php b/config/routes.php index 1f3a42c..908b6f3 100644 --- a/config/routes.php +++ b/config/routes.php @@ -81,6 +81,9 @@ Router::addGroup('/doctor', function () { // 获取医生问诊消息用户属性 Router::post('/message/attr', [UserDoctorController::class, 'getDoctorMessageAttrList']); + + // 新增医生接诊 + Router::post('', [UserDoctorController::class, 'addDoctorInquiry']); }); //银行卡 @@ -534,6 +537,3 @@ Router::post('/26', [CallBackController::class, 'imCallBack']); // 获取患者简短问诊病例-聊天界面 Router::post('/27', [CallBackController::class, 'imCallBack']); - -// 新增医生接诊-医生端 -Router::post('/28', [CallBackController::class, 'imCallBack']); \ No newline at end of file