From 6cb650c5e84ddee77f8c15e2f6cf75b41a61fd61 Mon Sep 17 00:00:00 2001
From: yanzai <boy_yan@163.com>
Date: Mon, 30 Jun 2025 23:15:21 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=8C=E7=BA=BF=E8=83=83=E8=82=A0=E9=95=9C?=
 =?UTF-8?q?=E9=A2=84=E7=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/API/H5/OrderController.php    | 39 +++++++++++--------
 h5/pages/buy/done/yuyue_done.vue              |  4 +-
 h5/pages/main/order/src/order.vue             |  4 +-
 3 files changed, 27 insertions(+), 20 deletions(-)

diff --git a/Laravel/app/Http/Controllers/API/H5/OrderController.php b/Laravel/app/Http/Controllers/API/H5/OrderController.php
index d1f0e40..85cb33d 100644
--- a/Laravel/app/Http/Controllers/API/H5/OrderController.php
+++ b/Laravel/app/Http/Controllers/API/H5/OrderController.php
@@ -471,7 +471,7 @@ class OrderController extends Controller
                 return \Yz::echoError1("二线号源不可用，请重新选择日期");
               }
             }
-
+          }
             if($erxian_item['leixing']==2 or $erxian_item['leixing']==3){
               $find=false;
               $startDate = $plan->date;
@@ -504,7 +504,7 @@ class OrderController extends Controller
               }
             }
 
-          }
+
 
 
 
@@ -1143,20 +1143,27 @@ class OrderController extends Controller
     }
     //发送二线微信通知
     if(!!$erxianinfo and isset($create_appointment['data'][0][0])) {
-      $data = [
-        "ghzid" => $person->ghzid,
-        "yyid" => $yyid,
-        "type" => "10",
-        "msg1" => $person->name,
-        "msg2" =>  $erxianinfo[0]['name'],
-        "msg3" => $person->phone,
-        "msg4" =>  $erxianinfo[0]['date'].' '.$erxianinfo[0]['time'],
-        "msg5" => "影像科",
-        "msg6" => "",
-        "url" => ""
-      ];
-      $dnet = new AspNetZhuanController();
-      $dnet->WeiXinSend($data);
+      foreach ($erxianinfo as $key => $erxianItem) {
+        $keshiname='影像科';
+        if($erxianItem['leixing']==2 or $erxianItem['leixing']==3) {
+          $keshiname='胃肠镜室';
+        }
+        $data = [
+          "ghzid" => $person->ghzid,
+          "yyid" => $yyid,
+          "type" => "10",
+          "msg1" => $person->name,
+          "msg2" => $erxianItem['name'],
+          "msg3" => $person->phone,
+          "msg4" =>  $erxianItem['date'].' '.$erxianItem['time'],
+          "msg5" => $keshiname,
+          "msg6" => "",
+          "url" => ""
+        ];
+        $dnet = new AspNetZhuanController();
+        $dnet->WeiXinSend($data);
+      }
+
 
     }
     //如果是婚检发送给his
diff --git a/h5/pages/buy/done/yuyue_done.vue b/h5/pages/buy/done/yuyue_done.vue
index 0c7f654..7e64d7e 100644
--- a/h5/pages/buy/done/yuyue_done.vue
+++ b/h5/pages/buy/done/yuyue_done.vue
@@ -144,10 +144,10 @@
 						<view class="order_info_value_wrapper">{{ order_info.appointment_date }} {{ order_info.appointment_time }}</view>
 					</view>
 					<view class="order_info_line_wrapper" v-if="order_info.erxian_appointment_info &&order_info.erxian_appointment_info.length>0">
-						<view class="order_info_label_wrapper">核磁项目:</view>
+						<view class="order_info_label_wrapper">二线项目:</view>
 						<view class="order_info_value_wrapper" style="margin-left: 20rpx;" v-for="(item,index) in order_info.erxian_appointment_info" :key="index">
 							<view>{{item.name}}</view>
-							 <view style="margin-top: -10rpx;">预约时间：{{order_info.erxian_appointment_info[0].date}} {{order_info.erxian_appointment_info[0].time}}</view>
+							 <view style="margin-top: -10rpx;">预约时间：{{item.date}} {{item.time}}</view>
 						</view>
 					</view> 
 				<!-- 	<view class="tishi">
diff --git a/h5/pages/main/order/src/order.vue b/h5/pages/main/order/src/order.vue
index 3d4fa82..ff92552 100644
--- a/h5/pages/main/order/src/order.vue
+++ b/h5/pages/main/order/src/order.vue
@@ -444,10 +444,10 @@
 					</view>
 				</view>
 				<view class="OrderInfoRow" v-if="OrderInfoDetail.erxian_appointment_info &&OrderInfoDetail.erxian_appointment_info.length>0">
-					<view class="row_label">核磁项目:</view>
+					<view class="row_label">二线项目:</view>
 					<view class="row_value" v-for="(item,index) in OrderInfoDetail.erxian_appointment_info" :key="index">
 						<view>{{item.name}}</view>
-						 <view style="margin-top: 10rpx;">预约时间：{{OrderInfoDetail.erxian_appointment_info[0].date}} {{OrderInfoDetail.erxian_appointment_info[0].time}}</view>
+						 <view style="margin-top: 10rpx;">预约时间：{{item.date}} {{item.time}}</view>
 					</view>
 				</view> 
 				<view class="OrderInfoRow" v-if="OrderInfoDetail.source==null && OrderInfoDetail.buy_info.items && OrderInfoDetail.buy_info.items.length>0">