提示调整、web订单隐藏按钮、团检号源绑定调整

Laravel/app/Http/Controllers/API/H5/PlanController.php

@@ -35,18 +35,21 @@ class PlanController extends Controller
       ->whereRaw('JSON_CONTAINS(checkup_type_id, ?, "$")', [json_encode($checkup_type_id)])
       ->where(['hospital_id' => $hospital_id, 'type' => 1, 'is_del' => 0])
       ->where('is_vip', '<>', 1)
-        ->whereIn('use_type',[0,$use_type])
+      ->whereIn('use_type', [0, $use_type]);
+
+    if (!empty($danwei_id)) {
+      $cha_bind_danwei = DB::table('plan_type')->WhereRaw('JSON_CONTAINS(bind_units, ?)', [json_encode($danwei_id)])->where(['is_del' => 0])->get();
+      if (count($cha_bind_danwei) > 0) {
+        $list = $list->WhereRaw('JSON_CONTAINS(bind_work_unit_id, ?)', [json_encode($danwei_id)]);
+      } else {
+        $list = $list
           ->where(function ($query) use ($danwei_id) {
             // 检查 bind_work_unit_id 为 NULL 或空字符串
             $query->whereNull('bind_work_unit_id')
               ->orWhere('bind_work_unit_id', '=', '');
-
-          // 如果 $danwei_id 不为空，则添加额外的条件
-          if (!empty($danwei_id)) {
-            $query->orWhereRaw('JSON_CONTAINS(bind_work_unit_id, ?)', [json_encode($danwei_id)]);
-          }
           });
-
+      }
+    }
     if (isset($person_id)) {
       $personInfo = DB::table('web_user_person')->where(['id' => $person_id])->first();
       if (!!$personInfo) {
@@ -108,6 +111,7 @@ class PlanController extends Controller
 
     return \Yz::Return(true, "查询完成", ['list' => $dates]);
   }
+
   //获取某日号源列表
   public function GetDayPlanList()
   {
@@ -137,18 +141,20 @@ class PlanController extends Controller
       ->whereRaw('JSON_CONTAINS(checkup_type_id, ?, "$")', [$checkup_type_id])
       ->where(['hospital_id' => $hospital_id, 'type' => 1, 'is_del' => 0])
       ->where('is_vip', '<>', 1)
-        ->whereIn('use_type',[0,$use_type])
+      ->whereIn('use_type', [0, $use_type]);
+    if (!empty($danwei_id)) {
+      $cha_bind_danwei = DB::table('plan_type')->WhereRaw('JSON_CONTAINS(bind_units, ?)', [json_encode($danwei_id)])->where(['is_del' => 0])->get();
+      if (count($cha_bind_danwei) > 0) {
+        $list = $list->WhereRaw('JSON_CONTAINS(bind_work_unit_id, ?)', [json_encode($danwei_id)]);
+      } else {
+        $list = $list
           ->where(function ($query) use ($danwei_id) {
             // 检查 bind_work_unit_id 为 NULL 或空字符串
             $query->whereNull('bind_work_unit_id')
               ->orWhere('bind_work_unit_id', '=', '');
-
-          // 如果 $danwei_id 不为空，则添加额外的条件
-          if (!empty($danwei_id)) {
-            $query->orWhereRaw('JSON_CONTAINS(bind_work_unit_id, ?)', [json_encode($danwei_id)]);
-          }
           });
-
+      }
+    }
 
 
     $comboItemsNmr = [];
@@ -215,18 +221,20 @@ class PlanController extends Controller
       ->whereRaw('JSON_CONTAINS(checkup_type_id, ?, "$")', [$checkup_type_id])
       ->where(['hospital_id' => $hospital_id, 'type' => 1, 'is_del' => 0])
       ->where('is_vip', '<>', 1)
-        ->whereIn('use_type',[0,$use_type])
+      ->whereIn('use_type', [0, $use_type]);
+    if (!empty($danwei_id)) {
+      $cha_bind_danwei = DB::table('plan_type')->WhereRaw('JSON_CONTAINS(bind_units, ?)', [json_encode($danwei_id)])->where(['is_del' => 0])->get();
+      if (count($cha_bind_danwei) > 0) {
+        $weeklist = $weeklist->WhereRaw('JSON_CONTAINS(bind_work_unit_id, ?)', [json_encode($danwei_id)]);
+      } else {
+        $weeklist = $weeklist
           ->where(function ($query) use ($danwei_id) {
             // 检查 bind_work_unit_id 为 NULL 或空字符串
             $query->whereNull('bind_work_unit_id')
               ->orWhere('bind_work_unit_id', '=', '');
-
-          // 如果 $danwei_id 不为空，则添加额外的条件
-          if (!empty($danwei_id)) {
-            $query->orWhereRaw('JSON_CONTAINS(bind_work_unit_id, ?)', [json_encode($danwei_id)]);
-          }
           });
-
+      }
+    }
 
 
     if (count($comboItemsNmr) > 0 or count($ItemsNmr) > 0 or !empty($er_xian_info)) {
@@ -296,6 +304,7 @@ class PlanController extends Controller
 
     return \Yz::Return(true, "查询完成", ['list' => $list, 'weeklist' => $week7]);
   }
+
   //检查号源是否可用
   public function CheckPlan($plan_id, $hospital_id, $type, $sex, $price, $checkup_type_id)
   {

h5/config.js

@@ -1,7 +1,7 @@
 const app_type = 'gzh'
 //const base_url = "https://api.hainan2024.sa0.online" //开发环境
-const base_url="https://tj-h5.hnxdfe.com"  //正式环境
-//const base_url="http://124.225.137.54:39081"  //测试环境
+//const base_url="https://tj-h5.hnxdfe.com"  //正式环境
+const base_url="http://124.225.137.54:39081"  //测试环境
 const config = {
 	api_map_url: base_url + '/api/ApiMap/h5',
 	base_assets_url: base_url,

h5/pages/buy/done/done.vue

@@ -139,7 +139,7 @@
 						<view class="order_info_value_wrapper">¥{{ order_info.true_price }}</view>
 					</view>
 				</view>
-				<view @click="toPlan()" class="check_done_wrapper">立即预约体检</view>
+				<view v-if="order_info.source !='web'" @click="toPlan()" class="check_done_wrapper">立即预约体检</view>
 				<view @click="toOrderList()" class="next_done_wrapper">
 					<view style="margin-right: 6rpx;">下次预约</view>
 					<view style="letter-spacing: -10rpx; vertical-align:super;color: #b3b3b3;">

h5/pages/buy/done/yuyue_done.vue

@@ -108,6 +108,10 @@
 						style="font-size: 24rpx;padding:20rpx 40rpx; 0rpx 40rpx;color:#FF0000;">
 						请您的配偶在15分钟内完成预约，否则本次预约将会失效，如有支付金额会原路退回
 					</view>
+					<view v-else
+						style="font-size: 24rpx;padding:20rpx 40rpx; 0rpx 40rpx;color:#FF0000;text-align: center;">
+						请提前10分钟到现场自助机取号，超时作废
+					</view>
 				</view>
 				<view class="order_info_wrapper">
 					<view class="order_info_title_wrapper">预约信息</view>