Merge branch 'develop' of ssh://git.9026.com:2212/swdz-WangHaijun/BaoMa into develop

app/Community/Controllers/NurseController.php

@@ -44,11 +44,11 @@ class NurseController extends AdminController
            return Nurse::getNursetype()[$t];
         });
         $grid->column('today', __('今日预约'));
-        $grid->column('docters','服务医生')->display(function ($ids){
-           $docters = Docter::whereIn('id',$ids)->pluck('name')->toArray();
-           if(count($docters) > 3) return $docters[0].','.$docters[1].','.$docters[2].'...';
-           return implode(',',$docters);
-        });
+//        $grid->column('docters','服务医生')->display(function ($ids){
+//           $docters = Docter::whereIn('id',$ids)->pluck('name')->toArray();
+//           if(count($docters) > 3) return $docters[0].','.$docters[1].','.$docters[2].'...';
+//           return implode(',',$docters);
+//        });
         $grid->column('price', __('价格'))->display(function ($v){
             return round($v/100,4).'元';
         })->editable();
@@ -103,14 +103,14 @@ class NurseController extends AdminController
         })->rules('required',['required'=>'请填写价格']);
         $form->hidden('org_id')->value($org_id);
 
-        $form->multipleSelect('docters','服务医生')->options(function () use ($org_id) {
-            if(empty($org_id)){
-                return  Docter::pluck('name','id');
-            }
-            $ids = DocterOrganization::where('organization_id',$org_id)->pluck('docter_id');
-            if(empty($ids)) return [];
-            return  Docter::whereIn('id',$ids)->pluck('name','id');
-        })->rules('required',['required'=>'请选择医生']);
+//        $form->multipleSelect('docters','服务医生')->options(function () use ($org_id) {
+//            if(empty($org_id)){
+//                return  Docter::pluck('name','id');
+//            }
+//            $ids = DocterOrganization::where('organization_id',$org_id)->pluck('docter_id');
+//            if(empty($ids)) return [];
+//            return  Docter::whereIn('id',$ids)->pluck('name','id');
+//        })->rules('required',['required'=>'请选择医生']);
         $form->textarea('remark', __('备注'));
         $form->saving(function ($form){
             if($form->type == 1){

app/Http/Controllers/Api/V2/DoctorController.php

@@ -345,8 +345,6 @@ class DoctorController extends AuthController
         return out($list);
     }
 
-
-
     /**
      * 获取审核状态
      * @param $type
@@ -953,7 +951,7 @@ class DoctorController extends AuthController
         $where['province_id'] = $province;
         $where['city_id'] = $city;
         $where['area_id'] = $area;
-        $where['type'] = 1;
+//        $where['type'] = 1;
         $Organization = Organization::with('offices')->where($where)->get()->toArray();
         $qulire = Qualification::where('status', 1)->get();
         $newList = [];