代码整理

app/Community/Controllers/OrderController.php

@@ -44,13 +44,19 @@ class OrderController extends AdminController
 
         //检查是否是门诊医生
         $is_docter = $user->isRole('opc');
+        $org_id = $user->org_id;
+        $where = ['product_type'=>3];
         if(!$is_admin){
-            $org_id = $user->org_id;
-            $where = ['product_type'=>3,'organization_id'=>$org_id];
             if($is_docter) {
                 $where['docter_id'] = Docter::where(['id'=>$user->docter_id])->value('id');
             }
-            $grid->model()->where($where);
+            $where ['organization_id']=$org_id;
+        }
+        $grid->model()->where($where)->leftJoin('order_patients','order_patients.order_id','=','orders.id');
+        if(!empty($res['orderPatient']['appoint_start_time']['start']) || !empty($res['orderPatient']['appoint_start_time']['start']) ){
+            $grid->model()->orderBy('order_patients.appoint_start_time','asc');
+        } else {
+            $grid->model()->orderBy('order_patients.appoint_start_time','desc');
         }
         $grid->column('id', __('Id'));
         $grid->column('orderUser.nickname', __('预约用户'));

app/Community/Controllers/OrderNurseController.php

@@ -49,16 +49,14 @@ class OrderNurseController extends AdminController
         $where = ['product_type'=>5];
         if(!$is_admin){
             $org_id = $user->org_id;
-            $docter_id = $user->docter_id;
-            $where['organization_id']=$org_id;
-//            if($docter_id){
-//                $where['docter_id'] = $docter_id;
-//            } else {
-//                $where['organization_id']=$org_id;
-//            }
+            $where['orders.organization_id']=$org_id;
+        }
+        $grid->model()->where($where)->leftJoin('order_patients','order_patients.order_id','=','orders.id');
+        if(!empty($res['orderPatient']['appoint_start_time']['start']) || !empty($res['orderPatient']['appoint_start_time']['start']) ){
+            $grid->model()->orderBy('order_patients.appoint_start_time','asc');
+        } else {
+            $grid->model()->orderBy('order_patients.appoint_start_time','desc');
         }
-        $grid->model()->where($where);
-
         $grid->column('id', __('ID'));
         $grid->column('orderUser.user_name', __('预约用户'))->display(function($w){
             if(empty($w)) return '';

app/Community/Controllers/OrderVaccinesController.php

@@ -55,15 +55,13 @@ class OrderVaccinesController extends AdminController
         $where = ['product_type'=>4];
         if(!$is_admin){
             $org_id = $user->org_id;
-            $where = ['product_type'=>4,'organization_id'=>$org_id];
+            $where = ['product_type'=>4,'orders.organization_id'=>$org_id];
         }
-
+        $grid->model()->where($where)->leftJoin('order_patients','order_patients.order_id','=','orders.id');
         if(!empty($res['orderPatient']['appoint_start_time']['start']) || !empty($res['orderPatient']['appoint_start_time']['start']) ){
-            $grid->model()->where($where)->leftJoin('order_patients','order_patients.order_id','=','orders.id')
-                ->where('product_type',4)->orderBy('order_patients.appoint_start_time','asc');
+            $grid->model()->orderBy('order_patients.appoint_start_time','asc');
         } else {
-            $grid->model()->where($where)->leftJoin('order_patients','order_patients.order_id','=','orders.id')
-                ->where('product_type',4)->orderBy('order_patients.appoint_start_time','desc');
+            $grid->model()->orderBy('order_patients.appoint_start_time','desc');
         }
 
         $grid->column('order_id', __('Id'));
@@ -91,6 +89,7 @@ class OrderVaccinesController extends AdminController
             return implode(',',$vaccine_name);
 
         });
+//        $grid->column('docter.name', __('排班医生'));
         $status_arr = Order::getStatus();
         $grid->column('order_status', __('订单状态'))->display(function ($w) use ($status_arr) {
             $info = $status_arr[intval($w)];
@@ -106,9 +105,12 @@ class OrderVaccinesController extends AdminController
                 return '<span class="label label-default">'.$info.'</span>';
             }
         });
+//        $grid->column('payment_status', __('支付状态'))->using(Order::getPayStatus())->label([1=>'warring',2=>'success',3=>'info',4=>'danger']);
+
 
         $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);
                 $filter->timestampBetween('orderPatient.appoint_start_time','预约时间')->datetime();
             });
@@ -117,11 +119,16 @@ class OrderVaccinesController extends AdminController
             $tools->append(new FasteOrder());
         });
         $grid->actions(function ($actions) {
+//            if( $actions->row->order_status<= 2){
+//                $actions->add(new Reserved());
+//            }
+
             if(!empty($actions->row->order_status) &&  ($actions->row->order_status<= 3 || $actions->row->order_status == 7 )  ){
                 $actions->add(new Finished());
                 $actions->add(new OrderCance());
                 $actions->add(new AddVaccine());
             }
+
             $actions->disableEdit();
 //            $actions->disableView();
             $actions->disableDelete();