From f6af6556008dffb790cb7eec44653ca98da5c3d0 Mon Sep 17 00:00:00 2001
From: yanzai <boy_yan@163.com>
Date: Mon, 4 Nov 2024 22:18:14 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=80=89=E6=8B=A9=E5=AE=8C?=
 =?UTF-8?q?=E4=BD=93=E6=A3=80=E5=86=8D=E9=80=89=E5=8C=BB=E7=94=9F=E4=BA=8C?=
 =?UTF-8?q?=E6=AC=A1=E5=BC=B9=E6=9C=88=E5=8E=86=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 h5/pages/main/tjyy/tjyy.vue     |  8 +++++++-
 h5/pages/main/yytjsj/yytjsj.vue | 16 +++++++++++++++-
 2 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/h5/pages/main/tjyy/tjyy.vue b/h5/pages/main/tjyy/tjyy.vue
index 3d05232..bdb81fe 100755
--- a/h5/pages/main/tjyy/tjyy.vue
+++ b/h5/pages/main/tjyy/tjyy.vue
@@ -384,7 +384,13 @@ const toRouter = (url, status, index) => {
     console.log(yytjInfo.value);
     uni.setStorageSync("yytjInfoS", yytjInfo.value);
     $store.setYytjInfo(yytjInfo.value);
-    if (yytjInfo.value.doctor_name && i == -1) {
+	//判断是否选择了体检时间
+	yytjInfo.value.nmr_list.forEach((vv,ii)=>{
+		if(vv.item_id=='-1' && vv.time){
+			yytjInfo.value.doctor_date=vv.time.substr(0,10)
+		}
+	})
+    if ((yytjInfo.value.doctor_name || yytjInfo.value.doctor_date) && i == -1) {
       uni.navigateTo({
         url: `/pages/main/selectDoctor/selectDoctor?date=${yytjInfo.value.doctor_date}`,
       });
diff --git a/h5/pages/main/yytjsj/yytjsj.vue b/h5/pages/main/yytjsj/yytjsj.vue
index 1a66313..a61e402 100755
--- a/h5/pages/main/yytjsj/yytjsj.vue
+++ b/h5/pages/main/yytjsj/yytjsj.vue
@@ -518,9 +518,23 @@
 		// if (yytjInfo.value.nmr_list[yytjInfo.value.nmr_list.length - 1]?.time == "") {
 		// nmrIndex.value = yytjInfo.value.nmr_list?.length - 1;
 		nmrIndex.value = -1;
-		moreTime(null, 1);
+		//判断是否选择了体检时间
+		
+		    let is_tj_date=false;
+			yytjInfo.value.nmr_list.forEach((vv,ii)=>{
+				if(vv.item_id=='-1' && vv.time){
+					yytjInfo.value.doctor_date=vv.time.substr(0,10)
+					is_tj_date=true;
+				}
+			})
+			console.log("999999999999",is_tj_date);
+	    if(!is_tj_date){
+			moreTime(null, 1);
+			return false;
+		}	
 		// return;
 		// }
+		console.log('00000000000',yytjInfo.value);
 		if (s) {
 			return;
 		}