From 524a4f050352fca78a9e26c25aaefab7114d2376 Mon Sep 17 00:00:00 2001 From: yanzai Date: Thu, 28 Aug 2025 14:52:54 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9B=A2=E6=A3=80=E8=AE=BE=E7=BD=AE=E8=87=AA?= =?UTF-8?q?=E8=B4=B9=E9=A1=B9=E7=9B=AE=E6=94=B6=E8=B4=B9=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/API/H5/OrderController.php | 34 ++++++++++++++++--- .../Controllers/API/H5/PersonController.php | 2 ++ .../Controllers/API/PEISApiController.php | 1 + 3 files changed, 33 insertions(+), 4 deletions(-) diff --git a/Laravel/app/Http/Controllers/API/H5/OrderController.php b/Laravel/app/Http/Controllers/API/H5/OrderController.php index 682fda2..92ebca0 100644 --- a/Laravel/app/Http/Controllers/API/H5/OrderController.php +++ b/Laravel/app/Http/Controllers/API/H5/OrderController.php @@ -35,7 +35,9 @@ class OrderController extends Controller if(isset($searchInfo['status'])){ $where['status'] = $searchInfo['status']; } - + if(isset($searchInfo['orderid'])){ + $where['id'] = $searchInfo['orderid']; + } $OrderList = DB::table('orders'); $OrderList=$OrderList ->select('id', 'source','title','person_id','buy_info','plan_id', 'checkup_type_id','hunjian_status','status', 'name','appointment_date as date', 'appointment_time as time', 'order_number as order','appointment_number','transfer_type', @@ -46,9 +48,12 @@ class OrderController extends Controller } $OrderList=$OrderList ->where($where) - ->orWhere(function ($query) use ($persons_sfz) { - $query->WhereIn('id_number', $persons_sfz) - ->where('person_id', 0); + ->where(function ($query) use ($persons_sfz,$user) { + $query->where('web_user_id', $user->id) + ->orWhere(function ($q) use ($persons_sfz) { + $q->whereIn('id_number', $persons_sfz) + ->where('person_id', 0); + }); })->orderBy('id', 'desc') ->skip(($page - 1) * 100) // 跳过前9999条记录 ->take(100)->get(); @@ -1261,6 +1266,8 @@ class OrderController extends Controller $data = "appointmentId=" . $create_appointment['data'][0][0] . "&appGroupId=".$haoyuan."&appPlanId=" . $order_info->plan_id . "&appPlanNumber=" . $order_info->plan_number . "&date=" . urlencode($order_info->appointment_date . ' ' . $order_info->appointment_time); $ch = $peis::Post2('修改用户预约时间', $peis::Api('修改用户预约时间', $data), $order_info->hospital_id, []); + + //如果是医生web端预约，则调用预约时段修改接口，传入医生名称 if ($order_info->source == 'web') { $peis = new PEISApiController(); @@ -1287,6 +1294,25 @@ class OrderController extends Controller 'wx_day1_sendmsg_status'=>$wx_day1_sendmsg_status, 'wx_day1_sendmsg_time'=>$wx_day1_sendmsg_time<>''?$wx_day1_sendmsg_time:null, ]); + + // 团检设置自费项目收费状态 + if($order_info->type==2 && !empty($buy_info['group']['items'])){ + $temp_items=[]; + foreach ($buy_info['group']['items'] as $gitem) { + if($gitem['pay_type']=='自费'){ + $temp_items[]=[ + 'Id' => $gitem['id'], + '已收费' => true, + ]; + } + } + $tuan_data=[ + '预约Id' => $create_appointment['data'][0][0], + '收费项目列表' => $temp_items, + ]; + $peis::Post('团检设置自费项目收费状态', $order_info->hospital_id, $tuan_data); + } + $is_sendMsg = DB::table('configs')->where(['label' => '预约完成短信通知'])->first(); if (!!$is_sendMsg and $is_sendMsg->value == 1 and strlen($cha->phone)>0) { $asp = new AspNetZhuanController(); diff --git a/Laravel/app/Http/Controllers/API/H5/PersonController.php b/Laravel/app/Http/Controllers/API/H5/PersonController.php index 5b92399..205b15f 100644 --- a/Laravel/app/Http/Controllers/API/H5/PersonController.php +++ b/Laravel/app/Http/Controllers/API/H5/PersonController.php @@ -24,6 +24,7 @@ class PersonController extends Controller $items[] = [ 'id' => $datum['Id'], 'name' => $datum['名称'], + 'pay_type'=>$datum['收费方式'], ]; } } @@ -46,6 +47,7 @@ class PersonController extends Controller $items[] = [ 'id' => $datum['Id'], 'name' => $datum['名称'], + 'pay_type'=>$datum['收费方式'], ]; } } diff --git a/Laravel/app/Http/Controllers/API/PEISApiController.php b/Laravel/app/Http/Controllers/API/PEISApiController.php index 97b43e5..91c1995 100644 --- a/Laravel/app/Http/Controllers/API/PEISApiController.php +++ b/Laravel/app/Http/Controllers/API/PEISApiController.php @@ -42,6 +42,7 @@ class PEISApiController extends Controller $api['弃检接口'] = "{$url}/Home/AbandonCheck"; $api['检后签到'] = "{$url}/Home/PostExamSignIn?eventNo={$code}"; $api['个检预约设置套餐和项目信息'] = "{$url}/PEISCommon/PersonAppSetComboInfo?key=YmMxOGI2MDUxZmFh"; + $api['团检设置自费项目收费状态'] = "{$url}/PEISCommon/SetUnitAppointmentSelfPayItemPayStatus?key=YmMxOGI2MDUxZmFh"; } if($env=='dev') { //如果是测试环境