修改细节，增加团检自带项目描述和科室

Laravel/app/Http/Controllers/API/ApiMapController.php

@@ -50,6 +50,7 @@ class ApiMapController extends Controller
       'GetReportList' => $base_url . '/api/H5/GetReportList',//获取关联的所有体检人报告列表
       'GetReportJieLunJianYi' => $base_url . '/api/H5/GetReportJieLunJianYi',//获取报告结论建议页面数据
       'GetReportDetaiList' => $base_url . '/api/H5/GetReportDetaiList',//完整报告中的列表
+      'GetReportDetai' => $base_url . '/api/H5/GetReportDetai',//完整报告中的详情
       'StartPay' => $base_url . '/api/H5/StartPay',//开始支付
       'CheckPay' => $base_url . '/api/H5/CheckPay',//支付查询
       'Refund' => $base_url . '/api/H5/Refund',//退款

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

@@ -303,6 +303,38 @@ select combo_id as c_id,count(*) as sale_count from orders where status in(2,4)
 
       $group_info = $P->group_info($hospital_id,$data);
 
+
+      $all_items=DB::table('items')->where(['status'=>1])->get();
+      $item_new=[];
+      foreach ($group_info[0]['items'] as  $item) {
+        $item['keshi_name'] = '其他';
+        $item['desc'] = '';
+        foreach ($all_items as $it) {
+          if ($it->item_id == $item['id']) {
+            $item['keshi_name'] = $it->keshi_name;
+            $item['desc'] = $it->jianjie;
+            break;
+          }
+        }
+        $item_new[] =$item;
+      }
+      $groupedData = [];
+      foreach ($item_new as $item){
+        $keshiName = $item['keshi_name'];
+        if (!isset($groupedData[$keshiName])) {
+          $groupedData[$keshiName] = [];
+
+        }
+        $groupedData[$keshiName][] = ['desc'=>$item['desc'],'name'=>$item['name'],'id'=>$item['id'],'keshi_name'=>$item['keshi_name']];
+      }
+      $group_info[0]['items']=[];//清空原来的item
+      foreach ($groupedData as $keshiName => $children) {
+        $group_info[0]['items'][] = [
+          'keshi_name' => $keshiName,
+          'children'   => $children
+        ];
+      }
+
     }
 
     $data=[

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

@@ -32,6 +32,7 @@ class PersonController extends Controller
         'start_time' => $group_info['预约开始日期'],
         'end_time' => $group_info['预约结束日期'],
         'group_name' => $group_info['单位名称'] . ($group_info['部门名称']),
+        'bumen_name' => $group_info['部门名称'],
         'group_id' => $group_info['预约Id'],
         'tongshou_xiane'=>$group_info['统收限额'],
         'sixi_zong_ji_jin_e'=>$group_info['总计金额'],

Laravel/config/app.php

@@ -5,7 +5,7 @@ return [
         'WxAppid' => 'wx526430047d34c85c',  //岚科公众号
         'WxAppSecret' => '975b8a8b627b1bde71bbe49149134549', //岚科公众号
         'WaitingPaymentTime'=>20, //等待支付时间，单位分钟
-        'PayNotifyUrl' =>env('APP_URL')."/h5/#/pages/main/order/CheckPay",//支付完成后小程序跳转H5路径
+        'PayNotifyUrl' =>"http://124.225.137.54:39080/h5/#/pages/main/order/CheckPay",//支付完成后小程序跳转H5路径
       //  'Env'=>'pro',
         'Env'=>'dev',
     ],

Laravel/routes/web.php

@@ -34,7 +34,7 @@ Route::group(['prefix' => 'api/H5'], function () {
   Route::post('/CheckUpTypeGetList', 'App\Http\Controllers\API\H5\CheckUpTypeController@GetList');//获取体检类型分类
   Route::post('/GetComboSort', 'App\Http\Controllers\API\H5\ComboController@GetComboSort');//  //获取套餐类型、适用人群
   Route::post('/ComboCompare', 'App\Http\Controllers\API\H5\ComboController@ComboCompare');//  //套餐对比
-  Route::post('/BuyInfo', 'App\Http\Controllers\API\H5\ComboController@BuyInfo');//获取购买详情内容（详情页信息）
+  Route::post('/BuyInfo', 'App\Http\Controllers\API\H5\ComboController@BuyInfo')->middleware('log');//获取购买详情内容（详情页信息）
   Route::post('/GetAllItems', 'App\Http\Controllers\API\H5\ItemController@GetItems');//获取所有自选项目
   Route::post('/GetReadme', 'App\Http\Controllers\API\H5\HospitalExtraController@GetReadme');//获取注意事项
   Route::post('/GetMonthPlanCount', 'App\Http\Controllers\API\H5\PlanController@GetMonthPlanCount');//获取本月每日剩余号源数量