From 5baf6de53759ee57ff3adfc544d77d3ad2f9ca89 Mon Sep 17 00:00:00 2001
From: wucongxing8150 <815046773@qq.com>
Date: Mon, 29 Apr 2024 16:44:38 +0800
Subject: [PATCH] =?UTF-8?q?=E8=8D=AF=E5=93=81=E8=AE=A2=E5=8D=95=E4=BD=BF?=
 =?UTF-8?q?=E7=94=A8=E6=95=B0=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Services/PatientOrderService.php | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

diff --git a/app/Services/PatientOrderService.php b/app/Services/PatientOrderService.php
index 04e7599..07565e4 100644
--- a/app/Services/PatientOrderService.php
+++ b/app/Services/PatientOrderService.php
@@ -1517,7 +1517,7 @@ class PatientOrderService extends BaseService
             return fail();
         }
 
-        // 获取患者家庭成员进行中的服务包订单
+        // 获取患者家庭成员进行中的服务包订单-健康包
         $OrderServicePackageService = new OrderServicePackageService();
         $order_service_package = $OrderServicePackageService->getPatientFamilyInProgressServicePackage($order_inquiry['user_id'],$order_inquiry['family_id'],$order_inquiry['doctor_id'],1);
         if (!empty($order_service_package)){
@@ -1720,18 +1720,9 @@ class PatientOrderService extends BaseService
                 ProductPlatformAmount::dec($params, 'stock', $product_data['product_num']);
 
                 // 处理健康包数据，增加使用数量
-                if ($order_inquiry['inquiry_type'] == 1 && $order_inquiry['inquiry_mode'] == 8){
-                    // 获取问诊订单关联服务包id
-                    $params = array();
-                    $params['order_inquiry_id'] = $order_inquiry['order_inquiry_id'];
-                    $order_service_package_inquiry = OrderServicePackageInquiry::getOne($params);
-                    if (empty($order_service_package_inquiry)){
-                        Db::rollBack();
-                        return fail(HttpEnumCode::SERVER_ERROR, "订单创建失败");
-                    }
-
+                if (!empty($order_service_package)){
                     $data = array();
-                    $data['order_service_id'] = $order_service_package_inquiry['order_service_id'];
+                    $data['order_service_id'] = $order_service_package['order_service_id'];
                     $data['order_product_id'] = $order_product['order_product_id'];
                     $data['order_product_no'] = $order_product['order_product_no'];
                     $data['product_item_id'] = $order_product_item['product_item_id'];