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 @@ 暂无报告 +