门诊管理优化

app/Community/Controllers/OrderController.php

@@ -35,7 +35,7 @@ class OrderController extends AdminController
             $org_id = $user->org_id;
             $where = ['product_type'=>3,'organization_id'=>$org_id];
             if($is_docter) {
-                $where['docter_id'] = Docter::where(['cmds_id'=>$user->id])->value('id');
+                $where['docter_id'] = Docter::where(['id'=>$user->docter_id])->value('id');
             }
             $grid->model()->where($where);
         }
@@ -61,7 +61,6 @@ class OrderController extends AdminController
 //        $grid->column('order_status', __('订单状态'))->using([1=>'未支付',2=>'待接单',3=>'进行中',4=>'已完成',5=>'已取消']);
         $grid->column('order_status','订单状态')->using(Order::getStatus())->label([1=>'info',2=>'warring',3=>'info',4=>'success',5=>'error']);
         $grid->column('payment_status', __('支付状态'))->using([1=>'待付款',2=>'已付款',3=>'退款中',4=>'已退款']);
-
         //查询
         $grid->quickSearch(function ($model, $query) {
             $model->whereHas('patients',function ($model) use ($query) {
@@ -77,7 +76,6 @@ class OrderController extends AdminController
                 $filter->between('orderPatient.appoint_start_time','预约时间')->datetime();
             });
         });
-
         return $grid;
     }
 

app/Community/Controllers/OrderVaccinesController.php

@@ -36,12 +36,12 @@ class OrderVaccinesController extends AdminController
         $user = Admin::user();
         $is_admin = Admin::user()->inRoles(['administrator','devloper']);
         //检查是否是门诊医生
-        $is_docter = $user->isRole('opc');
+        $is_docter = $user->docter_id;
         if(!$is_admin){
             $org_id = $user->org_id;
             $where = ['product_type'=>4,'organization_id'=>$org_id];
             if($is_docter) {
-                $where['docter_id'] = Docter::where(['cmds_id'=>$user->id])->value('id');
+                $where['docter_id'] = Docter::where(['id'=>$user->docter_id])->value('id');
             }
             $grid->model()->where($where);
         }