From 3771ff155ce30ba04156c9a70f8c2ea78a0181b6 Mon Sep 17 00:00:00 2001 From: sa0ChunLuyu Date: Fri, 8 Nov 2024 23:06:04 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20=E9=97=AE=E5=8D=B7?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=E8=BF=94=E5=9B=9E=20=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E6=80=A7=E5=88=AB=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Http/Controllers/API/H5/QuestionnairesLogsController.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Laravel/app/Http/Controllers/API/H5/QuestionnairesLogsController.php b/Laravel/app/Http/Controllers/API/H5/QuestionnairesLogsController.php index 4fdffee..fe772ba 100644 --- a/Laravel/app/Http/Controllers/API/H5/QuestionnairesLogsController.php +++ b/Laravel/app/Http/Controllers/API/H5/QuestionnairesLogsController.php @@ -88,6 +88,7 @@ class QuestionnairesLogsController extends Controller $person_info = json_decode($log_info->person_info, true); $age = !!$person_info['birthday'] ? date('Y') - date('Y', strtotime($person_info['birthday'])) : 0; + $sex = !!$person_info['sex'] ? $person_info['sex'] : 1; $weight = !!$log_info->weight ? $log_info->weight : 0; $height = !!$log_info->height ? $log_info->height : 0; $items_ids = json_decode($log_info->check_items, true); @@ -109,6 +110,7 @@ class QuestionnairesLogsController extends Controller } return \Yz::Return(true, '操作完成', [ 'date' => date('Y-m-d', strtotime($log_info->created_at)), + 'sex' => $sex, 'age' => $age, 'weight' => $wh, 'items' => $items, From b5ae01cd42786f3e70e06faecb7ac562bc69c443 Mon Sep 17 00:00:00 2001 From: sa0ChunLuyu Date: Fri, 8 Nov 2024 23:12:10 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20=E6=A3=80=E6=9F=A5?= =?UTF-8?q?=E8=AF=84=E4=BC=B0=E6=96=B9=E6=A1=88=20=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E5=8E=9F=E4=BB=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../API/H5/QuestionnairesLogsController.php | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/Laravel/app/Http/Controllers/API/H5/QuestionnairesLogsController.php b/Laravel/app/Http/Controllers/API/H5/QuestionnairesLogsController.php index fe772ba..b138360 100644 --- a/Laravel/app/Http/Controllers/API/H5/QuestionnairesLogsController.php +++ b/Laravel/app/Http/Controllers/API/H5/QuestionnairesLogsController.php @@ -121,6 +121,11 @@ class QuestionnairesLogsController extends Controller 'tuijian' => self::sum_items($items, $check_items_array['tuijian']), 'gaoduan' => self::sum_items($items, $check_items_array['gaoduan']), ], + 'original_price' => [ + 'jichu' => self::sum_items($items, $check_items_array['jichu'], false), + 'tuijian' => self::sum_items($items, $check_items_array['tuijian'], false), + 'gaoduan' => self::sum_items($items, $check_items_array['gaoduan'], false), + ], 'count' => [ 'jichu' => self::item_count($items, $check_items_array['jichu']), 'tuijian' => self::item_count($items, $check_items_array['tuijian']), @@ -156,7 +161,7 @@ class QuestionnairesLogsController extends Controller return $ic; } - public function sum_items($items, $check_items) + public function sum_items($items, $check_items, $zk = true) { if (count($items)) { $sum = DB::table('items')->whereIn('item_id', $items)->where('status', 1)->sum('price'); @@ -174,7 +179,11 @@ class QuestionnairesLogsController extends Controller } else { $combo = 0; } + if (!!$zk) { $zhekou = config('app.globals.Wj_ZheKou'); + } else { + $zhekou = 1; + } return number_format((($combo + $sum + $check_sum) * $zhekou), 2, '.', ''); } public function submit(Request $request) From cfa220a4a93b120de70757d3fcd1c17eeb4e5c76 Mon Sep 17 00:00:00 2001 From: sa0ChunLuyu Date: Fri, 8 Nov 2024 23:47:24 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20=E4=BD=93=E6=A3=80?= =?UTF-8?q?=E5=BC=95=E5=AF=BC=20=E6=8A=A5=E5=91=8A=E8=A7=A3=E8=AF=BB?= =?UTF-8?q?=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/API/H5/FenzhenController.php | 194 +++++++++--------- 1 file changed, 102 insertions(+), 92 deletions(-) diff --git a/Laravel/app/Http/Controllers/API/H5/FenzhenController.php b/Laravel/app/Http/Controllers/API/H5/FenzhenController.php index 472743a..18598a0 100644 --- a/Laravel/app/Http/Controllers/API/H5/FenzhenController.php +++ b/Laravel/app/Http/Controllers/API/H5/FenzhenController.php @@ -73,6 +73,7 @@ class FenzhenController extends Controller "more" => 0, "name" => $item['name'], "status" => 1, + 'count' => -1, "time" => "$in_time", "tip" => "剩余{$item_count}项正在排队中，" ] @@ -88,6 +89,7 @@ class FenzhenController extends Controller "more" => 0, "name" => "体检结束", "status" => -1, + 'count' => -1, "time" => "$in_time", "tip" => "" ] @@ -111,101 +113,109 @@ class FenzhenController extends Controller $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 < $now_time) { - $report_status = true; - } - if (!$report_status) { - $time_line[] = [ - 'time' => '', - 'name' => '出具报告', - 'status' => -1, - 'desc' => "预计 $report_time_show 出具体检报告", - 'tip' => '', - 'more' => 0 - ]; - } else { - $time_line[] = [ - 'time' => '', - 'name' => '出具报告', - 'status' => -1, - 'desc' => "已出具体检报告 $report_time_show", - 'tip' => '', - 'more' => 0 - ]; - } - $check_report_time = $report_time + (60 * 60 * 24); - $check_report_status = 0; - // $check_report_status = '2024年10月11日'; - // 这里补充 获取 报告解读 时间的逻辑 - 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) { - $hospital_map = [ - 'h1' => '6', - 'h4' => '2' - ]; - $dnet = new AspNetZhuanController(); - $hid = $info->hospital_id; - $report_res = $dnet->GetReportAnalysis([ - "yyrq" => date('Y-m-d', $check_report_time), - "ghzid" => $user_info->ghzid, - "yyid" => $hospital_map["h$hid"], - "action" => "1" - ]); - switch ($report_res['code']) { - case '200': - $check_report_status = 2; - $show_date = date('m-d', strtotime($report_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; + if ($report_day !== false) { + $report_status = false; + $report_time = strtotime($res['data']['report'] . ' 00:00:00') + (60 * 60 * 24 * $report_day); + $report_time_show = date('m月d日', $report_time); + // 这里补充 获取 出具报告 时间的逻辑 + if ($report_time < $now_time) { + $report_status = true; + } + if (!$report_status) { + $time_line[] = [ + 'time' => '', + 'name' => '出具报告', + 'status' => -1, + 'count' => -1, + 'desc' => "预计 $report_time_show 出具体检报告", + 'tip' => '', + 'more' => 0 + ]; + } else { + $time_line[] = [ + 'time' => '', + 'name' => '出具报告', + 'status' => -1, + 'count' => -1, + 'desc' => "已出具体检报告 $report_time_show", + 'tip' => '', + 'more' => 0 + ]; + } + $check_report_time = $report_time + (60 * 60 * 24); + $check_report_status = 0; + // $check_report_status = '2024年10月11日'; + // 这里补充 获取 报告解读 时间的逻辑 + 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) { + $hospital_map = [ + 'h1' => '6', + 'h4' => '2' + ]; + $dnet = new AspNetZhuanController(); + $hid = $info->hospital_id; + $report_res = $dnet->GetReportAnalysis([ + "yyrq" => date('Y-m-d', $check_report_time), + "ghzid" => $user_info->ghzid, + "yyid" => $hospital_map["h$hid"], + "action" => "1" + ]); + switch ($report_res['code']) { + case '200': + $check_report_status = 2; + $show_date = date('m-d', strtotime($report_res['yyrq'])); + $time_line[] = [ + 'time' => '', + 'name' => '报告解读', + 'status' => -1, + 'count' => -1, + 'desc' => "已预约 $show_date 报告解读", + 'tip' => '', + 'more' => 0 + ]; + break; + case '199': + case '201': + $check_report_status = 1; + $time_line[] = [ + 'time' => '', + 'name' => '报告解读', + 'status' => -1, + 'count' => -1, + 'desc' => "可以预约报告解读", + 'tip' => '', + 'more' => 0 + ]; + break; + case '202': + $check_report_status = 0; + $time_line[] = [ + 'time' => '', + 'name' => '报告解读', + 'status' => 1, + 'count' => -1, + 'desc' => "已完成报告解读", + 'tip' => '', + 'more' => 0 + ]; + break; + } } } + } else { + $check_report_time_show = date('m月d日', $check_report_time); + $time_line[] = [ + 'time' => '', + 'name' => '报告解读', + 'status' => -1, + 'count' => -1, + 'desc' => "预计 $check_report_time_show 可以预约报告解读", + '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 - ]; } } $res['data']['end_time'] = date('H:i', $last_time); From 56eb41171fa8aab8e7804c7afa30cf48acfb04ac Mon Sep 17 00:00:00 2001 From: sa0ChunLuyu Date: Sat, 9 Nov 2024 00:00:24 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E6=9B=B4=E6=96=B0=201.=E6=A3=80=E5=89=8D?= =?UTF-8?q?=E8=AF=84=E4=BC=B0=20=E6=AD=A3=E5=9C=A8=E7=AD=94=E9=A2=98?= =?UTF-8?q?=E4=B8=AD=EF=BC=8C=E5=A6=82=E6=9E=9C=E7=9C=8B=E4=BA=86=E5=88=AB?= =?UTF-8?q?=E7=9A=84=E6=B6=88=E6=81=AF=E6=8F=90=E9=86=92=20=E7=AD=94?= =?UTF-8?q?=E9=A2=98=E5=B0=B1=E9=87=8D=E6=96=B0=E5=BC=80=E5=A7=8B=E4=BA=86?= =?UTF-8?q?=EF=BC=88=E5=81=A5=E5=BA=B7=E9=97=AE=E5=8D=B7=E4=B9=9F=E4=B8=80?= =?UTF-8?q?=E6=A0=B7=EF=BC=89=202.=E6=A3=80=E5=89=8D=E8=AF=84=E4=BC=B0=20?= =?UTF-8?q?=E7=AD=94=E9=A2=98=E5=AE=8C=E6=88=90=E5=90=8E=EF=BC=8C=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E6=98=BE=E7=A4=BA=E7=9A=84=E5=A4=B4=E5=83=8F=E9=83=BD?= =?UTF-8?q?=E6=98=AF=E5=A5=B3=E6=80=A7=EF=BC=88=E6=98=AF=E5=90=A6=E4=BC=9A?= =?UTF-8?q?=E5=8C=BA=E5=88=86=E6=80=A7=E5=88=AB=EF=BC=89=203.=E6=A3=80?= =?UTF-8?q?=E5=89=8D=E8=AF=84=E4=BC=B0=20=E9=80=89=E6=8B=A9=E6=8E=A8?= =?UTF-8?q?=E8=8D=90=E6=96=B9=E6=A1=88=E5=90=8E=EF=BC=8C=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E7=9A=84=E4=BB=B7=E6=A0=BC=EF=BC=8C=E5=8E=9F=E4=BB=B7=E5=92=8C?= =?UTF-8?q?=E6=8A=98=E6=89=A3=E4=BB=B7=EF=BC=88=E7=8E=B0=E5=9C=A8=E6=98=AF?= =?UTF-8?q?=E6=8A=98=E6=89=A3=E4=BB=B7=EF=BC=8C=E5=8A=A0=E4=B8=AA=E5=8E=9F?= =?UTF-8?q?=E4=BB=B7=EF=BC=89=2015.=E5=BC=83=E6=A3=80=E7=AD=BE=E5=AD=97?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=EF=BC=8C=E7=AA=97=E4=BD=93=E5=9B=BA=E5=AE=9A?= =?UTF-8?q?=EF=BC=8C=E7=AD=BE=E5=AD=97=E6=97=B6=E7=AA=97=E4=BD=93=E4=BC=9A?= =?UTF-8?q?=E4=B8=8A=E4=B8=8B=E6=B4=BB=E5=8A=A8=EF=BC=88=E8=8B=B9=E6=9E=9C?= =?UTF-8?q?=E6=89=8B=E6=9C=BA=EF=BC=89=2017.=E4=BD=93=E6=A3=80=E5=BC=95?= =?UTF-8?q?=E5=AF=BC=E7=95=8C=E9=9D=A2=E7=A7=91=E5=AE=A4=E5=90=8D=E7=A7=B0?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E5=85=A8=2018.=E4=BD=93=E6=A3=80=E5=BC=95?= =?UTF-8?q?=E5=AF=BC=E7=95=8C=E9=9D=A2=20=E5=8A=A0=E4=B8=80=E4=B8=AA?= =?UTF-8?q?=E7=A7=91=E5=AE=A4=E6=9C=89=E5=A4=9A=E5=B0=91=E4=BA=BA=E5=9C=A8?= =?UTF-8?q?=E6=8E=92=E9=98=9F=EF=BC=8C=E8=BF=9B=E5=85=A5=E9=98=9F=E5=88=97?= =?UTF-8?q?=E5=90=8E=EF=BC=8C=E6=98=BE=E7=A4=BA=E6=8E=92=E5=9C=A8=E7=AC=AC?= =?UTF-8?q?=E5=87=A0=E4=BD=8D=2019.=E4=BD=93=E6=A3=80=E5=BC=95=E5=AF=BC?= =?UTF-8?q?=E7=95=8C=E9=9D=A2=EF=BC=8C=E5=81=9A=E4=B8=AA10=E7=A7=92?= =?UTF-8?q?=E5=88=B7=E6=96=B0=E4=B8=80=E6=AC=A1=EF=BC=8C=E5=A6=82=E6=9E=9C?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E6=9C=89=E5=8F=98=E5=8A=A8=EF=BC=8C=E4=B8=8D?= =?UTF-8?q?=E9=9C=80=E8=A6=81=E9=80=80=E5=87=BA=E9=87=8D=E6=96=B0=E8=BF=9B?= =?UTF-8?q?=E5=85=A5=20=E5=B0=B1=E8=83=BD=E5=8F=98=E6=9B=B4=2020.=E4=BD=93?= =?UTF-8?q?=E6=A3=80=E5=BC=95=E5=AF=BC=E7=95=8C=E9=9D=A2=EF=BC=8C=E6=A3=80?= =?UTF-8?q?=E6=9F=A5=E7=BB=93=E6=9D=9F=E5=90=8E=E5=B0=B1=E5=8F=AF=E4=BB=A5?= =?UTF-8?q?=E9=A2=84=E7=BA=A6=E6=8A=A5=E5=91=8A=E8=A7=A3=E8=AF=BB=EF=BC=88?= =?UTF-8?q?=E6=A3=80=E5=90=8E=E7=AD=BE=E5=88=B0=E4=BA=86=E5=B0=B1=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E9=A2=84=E7=BA=A6=E6=8A=A5=E5=91=8A=E8=A7=A3=E8=AF=BB?= =?UTF-8?q?=E6=8C=89=E9=92=AE=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- h5/pages/main/question/done/done.vue | 3 +- h5/pages/main/question/info/info.vue | 31 ++++++++++++++----- h5/pages/main/question/question/question.vue | 31 +++++++++++++++++-- h5/pages/user/fenzhen/fenzhen.vue | 22 +++++++++---- h5/pages/user/fenzhen/qijian.vue | 2 +- h5/static/assets/question/toux_nan.png | Bin 0 -> 41833 bytes 6 files changed, 72 insertions(+), 17 deletions(-) create mode 100644 h5/static/assets/question/toux_nan.png diff --git a/h5/pages/main/question/done/done.vue b/h5/pages/main/question/done/done.vue index 554a994..9782910 100644 --- a/h5/pages/main/question/done/done.vue +++ b/h5/pages/main/question/done/done.vue @@ -99,7 +99,8 @@ - + + - + 预约解读 @@ -277,6 +285,7 @@ line-height: 1; text-decoration-line: underline; margin-right: 19rpx; + flex-shrink: 0; } .time_line_item_text_wrapper { @@ -285,8 +294,7 @@ color: #6e6e6e; line-height: 1; margin-left: 42rpx; - - width: calc(100% - 210rpx); + /* width: calc(100% - 210rpx); */ white-space: nowrap; overflow: hidden; text-overflow: ellipsis; @@ -302,6 +310,7 @@ .time_line_item_box_wrapper { width: 400rpx; + margin-left: 20rpx; height: 40rpx; background: #5a75ca30; border-radius: 5rpx; @@ -314,7 +323,7 @@ } .time_line_item_title_wrapper { - width: 140rpx; + /* width: 140rpx; */ font-weight: bold; font-size: 28rpx; color: #0d0d0d; @@ -324,6 +333,7 @@ white-space: nowrap; overflow: hidden; text-overflow: ellipsis; + flex-shrink: 0; } .time_line_item_flex_wrapper { diff --git a/h5/pages/user/fenzhen/qijian.vue b/h5/pages/user/fenzhen/qijian.vue index d6910b5..569b09f 100644 --- a/h5/pages/user/fenzhen/qijian.vue +++ b/h5/pages/user/fenzhen/qijian.vue @@ -1,5 +1,5 @@