调整二维码查看报告

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('电话不能为空');

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')
 	}]
 })
 

mH5/src/views/AppLogin.vue

@@ -16,7 +16,7 @@
 					<div> 65岁以上老年人</div>
 					<div style="font-size: 12px;color: #277d7b;">老年人体检预约</div>
 				</div>
-				<div class="button_new" style="background-color: #ecb322;" v-if="JianKangTiJianEnable==1">
+				<div class="button_new" style="background-color: #ecb322;" v-if="JianKangTiJianEnable==1" @click="gotoJianKang()">
 					<div>健康体检</div>
 					<div style="font-size: 12px;color: #927220;">健康体检预约</div>
 				</div>
@@ -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()

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('参数缺失');	
 				}

mH5/src/views/SelectCheckType.vue

@@ -0,0 +1,127 @@
+<template>
+	<div class="SelectOrganization">
+		<LoadingD :status="loading"></LoadingD>
+		<div style="display: flex;justify-content: space-between;width: 100%;padding: 8px;">
+			<div></div>
+			<div v-if="username" style="font-size: 16px;font-weight: 700; color: #277d7b;"><van-icon name="manager"
+					size="18" style="margin-right: 4px;" />{{username}}</div>
+		</div>
+		<div>
+			<div class="title">请选择要预约的体检类型</div>
+		</div>
+		<van-radio-group v-model="selectedCheckType">
+			<div v-for=" item in CheckTypeList" class="item" :key="item.id" :class="selectedCheckType==item.id?'active':''"
+				@click="selectedCheckType=item.id">
+				<!-- <div class="logo"><img src="../assets/image/map.png" /></div> -->
+				<div class="name">
+					{{item.name}}
+					<van-radio checked-color="#33cdc9" :name="item.id" style="margin-left: 10px;"></van-radio>
+				</div>
+			</div>
+		</van-radio-group>
+		<van-button v-if="selectedCheckType" type="primary" class="button" round @click="to('jiankangzheng')">立即进入</van-button>
+	</div>
+</template>
+
+<script setup>
+	import {
+		ref,
+		onMounted,
+		watch
+	} from 'vue';
+	import {
+		useRouter
+	} from "vue-router"
+	import {
+		GetOrgEnableList,
+		GetPersonRecode
+	} from "@/api/api.js";
+	import {
+		showToast,
+		showDialog
+	} from 'vant';
+	const router = useRouter();
+	let username = ref('');
+	let loading = ref(false)
+	let selectedCheckType=ref('');
+	let CheckTypeList=ref([]);
+	CheckTypeList.value=[{
+		id:1,
+		name:"健康证体检(自费)"
+	}]
+	const to=(code)=>{
+		if(code=="jiankangzheng"){
+			router.push('/selectOrganization')
+		}
+	}
+	onMounted(()=>{
+		sessionStorage.setItem('is_zifei', 'zifei');
+	})
+</script>
+
+<style scoped>
+	.SelectOrganization {
+		padding: 20px 20px 80px 20px;
+	}
+
+	.title {
+		font-size: 24px;
+		font-weight: 900;
+		color: #4c7aa5
+	}
+	.item {
+		display: flex;
+		border: 1px solid #c7f3f6;
+		border-radius: 10px;
+		height: 70px;
+		background: linear-gradient(to right, #a8f1ef, #fff);
+		margin-top: 20px;
+	}
+	
+	.active {
+		border: 2px solid #33cdc9;
+	}
+	
+	.item .logo {
+		width: 30%;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+	
+	}
+	
+	.item .logo img {
+		height: 70px;
+		position: relative;
+		top: -10px;
+	}
+	
+	.item .name {
+		width: 70%;
+		display: flex;
+		align-items: center;
+		justify-content: flex-end;
+		padding-right: 40px;
+		font-size: 16px;
+		font-weight: 700;
+		color: #414141;
+	}
+	
+	.button {
+		width: calc(100vw - 40px);
+		background-color: #33cdc9;
+		border: 0px;
+		/* position: fixed; */
+		bottom: 20px;
+	
+	
+		margin-top: 50px;
+	}
+	
+	.orginput {
+		border: 1px solid #90d4ec;
+		height: 30px;
+		border-radius: 15px;
+		padding-left: 18px;
+	}
+</style>

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 => {

mH5/src/views/SelectOrganization.vue

@@ -19,7 +19,10 @@
 						<div class="logo"><img src="../assets/image/map.png" /></div>
 						<div class="name">
 							{{item.org_name}}
-							<van-radio checked-color="#33cdc9" :name="item.id" style="margin-left: 10px;"></van-radio>
+							<div>
+								<van-radio checked-color="#33cdc9" :name="item.id" style="margin-left: 10px;"></van-radio>
+							</div>
+							
 						</div>
 					</div>
 				</van-radio-group>
@@ -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;

mH5/src/views/UploadFiles.vue

@@ -137,17 +137,19 @@
 		//遍历整体信息提取上传的图片 数组
 		let t_filelist = []
 		let check_status = true
-		needinfo.value.fileList.forEach((v, k) => {
+		if(import.meta.env.MODE=='production'){
-			t_filelist.push([])
+			needinfo.value.fileList.forEach((v, k) => {
-			if (v.fileurl.length == 0) {
+				t_filelist.push([])
-				showToast('第' + (k + 1) + '项,不能为空');
+				if (v.fileurl.length == 0) {
-				check_status = false
+					showToast('第' + (k + 1) + '项,不能为空');
-			}
+					check_status = false
-			v.fileurl.forEach((v1, k1) => {
+				}
-				t_filelist[k].push(v1.upurl)
+				v.fileurl.forEach((v1, k1) => {
+					t_filelist[k].push(v1.upurl)
+				})
 			})
-		})
+		}
-
+		
 		let info = pinia.yuyue_info
 		info.upfileList = t_filelist
 		pinia.ChangeYuYueInfo(info)