From 9d8eade3753dca0810cd5e10d30b90f095dd9509 Mon Sep 17 00:00:00 2001
From: wucongxing8150 <815046773@qq.com>
Date: Wed, 24 Apr 2024 15:16:34 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E8=8E=B7=E5=8F=96=E6=9C=8D?=
 =?UTF-8?q?=E5=8A=A1=E5=8C=85=E5=85=B3=E8=81=94=E9=97=AE=E8=AF=8A=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E6=B6=88=E6=81=AF=E5=86=85=E9=A1=B5=E5=9F=BA=E7=A1=80?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Services/PatientOrderService.php | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/app/Services/PatientOrderService.php b/app/Services/PatientOrderService.php
index 2c326a0..4b5f2f8 100644
--- a/app/Services/PatientOrderService.php
+++ b/app/Services/PatientOrderService.php
@@ -3116,9 +3116,9 @@ class PatientOrderService extends BaseService
             // 健康包商品数据
             $params = array();
             $params['order_service_id'] = $order_service_package['order_service_id'];
-            $order_service_package_product = OrderServicePackageProduct::getList($params);
-            if (!empty($order_service_package_product)){
-                $result['order_service_package_product'] = $order_service_package_product->toArray();
+            $order_service_package_products = OrderServicePackageProduct::getList($params);
+            if (!empty($order_service_package_products)){
+                $result['order_service_package_product'] = $order_service_package_products->toArray();
             }
 
             // 健康包关联优惠卷数据
@@ -3146,11 +3146,15 @@ class PatientOrderService extends BaseService
                     $result['order_product'] = $order_products->toArray();
                 }
 
-                // 获取服务包内某一药品的总数量
-                $total_quantity = $OrderServicePackageService->getOrderServiceProductTotalQuantity($order_service_package_product['product_id']);
+                if (!empty($order_service_package_products)) {
+                    foreach ($order_service_package_products as $order_service_package_product) {
+                        // 获取服务包内某一药品的总数量
+                        $total_quantity = $OrderServicePackageService->getOrderServiceProductTotalQuantity($order_service_package_product['product_id']);
 
-                // 获取服务包内某一药品的剩余数量
-                $result['order_service_package_detail']['remaining_quantity'] = $OrderServicePackageService->getOrderServiceProductCanUseQuantity($order_service_package['order_service_id'],$order_service_package_product['product_id'],$total_quantity);
+                        // 获取服务包内某一药品的剩余数量
+                        $result['order_service_package_detail']['remaining_quantity'] = $OrderServicePackageService->getOrderServiceProductCanUseQuantity($order_service_package['order_service_id'],$order_service_package_product['product_id'],$total_quantity);
+                    }
+                }
             }
         }