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

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

@@ -123,6 +123,7 @@ class FenzhenController extends Controller
     }
     if (!!$res) {
       $time_line = $res['data']['time_line'];
+      $end_queue = $res['data']['end_queue'];
       $clinic_map = [];
       foreach ($time_line as $key => $item) {
         if (isset($item['his_number'])) {
@@ -177,6 +178,14 @@ class FenzhenController extends Controller
         $tip_check_show = true;
         $time_line[count($time_line) - 1]['status'] = 4;
       }
+
+      // 插入 体检区外的 诊室
+      if (count($end_queue) != 0) {
+        foreach ($end_queue as $end_queue_item) {
+          $time_line[] = $end_queue_item;
+        }
+      }
+
       // -1 报告未出 不能预约 报告解读 不显示
       //  0 时间未到 不能预约 报告解读 不显示
       //  1 时间已到 可以预约 报告解读