From a2d36432c2aaffaa7f6f04f19ff19e0ecd24f289 Mon Sep 17 00:00:00 2001 From: yanzai Date: Fri, 13 Sep 2024 17:35:56 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=A4=E6=96=AD48=E5=B0=8F=E6=97=B6=E5=86=85?= =?UTF-8?q?=E4=B8=8D=E8=83=BD=E6=9F=A5=E7=9C=8B=E6=8A=A5=E5=91=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Http/Controllers/ReportController.php | 42 +++++++++++++++++++---- config/code.php | 1 + 北京国康小程序/api/api.js | 2 +- 北京国康小程序/api/index.js | 2 +- 北京国康报告对比/api/api.js | 2 +- 北京国康报告对比/api/index.js | 2 +- 6 files changed, 40 insertions(+), 11 deletions(-) diff --git a/app/Http/Controllers/ReportController.php b/app/Http/Controllers/ReportController.php index 4ddfa1a..778ea20 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; @@ -137,7 +138,17 @@ class ReportController extends Controller $data_arr = []; $res_done_arr = []; foreach ($res as $re) { - if ($re['体检状态'] == '报告已出') { + + $givenTime = $re['报告日期']; + $now = new DateTime(); + $givenDateTime = new DateTime($givenTime); + $interval = $now->diff($givenDateTime); + // 判断是否超过48小时 + $isMoreThan48HoursAgo = ($interval->days * 24 * 3600 + $interval->h * 3600 + $interval->i * 60 + $interval->s) > 48 * 3600; + + + + if ($re['体检状态'] == '报告已出' and $isMoreThan48HoursAgo) { $res_done_arr[] = $re; } } @@ -600,12 +611,29 @@ class ReportController extends Controller ])['data']; $list = []; foreach ($res as $item) { - $list[] = [ - 'id' => $item['体检号'], - 'title' => explode('T', $item['登记时间'])[0] . ' 体检报告', - 'desc' => $hospital->name, - ]; + + + $givenTime = $item['报告日期']; + $now = new DateTime(); + $givenDateTime = new DateTime($givenTime); + $interval = $now->diff($givenDateTime); + // 判断是否超过48小时 + $isMoreThan48HoursAgo = ($interval->days * 24 * 3600 + $interval->h * 3600 + $interval->i * 60 + $interval->s) > 48 * 3600; + + if($isMoreThan48HoursAgo){ + $list[] = [ + 'id' => $item['体检号'], + 'title' => explode('T', $item['登记时间'])[0] . ' 体检报告', + 'desc' => $hospital->name, + ]; + } + + } + if(count($list)>0){ + return Yo::echo(['list' => $list]); + }else{ + Yo::error_echo(200098); } - return Yo::echo(['list' => $list]); + } } diff --git a/config/code.php b/config/code.php index b3e5c7c..9cf5c79 100644 --- a/config/code.php +++ b/config/code.php @@ -147,4 +147,5 @@ return [ 200095 => '验证码无效', 200096 => '短信发送失败', 200097 => '请选择生日', + 200098 => '暂无报告', ]; diff --git a/北京国康小程序/api/api.js b/北京国康小程序/api/api.js index 7c9478c..84970f8 100644 --- a/北京国康小程序/api/api.js +++ b/北京国康小程序/api/api.js @@ -2,7 +2,7 @@ let url_ = "https://bjgk-api.sixinyun.com"; let report_url_ = "https://bjgk-api.sixinyun.com"; //let report_url_ = "http://192.168.31.106:5173"; let h5_url_ = "https://bjgk-api.sixinyun.com"; -const dev =0; +const dev =1; if (dev === 1) { url_ = "http://beijingguokang"; report_url_ = "http://192.168.31.106:5173"; diff --git a/北京国康小程序/api/index.js b/北京国康小程序/api/index.js index 6b76c97..ec3b0b0 100644 --- a/北京国康小程序/api/index.js +++ b/北京国康小程序/api/index.js @@ -4,7 +4,7 @@ import { import $api from './api.js' let url_ = "https://bjgk-api.sixinyun.com"; let chat_url = "https://bjgk-api.sixinyun.com" -const dev = 0 +const dev = 1 if (dev === 1) { url_ = "http://beijingguokang" chat_url = "http://192.168.31.106:5173" diff --git a/北京国康报告对比/api/api.js b/北京国康报告对比/api/api.js index b91e174..504f98b 100644 --- a/北京国康报告对比/api/api.js +++ b/北京国康报告对比/api/api.js @@ -1,7 +1,7 @@ let url_ = "https://bjgk-api.sixinyun.com"; const dev =1 if (dev === 1) { - url_ = "http://localhostlanketijian" + url_ = "http://beijingguokang" } let url_array = {}; url_array['ReportDown'] = `${url_}/api/Mp/Down/pdf`; diff --git a/北京国康报告对比/api/index.js b/北京国康报告对比/api/index.js index 7f8ef41..9194f05 100644 --- a/北京国康报告对比/api/index.js +++ b/北京国康报告对比/api/index.js @@ -4,7 +4,7 @@ import { let url_ = "https://bjgk-api.sixinyun.com"; const dev = 1 if (dev === 1) { - url_ = "http://localhostlanketijian" + url_ = "http://beijingguokang" } export const HospitalExtraReportStatusAction = async (data) => await $post({ url: 'HospitalExtraReportStatus',