diff --git a/app/Http/Controllers/ReportController.php b/app/Http/Controllers/ReportController.php index 784790d..3af93f1 100644 --- a/app/Http/Controllers/ReportController.php +++ b/app/Http/Controllers/ReportController.php @@ -549,7 +549,7 @@ class ReportController extends Controller ]; if (count($res) != 0) { - if($res[0]['体检状态']!='报告已出') Yo::error_echo(200090); + if($res[0]['体检状态']!='报告已出' and $res[0]['体检状态']!='总检完成') Yo::error_echo(200090); $info = self::orderReport($res[0]); // Yo::error_exit([ // 'message' => "res", @@ -561,11 +561,23 @@ class ReportController extends Controller $list['info']['name'] = $info['姓名']; $list['info']['password'] = $info['查询密码']; $list['list'] = $info['报告文件列表']; + $jielun=$info['总检结论']; + $jianyi=$info['总检建议']; + if(empty($info['总检结论'])){ + foreach ($info['综述建议'] as $item) { + $jielun=$jielun.$item['综述']; + } + } + if(empty($info['总检建议'])){ + foreach ($info['综述建议'] as $item) { + $jianyi=$jianyi.$item['建议']; + } + } $conclusion = [ 'datetime' => str_replace('T', ' ', $info['登记时间']), 'doctor' => $info['总检医生'], - 'content' => $info['总检结论'], - 'suggestion' => $info['总检建议'], + 'content' =>$jielun, + 'suggestion' =>$jianyi, ]; foreach ($info['收费项目列表'] as $item) { $content_list = []; diff --git a/柳江医院体检平台H5/api/api.js b/柳江医院体检平台H5/api/api.js index 8a6ceaf..af60917 100644 --- a/柳江医院体检平台H5/api/api.js +++ b/柳江医院体检平台H5/api/api.js @@ -1,4 +1,4 @@ -let url_ = "https://lnfynew-tj.sixinyun.com"; +let url_ = "https://liujiangyy-tj.sixinyun.com"; const dev = 0 if (dev === 1) { url_ = "http://sixintijian" diff --git a/柳江医院体检平台H5/api/index.js b/柳江医院体检平台H5/api/index.js index 690fe19..e6bb2a4 100644 --- a/柳江医院体检平台H5/api/index.js +++ b/柳江医院体检平台H5/api/index.js @@ -1,7 +1,7 @@ import { $post } from '@/lu/axios.js' -let url_ = "https://lnfynew-tj.sixinyun.com"; +let url_ = "https://liujiangyy-tj.sixinyun.com"; const dev = 0 if (dev === 1) { url_ = "http://sixintijian" diff --git a/柳江医院小程序/api/api.js b/柳江医院小程序/api/api.js index f0c784c..a32be9f 100644 --- a/柳江医院小程序/api/api.js +++ b/柳江医院小程序/api/api.js @@ -1,7 +1,7 @@ -let url_ = "https://lnfynew-tj.sixinyun.com"; -let report_url_ = "https://lnfynew-tj.sixinyun.com"; -let h5_url_ = "https://lnfynew-tj.sixinyun.com"; -const dev = 1; +let url_ = "https://liujiangyy-tj.sixinyun.com"; +let report_url_ = "https://liujiangyy-tj.sixinyun.com"; +let h5_url_ = "https://liujiangyy-tj.sixinyun.com"; +const dev = 0; if (dev === 1) { url_ = "http://liujiang-local"; report_url_ = "http://192.168.31.106:5173"; diff --git a/柳江医院小程序/api/index.js b/柳江医院小程序/api/index.js index d5cc091..1011911 100644 --- a/柳江医院小程序/api/index.js +++ b/柳江医院小程序/api/index.js @@ -2,9 +2,9 @@ import { $post } from '@/lu/axios.js' import $api from './api.js' -let url_ = "https://lnfynew-tj.sixinyun.com"; -let chat_url = "https://lnfynew-tj.sixinyun.com" -const dev =1 +let url_ = "https://liujiangyy-tj.sixinyun.com"; +let chat_url = "https://liujiangyy-tj.sixinyun.com" +const dev =0 if (dev === 1) { url_ = "http://liujiang-local" chat_url = "http://192.168.31.106:5173" diff --git a/柳江医院报告对比/api/api.js b/柳江医院报告对比/api/api.js index d994045..4eeaf0f 100644 --- a/柳江医院报告对比/api/api.js +++ b/柳江医院报告对比/api/api.js @@ -1,4 +1,4 @@ -let url_ = "https://lnfynew-tj.sixinyun.com"; +let url_ = "https://liujiangyy-tj.sixinyun.com"; const dev = 0 if (dev === 1) { url_ = "http://192.168.31.106:8000" diff --git a/柳江医院报告对比/api/index.js b/柳江医院报告对比/api/index.js index c006e18..affc928 100644 --- a/柳江医院报告对比/api/index.js +++ b/柳江医院报告对比/api/index.js @@ -1,7 +1,7 @@ import { $post } from '@/lu/axios.js' -let url_ = "https://lnfynew-tj.sixinyun.com"; +let url_ = "https://liujiangyy-tj.sixinyun.com"; const dev = 0 if (dev === 1) { url_ = "http://192.168.31.106:8000"