筛选条件

app/Community/Controllers/OrderController.php

@@ -76,12 +76,9 @@ class OrderController extends AdminController
 //            if(empty($w)) return '';
 //            return date('Y-m-d H:i',$w);
 //        });
-        $grid->column('orderPatient.phone', __('电话号码'))->display(function ($p){
-            if(empty($p))  return $this->user->phone;
-            return $p;
-        });
+        $grid->column('patient.phone', __('电话号码'));
 
-        $grid->column('orderPatient.name', __('预约患者'));
+        $grid->column('patient.name', __('预约患者'));
         $grid->column('orderPatient.sex', __('患者性别'))->display(function ($w){
             return $w==1?'男':'女';
         });
@@ -131,6 +128,8 @@ class OrderController extends AdminController
             $filter->disableIdFilter();
             $filter->column(1/2, function ($filter)   {
                 $filter->equal('docter_id','排班医生')->select('/cdms/api/getDocter');
+                $filter->like('patient.phone','电话');
+                $filter->like('patient.name','患者名称');
                 $filter->equal('order_status','订单状态')->select(Order::$_order_status);
                 $filter->timestampBetween('orderPatient.appoint_start_time','预约时间')->datetime();
             });

app/Community/Controllers/OrderNurseController.php

@@ -69,14 +69,8 @@ class OrderNurseController extends AdminController
             return date('Y-m-d H:i',$w).'~'.date('H:i',$w);
         });
 
-        $grid->column('orderPatient.name', __('儿保患者'));
-        $grid->column('orderPatient.phoe', __('电话'))->display(function ($w){
-            if(empty($w)) {
-                if(empty($this->orderUser->phone)) return '';
-                return $this->orderUser->phone;
-            }
-            return $w;
-        });
+        $grid->column('patient.name', __('儿保患者'));
+        $grid->column('patient.phone', __('电话'));
         $grid->column('orderPatient.sex', __('患者性别'))->display(function ($w){
             return $w==1?'男':'女';
         });
@@ -113,7 +107,8 @@ class OrderNurseController extends AdminController
         $grid->filter(function (Grid\Filter $filter){
             $filter->disableIdFilter();
             $filter->column(1/2, function ($filter) {
-//                $filter->equal('orders.docter_id','排班医生')->select('/cdms/api/getDocter');
+                $filter->like('patient.phone','电话');
+                $filter->like('patient.name','患者名称');
                 $filter->equal('order_status','订单状态')->select(Order::$_order_status);
                 $filter->timestampBetween('orderPatient.appoint_start_time','预约时间')->datetime();
             });

app/Community/Controllers/OrderVaccinesController.php

@@ -63,11 +63,12 @@ class OrderVaccinesController extends AdminController
 
         $grid->column('id', __('Id'));
         $grid->column('user.nickname', __('预约用户'));
-        $grid->column('orderPatient.phoe', __('电话'))->display(function ($w){
-            if(empty($w)) {
-                if(empty($this->orderUser->phone)) return '';
-                return $this->orderUser->phone;
-            }
+        $grid->column('patient.phone', __('电话'))->display(function ($w){
+//            dd($this->orderPatient);
+//            if(empty($w)) {
+//                if(empty($this->orderUser->phone)) return '';
+//                return $this->orderUser->phone;
+//            }
             return $w;
         });
         $grid->column('appoint_start_time', __('预约时间'))->display(function ($w){
@@ -79,7 +80,7 @@ class OrderVaccinesController extends AdminController
             if(empty($w)) return '';
             return date('Y-m-d',$w);
         });
-        $grid->column('orderPatient.name', __('接种患者'));
+        $grid->column('patient.name', __('接种患者'));
         $grid->column('orderPatient.sex', __('患者性别'))->display(function ($w){
             return $w==1?'男':'女';
         });
@@ -114,6 +115,8 @@ class OrderVaccinesController extends AdminController
         $grid->filter(function ($filter)  {
             $filter->column(1/2, function ($filter) {
 //                $filter->equal('docter.id','排班医生')->select('https://wechat.fresherbaby.com/api/getAppiontInfo?telphone=13808729518&sig=d7d875f10af1c341b8ba3d9e433e88aa&SecretKey=2018&st=2018&id=11&barcode=&area=12');
+                $filter->like('patient.phone','电话');
+                $filter->like('patient.name','患者名称');
                 $filter->equal('order_status','订单状态')->select(Order::$_order_status);
                 $filter->timestampBetween('orderPatient.appoint_start_time','预约时间')->datetime();
             });