diff --git a/app/Http/Controllers/ReportController.php b/app/Http/Controllers/ReportController.php index 4ddfa1a..855cf30 100644 --- a/app/Http/Controllers/ReportController.php +++ b/app/Http/Controllers/ReportController.php @@ -529,6 +529,12 @@ class ReportController extends Controller { $id = $request->post('id'); $res = self::get_report($id); + +// return Yo::echo([ +// 'message' => "res", +// 'code' => 2001, +// 'data' => $res +// ]); $conclusion = [ 'datetime' => '', 'doctor' => '', @@ -545,13 +551,10 @@ class ReportController extends Controller ]; if (count($res) != 0) { + if($res[0]['体检状态'] != '报告已出') Yo::error_echo(200090); $info = self::orderReport($res[0]); -// Yo::error_exit([ -// 'message' => "res", -// 'code' => 2001, -// 'data' => $res -// ]); + $list['info']['id'] = $info['体检号']; $list['info']['password'] = $info['查询密码']; diff --git a/config/code.php b/config/code.php index 83d8895..31f6fd9 100644 --- a/config/code.php +++ b/config/code.php @@ -137,4 +137,6 @@ return [ 200087 => '请输入分账名称', 200088 => '分账名称长度在1-50位字符之间', 200089 => '分账类型不支持追回', + + 200090 => '报告未出', ]; diff --git a/思信体检小程序/api/api.js b/思信体检小程序/api/api.js index 125efdb..769740e 100644 --- a/思信体检小程序/api/api.js +++ b/思信体检小程序/api/api.js @@ -1,7 +1,7 @@ let url_ = "https://health.sixinyun.com"; let report_url_ = "https://health.sixinyun.com"; let h5_url_ = "https://health.sixinyun.com"; -const dev = 0; +const dev = 1; if (dev === 1) { url_ = "http://sixintijian"; report_url_ = "http://192.168.31.106:5173"; diff --git a/思信体检小程序/api/index.js b/思信体检小程序/api/index.js index 9babcd7..05ebead 100644 --- a/思信体检小程序/api/index.js +++ b/思信体检小程序/api/index.js @@ -5,7 +5,7 @@ import $api from './api.js' let url_ = "https://health.sixinyun.com"; let chat_url = "https://service-platform.sixinyun.com" let service_platform_appid="qhd130302000100" //岚科服务平台唯一appid -const dev =0 +const dev =1 if (dev === 1) { url_ = "http://sixintijian" chat_url = "http://192.168.31.106:5173" diff --git a/思信体检平台报告对比/api/api.js b/思信体检平台报告对比/api/api.js index 213a09e..b15ea28 100644 --- a/思信体检平台报告对比/api/api.js +++ b/思信体检平台报告对比/api/api.js @@ -1,7 +1,7 @@ -let url_ = "https://health.cjy.net.cn"; +let url_ = "https://health.sixinyun.com"; const dev = 0 if (dev === 1) { - url_ = "http://192.168.31.106:8000" + url_ = "http://sixintijian" } let url_array = {}; url_array['ReportDown'] = `${url_}/api/Mp/Down/pdf`; diff --git a/思信体检平台报告对比/api/index.js b/思信体检平台报告对比/api/index.js index daafef3..9563fbf 100644 --- a/思信体检平台报告对比/api/index.js +++ b/思信体检平台报告对比/api/index.js @@ -1,10 +1,10 @@ import { $post } from '@/lu/axios.js' -let url_ = "https://health.cjy.net.cn"; +let url_ = "https://health.sixinyun.com"; const dev = 0 if (dev === 1) { - url_ = "http://192.168.31.106:8000" + url_ = "http://sixintijian" } export const HospitalExtraReportStatusAction = async (data) => await $post({ url: 'HospitalExtraReportStatus', diff --git a/思信体检平台报告对比/pages/main/list/list.vue b/思信体检平台报告对比/pages/main/list/list.vue index 4affe30..12304c5 100644 --- a/思信体检平台报告对比/pages/main/list/list.vue +++ b/思信体检平台报告对比/pages/main/list/list.vue @@ -28,9 +28,13 @@ }, }); const ReportList = async () => { + uni.showLoading({ + title: '加载中' + }); const response = await ReportListAction({ id_number: $props.id_number }) + uni.hideLoading(); $response(response, () => { report_list.value = response.data.list }) diff --git a/思信体检平台报告对比/pages/main/report/report.vue b/思信体检平台报告对比/pages/main/report/report.vue index e40df36..b2dfe9b 100644 --- a/思信体检平台报告对比/pages/main/report/report.vue +++ b/思信体检平台报告对比/pages/main/report/report.vue @@ -40,9 +40,13 @@ }) } const ReportInfo = async () => { + uni.showLoading({ + title: '加载中' + }); const response = await ReportInfoAction({ id: $props.id }) + uni.hideLoading(); $response(response, () => { report_content.value = { content: response.data.content,