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

app/Community/Controllers/ApiController.php

@@ -52,7 +52,12 @@ class ApiController extends Controller
     //获取订单
     public function getDocter()
     {
-        return Docter::pluck('name','id')->toArray();
+        $user = Admin::user();
+        $where = [];
+        if($user->docter_id){
+            $where ['id'] = $user->docter_id;
+        }
+        return Docter::where($where)->get(['name as text','id'])->toArray();
     }
 
     //备注

app/Community/Controllers/OrderController.php

@@ -68,10 +68,10 @@ class OrderController extends AdminController
             });
         })->placeholder('请输入用户姓名');
 
-        $grid->filter(function (Grid\Filter $filter){
+        $grid->filter(function (Grid\Filter $filter)  {
             $filter->disableIdFilter();
-            $filter->column(1/2, function ($filter) {
-                $filter->equal('docter_id','排班医生')->select(Docter::pluck('name','id')->toArray());
+            $filter->column(1/2, function ($filter)   {
+                $filter->equal('docter_id','排班医生')->select('/cdms/api/getDocter');
                 $filter->equal('order_status','订单状态')->select(Order::$_order_status);
                 $filter->between('orderPatient.appoint_start_time','预约时间')->datetime();
             });

app/Community/Controllers/OrderVaccinesController.php

@@ -73,7 +73,7 @@ class OrderVaccinesController extends AdminController
         $grid->column('order_status', __('订单状态'))->using(Order::getStatus());
         $grid->column('payment_status', __('支付状态'))->using([1=>'待付款',2=>'已付款',3=>'退款中',4=>'已退款'])->label('info');
 
-        $grid->filter(function ($filter){
+        $grid->filter(function ($filter)  {
             $filter->column(1/2, function ($filter) {
                 $filter->equal('docter.id','排班医生')->select('/cdms/api/getDocter');
                 $filter->equal('order_status','订单状态')->select(Order::$_order_status);