预约时间

app/Community/Controllers/OrderController.php

@@ -47,7 +47,7 @@ class OrderController extends AdminController
         $grid->column('id', __('Id'));
         $grid->column('orderUser.nickname', __('预约用户'));
         $grid->column('orderPatient.appoint_start_time', __('预约时间'))->display(function ($w){
-            return date('Y-m-d H:i',$w).'至'.date('H:i',$this->orderPatient->appoint_end_time);
+            return date('Y-m-d H:i',$w).'~'.date('H:i',$this->orderPatient->appoint_end_time);
         });
 //        $grid->column('orderPatient.appoint_end_time', __('预约结束时间'))->display(function ($w){
 //            if(empty($w)) return '';

app/Community/Controllers/OrderNurseController.php

@@ -58,12 +58,9 @@ class OrderNurseController extends AdminController
             return User::where('id',$w)->value('nickname');
         });
         $grid->column('patients.appoint_start_time', __('预约时间'))->display(function ($w){
-            return date('Y-m-d H:i:s',$w);
+            return date('Y-m-d H:i',$w).'~'.date('H:i',$this->patients->appoint_end_time);
         });
 
-        $grid->column('patients.appoint_end_time', __('儿保时间'))->display(function ($w){
-            return date('Y-m-d H:i:s',$w);
-        });
         $grid->column('patients.name', __('儿保患者'));
         $grid->column('patients.phone', __('电话'))->display(function ($w){
             if(empty($w)) return $this->patients->phone;

app/Community/Controllers/OrderVaccinesController.php

@@ -55,7 +55,7 @@ class OrderVaccinesController extends AdminController
 //            return date('Y-m-d H:i:s',($this->orderPatient->appoint_start_time)) .'致' . date('Y-m-d H:i:s',($this->orderPatient->appoint_end_time));
 //        });
         $grid->column('orderPatient.appoint_start_time', __('预约时间'))->display(function ($w){
-            return date('Y-m-d H:i',$w).'至'.date('H:i',$this->orderPatient->appoint_end_time);
+            return date('Y-m-d H:i',$w).'~'.date('H:i',$this->orderPatient->appoint_end_time);
         });
         $grid->column('end_time', __('接种时间'))->display(function ($w){
             if(empty($w)) return '';