diff --git a/app/Services/PatientOrderService.php b/app/Services/PatientOrderService.php index f9b3cbd..71b0f65 100644 --- a/app/Services/PatientOrderService.php +++ b/app/Services/PatientOrderService.php @@ -3124,14 +3124,6 @@ class PatientOrderService extends BaseService // 健康包数据 if ($order_service_package['order_service_type'] == 1){ - // 健康包商品订单数据 - $params = array(); - $params['order_service_id'] = $order_service_package['order_service_id']; - $order_service_package_products = OrderServicePackageProduct::getList($params); - if (!empty($order_service_package_products)){ - $result['order_service_package_product'] = $order_service_package_products->toArray(); - } - // 健康包关联优惠卷数据 if (in_array($order_service_package['order_service_status'],[3,4,5])){ // 订单状态(1:待支付 2:未开始 3:服务中 4:服务完成 5:服务取消) @@ -3145,16 +3137,15 @@ class PatientOrderService extends BaseService // 健康包药品订单数据-周期内所有药品订单 if (in_array($order_service_package['order_service_status'],[3,4,5])){ $params = array(); - $params['doctor_id'] = $order_service_package['doctor_id']; - $params['patient_id'] = $order_service_package['patient_id']; - $params['family_id'] = $order_service_package['family_id']; - - $created_at = [$order_service_package['start_time'],$order_service_package['finish_time']]; - - $order_product_status_params = [2,3,4]; - $order_products = OrderProduct::getProductWithCreateTime($params,$created_at,$order_product_status_params); - if (!empty($order_products)){ - $result['order_product'] = $order_products->toArray(); + $params['order_service_id'] = $order_service_package['order_service_id']; + $order_service_package_products = OrderServicePackageProduct::getList($params); + foreach ($order_service_package_products as $order_service_package_product){ + $params = array(); + $params['order_product_id'] = $order_service_package_product['order_product_id']; + $order_product = OrderProduct::getOne($params); + if (!empty($order_product)){ + $result['order_product'] = $order_product->toArray(); + } } // 获取服务包内所有药品