From f48e493f82830d128275c5b15d41794278187380 Mon Sep 17 00:00:00 2001 From: yanzai Date: Mon, 18 Aug 2025 21:59:35 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=97=A5=E6=9C=9F=E9=80=89?= =?UTF-8?q?=E6=8B=A9=EF=BC=8C=E8=BF=87=E6=BB=A4=E6=9C=AA=E5=87=BA=E6=8A=A5?= =?UTF-8?q?=E5=91=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Http/Controllers/ReportController.php | 10 +++ .../pages/main/list/list.vue | 71 ++++++++++++++++--- 2 files changed, 73 insertions(+), 8 deletions(-) diff --git a/app/Http/Controllers/ReportController.php b/app/Http/Controllers/ReportController.php index 744d84b..a5ea639 100644 --- a/app/Http/Controllers/ReportController.php +++ b/app/Http/Controllers/ReportController.php @@ -4,6 +4,7 @@ namespace App\Http\Controllers; use App\Models\AnalysisType; use App\Models\Hospital; +use DateTime; use Illuminate\Http\Request; use Illuminate\Support\Facades\Storage; use Yo; @@ -593,6 +594,13 @@ class ReportController extends Controller public function list(Request $request) { $id_number = $request->post('id_number'); + $daterange = $request->post('daterange'); + if(!isset($daterange) or count($daterange)!==2 or empty($daterange)){ + $today = new DateTime(); + $oneYearAgo = new DateTime(); + $oneYearAgo->modify('-1 year'); + $daterange=[$oneYearAgo->format('Y-m-d'),$today->format('Y-m-d')]; + } $hospital = Hospital::where('id', $request->post('hospital'))->where('del', 2)->first(); if (!$hospital) Yo::error_echo(100000, ['机构/医院']); $peis = new PEISApiController(); @@ -603,6 +611,8 @@ class ReportController extends Controller ])['data']; $list = []; foreach ($res as $item) { + if ($item['登记时间'] < $daterange[0] . ' 00:00:00' || $item['登记时间'] > $daterange[1] . ' 23:59:59') continue; + if($item['体检状态'] != '报告已出') continue; $list[] = [ 'id' => $item['体检号'], 'title' => explode('T', $item['登记时间'])[0] . ' 体检报告', diff --git a/高埗医院体检平台报告对比/pages/main/list/list.vue b/高埗医院体检平台报告对比/pages/main/list/list.vue index 1ad0596..68ab1c9 100644 --- a/高埗医院体检平台报告对比/pages/main/list/list.vue +++ b/高埗医院体检平台报告对比/pages/main/list/list.vue @@ -18,7 +18,7 @@ onShow } from '@dcloudio/uni-app' import Empty from '../../../components/Empty.vue'; - let tishi=ref('') + let tishi = ref('') const $props = defineProps({ id_number: { type: String, @@ -29,18 +29,21 @@ default: '' }, }); + let date_start = ref(''); + let date_end = ref('') const ReportList = async () => { uni.showLoading({ title: '加载中' }); const response = await ReportListAction({ - id_number: $props.id_number + id_number: $props.id_number, + daterange:[date_start.value,date_end.value] }) uni.hideLoading(); $response(response, () => { report_list.value = response.data.list - if(report_list.value.length===0){ - tishi.value='暂无报告' + if (report_list.value.length === 0) { + tishi.value = '暂无报告' } }) } @@ -64,10 +67,38 @@ report_status.value = response.data.info.open === 1 }) } - + const StartDateChange = (e) => { + date_start.value = e.detail.value + ReportList() + } + const EndDateChange = (e) => { + date_end.value = e.detail.value + ReportList() + } + const formatDate=(date)=> { + const year = date.getFullYear(); + const month = (date.getMonth() + 1).toString().padStart(2, '0'); + const day = date.getDate().toString().padStart(2, '0'); + return `${year}-${month}-${day}`; + } onMounted(() => { + const currentDate = new Date(); + const oneYearAgo = new Date(); + oneYearAgo.setFullYear(currentDate.getFullYear() - 1); + + const formatDateString = (date) => { + const year = date.getFullYear(); + const month = String(date.getMonth() + 1).padStart(2, "0"); + const day = String(date.getDate()).padStart(2, "0"); + return `${year}-${month}-${day}`; + }; + date_start.value=formatDateString(oneYearAgo) + date_end.value=formatDateString(currentDate) ReportList() HospitalExtraReportStatus() + + + })