diff --git a/Laravel/app/Http/Controllers/API/H5/ComboController.php b/Laravel/app/Http/Controllers/API/H5/ComboController.php
index 07c9abd..2157ad2 100644
--- a/Laravel/app/Http/Controllers/API/H5/ComboController.php
+++ b/Laravel/app/Http/Controllers/API/H5/ComboController.php
@@ -116,16 +116,12 @@ select combo_id as c_id,count(*) as count from orders where status in(2,4) group
     ]);
   }
 
-  //获取套餐类型
-  public function GetComboType()
+  //获取套餐类型、适用人群
+  public function GetComboSort()
   {
     $type=DB::table('combo_type')->get();
-    return \Yz::Return(true,"查询成功",['list'=>$type]);
-  }
-  //获取套餐适用人群分类
-  public function GetComboCrowd()
-  {
-    $list=DB::table('combo_crowd')->get();
-    return \Yz::Return(true,"查询成功",['list'=>$list]);
+    $crowd=DB::table('combo_crowd')->get();
+    return \Yz::Return(true,"查询成功",['type'=>$type,'crowd'=>$crowd]);
   }
+
 }
diff --git a/Laravel/routes/web.php b/Laravel/routes/web.php
index 6b18907..ba0d707 100644
--- a/Laravel/routes/web.php
+++ b/Laravel/routes/web.php
@@ -31,7 +31,6 @@ Route::get('/test', 'App\Http\Controllers\TestController@DBtest');
 
 Route::any('/payNotify', 'App\Http\Controllers\API\H5\PayController@Notify')->middleware('log');//支付回调
 Route::post('/CheckUpTypeGetList', 'App\Http\Controllers\API\H5\CheckUpTypeController@GetList');//获取体检类型分类
-Route::post('/GetComboType', 'App\Http\Controllers\API\H5\ComboController@GetComboType');//获取套餐类型
-Route::post('/GetComboCrowd', 'App\Http\Controllers\API\H5\ComboController@GetComboCrowd');//获取套餐适用人群分类
+Route::post('/GetComboSort', 'App\Http\Controllers\API\H5\ComboController@GetComboSort');//  //获取套餐类型、适用人群
 Route::post('/GetAllItems', 'App\Http\Controllers\API\H5\ItemController@GetItems');//获取所有自选项目