From 6849f1c15bf3cc6a571e2b6ec91e00b1e311c76f Mon Sep 17 00:00:00 2001
From: wucongxing8150 <815046773@qq.com>
Date: Wed, 8 May 2024 13:23:54 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8E=A8=E9=80=81=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=EF=BC=8C=E8=BF=9B=E5=85=A5=E8=B4=A6=E6=88=B7=E9=87=91?=
 =?UTF-8?q?=E9=A2=9D=E8=AE=A1=E7=AE=97=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...pleteServicePackageDelayDirectConsumer.php | 38 +++++++++----------
 app/Services/MessagePush.php                  |  2 +-
 app/Services/OrderServicePackageService.php   |  1 +
 3 files changed, 20 insertions(+), 21 deletions(-)

diff --git a/app/Amqp/Consumer/AutoCompleteServicePackageDelayDirectConsumer.php b/app/Amqp/Consumer/AutoCompleteServicePackageDelayDirectConsumer.php
index 932d03b..70a61b6 100644
--- a/app/Amqp/Consumer/AutoCompleteServicePackageDelayDirectConsumer.php
+++ b/app/Amqp/Consumer/AutoCompleteServicePackageDelayDirectConsumer.php
@@ -121,31 +121,29 @@ class AutoCompleteServicePackageDelayDirectConsumer extends ConsumerMessage
             $params['order_service_id'] = $order_service_package['order_service_id'];
             OrderServicePackage::edit($params,$data);
 
-            // 处理统计问题
-            if ($order_service_package['amount_total'] > 0) {
-                // 计算本次问诊服务包问诊金额
+            // 计算本次问诊服务包问诊金额
+            if ($order_service_package['order_service_type'] == 1){
                 $amount_total = bcmul(
+                    (string)$order_service_package_detail['single_inquiry_price'],
                     (string)$order_service_package_detail['service_count'],
-                    bcmul(
-                        (string)$order_service_package_detail['single_inquiry_price'],
-                        "0.75",
-                        3),
-                    3
+                    8
                 );
+            }else{
+                $amount_total = $order_service_package_detail['service_price'];
+            }
 
-                // 处理医生账户总表
-                $res = $this->handleDoctorAccount($amount_total,$order_service_package['doctor_id']);
-                if (!$res) {
-                    Db::rollBack();
-                    return Result::REQUEUE;
-                }
+            // 处理医生账户总表
+            $res = $this->handleDoctorAccount($amount_total,$order_service_package['doctor_id']);
+            if (!$res) {
+                Db::rollBack();
+                return Result::REQUEUE;
+            }
 
-                // 处理医生账户表-日
-                $res = $this->handleDoctorAccountDay($amount_total,$order_service_package['doctor_id'],$order_service_package['start_time']);
-                if (!$res) {
-                    Db::rollBack();
-                    return Result::REQUEUE;
-                }
+            // 处理医生账户表-日
+            $res = $this->handleDoctorAccountDay($amount_total,$order_service_package['doctor_id'],$order_service_package['start_time']);
+            if (!$res) {
+                Db::rollBack();
+                return Result::REQUEUE;
             }
 
             Db::commit();
diff --git a/app/Services/MessagePush.php b/app/Services/MessagePush.php
index ec0f9a4..3c2a27d 100644
--- a/app/Services/MessagePush.php
+++ b/app/Services/MessagePush.php
@@ -3126,7 +3126,7 @@ class MessagePush extends BaseService
             $sub_data['params']['page'] = "Pages/yishi/wenzhen_v2/wenzhen";
             $sub_data['params']['data'] = [
                 "thing1" => "{$order_service_type}服务已完成",// 提醒内容
-                "name2" => $this->order_inquiry['patient_name'],// 患者姓名
+                "name2" => $order_service_package['patient_name'],// 患者姓名
                 "thing4" => $disease_desc,// 病情描述
                 "thing6" => "您可以提醒患者进行续费",// 提示说明
                 "thing5" => "",// 咨询内容
diff --git a/app/Services/OrderServicePackageService.php b/app/Services/OrderServicePackageService.php
index c320e79..7c5b867 100644
--- a/app/Services/OrderServicePackageService.php
+++ b/app/Services/OrderServicePackageService.php
@@ -1478,6 +1478,7 @@ class OrderServicePackageService extends BaseService
                         bcmul(
                             (string)$order_service_package_detail['single_inquiry_price'],
                             (string)$order_service_package_detail['service_count'],
+                            2
                         ),
                         2
                     );