筛查预约

pagesB/orderlist/orderlist.vue

@@ -18,6 +18,9 @@
 						</text>
 						<view style="color:#333;margin-bottom: 30rpx;">
 							预约状态：
+						<!-- 	<span v-if="item.exceedStatus == '0'">生效中</span>
+							<span v-if="item.exceedStatus == '1'">已过期</span> -->
+							
 							<uni-tag v-if="item.exceedStatus == '0'" text="生效中" size="mini" type="success" />
 							<uni-tag v-if="item.exceedStatus == '1'" size="mini" text="已过期" />
 						</view>

pagesB/screenorder/screenorder.vue

@@ -6,17 +6,17 @@
 				<view style="margin-right: 30rpx; color: #333">年龄：{{userInfo.age}}</view>
 				<view style="color: #333;">性别：{{userInfo.sex}}</view>
 			</view>
-			<view class="illness" v-if="userInfo.diseaseList">
+			<view class="illness" v-if="formData.disease">
-				<view v-show="userInfo.diseaseList.includes(0)">
+				<view v-show="formData.disease.includes(0)">
 					<span>无</span>
 				</view>
-				<view v-show="userInfo.diseaseList.includes(1)">
+				<view v-show="formData.disease.includes(1)">
 					<span>高血压</span>
 				</view>
-				<view v-show="userInfo.diseaseList.includes(2) ">
+				<view v-show="formData.disease.includes(2) ">
 					<span>高血糖</span>
 				</view>
-				<view v-show="userInfo.diseaseList.includes(3)">
+				<view v-show="formData.disease.includes(3)">
 					<span>高血脂</span>
 				</view>
 			</view>
@@ -193,24 +193,25 @@
 			this.$refs.form1.setRules(this.rules);
 		},
 		onLoad(e) {
-			console.log(e, '4')
 			if (e) {
 				this.userInfo = JSON.parse(e.userinfo)
-				this.formData.disease = this.userInfo.diseaseList.join(',')
-
 				if (this.userInfo.sex == 'MALE') {
 					this.userInfo.sex = '男'
-				} else {
+				} else if(this.userInfo.sex == 'FEMALE'){
 					this.userInfo.sex = '女'
 				}
 				this.userInfo.age = getAgeFun(this.userInfo.birthDate)
+				if(this.userInfo.diseaseList.length>0){
+					this.formData.disease = this.userInfo.diseaseList.join(',')
+					console.log(this.formData.disease,'9999')
+
+				}
 			}
 			this.getDeptAndPro()
 		},
 
 		methods: {
 			appointitem(e) {
-				// console.log(e, '67')
 				var that = this
 				if (that.formData.hospitalId == '') {
 					this.$refs.uToast.show({
@@ -322,7 +323,7 @@
 				const value = uni.getStorageSync('userinfo');
 				this.formData.patientId = value.id
 				this.formData.identity = this.userInfo.cardNo
-				this.formData.diseaseList = this.userInfo.diseaseList
+				this.formData.diseaseList = this.userInfo.diseaseList.map(Number)
 				this.formData.applyStartTime = this.datetimerange[0]
 				this.formData.applyEndTime = this.datetimerange[1]
 				if (this.formData.sex == '男') {