From bc49d74fcfd79f0f763656812569b54d77e84c50 Mon Sep 17 00:00:00 2001
From: yanzai <boy_yan@163.com>
Date: Thu, 28 Nov 2024 18:05:18 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=B9=E7=BA=A6=E8=B0=83=E6=95=B4=E5=8C=BB?=
 =?UTF-8?q?=E7=94=9F=E4=BD=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/API/H5/OrderController.php    |  6 ++++-
 h5/pages/main/ctime/ctime.vue                 | 25 +++++++++----------
 2 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/Laravel/app/Http/Controllers/API/H5/OrderController.php b/Laravel/app/Http/Controllers/API/H5/OrderController.php
index 311689e..dfe5b5e 100644
--- a/Laravel/app/Http/Controllers/API/H5/OrderController.php
+++ b/Laravel/app/Http/Controllers/API/H5/OrderController.php
@@ -578,7 +578,11 @@ class OrderController extends Controller
     // $ErXianKuaDu = config('app.globals.erxian_kuadu');
     // $check_erxian_kuadu=$this->checkDatesWithinDays($nmr_info,$ErXianKuaDu);
     // if(!$check_erxian_kuadu['check_status']) return \Yz::echoError1("所有二线项目预约跨度不应大于".$ErXianKuaDu."天，请重新选择");
-    if(isset($plan_id) && $plan_id == $orderInfo->plan_id) return \Yz::echoError1("无需进行此操作");
+    if(isset($plan_id) && $plan_id == $orderInfo->plan_id ){
+      if($doctor==$orderInfo->doctor) return \Yz::echoError1("无需进行此操作");
+      $up_doctor=DB::table('orders')->where('id', $orderid)->update(['doctor' => $doctor]);
+      return \Yz::Return(true,"操作完成",[]);
+    }
     //如果有二线号源,根据体检时间查询二线可用号源，区分上下午
     $db_nmr_info=json_decode($orderInfo->erxian_appointment_info,true);
     $nmr_info=[];
diff --git a/h5/pages/main/ctime/ctime.vue b/h5/pages/main/ctime/ctime.vue
index 4dbfebe..24d808d 100644
--- a/h5/pages/main/ctime/ctime.vue
+++ b/h5/pages/main/ctime/ctime.vue
@@ -1,12 +1,6 @@
 <template>
 	<view class="ctime_main">
-		<view class="top">
-			<view v-if="orderInfo" style="display: flex;justify-content: space-between;">
-				<view style="font-size: 26rpx; color: #666;">体检医生 - <span v-if="doctor_name"
-						style="font-size: 28rpx;font-weight: 700;"> {{doctor_name}}</span></view>
-				<view style="font-size: 26rpx; color: #333;font-weight: 700;" @click="selectDoctor()">重新选择 </view>
-			</view>
-		</view>
+		 
 		<view class="zhouli">
 			<WeeklyCalendar v-if="weekList" :dataInfo="weekList" :selectedTime="selectedTime" :YuYueInfo="YuYueInfo" :TjDTime="tj_date+' '+tj_time" :ItemSelected="itemSelected"
 				@selectDate="selectDateFunc" @selectTime="selectTimeFunc" @openMonth="openMonthFunc" />
@@ -29,6 +23,11 @@
 					<view @click="itemClick('tj','',0)" style="margin-top: 10rpx;padding: 20rpx;color: #666;"
 						:class="itemSelected.type=='tj'?'itemSelected':''">体检日期 <span v-if="tj_date && tj_time">{{tj_date}}
 							{{tj_time}}</span></view>
+							<view v-if="orderInfo" style="display: flex;justify-content: space-between;padding: 20rpx;color: #666;">
+								<view style="font-size: 26rpx; color: #666;">体检医生 - <span v-if="doctor_name"
+										style="font-size: 28rpx;font-weight: 700;"> {{doctor_name}}</span></view>
+								<view style="font-size: 26rpx; color: #333;font-weight: 700;" @click="selectDoctor()">重新选择 </view>
+							</view>
 				</view>
 
 			</view>
@@ -218,12 +217,12 @@
 	
 	let DoctorMonthCalendar = ref(null)
 	const selectDoctor = () => {
-		if (orderInfo.value.buy_info.nmr_list && orderInfo.value.buy_info.nmr_list.length > 0) {
-			if (YuYueInfo.value.NmrInfo[itemSelected.value.index].date == null || YuYueInfo.value.NmrInfo[itemSelected.value.index].time == null) {
-				uni.$lu.toast("请先预约为影像科项目选择时间");
-				return false
-			}
-		}
+		// if (orderInfo.value.buy_info.nmr_list && orderInfo.value.buy_info.nmr_list.length > 0) {
+		// 	if (YuYueInfo.value.NmrInfo[itemSelected.value.index].date == null || YuYueInfo.value.NmrInfo[itemSelected.value.index].time == null) {
+		// 		uni.$lu.toast("请先预约为影像科项目选择时间");
+		// 		return false
+		// 	}
+		// }
 		if (tj_date.value == null) { //如果没有选定体检日期，则打开日历
 			DoctorMonthCalendar.value.open();
 		} else {