diff --git a/Laravel/app/Http/Controllers/API/H5/ComboController.php b/Laravel/app/Http/Controllers/API/H5/ComboController.php index 7929f63..f35c076 100644 --- a/Laravel/app/Http/Controllers/API/H5/ComboController.php +++ b/Laravel/app/Http/Controllers/API/H5/ComboController.php @@ -244,6 +244,12 @@ select combo_id as c_id,count(*) as sale_count from orders where status in(2,4) if($r_v['zu_name'] == $n1v['组名称']){ foreach ($n1v['包含项目'] as $k2 => $v2){ if($v2['Id'] == $r_v['item_id']){ + if($v2['科室名称']=='影像科'){ + $nmr_list[]=[ + 'item_id' => $v2['Id'], + 'name' => $v2['名称'], + ]; + } $Nx1_arrInfo[] = [ 'id' => $v2['Id'], 'name' => $v2['名称'], diff --git a/Laravel/app/Http/Controllers/API/H5/OrderController.php b/Laravel/app/Http/Controllers/API/H5/OrderController.php index b0db579..63adf7e 100644 --- a/Laravel/app/Http/Controllers/API/H5/OrderController.php +++ b/Laravel/app/Http/Controllers/API/H5/OrderController.php @@ -123,6 +123,12 @@ class OrderController extends Controller if($r_v['zu_name'] == $n1v['组名称']){ foreach ($n1v['包含项目'] as $k2 => $v2){ if($v2['Id'] == $r_v['item_id']){ + if($v2['科室名称']=='影像科'){ + $buy_info['nmr_list'][]=[ + 'item_id' => $v2['Id'], + 'name' => $v2['名称'], + ]; + } $Nx1_arrInfo[] = [ 'id' => $v2['Id'], 'name' => $v2['名称'],