|
@@ -80,15 +80,18 @@ class DoctorManagementController extends AdminController
|
|
'off' => ['value' => 0, 'text' => '禁用', 'color' => 'danger'],
|
|
'off' => ['value' => 0, 'text' => '禁用', 'color' => 'danger'],
|
|
];
|
|
];
|
|
// $grid->column('organization', __('所属机构'))->pluck('name')->label('info');
|
|
// $grid->column('organization', __('所属机构'))->pluck('name')->label('info');
|
|
- $grid->column('organization', __('所属机构'))->pluck('name')->display(function ($organization){
|
|
|
|
|
|
+ $grid->column('org', __('所属机构'))->display(function (){
|
|
// dd($organization);
|
|
// dd($organization);
|
|
- if (empty($organization->toArray()))
|
|
|
|
|
|
+// dd($this->id);
|
|
|
|
+ $org_id = DocterOrganization::where('docter_id',$this->id)->where('state',1)->pluck('organization_id')->toArray();
|
|
|
|
+ $name = Organization::whereIn('id',$org_id)->pluck('name')->toArray();
|
|
|
|
+ if (empty($name))
|
|
{
|
|
{
|
|
return '无';
|
|
return '无';
|
|
}
|
|
}
|
|
else
|
|
else
|
|
{
|
|
{
|
|
- return $organization;
|
|
|
|
|
|
+ return $name;
|
|
}
|
|
}
|
|
})->label('info');
|
|
})->label('info');
|
|
$grid->column('serviceapply', __('开通服务'))->where('status',2)->pluck('service_type')->display(function ($type){
|
|
$grid->column('serviceapply', __('开通服务'))->where('status',2)->pluck('service_type')->display(function ($type){
|