完善团检

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

@@ -486,7 +486,7 @@ select combo_id as c_id,count(*) as sale_count from orders where status in(2,4)
 
     }
     $temp_nmr=[];
-    $keywords = ['核磁', 'CT', 'DR', '钼靶'];
+    $keywords = ['磁', 'CT', 'DR', '钼靶'];
 
     foreach ($nmr_list as $key=>$item){
       foreach ($keywords as $index => $keyword) {

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

@@ -238,6 +238,20 @@ class OrderController extends Controller
       ];
       $group_info = $P->group_info($hospital_id, $data);
       $group_info = $group_info[0];
+
+      //如果有多选一项目
+      //构建多选一数据
+      $Nx1_arrInfo=[];
+      if(isset($duo_xuan_yi) and !empty($duo_xuan_yi)){
+        foreach ($duo_xuan_yi as $r_k=>$r_v){
+          $Nx1_arrInfo[]=[
+            'id' => $r_v['item_id'],
+            'name' => $r_v['item_name'],
+          ];
+        }
+      }
+      $group_info['items'] =array_merge($group_info['items'],$Nx1_arrInfo); //合并多选一
+
       $buy_info['group'] = [
         'id' => $group_id,
         'combo_name' => $group_info['combo_name'],
@@ -261,8 +275,8 @@ class OrderController extends Controller
         foreach ($all_items as $it) {
           if ($it->item_id == $item['id']) {
             $buy_info['nmr_list'][] = [
-              'item_id' => $item->item_id,
+              'item_id' => $it->item_id,
-              'name' => $item->name,
+              'name' => $it->name,
             ];
           }
         }
@@ -727,7 +741,7 @@ class OrderController extends Controller
     $combo_id = $buy_info['combo']['id'];
     $item_arr = [];
     foreach ($buy_info['items'] as $item) {
-      $item_arr[] = ['Id' => $item['id'], '已收费' => true];
+      $item_arr[] = ['Id' => $item['id'], '已收费' => true,'分组项目'=>false,'收费方式'=>'自费',];
     }
     //调用思信 套餐项目检查
     if ((isset($combo_id) and $combo_id <> 0) || count($item_arr) != 0) {
@@ -783,6 +797,18 @@ class OrderController extends Controller
       }
       $cad = array_merge($cad, $cad2);
     } else {
+      if(isset($buy_info['group']['items'])){
+        $item_temp=[];
+        foreach ($buy_info['group']['items'] as $gitem) {
+          $item_temp[]=[
+            'Id' => $gitem['id'],
+            '分组项目' => true,
+            '收费方式'=>'统收',
+            '已收费' => true
+          ];
+        }
+        $item_arr= array_merge($item_arr,$item_temp);
+      }
       $cad = [
         'type' => 2,
         "预约Id" => $buy_info['group']['group_id'],
@@ -883,6 +909,9 @@ class OrderController extends Controller
   {
     $peis = new PEISApiController();
     $url_code = $data['type'] == 1 ? '个检预约取消' : '团检预约取消';
+    if($data['type']==2){
+      $data['删除套餐']=true;
+    }
     unset($data['type']);
     $info = $peis::Post($url_code, $hospital, $data);
     return $info;

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

@@ -28,8 +28,8 @@ class PersonController extends Controller
       }
 
 
-
       if(isset($group_info['单位Id']) and !empty($group_info['单位Id']) and isset($group_info['分组Id']) and !empty($group_info['分组Id'])){
+        $items=[];
         $peis = new PEISApiController();
         $data=[
           "单位Id"=>$group_info['单位Id']
@@ -38,6 +38,7 @@ class PersonController extends Controller
 
         foreach ($fenzu['data'][0]['分组'] as $key => $value) {
           if($value['Id']==$group_info['分组Id']){
+            $group_info['总计金额']=$value['价格'];
             if (isset($value['包含项目信息'])) {
               foreach ($value['包含项目信息'] as $datum) {
                 $items[] = [
@@ -151,6 +152,7 @@ class PersonController extends Controller
       '预约Id'=>$group_id
     ];
     $res = self::group_info($hospital_id, $data);
+    if($res[0]['fenzu_id']=="") return \Yz::echoError1("用户分组不能为空");
     return \Yz::Return(true,"查询完成",['unit'=>$res]);
   }
 }