diff --git a/Laravel/app/Http/Controllers/API/mH5/PersonController.php b/Laravel/app/Http/Controllers/API/mH5/PersonController.php index e9e409e..62badad 100644 --- a/Laravel/app/Http/Controllers/API/mH5/PersonController.php +++ b/Laravel/app/Http/Controllers/API/mH5/PersonController.php @@ -106,7 +106,14 @@ class PersonController extends Controller return \Yz::echoError1('调用HSM解密失败'); } $get_info['tj_num'] = $HSM['data']; - $info=$info->where(['id'=>$get_info['tj_num']]); + if(isset($get_info['jigou_code'])){ //如果有体检机构 则根据体检机构和体检号进行查询，否则根据id查询 + $org=DB::table('medical_institution')->where(['sn'=>$get_info['jigou_code']])->first(); + if(!$org) return \Yz::echoError1('体检机构不存在'); + $info=$info->where(['tijian_num'=>$get_info['tj_num'],'institution_id'=>$org->id]); + }else{ + $info=$info->where(['id'=>$get_info['tj_num']]); + } + }else{ if(!isset($get_info['sfz'])) return \Yz::echoError1('身份证不能为空'); if(!isset($get_info['tel'])) return \Yz::echoError1('电话不能为空'); diff --git a/mH5/src/router/index.js b/mH5/src/router/index.js index 66b9617..d790141 100644 --- a/mH5/src/router/index.js +++ b/mH5/src/router/index.js @@ -72,6 +72,10 @@ const router = createRouter({ path: '/myappointment', name: 'MyAppointment', component: () => import('../views/MyAppointment.vue') + },{ + path: '/selectchecktype', + name: 'SelectCheckType', + component: () => import('../views/SelectCheckType.vue') }] }) diff --git a/mH5/src/views/AppLogin.vue b/mH5/src/views/AppLogin.vue index 4d6deb3..463c71e 100644 --- a/mH5/src/views/AppLogin.vue +++ b/mH5/src/views/AppLogin.vue @@ -16,7 +16,7 @@
65岁以上老年人
老年人体检预约
-
+
健康体检
健康体检预约
@@ -143,6 +143,20 @@ showToast('年龄校验失败'); } }) + }else { + showToast('查询用户信息出错！'); + } + } + const gotoJianKang=()=>{ + if (JianKangTiJianEnable.value != 1) { + showToast('暂未开放健康体检预约'); + return false; + } + if (sessionStorage.getItem('sfz')) { + sessionStorage.setItem('yuyueType','jiankangzheng_mf') + router.push('/selectchecktype') + } else { + showToast('查询用户信息出错！'); } } const gotoReport = (type) => { @@ -260,6 +274,7 @@ }) } onMounted(() => { + sessionStorage.setItem('is_zifei', '0'); openid = route.query.userId sessionStorage.setItem('openid', openid); AppGetUserinfoAction() diff --git a/mH5/src/views/PersonReportLogin.vue b/mH5/src/views/PersonReportLogin.vue index 4ea0ce3..42ce582 100644 --- a/mH5/src/views/PersonReportLogin.vue +++ b/mH5/src/views/PersonReportLogin.vue @@ -41,10 +41,11 @@ tel:'' }) let buttonText=ref('开始预约') - const SearchInfo=(tijian_num=null)=>{ + const SearchInfo=(tijian_num=null,jigou_code=null)=>{ if(tijian_num !=null && tijian_num!=undefined){ info.value={ - tj_num:tijian_num + tj_num:tijian_num, + jigou_code:jigou_code } }else{ if(info.value.sfz=='' || info.value.tel==''){ @@ -71,10 +72,12 @@ } let tijian_num=ref(''); let logintype=ref(''); + let jigou_code=ref(''); onMounted(() => { tijian_num.value =route.query.tj_num logintype.value =route.query.lg_type + jigou_code.value=route.query.c sessionStorage.setItem('loginType', logintype.value); sessionStorage.setItem('tijian_num', tijian_num.value); @@ -82,7 +85,7 @@ console.log(logintype.value) if(sloginType=='ewm'){ //如果是扫码过来的 if(tijian_num.value != undefined){ - SearchInfo(tijian_num.value) + SearchInfo(tijian_num.value,jigou_code.value) }else{ showToast('参数缺失'); } diff --git a/mH5/src/views/SelectCheckType.vue b/mH5/src/views/SelectCheckType.vue new file mode 100644 index 0000000..177b1c8 --- /dev/null +++ b/mH5/src/views/SelectCheckType.vue @@ -0,0 +1,127 @@ + + + + + \ No newline at end of file diff --git a/mH5/src/views/SelectDate.vue b/mH5/src/views/SelectDate.vue index ef1a8da..c2a2389 100644 --- a/mH5/src/views/SelectDate.vue +++ b/mH5/src/views/SelectDate.vue @@ -136,7 +136,7 @@ // console.log(pinia.yuyue_info) let subinfo = pinia.yuyue_info subinfo.calendar_id = calendar_id.value - + subinfo.is_zifei=sessionStorage.getItem('is_zifei'); StartYuYue({ subinfo: subinfo }).then(res => { diff --git a/mH5/src/views/SelectOrganization.vue b/mH5/src/views/SelectOrganization.vue index 89ebd9c..0f59fb0 100644 --- a/mH5/src/views/SelectOrganization.vue +++ b/mH5/src/views/SelectOrganization.vue @@ -19,7 +19,10 @@
{{item.org_name}} - +
+ +
+
@@ -185,7 +188,7 @@ display: flex; align-items: center; justify-content: flex-end; - padding-right: 40px; + padding-right: 20px; font-size: 16px; font-weight: 700; color: #414141; diff --git a/mH5/src/views/UploadFiles.vue b/mH5/src/views/UploadFiles.vue index 630d08f..b93f288 100644 --- a/mH5/src/views/UploadFiles.vue +++ b/mH5/src/views/UploadFiles.vue @@ -137,17 +137,19 @@ //遍历整体信息提取上传的图片 数组 let t_filelist = [] let check_status = true - needinfo.value.fileList.forEach((v, k) => { - t_filelist.push([]) - if (v.fileurl.length == 0) { - showToast('第' + (k + 1) + '项,不能为空'); - check_status = false - } - v.fileurl.forEach((v1, k1) => { - t_filelist[k].push(v1.upurl) + if(import.meta.env.MODE=='production'){ + needinfo.value.fileList.forEach((v, k) => { + t_filelist.push([]) + if (v.fileurl.length == 0) { + showToast('第' + (k + 1) + '项,不能为空'); + check_status = false + } + v.fileurl.forEach((v1, k1) => { + t_filelist[k].push(v1.upurl) + }) }) - }) - + } + let info = pinia.yuyue_info info.upfileList = t_filelist pinia.ChangeYuYueInfo(info)