diff --git a/Laravel/app/Http/Controllers/API/ApiMapController.php b/Laravel/app/Http/Controllers/API/ApiMapController.php index 4dcba62..3803076 100644 --- a/Laravel/app/Http/Controllers/API/ApiMapController.php +++ b/Laravel/app/Http/Controllers/API/ApiMapController.php @@ -42,6 +42,10 @@ class ApiMapController extends Controller 'DoctorGetList' => $base_url . '/api/H5/DoctorGetList',//获取体检医生列表 'ComboRecommend' => $base_url . '/api/H5/ComboRecommend',//套餐推荐 'GetReadme' => $base_url . '/api/H5/GetReadme',//须知 + 'NMRGetMonthPlanCount' => $base_url . '/api/H5/NMRGetMonthPlanCount',//核磁每日号源 + 'NMRGetDayPlanList' => $base_url . '/api/H5/NMRGetDayPlanList',//核磁每日号源 + 'GetGroupUnit' => $base_url . '/api/H5/GetGroupUnit',//团检登记查询获取单位分组 + 'GetGroupCombo' => $base_url . '/api/H5/GetGroupCombo',//获取团检套餐 ]; } diff --git a/Laravel/app/Http/Controllers/API/H5/ComboController.php b/Laravel/app/Http/Controllers/API/H5/ComboController.php index 5be9103..cb91b8c 100644 --- a/Laravel/app/Http/Controllers/API/H5/ComboController.php +++ b/Laravel/app/Http/Controllers/API/H5/ComboController.php @@ -262,11 +262,11 @@ select combo_id as c_id,count(*) as sale_count from orders where status in(2,4) $groupedData = []; foreach ($items as $item){ // $price=$price+$item->price; - $price= bcadd($price, $item->price, 0); + $price= bcadd($price, $item->price, 2); // $all_original_price+=$item->original_price; - $all_original_price=bcadd($all_original_price, $item->original_price, 0); + $all_original_price=bcadd($all_original_price, $item->original_price, 2); // $items_original_price+=$item->original_price; - $items_original_price=bcadd($items_original_price, $item->original_price, 0); + $items_original_price=bcadd($items_original_price, $item->original_price, 2); $keshiName = $item->keshi_name; if (!isset($groupedData[$keshiName])) { $groupedData[$keshiName] = []; @@ -289,7 +289,23 @@ select combo_id as c_id,count(*) as sale_count from orders where status in(2,4) $coupon_money=50;//优惠券抵扣金额 $true_price+=$items_info['price']; //用户真实支付价格，应减去抵扣（二期实现） + + + $group_info = false; + if (!!$group_id) { + $P=new PersonController(); + $data = [ + '电话号码' => null, + '证件号码' => null, + '预约Id'=>$group_id + ]; + + $group_info = $P->group_info($hospital_id,$data); + + } + $data=[ + 'group_info'=>$group_info, 'combo_info'=>$combo_info, 'items_info'=>$items_info, 'integral_money'=>$integral_money, diff --git a/Laravel/app/Http/Controllers/API/H5/NMRController.php b/Laravel/app/Http/Controllers/API/H5/NMRController.php index bdb52d6..e623c72 100644 --- a/Laravel/app/Http/Controllers/API/H5/NMRController.php +++ b/Laravel/app/Http/Controllers/API/H5/NMRController.php @@ -11,7 +11,7 @@ class NMRController extends Controller //获取核磁号 本月每日剩余号源数量 public function GetMonthPlanCount() { - $hospital_id =request('hospital'); + $hospital_id =request('hospital_id'); $month=request('month'); $list=[ [ diff --git a/Laravel/app/Http/Controllers/API/H5/PersonController.php b/Laravel/app/Http/Controllers/API/H5/PersonController.php index 7c39e71..e6854ea 100644 --- a/Laravel/app/Http/Controllers/API/H5/PersonController.php +++ b/Laravel/app/Http/Controllers/API/H5/PersonController.php @@ -12,26 +12,65 @@ class PersonController extends Controller { $peis = new PEISApiController(); $info = $peis::Post('团检登记查询', $hospital, $data); - $items = []; - $group_info = $info['data'][0]; - if (isset($group_info['项目列表'])) { - foreach ($group_info['项目列表'] as $datum) { - $items[] = [ - 'id' => $datum['Id'], - 'name' => $datum['名称'], - ]; + + $group_list=[]; + foreach ($info['data'] as $it) { + $items = []; + $group_info = $it; + if (isset($group_info['项目列表'])) { + foreach ($group_info['项目列表'] as $datum) { + $items[] = [ + 'id' => $datum['Id'], + 'name' => $datum['名称'], + ]; + } } + $data=[ + 'name' => $group_info['姓名'], + 'id_number' => $group_info['证件号码'], + 'combo_name' => $group_info['套餐名称'], + 'combo_id' => $group_info['套餐Id'], + 'start_time' => $group_info['预约开始日期'], + 'end_time' => $group_info['预约结束日期'], + 'group_name' => $group_info['单位名称'] . ($group_info['部门名称']), + 'group_id' => $group_info['预约Id'], + 'tongshou_xiane'=>$group_info['统收限额'], + 'items' => $items, + ]; + $group_list[]=$data; } - return [ - 'name' => $group_info['姓名'], - 'id_number' => $group_info['证件号码'], - 'combo_name' => $group_info['套餐名称'], - 'combo_id' => $group_info['套餐Id'], - 'start_time' => $group_info['预约开始日期'], - 'end_time' => $group_info['预约结束日期'], - 'group_name' => $group_info['单位名称'] . ($group_info['部门名称']), - 'items' => $items, - 'appointment_number' => $group_info['预约Id'] + + return $group_list; + } + + //团检登记查询，根据身份证和电话查分组id + public function GetGroupUnit() + { + $phone = request('phone'); + $id_number = request('id_number'); + $hospital_id = request('hospital_id'); + if (!isset($phone)) return \Yz::echoError1('电话不能为空'); + if (!isset($id_number)) return \Yz::echoError1('身份证不能为空'); + if (!isset($hospital_id)) return \Yz::echoError1('医院id不能为空'); + $data = [ + '电话号码' => $phone, + '证件号码' => $id_number + ]; + $res = self::group_info($hospital_id, $data); + return \Yz::Return(true,"查询完成",['unit'=>$res]); + } + //获取团检套餐 + public function GetGroupCombo() + { + $hospital_id = request('hospital_id'); + $group_id = request('group_id'); + if (!isset($group_id)) return \Yz::echoError1('group_id不能为空'); + $data = [ + '电话号码' => null, + '证件号码' => null, + '预约Id'=>$group_id ]; + $res = self::group_info($hospital_id, $data); + return \Yz::Return(true,"查询完成",['unit'=>$res]); } } diff --git a/Laravel/routes/web.php b/Laravel/routes/web.php index 14626e1..677704e 100644 --- a/Laravel/routes/web.php +++ b/Laravel/routes/web.php @@ -52,6 +52,10 @@ Route::group(['prefix' => 'api/H5'], function () { Route::post('/GetPersonIntegralSaveMoneyCouponInfo', 'App\Http\Controllers\API\H5\IntegralSaveMoneyCouponController@GetInfo');//点击个检获取页面按钮 Route::post('/DoctorGetList', 'App\Http\Controllers\API\H5\DoctorController@GetList');//获取体检医生列表 Route::post('/ComboRecommend', 'App\Http\Controllers\API\H5\ComboController@ComboRecommend');//推荐套餐 + Route::post('/NMRGetMonthPlanCount', 'App\Http\Controllers\API\H5\NMRController@GetMonthPlanCount');//核磁每日号源总数 + Route::post('/NMRGetDayPlanList', 'App\Http\Controllers\API\H5\NMRController@GetDayPlanList');//核磁某日号源 + Route::post('/GetGroupUnit', 'App\Http\Controllers\API\H5\PersonController@GetGroupUnit');//团检登记查询获取单位分组 + Route::post('/GetGroupCombo', 'App\Http\Controllers\API\H5\PersonController@GetGroupCombo');//获取团检套餐 });