diff --git a/api/pagesC/H5Healthrecord/index.js b/api/pagesC/H5Healthrecord/index.js
index e20795e..1c29c04 100644
--- a/api/pagesC/H5Healthrecord/index.js
+++ b/api/pagesC/H5Healthrecord/index.js
@@ -1,9 +1,9 @@
 import request from "@/api/request.js"
 
 //获取健康档案Key
-export function getHealthKey(cardNo) {
+export function getHealthKey(cardNo, openid) {
 	return request({
-		url: `/applet/signinfo/getHealthKey/${cardNo}`,
+		url: `/applet/signinfo/getHealthKey/${cardNo}/${openid}`,
 		method: 'get',
 		header: {
 			region: uni.getStorageSync('region'),
diff --git a/pages/medicalservice/medicalservice.vue b/pages/medicalservice/medicalservice.vue
index cc447aa..3112e2a 100644
--- a/pages/medicalservice/medicalservice.vue
+++ b/pages/medicalservice/medicalservice.vue
@@ -109,6 +109,11 @@
 										url: `/pagesB/orderlist/orderlist?userinfo=${userinfo}`
 									})
 								}
+							} else {
+								this.$refs.uToast.show({
+									title: res.msg,
+									type: 'error',
+								})
 							}
 						})
 					}
diff --git a/pagesB/Healthindex/Healthindex.vue b/pagesB/Healthindex/Healthindex.vue
index 99bb491..fd42577 100644
--- a/pagesB/Healthindex/Healthindex.vue
+++ b/pagesB/Healthindex/Healthindex.vue
@@ -2,13 +2,13 @@
 	<view class="app">
 		<view class="health" v-if="healthdata">
 			<view class="health_top">
-				<image image v-if="healthdata.hiEva<650" :src="require('../images/red.png')">
-					<image image v-if="healthdata.hiEva>=850" :src="require('../images/green.png')" image>
-						<image v-if="850>healthdata.hiEva >= 650" :src="require('../images/yellow.png')" image>
-							<view class="count">
-								<view class="numbers">{{healthdata.hiEva}}</view>
-								<view class="healths">健康指数</view>
-							</view>
+				<image v-if="healthdata.hiEva<650" :src="require('../images/red.png')" />
+				<image v-else-if="850>healthdata.hiEva >= 650" :src="require('../images/yellow.png')" />
+				<image v-else-if="healthdata.hiEva>=850" :src="require('../images/green.png')" />
+				<view class="count">
+					<view class="numbers">{{healthdata.hiEva}}</view>
+					<view class="healths">健康指数</view>
+				</view>
 			</view>
 			<view class="health_body">
 				<view class="healthitem">
@@ -139,20 +139,16 @@
 					let resbloodsugar = {
 						categories: [],
 						series: [{
-								name: "空腹血糖",
-								data: []
-							},
-
-						]
+							name: "空腹血糖",
+							data: []
+						}, ]
 					}
 					let resBMI = {
 						categories: [],
 						series: [{
-								name: "体质指数",
-								data: []
-							},
-
-						]
+							name: "体质指数",
+							data: []
+						}, ]
 					}
 					let resbloodpressure = {
 						categories: [],
@@ -164,23 +160,32 @@
 								name: "舒张压",
 								data: []
 							},
-
 						]
 					}
 					// bf血脂变化趋势
-					res.series[0].data = this.healthdata.evaAnalysis.bf.series[0].data
-					res.series[1].data = this.healthdata.evaAnalysis.bf.series[1].data
-					res.categories = this.healthdata.evaAnalysis.bf.xValue
+					this.healthdata.evaAnalysis.bf && this.healthdata.evaAnalysis.bf.series.length > 0 ? res
+						.series[0].data = this.healthdata.evaAnalysis.bf.series[0].data : ''
+					this.healthdata.evaAnalysis.bf && this.healthdata.evaAnalysis.bf.series.length > 1 ? res
+						.series[1].data = this.healthdata.evaAnalysis.bf.series[1].data : ''
+					this.healthdata.evaAnalysis.bf.xValue.length > 0 ? res.categories = this.healthdata.evaAnalysis
+						.bf.xValue : ''
 					//bg血糖
-					resbloodsugar.series[0].data = this.healthdata.evaAnalysis.bg.series[0].data
-					resbloodsugar.categories = this.healthdata.evaAnalysis.bg.xValue
+					this.healthdata.evaAnalysis.bg && this.healthdata.evaAnalysis.bg.series.length > 0 ?
+						resbloodsugar.series[0].data = this.healthdata.evaAnalysis.bg.series[0].data : ''
+					this.healthdata.evaAnalysis.bg.xValue.length > 0 ? resbloodsugar.categories = this.healthdata
+						.evaAnalysis.bg.xValue : ''
 					//bmi体脂
-					resBMI.series[0].data = this.healthdata.evaAnalysis.bmi.series[0].data
-					resBMI.categories = this.healthdata.evaAnalysis.bmi.xValue
+					this.healthdata.evaAnalysis.bmi && this.healthdata.evaAnalysis.bmi.series.length > 0 ?
+						resBMI.series[0].data = this.healthdata.evaAnalysis.bmi.series[0].data : ''
+					this.healthdata.evaAnalysis.bmi.xValue.length > 0 ? resBMI.categories = this.healthdata
+						.evaAnalysis.bmi.xValue : ''
 					//bp血压
-					resbloodpressure.series[0].data = this.healthdata.evaAnalysis.bp.series[0].data
-					resbloodpressure.series[1].data = this.healthdata.evaAnalysis.bp.series[1].data
-					resbloodpressure.categories = this.healthdata.evaAnalysis.bp.xValue
+					this.healthdata.evaAnalysis.bp && this.healthdata.evaAnalysis.bp.series.length > 0 ?
+						resbloodpressure.series[0].data = this.healthdata.evaAnalysis.bp.series[0].data : ""
+					this.healthdata.evaAnalysis.bp && this.healthdata.evaAnalysis.bp.series.length > 1 ?
+						resbloodpressure.series[1].data = this.healthdata.evaAnalysis.bp.series[1].data : ""
+					this.healthdata.evaAnalysis.bp.xValue.length > 0 ? resbloodpressure.categories = this
+						.healthdata.evaAnalysis.bp.xValue : ''
 					this.datalist = res
 					this.bloodsugar = resbloodsugar
 					this.BMIdata = resBMI
@@ -202,13 +207,11 @@
 		.health {
 			width: 100%;
 			margin: 0 auto;
+			padding-bottom: 40rpx;
 
-			// background: red;
 			.health_top {
 				width: 100%;
 
-				// height: 100%;
-				// background: #FBDA81;
 				.right {
 					position: relative;
 					font-size: 20rpx;
@@ -218,8 +221,6 @@
 					top: 30rpx;
 					line-height: 30rpx;
 					left: 471rpx;
-					// left: 288rpx;
-
 				}
 
 				image {
@@ -250,13 +251,7 @@
 					text-align: left;
 					padding: 0 0 40rpx 62rpx;
 					font-size: 29rpx;
-
-					// padding-bottom: 40rpx;
-					// position: relative;
-					// left: -53rpx;
-
 				}
-
 			}
 
 			.zx {
@@ -270,7 +265,6 @@
 					margin-left: 30rpx;
 				}
 			}
-
 		}
 	}
 </style>
\ No newline at end of file
diff --git a/pagesB/Precords/Precords.vue b/pagesB/Precords/Precords.vue
index 5becf27..4da8053 100644
--- a/pagesB/Precords/Precords.vue
+++ b/pagesB/Precords/Precords.vue
@@ -1,13 +1,14 @@
 <template>
 	<view class="app">
-		<view class="prescription">
-			<view class="record" @tap="recorddata()">
+		<view class="prescription" v-if="lastrecodedata.ptList">
+			<!-- 	<view class="record" @tap="recorddata()">
 				处方记录
-			</view>
+			</view> -->
 			<view class="recorditem">
 				<u-collapse :item-style="itemStyle" :accordion='false' :arrow="false">
-					<u-collapse-item :title="item.tempName" v-for="(item, index) in lastrecodedata.ptList" :key="index"
-						@change='tapcollapse(item)' :class="item.check?'headcollapse':''">
+					<u-collapse-item :title="item.tempName" :open="item.open"
+						v-for="(item, index) in lastrecodedata.ptList" :key="index" @change='tapcollapse(item)'
+						:class="item.check?'headcollapse':''">
 						<view class="itemtext">
 							<view class="collapse_top" v-for="uitem in item.ptValList">
 								<u-icon name="star-fill" color="#000" size="28"
@@ -17,19 +18,21 @@
 								<span style="margin-left: 10rpx;" v-if="uitem.itemType=='3'">急症处理</span>
 								<view class="itemsdata">
 									<view class="itemword" v-if="uitem.val=='true'">
-										<u-checkbox active-color="#26A888" v-model="checked"> {{uitem.content}}</u-checkbox>
+										<u-checkbox active-color="#26A888" v-model="checked">
+											{{uitem.content}}</u-checkbox>
 									</view>
 									<view class="itemword" v-if="uitem.val==null || uitem.val=='false'">
-										<u-checkbox active-color="#26A888" v-model="checkedfalse">{{uitem.content}}</u-checkbox>
+										<u-checkbox active-color="#26A888"
+											v-model="checkedfalse">{{uitem.content}}</u-checkbox>
 									</view>
 								</view>
 							</view>
-
 						</view>
 					</u-collapse-item>
 				</u-collapse>
 			</view>
 		</view>
+		<u-empty v-else text="暂无"></u-empty>
 		<u-loading :show="show" mode="flower" size="40"></u-loading>
 	</view>
 </template>
@@ -46,22 +49,20 @@
 				lastrecodedata: null,
 				cardNo: '',
 				itemList: [],
-
 			}
 		},
 		mounted() {
 			this.lastrecodelist()
-
 		},
 		methods: {
 			tapcollapse(item) {
 				item.check = !item.check
 			},
 			lastrecodelist() {
-				if (uni.getStorageSync("userinfo").cardNo) {
-					this.cardNo=uni.getStorageSync("userinfo").cardNo
-					// this.cardNo = '370522196411282177'
+				if (uni.getStorageSync("userinfo")) {
+					this.cardNo = uni.getStorageSync("userinfo").cardNo
 					lastrecode(this.cardNo).then(res => {
+						res.data && res.data.ptList.length > 0 ? res.data.ptList[0].open = true : ''
 						this.lastrecodedata = res.data
 						this.show = false
 					})
@@ -72,10 +73,7 @@
 				uni.navigateTo({
 					url: "/pagesB/Prescriptionrecords/Prescriptionrecords"
 				})
-
-
 			},
-
 		}
 	}
 </script>
@@ -85,10 +83,8 @@
 	.app {
 		height: 100vh;
 		background-color: #fff;
-		// padding: 100rpx 40rpx;
 		text-align: center;
 		font-size: 36rpx;
-		
 
 		// 健康处方
 		.prescription {
@@ -108,11 +104,11 @@
 					color: #26A888;
 				}
 			}
+
 			::v-deep .u-icon--right {
 				color: #26A888 !important;
 			}
 
-
 			::v-deep .u-collapse-head {
 				width: 96%;
 				margin: 0 auto;
@@ -131,14 +127,11 @@
 				margin-left: auto;
 				background: #26A888;
 				font-size: 27rpx;
-
 			}
 
 			.recorditem {
 				margin-top: 39rpx;
 
-			
-
 				.itemtext {
 					.collapse_top {
 						font-size: 30rpx;
@@ -154,17 +147,11 @@
 
 							.itemword {
 								margin: 15rpx;
-
-
 							}
-
 						}
-
 					}
 				}
-
 			}
-
 		}
 	}
 </style>
\ No newline at end of file
diff --git a/pagesB/images/beijing.png b/pagesB/images/beijing.png
new file mode 100644
index 0000000..b0f9f4a
Binary files /dev/null and b/pagesB/images/beijing.png differ
diff --git a/pagesB/threeHundredAndSixty/threeHundredAndSixty.vue b/pagesB/threeHundredAndSixty/threeHundredAndSixty.vue
index 273d733..5de321c 100644
--- a/pagesB/threeHundredAndSixty/threeHundredAndSixty.vue
+++ b/pagesB/threeHundredAndSixty/threeHundredAndSixty.vue
@@ -14,17 +14,16 @@
 		</view>
 		<!-- 疾病预警 -->
 		<view class="disease" v-if="tabscurrent==1">
-			<image :src="baseurl+ '/profile/weChatPicture/360beijing.png'" class="background-image" />
+			<img src="../images/beijing.png" alt="" class="background-image" />
 			<view class="btnleftalls">
-				<view class="btnright">
-					<image :src="require('../images/renti.png')" mode=""></image>
-				</view>
 				<view class="left">
 					<view class="btnleftall">
 						<view class="btnleft" @tap="diseasecv">
 							<img src="../images/zitikuang.png" alt="" />
 							<span class="item">脑血管疾病</span>
 						</view>
+					</view>
+					<view class="btnleftall">
 						<view class="btnleft" @tap="diseaselc">
 							<img src="../images/zitikuang.png" alt="" />
 							<span class="item">缺血性心血管疾病风险</span>
@@ -34,14 +33,18 @@
 						<view class="btnleft" @tap="diseaselu">
 							<img src="../images/zitikuang.png" alt="" />
 							<span class="item">肺癌风险</span>
-
 						</view>
+					</view>
+					<view class="btnleftall">
 						<view class="btnleft" @tap="diseaseck">
 							<img src="../images/zitikuang.png" alt="" />
 							<span class="item">肾功能不全风险</span>
 						</view>
 					</view>
 				</view>
+				<view class="btnright">
+					<image :src="require('../images/renti.png')" mode=""></image>
+				</view>
 			</view>
 		</view>
 		<!-- 心血管 -->
@@ -300,8 +303,7 @@
 				</u-tr>
 			</u-table>
 		</u-popup>
-
-
+		<u-toast ref="uToast" />
 	</view>
 </template>
 
@@ -435,7 +437,7 @@
 
 	.app {
 		width: 100%;
-		height: 110vh;
+		height: 100vh;
 		background-repeat: no-repeat;
 		text-align: center;
 		font-size: 36rpx;
@@ -492,13 +494,14 @@
 		.disease {
 			width: 100%;
 			position: relative;
-			height: 110vh;
+			height: calc(100vh - 100rpx);
 			z-index: 999;
+			padding-top: 40rpx;
 			color: #fff !important;
 
 			.background-image {
 				width: 100%;
-				height: 120vh;
+				height: calc(100vh - 100rpx);
 				position: absolute;
 				top: 0;
 				left: 0;
@@ -506,13 +509,15 @@
 			}
 
 			.btnleftalls {
-				// display: flex;
+				display: flex;
 				width: 100%;
 			}
 
 			.left {
-				height: 30vh;
-				transform: translateY(5%);
+				display: flex;
+				flex-wrap: wrap;
+				width: 30%;
+				height: 70vh;
 			}
 
 			.btnleftall {
@@ -523,12 +528,11 @@
 
 			.btnleft {
 				position: relative;
-				width: 42%;
-				/* margin-left: 2%; */
+				width: 100%;
 				line-height: 50px;
 				text-align: center;
 				height: 160rpx;
-				font-size: 22rpx;
+				font-size: 20rpx;
 				margin: 0 auto;
 				line-height: 160rpx;
 
@@ -548,13 +552,9 @@
 			}
 
 			.btnright {
-				height: 75vh;
+				height: 70vh;
+				width: 70%;
 
-				// position: absolute;
-				// left: 5%;
-				// width: 70%;
-				// height: 100rpx;
-				// background-color: yellow;
 				image {
 					width: 100%;
 					height: 100%;
diff --git a/pagesC/H5Healthrecord/H5Healthrecord.vue b/pagesC/H5Healthrecord/H5Healthrecord.vue
index be35be0..c244e25 100644
--- a/pagesC/H5Healthrecord/H5Healthrecord.vue
+++ b/pagesC/H5Healthrecord/H5Healthrecord.vue
@@ -19,7 +19,7 @@
 		},
 		methods: {
 			info() {
-				getHealthKey(uni.getStorageSync('userinfo').cardNo).then(res => {
+				getHealthKey(uni.getStorageSync('userinfo').cardNo, uni.getStorageSync('openid')).then(res => {
 					this.src = 'https://qmjk.jiankangdongying.cn/html/gzd/jkda/expLogin.html?key=' + res.data +
 						'&dyfs=14'
 				})