zhangyan
/
hainan_2024
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
main
yanzai 1 year ago
parent 5ed2b60163 41047d63e8
commit 02ec2a8ed8
2 changed files with 71 additions and 41 deletions
Show Stats Download Patch File Download Diff File

105
Laravel/app/Http/Controllers/API/H5/FenzhenController.php
Unescape Escape View File

@ -49,13 +49,15 @@ class FenzhenController extends Controller
$time_line = $res['data']['time_line']; $time_line = $res['data']['time_line'];
$clinic_map = []; $clinic_map = [];
foreach ($time_line as $key => $item) { 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'); $last_time = strtotime('2024-10-10 ' . $time_line[count($time_line) - 1]['time'] . ':00');
if (!$res['data']['queue']) { if (!$res['data']['queue']) {
$push_end = false; $push_end = false;
foreach ($clinics as $item) { foreach ($clinics as $item) {
if (!in_array($item['name'], $clinic_map)) { if (!in_array($item['keshi_id'], $clinic_map)) {
$push_end = true; $push_end = true;
$item_count = $item['count']; $item_count = $item['count'];
$in_time = date('H:i', $last_time); $in_time = date('H:i', $last_time);
@ -86,13 +88,19 @@ class FenzhenController extends Controller
]); ]);
} }
} }
// -1 报告未出 不能预约 报告解读 不显示
// 0 时间未到 不能预约 报告解读 不显示
// 1 时间已到 可以预约 报告解读
// 2 已经预约 报告解读
$check_report_status = -1; $check_report_status = -1;
// $now_time = time();
$now_time = strtotime('2024-11-07 00:00:00');
if (!!$res['data']['report']) { if (!!$res['data']['report']) {
$report_time = strtotime($res['data']['report'] . ' 00:00:00') + (60 * 60 * 24 * $report_day); $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; $report_status = false;
// 这里补充 获取 出具报告 时间的逻辑 // 这里补充 获取 出具报告 时间的逻辑
if (strtotime($report_time) < time()) { if ($report_time < $now_time) {
$report_status = true; $report_status = true;
} }
if (!$report_status) { if (!$report_status) {
@ -118,50 +126,75 @@ class FenzhenController extends Controller
$check_report_status = 0; $check_report_status = 0;
// $check_report_status = '2024年10月11日'; // $check_report_status = '2024年10月11日';
// 这里补充 获取 报告解读 时间的逻辑 // 这里补充 获取 报告解读 时间的逻辑
$dnet = new AspNetZhuanController(); if ($check_report_time < $now_time) {
$res = $dnet->GetReportAnalysis([ if (!!$info->person_id) {
"yyrq" => "2024-10-29", $user_info = DB::table('web_user_person')->where(['id' => $info->person_id])->first();
"ghzid" => "b656355aee12452693f53bb8ff916fa3", if (!!$user_info) {
"yyid" => "6", $hospital_map = [
"action" => "1" 'h1' => '6',
]); 'h4' => '2'
\Yz::debug(['a' => $res]); ];
$dnet = new AspNetZhuanController();
$hid = $info->hospital_id;
if (!$check_report_status) { $res = $dnet->GetReportAnalysis([
if ($check_report_time < time()) { "yyrq" => date('Y-m-d', $check_report_time),
$time_line[] = [ "ghzid" => $user_info->ghzid,
'time' => '', "yyid" => $hospital_map["h$hid"],
'name' => '报告解读', "action" => "1"
'status' => -1, ]);
'desc' => "可以预约报告解读", switch ($res['code']) {
'tip' => '', case '200':
'more' => 0 $check_report_status = 2;
]; $show_date = date('m-d', strtotime($res['yyrq']));
} else { $time_line[] = [
$check_report_time_show = date('m月d日', $check_report_time); 'time' => '',
$time_line[] = [ 'name' => '报告解读',
'time' => '', 'status' => -1,
'name' => '报告解读', 'desc' => "已预约 $show_date 报告解读",
'status' => -1, 'tip' => '',
'desc' => "预计 $check_report_time_show 可以预约报告解读", 'more' => 0
'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 { } else {
$show_date = explode('年', $check_report_status)[1]; $check_report_time_show = date('m月d日', $check_report_time);
$time_line[] = [ $time_line[] = [
'time' => '', 'time' => '',
'name' => '报告解读', 'name' => '报告解读',
'status' => -1, 'status' => -1,
'desc' => "已预约 $show_date 报告解读", 'desc' => "预计 $check_report_time_show 可以预约报告解读",
'tip' => '', 'tip' => '',
'more' => 0 'more' => 0
]; ];
} }
} }
$res['data']['end_time'] = date('H:i', $last_time); $res['data']['end_time'] = date('H:i', $last_time);
\Yz::debug(['a' => $res['data']]);
return \Yz::Return(true, "获取成功", [ return \Yz::Return(true, "获取成功", [
'info' => [ 'info' => [
'name' => $info->name, 'name' => $info->name,
@ -174,7 +207,7 @@ class FenzhenController extends Controller
'code' => $info->appointment_number, 'code' => $info->appointment_number,
], ],
'list' => $time_line, 'list' => $time_line,
'report' => $check_report_status 'report' => $check_report_status,
]); ]);
} else { } else {
return \Yz::Return(true, "获取成功", [ return \Yz::Return(true, "获取成功", [

7
h5/pages/user/fenzhen/fenzhen.vue
Unescape Escape View File

@ -187,11 +187,8 @@
</view> </view>
</view> </view>
</view> </view>
<view v-if="fenzhen_list.report !== -1" class="report_wrapper"> <view class="report_wrapper">
<view v-if="fenzhen_list.report !== 0 && fenzhen_list.report !== 1" class="report_tip_wrapper"> <view v-if="fenzhen_list.report === 1" @click="toReport()" class="report_button_wrapper">
已预约 {{ fenzhen_list.report }} 报告解读
</view>
<view v-else-if="fenzhen_list.report === 1" @click="toReport()" class="report_button_wrapper">
预约解读 预约解读
</view> </view>
</view> </view>

Write Preview
Loading…
Cancel
Save