From 18cfc70616a0f46516c398af05398cbd2daf8532 Mon Sep 17 00:00:00 2001 From: yanzai Date: Wed, 6 Aug 2025 21:03:06 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E6=8E=A8=E9=80=81=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E6=90=9C=E7=B4=A2=20=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../API/Admin/YeWu/PingTaiPushController.php | 7 +++++++ el-admin/.env.production | 8 ++++---- el-admin/src/views/MedicalCenter/HealthCheckList.vue | 11 +++++++++-- el-admin/src/views/PingTai/PushList.vue | 6 ++++++ 4 files changed, 26 insertions(+), 6 deletions(-) diff --git a/Laravel/app/Http/Controllers/API/Admin/YeWu/PingTaiPushController.php b/Laravel/app/Http/Controllers/API/Admin/YeWu/PingTaiPushController.php index 937e2b6..2822e1a 100644 --- a/Laravel/app/Http/Controllers/API/Admin/YeWu/PingTaiPushController.php +++ b/Laravel/app/Http/Controllers/API/Admin/YeWu/PingTaiPushController.php @@ -24,6 +24,13 @@ class PingTaiPushController extends Controller if (isset($searchInfo['dateRange']) && count($searchInfo['dateRange'])==2) { $list = $list->whereBetween('created_at', $searchInfo['dateRange']); } + if (isset($searchInfo['userinfo']) && !empty($searchInfo['userinfo'])) { + $list = $list->where(function($query) use ($searchInfo) { + $query->where('name', 'like', '%' . $searchInfo['userinfo'] . '%') + ->orWhere('tel', '=', $searchInfo['userinfo']) + ->orWhere('identifierValue', '=', $searchInfo['userinfo']); + }); + } if (isset($searchInfo['orgname'])) { $list = $list->where('hospitalName', 'like', '%' . $searchInfo['orgname'] . '%'); diff --git a/el-admin/.env.production b/el-admin/.env.production index 2205e17..3e024d3 100644 --- a/el-admin/.env.production +++ b/el-admin/.env.production @@ -1,6 +1,6 @@ ENV = 'production' -VITE_APP_API = 'http://192.168.50.123:33583/common/la/public/api/' -VITE_APP_FILE = 'http://192.168.50.123:33583/common/la/public' +VITE_APP_API_66666666 = 'http://192.168.50.123:33583/common/la/public/api/' +VITE_APP_FILE_66666666 = 'http://192.168.50.123:33583/common/la/public' -VITE_APP_API_66666666 = 'http://172.31.68.39:33583/common/la/public/api/' -VITE_APP_FILE_66666666 = 'http://172.31.68.39:33583/common/la/public' \ No newline at end of file +VITE_APP_API = 'http://172.31.68.39:33583/common/la/public/api/' +VITE_APP_FILE = 'http://172.31.68.39:33583/common/la/public' \ No newline at end of file diff --git a/el-admin/src/views/MedicalCenter/HealthCheckList.vue b/el-admin/src/views/MedicalCenter/HealthCheckList.vue index 4506807..8dd943b 100644 --- a/el-admin/src/views/MedicalCenter/HealthCheckList.vue +++ b/el-admin/src/views/MedicalCenter/HealthCheckList.vue @@ -45,6 +45,13 @@ 暂无报告 +
{ // 修改每页数量 pageSize.value = e - GetUserList() + GetList() } const PageCurrentChange = (e) => { //切换页码 currentPage.value = e - GetUserList() + GetList() } //获取列表 diff --git a/el-admin/src/views/PingTai/PushList.vue b/el-admin/src/views/PingTai/PushList.vue index 0ab1ed6..ce1eecf 100644 --- a/el-admin/src/views/PingTai/PushList.vue +++ b/el-admin/src/views/PingTai/PushList.vue @@ -9,6 +9,12 @@ :value="item.hospitalCode" /> + + 体检人 +
+ +
+ 时间段