数字化门诊

app/Community/Controllers/UserNoticeController.php

@@ -47,8 +47,9 @@ class UserNoticeController extends AdminController
         $grid->filter(function ($flter){
             $flter->like('name','请输入患者姓名');
             $flter->like('user.nickname','请输入监护人姓名');
+            $flter->like('phone','电话');
             $flter->between('birthday','生日')->datetime();
-            $flter->between('orderpatient.appoint_start_time','预约时间')->datetime();
+            $flter->timestampBetween('orderPatient.appoint_start_time','预约时间')->datetime();
             $flter->equal('order.product_type','用户类型')->select([4=>'计免',5=>'儿保']);
         });
 

app/Http/Controllers/AppiontController.php

@@ -77,7 +77,7 @@ class AppiontController extends Controller
            }
 
            DB::enableQueryLog();
-           $order = Order::where('user_id',$user_id)->select('id','order_sn','user_id','patient_id','is_ticket')->with('orderPatient:order_id,appoint_start_time,appoint_end_time');
+           $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){