过滤已取号信息

app/Http/Controllers/AppiontController.php

@@ -107,8 +107,11 @@ class AppiontController extends Controller
            DB::enableQueryLog();
            $order = Order::where('user_id',$user_id)
                ->where('organization_id',$data['area'])
+               ->where('is_ticket','!=',1)
+               ->where('product_type',4)
                ->select('id','order_sn','user_id','patient_id','is_ticket')
-               ->with('orderPatient:order_id,appoint_start_time,appoint_end_time,name');
+               ->with('orderPatient:order_id,appoint_start_time,appoint_end_time')
+               ->with('patient:id,name');
 
            if($data['st']){
                $order = $order->whereHas('orderPatient',function ($query) use ($data){
@@ -116,7 +119,8 @@ class AppiontController extends Controller
                });
            }
 
-           $order_list =$order->first();
+           $order_list =$order->first()->toArray();
+
            if(isset($data['sql']) && $data['sql'] == 1) dd(DB::getQueryLog());
            if(empty($order_list)){
                $defaulRes['tip_msg'] = '无预约';
@@ -141,12 +145,12 @@ class AppiontController extends Controller
                $defaulRes['allow_get_ticket']  = '1';
                $defaulRes['reserve_check_result']  = '1';
                $defaulRes['reserve_date']  = $date;
-               $defaulRes['reserve_name']  = $order['order_patient']['name'] ?? '';
            } else {
                $defaulRes['reserve_check_result']  = '1';
                $defaulRes['allow_post_ticket']  = '0';
                $defaulRes['tip_msg'] = '此订单已取号';
            }
+           $defaulRes['reserve_name']  = $order['patient']['name'] ?? '';
            exit(json_encode($defaulRes));
        }