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

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

@@ -25,7 +25,10 @@ class FenzhenController extends Controller
   {
     // 这里放 检查是否有 体检引导的数据
     $id_number = request('id_number');
-    $list = DB::table('orders')->where(['id_number' => $id_number])->whereIn('status', [2, 4])->get();
+    $list = DB::table('orders')->where(['id_number' => $id_number])->whereIn('status', [2, 4])->where('tj_number', '!=', null)->orderBy('id', 'desc')->get();
+    if (count($list) == 0) {
+      $list = DB::table('orders')->where(['id_number' => $id_number])->whereIn('status', [2, 4])->orderBy('id', 'desc')->get();
+    }
     return \Yz::Return(true, "弃检成功", ['list' => $list]);
   }
 
@@ -97,7 +100,7 @@ class FenzhenController extends Controller
       // $now_time = strtotime('2024-11-07 00:00:00');
       if (!!$res['data']['report']) {
         $report_time = strtotime($res['data']['report'] . ' 00:00:00') + (60 * 60 * 24 * $report_day);
-        $report_time_show = date('m月d日',  $report_time);
+        $report_time_show = date('m月d日', $report_time);
         $report_status = false;
         // 这里补充 获取 出具报告 时间的逻辑
         if ($report_time < $now_time) {