Merge branch 'master' into develop

app/Admin/Controllers/ServiceManagement/ServiceController.php

@@ -50,7 +50,7 @@ class ServiceController extends AdminController
         $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){
+        $grid->column('docterorganization', __('所属机构'))->where('state',1)->pluck('organization_id')->display(function ($organization){
             $value = Organization::whereIn('id',$organization->toArray())->pluck('intro')->toArray();
             return $value;
         })->label('info')->width(300);