开通服务类型展示（陈武杰）

app/Admin/Controllers/ServiceManagement/ServiceController.php

@@ -44,6 +44,7 @@ class ServiceController extends AdminController
         $grid->column('ondocter.avatar', __('头像'))->image('',50,50);
         $grid->column('ondocter.id', __('医生ID'));
         $grid->column('ondocter.name','医生名称');
+        $grid->column('service_type','服务类别')->using([1=>'图文咨询',2=>'电话咨询',3=>'门诊预约'])->label('default');
         $grid->column('ondocter.sex','性别')->using([1=>'男',2=>'女']);
         $grid->column('docterorganization', __('所属机构'))->pluck('organization_id')->display(function ($organization){
             $value = Organization::whereIn('id',$organization->toArray())->pluck('name')->toArray();
@@ -71,11 +72,6 @@ class ServiceController extends AdminController
         $grid->filter(function ($filter){
             $filter->equal('service_type','服务类型')->select([1 => '图文', 2 => '电话', 3 => '问诊']);
             $filter->equal('status','服务类型')->select([1=>'待审核',2 =>'已通过 ',3=>'已拒绝']);
-//            $filter->where(function ($query) {
-//                $query->whereHas('organization',function ($query){
-//                    $query->where('name','like',"%{$this->input}%");
-//                });
-//            },'机构名');
             $filter->equal('docterorganization.organization_id','机构')->select(Organization::pluck('name','id'));
         });
         $grid->actions(function ($actions) {