患者列表，接口测试

app/Community/Controllers/NurseUserController.php

@@ -35,8 +35,10 @@ class NurseUserController extends AdminController
 
         $grid->model()->orderByDesc('id');
         $grid->model()->GroupBy('patient_id');
-        $grid->column('orderPatient.name', __('姓名'));
-        $grid->column('orderUser.nickname', __('监护人'));
+        $grid->column('orderUser.nickname', __('用户'));
+        $grid->column('orderPatient.guardian_name', __('监护人'));
+        $grid->column('orderPatient.name', __('患者'));
+
         $grid->column('orderPatient.phone', __('监护人手机号'))->display(function ($w){
             if(empty($w)) return Patient::where('id',$this->patient_id)->value('phone');
             return $w;
@@ -58,8 +60,9 @@ class NurseUserController extends AdminController
         }
 
         $grid->filter(function ($flter){
-            $flter->like('orderPatient.name','请输入用户姓名');
-            $flter->like('orderUser.nickname','请输入监护人姓名');
+            $flter->like('orderPatient.name','请输入患者姓名');
+            $flter->like('orderUser.nickname','请输入用户名');
+            $flter->like('orderPatient.guardian_name','请输入监护人姓名');
             $flter->between('orderUser.birthday','生日')->datetime();
         });
 

app/Community/Controllers/OrderVaccinesController.php

@@ -47,9 +47,6 @@ class OrderVaccinesController extends AdminController
             } );
         });
 
-        DB::enableQueryLog();
-
-
         $user = Admin::user();
         $is_admin = Admin::user()->inRoles(['administrator','devloper']);
         $where = ['product_type'=>4];
@@ -116,7 +113,7 @@ class OrderVaccinesController extends AdminController
 
         $grid->filter(function ($filter)  {
             $filter->column(1/2, function ($filter) {
-//                $filter->equal('docter.id','排班医生')->select('/cdms/api/getDocter');
+                $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->equal('order_status','订单状态')->select(Order::$_order_status);
                 $filter->timestampBetween('orderPatient.appoint_start_time','预约时间')->datetime();
             });

app/Community/Controllers/UserNoticeController.php

@@ -39,6 +39,7 @@ class UserNoticeController extends AdminController
 
 
         $grid->column('user.nickname', __('用户'));
+        $grid->column('guardian_name', __('监护人'));
         $grid->column('name', __('患者'));
         $grid->column('relationship_type', __('关系'))->using([1=>'父亲',2=>'母亲',3=>'祖父',4=>'祖母',5=>'外祖父',6=>'外祖母',7=>'叔侄',8=>'其他']);
         $grid->column('phone', __('用户手机号'));
@@ -46,7 +47,8 @@ class UserNoticeController extends AdminController
 
         $grid->filter(function ($flter){
             $flter->like('name','请输入患者姓名');
-            $flter->like('user.nickname','请输入监护人姓名');
+            $flter->like('user.nickname','用户');
+            $flter->like('guardian_name','请输入监护人姓名');
             $flter->like('phone','电话');
             $flter->between('birthday','生日')->datetime();
 //            $flter->timestampBetween('orderPatient.appoint_start_time','预约时间')->datetime();

app/Community/Controllers/VaccineUserController.php

@@ -37,8 +37,9 @@ class VaccineUserController extends AdminController
         }
 
         $grid->model()->GroupBy('patient_id');
+        $grid->column('orderUser.nickname', __('用户'));
+        $grid->column('orderPatient.guardian_name', __('监护人'));
         $grid->column('orderPatient.name', __('姓名'));
-        $grid->column('orderUser.nickname', __('监护人'));
         $grid->column('orderPatient.phone', __('监护人手机号'))->display(function ($w){
             if(empty($w)) return Patient::where('id',$this->patient_id)->value('phone');
             return $w;
@@ -49,8 +50,9 @@ class VaccineUserController extends AdminController
         });
 
         $grid->filter(function ($flter){
-            $flter->like('orderPatient.name','请输入用户姓名');
-            $flter->like('orderUser.nickname','请输入监护人姓名');
+            $flter->like('orderPatient.name','请输入患者姓名');
+            $flter->like('orderUser.nickname','请输入用户名');
+            $flter->like('orderPatient.guardian_name','请输入监护人姓名');
             $flter->between('orderUser.birthday','生日')->datetime();
         });