diff --git a/app/Controller/UserDoctorController.php b/app/Controller/UserDoctorController.php index 73b0bb1..cb14969 100644 --- a/app/Controller/UserDoctorController.php +++ b/app/Controller/UserDoctorController.php @@ -206,9 +206,6 @@ class UserDoctorController extends AbstractController */ public function deleteDoctorWords(): ResponseInterface { - $request = $this->container->get(UserDoctorRequest::class); - $request->scene('deleteDoctorWords')->validateResolved(); - $UserDoctorService = new UserDoctorService(); $data = $UserDoctorService->deleteDoctorWords(); return $this->response->json($data); diff --git a/app/Request/UserDoctorRequest.php b/app/Request/UserDoctorRequest.php index 1f80100..dd8d8c3 100644 --- a/app/Request/UserDoctorRequest.php +++ b/app/Request/UserDoctorRequest.php @@ -50,10 +50,6 @@ class UserDoctorRequest extends FormRequest 'words', 'words_type' ], - 'deleteDoctorWords' => [ // 删除常用语 - 'words', - 'words_type' - ], 'getDoctorEvaluationList' => [ // 获取医生评价 'doctor_id', 'evaluation_type', diff --git a/app/Services/UserDoctorService.php b/app/Services/UserDoctorService.php index 2a9d242..4d235f5 100644 --- a/app/Services/UserDoctorService.php +++ b/app/Services/UserDoctorService.php @@ -590,6 +590,7 @@ class UserDoctorService extends BaseService foreach ($basic_words as $item) { $data = array(); $data['words'] = $item['basics_words']; + $data['doctor_words_id'] = ""; $data['is_system'] = 1; $result[] = $data; } @@ -605,6 +606,7 @@ class UserDoctorService extends BaseService foreach ($doctor_words as $item) { $data = array(); $data['words'] = $item['words']; + $data['doctor_words_id'] = $item['doctor_words_id']; $data['is_system'] = 0; $result[] = $data; } @@ -661,14 +663,12 @@ class UserDoctorService extends BaseService { $user_info = $this->request->getAttribute("userInfo") ?? []; - $words = $this->request->input('words'); - $words_type = $this->request->input('words_type'); + $doctor_words_id = $this->request->route('doctor_words_id'); // 查询是否重复 $params = array(); $params['doctor_id'] = $user_info['client_user_id']; - $params['words_type'] = $words_type; - $params['words'] = $words; + $params['doctor_words_id'] = $doctor_words_id; $doctor_words = DoctorWord::getOne($params); if (empty($doctor_words)) { return fail(); diff --git a/config/routes.php b/config/routes.php index 2078ef1..92d4699 100644 --- a/config/routes.php +++ b/config/routes.php @@ -163,7 +163,7 @@ Router::addGroup('/doctor', function () { Router::post('', [UserDoctorController::class, 'addDoctorWords']); // 删除常用语列表 - Router::delete('', [UserDoctorController::class, 'deleteDoctorWords']); + Router::delete('/{doctor_words_id:\d+}', [UserDoctorController::class, 'deleteDoctorWords']); }); // 医生数据 @@ -482,6 +482,9 @@ Router::addGroup('/basic', function () { // 搜索商品 Router::get('/search', [BasicDataController::class, 'getProductSearch']); }); + + // 获取民族列表数据 + Router::get('/operation/manual', [BasicDataController::class, 'getOperationManual']); }); // 获取医生评价