diff --git a/Laravel/app/Http/Controllers/API/H5/FenzhenController.php b/Laravel/app/Http/Controllers/API/H5/FenzhenController.php index f36e56f..f3f542b 100644 --- a/Laravel/app/Http/Controllers/API/H5/FenzhenController.php +++ b/Laravel/app/Http/Controllers/API/H5/FenzhenController.php @@ -67,6 +67,10 @@ class FenzhenController extends Controller $order_data = $order->DepartmentItemCount($info->id); $clinics = $order_data['department_list']; $report_day = $order_data['wait_day']; + $error_day = $report_day; + if ($report_day == -1) { + $report_day = false; + } // return \Yz::Return(true, "查询成功", [ // 'a'=>$order_data // ]); @@ -248,6 +252,11 @@ class FenzhenController extends Controller } } $res['data']['end_time'] = date('H:i', $last_time); + $check_tip = false; + if ($error_day == -1) { + $et = $info->appointment_date . strtotime($res['data']['end_time']); + $check_tip = (time() - $et) > (60 * 20); + } return \Yz::Return(true, "获取成功", [ 'info' => [ 'name' => $info->name, @@ -267,6 +276,7 @@ class FenzhenController extends Controller ], 'list' => $time_line, 'report' => $check_report_status, + 'check_tip' => $check_tip, ]); } else { return \Yz::Return(true, "获取成功", [ @@ -288,6 +298,7 @@ class FenzhenController extends Controller ], 'list' => [], 'report' => -1, + 'check_tip' => false, ]); } } @@ -328,7 +339,7 @@ class FenzhenController extends Controller 'check_date' => $info->appointment_date, 'start_time' => $info->appointment_time, 'end_time' => '10:25', - 'qrcode' => $person_ghzid, + 'qrcode' => $person_ghzid, 'ghzid' => $person_ghzid, 'tj_number' => $info->tj_number, 'code' => $info->appointment_number, diff --git a/Laravel/app/Services/OrderService.php b/Laravel/app/Services/OrderService.php index 6345711..0554104 100644 --- a/Laravel/app/Services/OrderService.php +++ b/Laravel/app/Services/OrderService.php @@ -21,6 +21,8 @@ class OrderService $wait=$peis::Get($peis::Api('报告时间计算',$order->tj_number),$hospital->code,"报告时间计算"); if(isset($wait['Data']['预计所需天数'])){ $wait_day=$wait['Data']['预计所需天数']; + } else { + $wait_day=-1; } }