From e4008852885ab42b8e5039883d3c1a799a2645b5 Mon Sep 17 00:00:00 2001 From: sa0ChunLuyu Date: Tue, 29 Oct 2024 13:28:21 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20=E5=88=86=E8=AF=8A?= =?UTF-8?q?=EF=BC=8C=E6=9C=AA=E7=AD=BE=E5=88=B0=E7=8A=B6=E6=80=81=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=20=E5=AF=B9=E6=8E=A5=E5=AD=97=E6=AE=B5=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/API/H5/FenzhenController.php | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/Laravel/app/Http/Controllers/API/H5/FenzhenController.php b/Laravel/app/Http/Controllers/API/H5/FenzhenController.php index f6bebd5..70bd801 100644 --- a/Laravel/app/Http/Controllers/API/H5/FenzhenController.php +++ b/Laravel/app/Http/Controllers/API/H5/FenzhenController.php @@ -49,13 +49,15 @@ class FenzhenController extends Controller $time_line = $res['data']['time_line']; $clinic_map = []; foreach ($time_line as $key => $item) { - $clinic_map[] = $item['name']; + if (isset($item['his_number'])) { + $clinic_map[] = $item['his_number']; + } } $last_time = strtotime('2024-10-10 ' . $time_line[count($time_line) - 1]['time'] . ':00'); if (!$res['data']['queue']) { $push_end = false; foreach ($clinics as $item) { - if (!in_array($item['name'], $clinic_map)) { + if (!in_array($item['keshi_id'], $clinic_map)) { $push_end = true; $item_count = $item['count']; $in_time = date('H:i', $last_time); @@ -125,6 +127,17 @@ class FenzhenController extends Controller "yyid" => "6", "action" => "1" ]); + switch ($res['code']) { + case '200': + $check_report_status = $res['data']['yyrq']; + break; + case 1: + $check_report_status = false; + break; + default: + $check_report_status = false; + break; + } \Yz::debug(['a' => $res]); From 1955fa146c0e187a8864a76efa9313fdd2cfaaa7 Mon Sep 17 00:00:00 2001 From: sa0ChunLuyu Date: Tue, 29 Oct 2024 14:00:20 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20=E6=8A=A5=E5=91=8A?= =?UTF-8?q?=E8=A7=A3=E8=AF=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/API/H5/FenzhenController.php | 105 ++++++++++-------- 1 file changed, 61 insertions(+), 44 deletions(-) diff --git a/Laravel/app/Http/Controllers/API/H5/FenzhenController.php b/Laravel/app/Http/Controllers/API/H5/FenzhenController.php index 70bd801..332a128 100644 --- a/Laravel/app/Http/Controllers/API/H5/FenzhenController.php +++ b/Laravel/app/Http/Controllers/API/H5/FenzhenController.php @@ -88,13 +88,17 @@ class FenzhenController extends Controller ]); } } + // -1 报告未出 不能预约 报告解读 不显示 + // 0 时间未到 不能预约 报告解读 不显示 + // 1 时间已到 可以预约 报告解读 + // 2 已经预约 报告解读 $check_report_status = -1; 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_status = false; // 这里补充 获取 出具报告 时间的逻辑 - if (strtotime($report_time) < time()) { + if ($report_time < time()) { $report_status = true; } if (!$report_status) { @@ -120,55 +124,68 @@ class FenzhenController extends Controller $check_report_status = 0; // $check_report_status = '2024年10月11日'; // 这里补充 获取 报告解读 时间的逻辑 - $dnet = new AspNetZhuanController(); - $res = $dnet->GetReportAnalysis([ - "yyrq" => "2024-10-29", - "ghzid" => "b656355aee12452693f53bb8ff916fa3", - "yyid" => "6", - "action" => "1" - ]); - switch ($res['code']) { - case '200': - $check_report_status = $res['data']['yyrq']; - break; - case 1: - $check_report_status = false; - break; - default: - $check_report_status = false; - break; - } - \Yz::debug(['a' => $res]); - - - if (!$check_report_status) { - if ($check_report_time < time()) { - $time_line[] = [ - 'time' => '', - 'name' => '报告解读', - 'status' => -1, - 'desc' => "可以预约报告解读", - 'tip' => '', - 'more' => 0 - ]; - } else { - $check_report_time_show = date('m月d日', $check_report_time); - $time_line[] = [ - 'time' => '', - 'name' => '报告解读', - 'status' => -1, - 'desc' => "预计 $check_report_time_show 可以预约报告解读", - 'tip' => '', - 'more' => 0 - ]; + if ($check_report_time < time()) { + if (!!$info->person_id) { + $user_info = DB::table('web_user_person')->where(['id' => $info->person_id])->first(); + if (!!$user_info) { + $hospital_map = [ + 'h1' => '6', + 'h4' => '2' + ]; + $dnet = new AspNetZhuanController(); + $hid = $info->hospital_id; + $res = $dnet->GetReportAnalysis([ + "yyrq" => date('Y-m-d', $check_report_time), + "ghzid" => $user_info->ghzid, + "yyid" => $hospital_map["h$hid"], + "action" => "1" + ]); + switch ($res['code']) { + case '200': + $check_report_status = 2; + $show_date = date('m-d', strtotime($res['yyrq'])); + $time_line[] = [ + 'time' => '', + 'name' => '报告解读', + 'status' => -1, + 'desc' => "已预约 $show_date 报告解读", + 'tip' => '', + 'more' => 0 + ]; + break; + case '199': + case '201': + $check_report_status = 1; + $time_line[] = [ + 'time' => '', + 'name' => '报告解读', + 'status' => -1, + 'desc' => "可以预约报告解读", + 'tip' => '', + 'more' => 0 + ]; + break; + case '202': + $check_report_status = 0; + $time_line[] = [ + 'time' => '', + 'name' => '报告解读', + 'status' => 1, + 'desc' => "已完成报告解读", + 'tip' => '', + 'more' => 0 + ]; + break; + } + } } } else { - $show_date = explode('年', $check_report_status)[1]; + $check_report_time_show = date('m月d日', $check_report_time); $time_line[] = [ 'time' => '', 'name' => '报告解读', 'status' => -1, - 'desc' => "已预约 $show_date 报告解读", + 'desc' => "预计 $check_report_time_show 可以预约报告解读", 'tip' => '', 'more' => 0 ]; From e79e15bb296a06f7b1ec0e1e7366d49aff2582d3 Mon Sep 17 00:00:00 2001 From: sa0ChunLuyu Date: Tue, 29 Oct 2024 14:07:30 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=E4=B8=80=E4=B8=8B=20=E6=8A=A5=E5=91=8A=E8=A7=A3=E8=AF=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Laravel/app/Http/Controllers/API/H5/FenzhenController.php | 8 +++++--- h5/pages/user/fenzhen/fenzhen.vue | 7 ++----- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/Laravel/app/Http/Controllers/API/H5/FenzhenController.php b/Laravel/app/Http/Controllers/API/H5/FenzhenController.php index 332a128..78d7656 100644 --- a/Laravel/app/Http/Controllers/API/H5/FenzhenController.php +++ b/Laravel/app/Http/Controllers/API/H5/FenzhenController.php @@ -93,12 +93,14 @@ class FenzhenController extends Controller // 1 时间已到 可以预约 报告解读 // 2 已经预约 报告解读 $check_report_status = -1; + // $now_time = time(); + $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_status = false; // 这里补充 获取 出具报告 时间的逻辑 - if ($report_time < time()) { + if ($report_time < $now_time) { $report_status = true; } if (!$report_status) { @@ -124,7 +126,7 @@ class FenzhenController extends Controller $check_report_status = 0; // $check_report_status = '2024年10月11日'; // 这里补充 获取 报告解读 时间的逻辑 - if ($check_report_time < time()) { + if ($check_report_time < $now_time) { if (!!$info->person_id) { $user_info = DB::table('web_user_person')->where(['id' => $info->person_id])->first(); if (!!$user_info) { @@ -204,7 +206,7 @@ class FenzhenController extends Controller 'code' => $info->appointment_number, ], 'list' => $time_line, - 'report' => $check_report_status + 'report' => $check_report_status, ]); } else { return \Yz::Return(true, "获取成功", [ diff --git a/h5/pages/user/fenzhen/fenzhen.vue b/h5/pages/user/fenzhen/fenzhen.vue index 105f814..1956610 100644 --- a/h5/pages/user/fenzhen/fenzhen.vue +++ b/h5/pages/user/fenzhen/fenzhen.vue @@ -187,11 +187,8 @@ - - - 已预约 {{ fenzhen_list.report }} 报告解读 - - + + 预约解读 From 41047d63e86d4e53bd3dfe6b563a3374565fa618 Mon Sep 17 00:00:00 2001 From: sa0ChunLuyu Date: Tue, 29 Oct 2024 14:09:12 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20debug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Laravel/app/Http/Controllers/API/H5/FenzhenController.php | 1 + 1 file changed, 1 insertion(+) diff --git a/Laravel/app/Http/Controllers/API/H5/FenzhenController.php b/Laravel/app/Http/Controllers/API/H5/FenzhenController.php index 78d7656..1d6a5b1 100644 --- a/Laravel/app/Http/Controllers/API/H5/FenzhenController.php +++ b/Laravel/app/Http/Controllers/API/H5/FenzhenController.php @@ -194,6 +194,7 @@ class FenzhenController extends Controller } } $res['data']['end_time'] = date('H:i', $last_time); + \Yz::debug(['a' => $res['data']]); return \Yz::Return(true, "获取成功", [ 'info' => [ 'name' => $info->name,