diff --git a/app/Admin/Controllers/PatientController.php b/app/Admin/Controllers/PatientController.php index 7f5ec87..9823e15 100644 --- a/app/Admin/Controllers/PatientController.php +++ b/app/Admin/Controllers/PatientController.php @@ -66,7 +66,7 @@ class PatientController extends AdminController { return $this->baseForm()->body([ amisMake()->SelectControl()->options($this->getTypeOptions())->name('type_id')->label(__('patient.type_id'))->required(), - amisMake()->SelectControl()->source(admin_url('/api/user/list'))->labelField('phone')->valueField('id')->name('user_id')->label(__('patient.user_id'))->clearable()->onEvent([ + amisMake()->SelectControl()->source(admin_url('/api/user/list'))->name('user_id')->label(__('patient.user_id'))->clearable()->onEvent([ 'change' => [ 'actions' => [ ['actionType' => 'setValue', 'componentId' => 'patient_name', 'args' => ['value' => '${event.data.selectedItems.name}']], diff --git a/app/Admin/Controllers/UserController.php b/app/Admin/Controllers/UserController.php index bc167e8..1a029aa 100644 --- a/app/Admin/Controllers/UserController.php +++ b/app/Admin/Controllers/UserController.php @@ -73,7 +73,7 @@ class UserController extends AdminController public function getList(Request $request) { - $list = $this->service->listQuery()->get(); + $list = $this->service->listQuery()->get()->map(fn($item) => ['value' => $item->id, 'label' => $item->name . '-' . $item->phone]); return $this->response()->success($list); } diff --git a/app/Admin/Services/PatientService.php b/app/Admin/Services/PatientService.php index 01cee43..b074faf 100644 --- a/app/Admin/Services/PatientService.php +++ b/app/Admin/Services/PatientService.php @@ -67,7 +67,7 @@ class PatientService extends BaseService 'user_id' => ['nullable', $userRule->where('type_id', data_get($data, 'type_id'))], ]; $updateRule = [ - 'user_id' => ['nullable', $userRule->where('type_id', data_get($data, 'type_id', $model?->type_id))] + 'user_id' => ['nullable', $userRule->where('type_id', data_get($data, 'type_id', $model?->type_id))->ignore($model->id)] ]; $validator = Validator::make($data, $model ? $updateRule : $createRule, [ 'type_id.required' => __('patient.type_id') . '必填', diff --git a/app/Http/Controllers/Client/PatientController.php b/app/Http/Controllers/Client/PatientController.php index 4205f29..600151e 100644 --- a/app/Http/Controllers/Client/PatientController.php +++ b/app/Http/Controllers/Client/PatientController.php @@ -19,7 +19,7 @@ class PatientController extends Controller public function show($id) { $user = auth('api')->user(); - $patient = $user->patients()->with(['type'])->findOrFail($id); + $patient = $user->patients()->with(['type', 'doctor'])->findOrFail($id); return $this->response()->success($patient); } } diff --git a/app/Http/Controllers/WechatController.php b/app/Http/Controllers/WechatController.php index 717709c..14ad9bb 100644 --- a/app/Http/Controllers/WechatController.php +++ b/app/Http/Controllers/WechatController.php @@ -51,7 +51,7 @@ class WechatController extends Controller return redirect(url('/client/pages/login/index') . '?' . http_build_query(['openid' => $openid, 'open_type' => SocialiteType::WxOfficial->value])); } - $token = $user->createToken('client')->plainTextToken; + $token = $user->createToken('client')->plainTextToken; return redirect(url('/client/pages/index/welcome') . '?token=' . $token); } diff --git a/public/client/index.html b/public/client/index.html index 8900696..522c647 100644 --- a/public/client/index.html +++ b/public/client/index.html @@ -1,2 +1,2 @@