From cc84d9a43e25202e9a1710173dca7cc02a294dc7 Mon Sep 17 00:00:00 2001
From: yanzai <boy_yan@163.com>
Date: Wed, 5 Mar 2025 11:30:34 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9B=A2=E6=A3=80=E5=A6=82=E6=9E=9C=E6=9C=89?=
 =?UTF-8?q?=E6=A0=B8=E7=A3=81=E9=9A=90=E8=97=8F11=E7=82=B9=E5=90=8E?=
 =?UTF-8?q?=E7=9A=84=20=E5=8F=B7=E6=BA=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../app/Http/Controllers/API/H5/PlanController.php   |  7 ++++++-
 h5/pages/main/yytjsj/yytjsj_new.vue                  | 12 +++++++++---
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/Laravel/app/Http/Controllers/API/H5/PlanController.php b/Laravel/app/Http/Controllers/API/H5/PlanController.php
index e9915e0..570b7c2 100644
--- a/Laravel/app/Http/Controllers/API/H5/PlanController.php
+++ b/Laravel/app/Http/Controllers/API/H5/PlanController.php
@@ -103,6 +103,7 @@ class PlanController extends Controller
       $combo_id=request('combo_id');
       $item_ids=request('item_ids');
       $date=request('date');
+      $er_xian_info=request('er_xian_info');
       $use_type=request('use_type');//使用类型 1个检 2团检
       $checkup_type_id=(string)request('checkup_type_id');//体检类型表对应id
       $amount=request('amount');//总金额
@@ -149,7 +150,7 @@ class PlanController extends Controller
         });
       }
       $list=$list->orderBy('time','asc')->get();
-      if(count($comboItemsNmr)>0 or count($ItemsNmr)>0){
+      if(count($comboItemsNmr)>0 or count($ItemsNmr)>0 or !empty($er_xian_info)){
         //如果有核磁项目，11点往后的号源不可用
         foreach ($list as $key=>$item) {
           if($item->time > '11:00:00' and $item->time <= '12:00:00'){
@@ -184,6 +185,10 @@ class PlanController extends Controller
         ->where(['hospital_id'=>$hospital_id,'type'=>1,'is_del'=>0])
         ->where('is_vip','<>',1)
         ->whereIn('use_type',[0,$use_type]);
+      if(count($comboItemsNmr)>0 or count($ItemsNmr)>0 or !empty($er_xian_info)){
+        //如果有核磁项目，11点往后的号源不可用
+        $weeklist=$weeklist->where('time','<=','11:00');
+      }
       if(!!$combo_id){
         $comboInfo=DB::table('combos')->where(['combo_id'=>$combo_id])->first();
         if(!empty($comboInfo->keyue_start_time) and !empty($comboInfo->keyue_end_time)){
diff --git a/h5/pages/main/yytjsj/yytjsj_new.vue b/h5/pages/main/yytjsj/yytjsj_new.vue
index bf90047..a348ce4 100644
--- a/h5/pages/main/yytjsj/yytjsj_new.vue
+++ b/h5/pages/main/yytjsj/yytjsj_new.vue
@@ -116,6 +116,7 @@
 	let combo_id=ref(null);
 	let item_ids=ref([]);
 	let YuYuePopupRef=ref(null);
+	let er_xian_info=ref(null);
 	const getBuyInfoFuc = async () => {
 		// 获取购买信息
 		let obj = {
@@ -130,6 +131,9 @@
 		};
 		const response = await $api("BuyInfo", obj);
 		$response(response, () => {
+			if(response.data.nmr_list2.length>0){
+				er_xian_info.value=response.data.nmr_list2
+			} 
 			if(combo_id.value){
 				combo_name.value=response.data.combo_info?.combo_name
 			}else{
@@ -152,7 +156,8 @@
 			checkup_type_id: checkup_type_id.value,
 			amount: amount.value,
 			combo_id:combo_id.value,
-			item_ids:item_ids.value
+			item_ids:item_ids.value, 
+			er_xian_info:er_xian_info.value
 		}
 		const response = await $api("GetDayPlanList", data);
 		uni.hideLoading();
@@ -581,7 +586,7 @@
 	}
 
 	let temp = null
-	onMounted(() => {
+	onMounted(async() => {
 		itemSelected.value.type = 'tj'
 		buyInfo.value = $store.getBuyInfo();
 		//清空一下缓存的医生，防止出问题
@@ -608,8 +613,9 @@
 					person_name.value = $store.getUser()?.name 
 				}
 				
+				
+				await getBuyInfoFuc()
 				GetDayPlanListFunc()
-				getBuyInfoFuc()
 		}
 
 	});