diff --git a/app/Http/Controllers/ReportController.php b/app/Http/Controllers/ReportController.php
index 9866967..0bd4478 100644
--- a/app/Http/Controllers/ReportController.php
+++ b/app/Http/Controllers/ReportController.php
@@ -634,10 +634,12 @@ class ReportController extends Controller
$res = $peis::Post('体检报告查询', $hospital->id, [
"电话号码" => "",
"证件号码" => $id_number,
- "体检号" => ''
+ "体检号" => '',
+ "包含内部信息"=>true
])['data'];
$list = [];
foreach ($res as $item) {
+ if($item['体检状态']=='隐藏显示') continue;
$list[] = [
'id' => $item['体检号'],
'title' => explode('T', $item['登记时间'])[0] . ' 体检报告',
diff --git a/app/Http/Controllers/UserPersonController.php b/app/Http/Controllers/UserPersonController.php
index 12af81e..2efeeab 100644
--- a/app/Http/Controllers/UserPersonController.php
+++ b/app/Http/Controllers/UserPersonController.php
@@ -40,6 +40,33 @@ class UserPersonController extends Controller
$relationship = $request->post('relationship');
$marriage = $request->post('marriage');
$default = $request->post('default');
+ $hospital = $request->post('hospital');
+
+ $peis = new PEISApiController();
+ $res = $peis::Post('体检报告查询', $hospital, [
+ "电话号码" => "",
+ "证件号码" => $id_number,
+ "体检号" => "",
+ "包含内部信息"=>true
+ ]);
+ if(isset($res['data']) and count($res['data'])>0){
+ if($res['data'][0]['电话号码']<>$phone){
+ Yo::error_echo(200099);
+ }
+ }else{
+ //获取三方报告
+ $sanfang_res = $peis::Post('三方体检报告查询', $hospital, [
+ "电话号码" => "",
+ "证件号码" => $id_number,
+ "报告Id" => ''
+ ])['data'];
+ if(count($sanfang_res)==0){
+ Yo::error_echo(200098);
+ }
+
+ }
+
+
$user_person_default_count = UserPerson::where('user', Login::$info->id)
->where('del', 2)->where('default', 1)->count();
if ($user_person_default_count == 0) $default = 1;
diff --git a/config/code.php b/config/code.php
index e62a219..147ff1d 100644
--- a/config/code.php
+++ b/config/code.php
@@ -144,4 +144,6 @@ return [
200095 => '验证码无效',
200096 => '短信发送失败',
200097 => '请选择生日',
+ 200098 => '该用户暂无体检信息,请稍后再试',
+ 200099 => '请输入体检时预留的手机号',
];
diff --git a/衡水博爱健康医院医院小程序/api/api.js b/衡水博爱健康医院医院小程序/api/api.js
index 028d756..011f632 100644
--- a/衡水博爱健康医院医院小程序/api/api.js
+++ b/衡水博爱健康医院医院小程序/api/api.js
@@ -3,7 +3,7 @@ let report_url_ = "https://hssbajkyy.sixinyun.com";
let h5_url_ = "https://hssbajkyy.sixinyun.com";
const dev = 0;
if (dev === 1) {
- url_ = "http://sixintijian";
+ url_ = "http://hengshuiboai";
report_url_ = "http://192.168.31.106:5173";
h5_url_ = "http://192.168.31.106:5173";
}
diff --git a/衡水博爱健康医院医院小程序/api/index.js b/衡水博爱健康医院医院小程序/api/index.js
index cbdd45d..2f123b5 100644
--- a/衡水博爱健康医院医院小程序/api/index.js
+++ b/衡水博爱健康医院医院小程序/api/index.js
@@ -6,7 +6,7 @@ let url_ = "https://hssbajkyy.sixinyun.com";
let chat_url = "https://hssbajkyy.sixinyun.com"
const dev =0
if (dev === 1) {
- url_ = "http://sixintijian"
+ url_ = "http://hengshuiboai"
chat_url = "http://192.168.31.106:5173"
}
export const ReportUrl = (data) => {
diff --git a/衡水博爱健康医院医院小程序/pages/user/edit/edit.vue b/衡水博爱健康医院医院小程序/pages/user/edit/edit.vue
index bb371ca..d3e52c8 100644
--- a/衡水博爱健康医院医院小程序/pages/user/edit/edit.vue
+++ b/衡水博爱健康医院医院小程序/pages/user/edit/edit.vue
@@ -27,7 +27,7 @@
default: '0'
}
});
- onShow(() => {
+ onShow(() => {
UserPersonCount()
UserPersonInfo()
setTitle()
@@ -227,6 +227,7 @@ const sendSmsFunc = async () => {
})
}
const saveClick = async () => {
+ user_person_info.value.hospital= uni.getStorageSync('HOSPITAL_ID')
if(tongyi.value!='tongyi'){
uni.showToast({
title: "请阅读并同意用户协议",
@@ -362,6 +363,7 @@ const sendSmsFunc = async () => {
《隐私协议》
+ 提示:请录入检查时留存的手机号
保存
@@ -375,6 +377,12 @@ const sendSmsFunc = async () => {
}