Merge branch 'main' of https://git.cjy.net.cn/zhangyan/hainan_2024

Laravel/app/Http/Controllers/API/H5/FenzhenController.php

@@ -90,6 +90,7 @@ class FenzhenController extends Controller
     $order_data = $order->DepartmentItemCount($info->id);
     $clinics = $order_data['department_list'];
     $report_day = $order_data['wait_day'];
+    $is_checked_sign_in = $order_data['is_checked_sign_in'];
     $error_day = $report_day;
     if ($report_day == -1) {
       $report_day = false;
@@ -293,10 +294,13 @@ class FenzhenController extends Controller
         $res['data']['end_time'] = date('H:i', $last_time);
       }
       $check_tip = false;
-      if ($error_day == -1) {
+//      \Yz::debug(['$is_checked_sign_in'=>$is_checked_sign_in,'$error_day'=>$error_day]);
-        if (!!$tip_check_show) {
+      if (!!$is_checked_sign_in) {
-          $et = $info->appointment_date . ' ' . $res['data']['end_time'] . ':00';
+        if ($error_day == -1) {
-          $check_tip = (time() - strtotime($et)) > (60 * 20);
+          if (!!$tip_check_show) {
+            $et = $info->appointment_date . ' ' . $res['data']['end_time'] . ':00';
+            $check_tip = (time() - strtotime($et)) > (60 * 20);
+          }
         }
       }
       return \Yz::Return(true, "获取成功", [