签名修改

app/Community/Controllers/VaccineUserController.php

@@ -39,7 +39,7 @@ class VaccineUserController extends AdminController
         $grid->model()->GroupBy('patient_id');
         $grid->column('orderUser.nickname', __('用户'));
         $grid->column('orderPatient.guardian_name', __('监护人'));
-        $grid->column('orderPatient.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;

app/Http/Controllers/AppiontController.php

@@ -109,10 +109,16 @@ class AppiontController extends Controller
            DB::enableQueryLog();
            $order = Order::where('user_id',$user_id)->where('organization_id',$data['area'])->select('id','order_sn','user_id','patient_id','is_ticket')->with('orderPatient:order_id,appoint_start_time,appoint_end_time');
 
+//           if($data['st']){
+//               $order = $order->whereHas('orderPatient',function ($query) use ($data){
+//                   $query->where('appoint_start_time','<=',$data['st']);
+//                   $query->where('appoint_end_time','>=',$data['st']);
+//               });
+//           }
+
            if($data['st']){
                $order = $order->whereHas('orderPatient',function ($query) use ($data){
-                   $query->where('appoint_start_time','<=',$data['st']);
-                   $query->where('appoint_end_time','>=',$data['st']);
+                   $query->where('appoint_start_time','>=',$data['st']);
                });
            }
            $order_list =$order->first();