增加站内、短信订阅消息推送，修改所有消息推送入参

app/Amqp/Consumer/AssignDoctorDelayDirectConsumer.php

@@ -129,7 +129,7 @@ class AssignDoctorDelayDirectConsumer extends ConsumerMessage
 
                 try {
                     // 患者-分配医生失败-订阅
-                    $MessagePush = new MessagePush($order_inquiry['user_id'],$order_inquiry['order_inquiry_id']);
+                    $MessagePush = new MessagePush($order_inquiry['user_id'],$order_inquiry['inquiry_no']);
                     $MessagePush->assignDoctorFail();
                 }catch (\Exception $e){
                     Log::getInstance("queue-AssignDoctor")->error( $e->getMessage());
@@ -176,7 +176,7 @@ class AssignDoctorDelayDirectConsumer extends ConsumerMessage
 
                 try {
                     // 患者-分配医生失败-订阅
-                    $MessagePush = new MessagePush($order_inquiry['user_id'],$order_inquiry['order_inquiry_id']);
+                    $MessagePush = new MessagePush($order_inquiry['user_id'],$order_inquiry['inquiry_no']);
                     $MessagePush->assignDoctorFail();
                 }catch (\Exception $e){
                     Log::getInstance("queue-AssignDoctor")->error($e->getMessage());
@@ -290,7 +290,7 @@ class AssignDoctorDelayDirectConsumer extends ConsumerMessage
             $imService->waitDoctorInquiry($order_inquiry,$user_doctor['user_id'],$order_inquiry['user_id']);
 
             // 医生-医生有新问诊 站内、订阅失败发送短信
-            $MessagePush = new MessagePush($user_doctor['user_id'],$order_inquiry['order_inquiry_id']);
+            $MessagePush = new MessagePush($user_doctor['user_id'],$order_inquiry['inquiry_no']);
             $MessagePush->doctorHaveNewInquiry();
 
             // 加入xx时间未接诊通知队列

app/Amqp/Consumer/AssignPharmacistConsumer.php

@@ -73,6 +73,16 @@ class AssignPharmacistConsumer extends ConsumerMessage
             return Result::ACK;// 销毁
         }
 
+        // 获取问诊订单数据
+        $params = array();
+        $params['order_inquiry_id'] = $order_prescription['order_inquiry_id'];
+        $order_inquiry = OrderInquiry::getOne($params);
+        if (empty($order_inquiry)) {
+            Db::rollBack();
+            Log::getInstance()->error("分配药师队列执行结束：缺少问诊订单数据");
+            return Result::ACK;// 销毁
+        }
+
         Db::beginTransaction();
         try {
             // 分配药师
@@ -84,7 +94,7 @@ class AssignPharmacistConsumer extends ConsumerMessage
                 Log::getInstance()->error("分配药师队列执行失败：药师数据错误");
 
                 // 分配失败，按照驳回处理
-                $this->reject($data['order_prescription_id'], $user_doctor['user_id'], $user_patient['user_id'], $order_prescription['order_inquiry_id']);
+                $this->reject($data['order_prescription_id'], $user_doctor['user_id'], $user_patient['user_id'], $order_inquiry['inquiry_no']);
 
                 return Result::DROP;// 销毁
             }
@@ -103,7 +113,7 @@ class AssignPharmacistConsumer extends ConsumerMessage
             Log::getInstance()->error("分配药师队列执行失败原因：" . $e->getMessage());
 
             // 分配失败，按照驳回处理
-            $this->reject($data['order_prescription_id'], $user_doctor['user_id'],$user_patient['user_id'], $order_prescription['order_inquiry_id']);
+            $this->reject($data['order_prescription_id'], $user_doctor['user_id'],$user_patient['user_id'], $order_inquiry['inquiry_no']);
 
             return Result::DROP; // 重回队列
         }
@@ -118,12 +128,10 @@ class AssignPharmacistConsumer extends ConsumerMessage
      * @param string $order_prescription_id
      * @param string $doctor_user_id
      * @param string $patient_user_id
-     * @param string $order_inquiry_id
+     * @param string $inquiry_no
      * @return void
-     * @throws ContainerExceptionInterface
-     * @throws NotFoundExceptionInterface
      */
-    public function reject(string $order_prescription_id, string $doctor_user_id, string $patient_user_id, string $order_inquiry_id): void
+    public function reject(string $order_prescription_id, string $doctor_user_id, string $patient_user_id, string $inquiry_no): void
     {
         try {
             $params = array();
@@ -137,11 +145,11 @@ class AssignPharmacistConsumer extends ConsumerMessage
             OrderPrescription::edit($params, $data);
 
             // 医生-开具的处方审核未通过
-            $MessagePush = new MessagePush($doctor_user_id, $order_inquiry_id);
+            $MessagePush = new MessagePush($doctor_user_id, $inquiry_no);
             $MessagePush->prescriptionVerifyFail($order_prescription_id);
 
             // 患者-处方审核未通过
-            $MessagePush = new MessagePush($patient_user_id, $order_inquiry_id);
+            $MessagePush = new MessagePush($patient_user_id, $inquiry_no);
             $MessagePush->patientPrescriptionVerifyFail();
 
         } catch (\Exception $e) {

app/Amqp/Consumer/AutoCompleteInquiryDelayDirectConsumer.php

@@ -181,7 +181,7 @@ class AutoCompleteInquiryDelayDirectConsumer extends ConsumerMessage
             if (isset($is_push_prescription_verify_fail)){
                 // 站内、订阅失败发送短信-医生开具的处方审核未通过
                 $order_prescription_id = $order_prescription_id ?? "";
-                $MessagePush = new MessagePush($user_doctor['user_id'],$order_inquiry['order_inquiry_id']);
+                $MessagePush = new MessagePush($user_doctor['user_id'],$order_inquiry['inquiry_no']);
                 $MessagePush->prescriptionVerifyFail($order_prescription_id);
             }
 
@@ -193,7 +193,7 @@ class AutoCompleteInquiryDelayDirectConsumer extends ConsumerMessage
             $imService->inquiryEndEvaluation($order_inquiry,$user_doctor['user_id'],$order_inquiry['user_id']);
 
             // 医生-发送站内消息-问诊结束
-            $MessagePush = new MessagePush($user_doctor['user_id'],$order_inquiry['order_inquiry_id']);
+            $MessagePush = new MessagePush($user_doctor['user_id'],$order_inquiry['inquiry_no']);
             $MessagePush->finishInquiryToDoctor();
         }catch (\Throwable $e){
             Log::getInstance("queue-AutoCompleteInquiry")->error($e->getMessage());

app/Amqp/Consumer/AutoCompleteServicePackageDelayDirectConsumer.php

@@ -6,6 +6,9 @@ namespace App\Amqp\Consumer;
 
 use App\Amqp\Producer\AutoCompleteServicePackageDelayDirectProducer;
 use App\Model\OrderServicePackage;
+use App\Model\OrderServicePackageInquiry;
+use App\Model\UserDoctor;
+use App\Services\MessagePush;
 use App\Utils\Log;
 use App\Utils\Utils;
 use Hyperf\Amqp\Message\ConsumerDelayedMessageTrait;
@@ -116,7 +119,33 @@ class AutoCompleteServicePackageDelayDirectConsumer extends ConsumerMessage
 
         // 发送消息
         try {
+            // 获取订单医生数据
+            $params = array();
+            $params['doctor_id'] = $order_service_package['doctor_id'];
+            $user_doctor = UserDoctor::getOne($params);
+            if (empty($user_doctor)) {
+                Log::getInstance("queue-AutoCompleteServicePackage")->error("医生数据错误");
+                return Result::ACK;
+            }
 
+            $params = array();
+            $params['order_service_id'] = $order_service_package['order_service_id'];
+            $order_service_package_inquiry = OrderServicePackageInquiry::getOne($params);
+            if (!empty($order_service_package_inquiry)){
+                // 获取医生数据
+                $params = array();
+                $params['doctor_id'] = $order_service_package['doctor_id'];
+                $user_doctor = UserDoctor::getOne($params);
+                if (!empty($user_doctor)) {
+                    // 医生-通知医生患者的服务包服务结束
+                    $MessagePush = new MessagePush($user_doctor['user_id'], $order_service_package_inquiry['inquiry_no']);
+                    $MessagePush->doctorServicePackageFinish();
+                }
+
+                // 患者-通知患者服务包服务已结束
+                $MessagePush = new MessagePush($order_service_package['user_id'], $order_service_package_inquiry['inquiry_no']);
+                $MessagePush->patientServicePackageFinish();
+            }
         }catch (\Throwable $e){
             Log::getInstance("queue-AutoCompleteServicePackage")->error($e->getMessage());
             return Result::ACK;

app/Amqp/Consumer/AutoPharmacistCaVerifyDelayDirectConsumer.php

@@ -152,11 +152,11 @@ class AutoPharmacistCaVerifyDelayDirectConsumer extends ConsumerMessage
                 $this->modifyOrderPrescription($data['order_prescription_id'], 2, "请联系平台客服，请勿重开处方");
 
                 // 医生-开具的处方审核未通过
-                $MessagePush = new MessagePush($user_doctor['user_id'], $order_prescription['order_inquiry_id']);
+                $MessagePush = new MessagePush($user_doctor['user_id'], $order_inquiry['inquiry_no']);
                 $MessagePush->prescriptionVerifyFail($data['order_prescription_id']);
 
                 // 患者-处方审核未通过
-                $MessagePush = new MessagePush($user_patient['user_id'], $order_prescription['order_inquiry_id']);
+                $MessagePush = new MessagePush($user_patient['user_id'], $order_inquiry['inquiry_no']);
                 $MessagePush->patientPrescriptionVerifyFail();
                 Db::commit();
 
@@ -274,12 +274,12 @@ class AutoPharmacistCaVerifyDelayDirectConsumer extends ConsumerMessage
             $imService->prescriptionIssued($order_inquiry,$user_doctor['user_id'],$order_inquiry['user_id'],$product_name,(string)$data['order_prescription_id'],7);
 
             // 发送站内、短信消息-患者的处方被药师审核通过
-            $MessagePush = new MessagePush($order_inquiry['user_id'],$order_inquiry['order_inquiry_id']);
+            $MessagePush = new MessagePush($order_inquiry['user_id'],$order_inquiry['inquiry_no']);
             $MessagePush->patientPrescriptionVerifyPass();
 
             // 站内、订阅失败发送短信-医生开具的处方审核通过
             // 发送目标不同，重新实例化
-            $MessagePush = new MessagePush($user_doctor['user_id'],$order_inquiry['order_inquiry_id']);
+            $MessagePush = new MessagePush($user_doctor['user_id'],$order_inquiry['inquiry_no']);
             $MessagePush->prescriptionVerifySuccess();
 
             // 添加处方过期队列

app/Amqp/Consumer/CancelUnInquiryOrdersDelayDirectConsumer.php

@@ -15,6 +15,7 @@ use App\Services\ImService;
 use App\Services\InquiryService;
 use App\Services\MessagePush;
 use App\Services\OrderService;
+use App\Services\OrderServicePackageService;
 use App\Utils\Log;
 use App\Utils\Utils;
 use Hyperf\Amqp\Message\ConsumerDelayedMessageTrait;
@@ -198,12 +199,32 @@ class CancelUnInquiryOrdersDelayDirectConsumer extends ConsumerMessage
             // 发送IM消息-问诊退款
             $imService->inquiryRefund($order_inquiry,$user_doctor['user_id'],$order_inquiry['user_id']);
 
-            // 发送站内、订阅消息-患者-医生未接诊
+            // 处理服务包情况
-            $MessagePush = new MessagePush($order_inquiry['user_id'],$order_inquiry['order_inquiry_id']);
+            if ($order_inquiry['inquiry_mode'] == 8 || $order_inquiry['inquiry_mode'] == 9) {
-            $MessagePush->patientNoInquiry();
+                $OrderServicePackageService = new OrderServicePackageService();
+
+                // 获取服务包订单编号-通过问诊订单id
+                $order_service_no = $OrderServicePackageService->getOrderServiceNoByOrderInquiryId($order_inquiry['inquiry_no']);
+
+                // 检测问诊是否服务包首次问诊
+                $is_first = $OrderServicePackageService->isFirstInquiryServicePackage($order_service_no);
+                if ($is_first){
+                    // 患者-医生未接受服务包订单
+                    $MessagePush = new MessagePush($order_inquiry['user_id'],$order_inquiry['inquiry_no']);
+                    $MessagePush->patientDoctorNoAcceptServicePackage();
+                }else{
+                    // 发送站内、订阅消息-患者-医生未接诊
+                    $MessagePush = new MessagePush($order_inquiry['user_id'],$order_inquiry['inquiry_no']);
+                    $MessagePush->patientNoInquiry();
+                }
+            }else{
+                // 发送站内、订阅消息-患者-医生未接诊
+                $MessagePush = new MessagePush($order_inquiry['user_id'],$order_inquiry['inquiry_no']);
+                $MessagePush->patientNoInquiry();
+            }
 
             // 发送站内、订阅消息-医生-超时未接诊
-            $MessagePush = new MessagePush($user_doctor['user_id'],$order_inquiry['order_inquiry_id']);
+            $MessagePush = new MessagePush($user_doctor['user_id'],$order_inquiry['inquiry_no']);
             $MessagePush->doctorNoInquiry();
 
             if (!empty($order_inquiry['coupon_amount_total']) && $order_inquiry['coupon_amount_total'] > 0) {
@@ -213,7 +234,7 @@ class CancelUnInquiryOrdersDelayDirectConsumer extends ConsumerMessage
                 $order_inquiry_coupon = OrderInquiryCoupon::getOne($params);
                 if (!empty($order_inquiry_coupon)){
                     // 发送站内消息-优惠卷退还
-                    $MessagePush = new MessagePush($order_inquiry['user_id'], $order_inquiry['order_inquiry_id']);
+                    $MessagePush = new MessagePush($order_inquiry['user_id'], $order_inquiry['inquiry_no']);
                     $MessagePush->patientRefundCoupon($order_inquiry_coupon['coupon_name']);
                 }
             }

app/Amqp/Consumer/DoctorNotYetInquiryDelayDirectConsumer.php

@@ -7,6 +7,7 @@ namespace App\Amqp\Consumer;
 use App\Model\OrderInquiry;
 use App\Model\UserDoctor;
 use App\Services\MessagePush;
+use App\Services\OrderServicePackageService;
 use App\Utils\Log;
 use Hyperf\Amqp\Message\ConsumerDelayedMessageTrait;
 use Hyperf\Amqp\Message\ProducerDelayedMessageTrait;
@@ -36,7 +37,7 @@ class DoctorNotYetInquiryDelayDirectConsumer extends ConsumerMessage
 
     public function consumeMessage($data, AMQPMessage $message): string
     {
-        Log::getInstance("queue-DoctorNotYetInquiry")->info("开始：" . json_encode($data, JSON_UNESCAPED_UNICODE));
+        Log::getInstance("queue-DoctorNotYetInquiry")->info(json_encode($data, JSON_UNESCAPED_UNICODE));
 
         if (!isset($data['order_inquiry_id'])){
             Log::getInstance("queue-DoctorNotYetInquiry")->error("缺少参数");
@@ -65,13 +66,30 @@ class DoctorNotYetInquiryDelayDirectConsumer extends ConsumerMessage
             $user_doctor = UserDoctor::getOne($params);
             if (empty($user_doctor)) {
                 Log::getInstance("queue-DoctorNotYetInquiry")->error("医生数据错误");
+                return Result::ACK;
             }
 
-            // 发送站内、订阅消息-医生-超时未接诊
+            // 处理服务包情况
-            $MessagePush = new MessagePush($user_doctor['user_id'],$order_inquiry['order_inquiry_id']);
+            if ($order_inquiry['inquiry_mode'] == 8 || $order_inquiry['inquiry_mode'] == 9){
-            $MessagePush->doctorNotYetInquiry();
+                $OrderServicePackageService = new OrderServicePackageService();
+
+                // 获取服务包订单编号-通过问诊订单id
+                $order_service_no = $OrderServicePackageService->getOrderServiceNoByOrderInquiryId($order_inquiry['inquiry_no']);
+
+                // 检测问诊是否服务包首次问诊
+                $is_first = $OrderServicePackageService->isFirstInquiryServicePackage($order_service_no);
+                if ($is_first){
+                    // 医生-医生xx时间后还未接受服务包订单
+                    $MessagePush = new MessagePush($user_doctor['user_id'],$order_inquiry['inquiry_no']);
+                    $MessagePush->doctorNotYetOrderServicePackage();
+                }
+            }else{
+                // 发送站内、订阅消息-医生-超时未接诊
+                $MessagePush = new MessagePush($user_doctor['user_id'],$order_inquiry['inquiry_no']);
+                $MessagePush->doctorNotYetInquiry();
+            }
         }catch (\Throwable $e){
-            Log::getInstance("queue-DoctorNotYetInquiry")->error("失败：" . $e->getMessage());
+            Log::getInstance("queue-DoctorNotYetInquiry")->error($e->getMessage());
             return Result::ACK;
         }
 

app/Controller/CallBackController.php

@@ -251,7 +251,7 @@ class CallBackController extends AbstractController
                     $imService->waitDoctorInquiry($order_inquiry, $user_doctor['user_id'], $order_inquiry['user_id']);
 
                     // 发送站内、订阅失败发送短信消息-医生有新问诊
-                    $MessagePush = new MessagePush($user_doctor['user_id'], $order_inquiry['order_inquiry_id']);
+                    $MessagePush = new MessagePush($user_doctor['user_id'], $order_inquiry['inquiry_no']);
                     $MessagePush->doctorHaveNewInquiry();
 
                     // 加入xx时间未接诊通知队列
@@ -365,7 +365,7 @@ class CallBackController extends AbstractController
         if ($message['refund_status'] == "SUCCESS") {
             try {
                 // 发送站内、订阅、短信消息-问诊服务退款成功
-                $MessagePush = new MessagePush($order_inquiry['user_id'], $order_inquiry['order_inquiry_id']);
+                $MessagePush = new MessagePush($order_inquiry['user_id'], $order_inquiry['inquiry_no']);
 
                 // 取消订单原因（1:医生未接诊 2:主动取消 3:无可分配医生 4:客服取消 5:支付超时）
                 $MessagePush->refundInquirySuccess($order_inquiry['cancel_reason']);
@@ -2378,7 +2378,25 @@ class CallBackController extends AbstractController
             return $this->wxPayErrorReturn($e->getMessage());
         }
 
-        Log::getInstance("CallBack-wxPayServiceRefund")->info("微信退款回调处理成功");
+        Log::getInstance("CallBack-wxPayServiceRefund")->info("微信退款回调处理成功,推送消息");
+
+        // 发送推送消息
+        if ($message['refund_status'] == "SUCCESS") {
+            try {
+                $params = array();
+                $params['order_service_id'] = $order_service_package['order_service_id'];
+                $order_service_package_inquiry = OrderServicePackageInquiry::getOne($params);
+                if (!empty($order_service_package_inquiry)){
+                    // 患者-服务包服务退款成功
+                    $MessagePush = new MessagePush($order_service_package['user_id'], $order_service_package_inquiry['inquiry_no']);
+                    $MessagePush->refundServicePackageSuccess();
+                }
+            } catch (\Exception $e) {
+                // 验证失败
+                Log::getInstance("CallBack-wxPayInquiryRefund")->error("微信退款回调处理成功，推送消息失败:" . $e->getMessage());
+                return $server->serve();
+            }
+        }
 
         return $server->serve();
     }
@@ -2785,14 +2803,14 @@ class CallBackController extends AbstractController
                 $imService->waitDoctorInquiry($order_inquiry, $user_doctor['user_id'], $order_inquiry['user_id']);
 
                 // 发送站内、订阅失败发送短信消息-医生有新服务包订单
-                $MessagePush = new MessagePush($user_doctor['user_id'], $order_service_package['order_service_no']);
+                $MessagePush = new MessagePush($user_doctor['user_id'], $order_inquiry['inquiry_no']);
                 $MessagePush->doctorHaveNewServicePackage();
 
                 // 加入xx时间未接诊通知队列
                 $data = array();
                 $data['order_inquiry_id'] = $order_inquiry['order_inquiry_id'];
 
-                $time = 1000 * 60 * 60 * 2;
+                $time = 1000 * 60 * 60 * 24;
                 $message = new DoctorNotYetInquiryDelayDirectProducer($data);
                 $message->setDelayMs($time);
                 $producer = $this->container->get(Producer::class);

app/Services/InquiryService.php

@@ -1218,11 +1218,11 @@ class InquiryService extends BaseService
             $imService->inquiryEndEvaluation($order_inquiry, $user_doctor['user_id'], $order_inquiry['user_id']);
 
             // 医生-发送通知消息-问诊结束
-            $MessagePush = new MessagePush($user_doctor['user_id'], $order_inquiry['order_inquiry_id']);
+            $MessagePush = new MessagePush($user_doctor['user_id'], $order_inquiry['inquiry_no']);
             $MessagePush->finishInquiryToDoctor();
 
             // 患者-发送通知消息-患者的问诊服务结束
-            $MessagePush = new MessagePush($order_inquiry['user_id'], $order_inquiry['order_inquiry_id']);
+            $MessagePush = new MessagePush($order_inquiry['user_id'], $order_inquiry['inquiry_no']);
             $MessagePush->patientInquiryFinish();
         } catch (\Throwable $e) {
             Log::getInstance("InquiryService-putFinishInquiry")->error($e->getMessage());
@@ -1399,7 +1399,7 @@ class InquiryService extends BaseService
             $imService->giveFreeRounds($order_inquiry, $user_doctor['user_id'], $order_inquiry['user_id'], $times_number, $give_expiration_time);
 
             // 发送站内、订阅失败发送短信消息-患者-赠送回合数
-            $MessagePush = new MessagePush($order_inquiry['user_id'], $order_inquiry['order_inquiry_id']);
+            $MessagePush = new MessagePush($order_inquiry['user_id'], $order_inquiry['inquiry_no']);
             $MessagePush->doctorGiveFreeRounds($times_number, $give_expiration_time);
         } catch (\Throwable $e) {
             Log::getInstance("InquiryService-addDoctorGiveInquiryOrder")->error($e->getMessage());

app/Services/OrderPrescriptionService.php

@@ -469,13 +469,13 @@ class OrderPrescriptionService extends BaseService
 
             OrderPrescription::edit($params, $data);
 
-            // 医生-开具的处方审核未通过
+            /*// 医生-开具的处方审核未通过
             $MessagePush = new MessagePush($doctor_user_id, $order_inquiry_id);
             $MessagePush->prescriptionVerifyFail($order_prescription_id);
 
             // 患者-处方审核未通过
             $MessagePush = new MessagePush($patient_user_id, $order_inquiry_id);
-            $MessagePush->patientPrescriptionVerifyFail();
+            $MessagePush->patientPrescriptionVerifyFail();*/
 
         } catch (\Exception $e) {
             throw new BusinessException($e->getMessage());

app/Services/OrderServicePackageService.php

@@ -986,15 +986,25 @@ class OrderServicePackageService extends BaseService
             // 等待医生接诊
             $imService->waitDoctorInquiry($order_inquiry, $user_doctor['user_id'], $order_inquiry['user_id']);
 
-            // 发送站内、订阅失败发送短信消息-医生有新服务包订单
+            // 检测问诊是否服务包首次问诊
-            $MessagePush = new MessagePush($user_doctor['user_id'], $order_service_package['order_service_no']);
+            $OrderServicePackageService = new OrderServicePackageService();
-            $MessagePush->doctorHaveNewServicePackage();
+            $is_first = $OrderServicePackageService->isFirstInquiryServicePackage($order_no);
+            if ($is_first){
+                // 首次
+                // 发送站内、订阅失败发送短信消息-医生有新服务包订单
+                $MessagePush = new MessagePush($user_doctor['user_id'], $order_inquiry['inquiry_no']);
+                $MessagePush->doctorHaveNewServicePackage();
+            }else{
+                // 发送站内、订阅失败-医生有新的服务包问诊订单
+                $MessagePush = new MessagePush($user_doctor['user_id'], $order_inquiry['inquiry_no']);
+                $MessagePush->doctorHaveNewServicePackageInquiry();
+            }
 
             // 加入xx时间未接诊通知队列
             $data = array();
             $data['order_inquiry_id'] = $order_inquiry['order_inquiry_id'];
 
-            $time = 1000 * 60 * 60 * 2;
+            $time = 1000 * 60 * 60 * 24;
             $message = new DoctorNotYetInquiryDelayDirectProducer($data);
             $message->setDelayMs($time);
             $producer = $this->container->get(Producer::class);
@@ -1260,7 +1270,7 @@ class OrderServicePackageService extends BaseService
     }
 
     /**
-     * 获取服务包剩余药品数量
+     * 获取服务包内某一药品的剩余数量
      * @param string|int $order_service_id
      * @param string|int $product_id
      * @return int
@@ -1303,4 +1313,50 @@ class OrderServicePackageService extends BaseService
 
         return false;
     }
+
+    /**
+     * 获取服务包订单编号-通过问诊订单id
+     * @param string|int $inquiry_no
+     * @return string|int
+     */
+    public function getOrderServiceNoByOrderInquiryId(string|int $inquiry_no): string|int
+    {
+        $params = array();
+        $params['inquiry_no'] = $inquiry_no;
+        $order_service_package_inquiry = OrderServicePackageInquiry::getOne($params);
+        if (empty($order_service_package_inquiry)){
+            throw new BusinessException("订单错误");
+        }
+
+        return $order_service_package_inquiry['order_service_no'];
+    }
+
+    /**
+     * 检测患者服务包内是否还存在剩余药品
+     * @param string|int $order_no
+     * @return bool
+     */
+    public function checkOrderServiceRemainingProduct(string|int $order_no): bool
+    {
+        // 获取服务包关联商品
+        $params = array();
+        $params['order_service_no'] = $order_no;
+        $order_service_package = OrderServicePackage::getOne($params);
+        if (empty($order_service_package)){
+            return false;
+        }
+
+        $params = array();
+        $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){
+            $remaining_quantity = $order_service_package_product['quantity'] - $order_service_package_product['used_quantity'];
+            if ($remaining_quantity > 0){
+                return true;
+            }
+        }
+
+        return false;
+    }
+
 }

app/Services/PatientOrderService.php

@@ -413,7 +413,7 @@ class PatientOrderService extends BaseService
                 }
 
                 // 推送医生-患者取消问诊
-                $MessagePush = new MessagePush($user_doctor['user_id'], $order_inquiry['order_inquiry_id']);
+                $MessagePush = new MessagePush($user_doctor['user_id'], $order_inquiry['inquiry_no']);
                 $MessagePush->patientCancelInquiryToDoctor();
             }
         } catch (\Exception $e) {
@@ -1241,7 +1241,7 @@ class PatientOrderService extends BaseService
                         $imService->waitDoctorInquiry($order_inquiry, $user_doctor['user_id'], $order_inquiry['user_id']);
 
                         // 发送站内、订阅失败发送短信消息-医生有新问诊
-                        $MessagePush = new MessagePush($user_doctor['user_id'], $order_inquiry['order_inquiry_id']);
+                        $MessagePush = new MessagePush($user_doctor['user_id'], $order_inquiry['inquiry_no']);
                         $MessagePush->doctorHaveNewInquiry();
 
                         // 加入xx时间未接诊通知队列
@@ -1503,7 +1503,7 @@ class PatientOrderService extends BaseService
 
             $amount_total = 0;
             foreach ($product_datas as &$product_data){
-                // 获取服务包剩余药品数量
+                // 获取服务包内某一药品的剩余数量
                 $remaining_quantity = $OrderServicePackageService->getOrderServiceProductRemainingQuantity($order_service_package_inquiry['order_service_id'],$product_data['product_id']);
 
                 // 可用数量大于处方商品数量，此情况把商品价格置为0
@@ -2014,7 +2014,7 @@ class PatientOrderService extends BaseService
 
             $amount_total = 0;
             foreach ($product_datas as &$product_data){
-                // 获取服务包剩余药品数量
+                // 获取服务包内某一药品的剩余数量
                 $remaining_quantity = $OrderServicePackageService->getOrderServiceProductRemainingQuantity($order_service_package_inquiry['order_service_id'],$product_data['product_id']);
 
                 // 可用数量大于处方商品数量，此情况把商品价格置为0
@@ -2667,7 +2667,7 @@ class PatientOrderService extends BaseService
                         $user_doctor = UserDoctor::getOne($params);
                         if (!empty($user_doctor)) {
                             // 推送医生-患者取消问诊
-                            $MessagePush = new MessagePush($user_doctor['user_id'], $order_inquiry['order_inquiry_id']);
+                            $MessagePush = new MessagePush($user_doctor['user_id'], $order_inquiry['inquiry_no']);
                             $MessagePush->patientCancelInquiryToDoctor();
                         }
                     }
@@ -2680,7 +2680,7 @@ class PatientOrderService extends BaseService
                     $order_detection = OrderDetection::getOne($params);
                     if (!empty($order_detection)) {
                         // 推送患者-订单取消成功通知
-                        $MessagePush = new MessagePush($order_detection['user_id']);
+                        $MessagePush = new MessagePush($order_detection['user_id'],$order_detection['detection_no']);
                         $MessagePush->patientCancelDetectionOrderSuccess($order_detection['order_detection_id']);
                     }
 
@@ -2707,9 +2707,9 @@ class PatientOrderService extends BaseService
                         $params['doctor_id'] = $order_service_package['doctor_id'];
                         $user_doctor = UserDoctor::getOne($params);
                         if (!empty($user_doctor)) {
-                            // 推送医生-患者取消问诊
+                            // 医生-患者取消服务包订单
-                            $MessagePush = new MessagePush($user_doctor['user_id'], $order_service_package_inquiry['order_inquiry_id']);
+                            $MessagePush = new MessagePush($user_doctor['user_id'], $order_service_package_inquiry['inquiry_no']);
-                            $MessagePush->patientCancelInquiryToDoctor();
+                            $MessagePush->doctorPatientCancelServicePackage();
                         }
                     }
 

app/Services/UserDoctorService.php

@@ -1985,9 +1985,37 @@ class UserDoctorService extends BaseService
             // 发送IM消息-患者病例
             $imService->patientCase($order_inquiry,$user_doctor['user_id'],$order_inquiry_case['disease_desc']);
 
-            // 发送站内、订阅、短信消息-医生已接诊
+            // 处理服务包情况
-            $MessagePush = new MessagePush($order_inquiry['user_id'],$order_inquiry['order_inquiry_id']);
+            if ($order_inquiry['inquiry_mode'] == 8 || $order_inquiry['inquiry_mode'] == 9){
-            $MessagePush->patientAcceptedInquiry();
+                $OrderServicePackageService = new OrderServicePackageService();
+
+                // 获取服务包订单编号-通过问诊订单id
+                $order_service_no = $OrderServicePackageService->getOrderServiceNoByOrderInquiryId($order_inquiry['inquiry_no']);
+
+                // 检测问诊是否服务包首次问诊
+                $is_first = $OrderServicePackageService->isFirstInquiryServicePackage($order_service_no);
+                if ($is_first){
+                    // 患者-通知患者医生已接受服务包服务
+                    $MessagePush = new MessagePush($order_inquiry['user_id'],$order_inquiry['inquiry_no']);
+                    $MessagePush->patientAcceptedServicePackage();
+                }else{
+                    // 患者-通知患者医生已接诊服务包相关问诊订单
+                    $MessagePush = new MessagePush($order_inquiry['user_id'],$order_inquiry['inquiry_no']);
+                    $MessagePush->patientAcceptedServicePackageInquiry();
+                }
+
+                // 检测患者服务包内是否还存在剩余药品
+                $res = $OrderServicePackageService->checkOrderServiceRemainingProduct($order_service_no);
+                if ($res){
+                    // 患者-通知患者服务包药品未使用完
+                    $MessagePush = new MessagePush($order_inquiry['user_id'],$order_inquiry['inquiry_no']);
+                    $MessagePush->patientServicePackageHaveProduct();
+                }
+            }else{
+                // 发送站内、订阅、短信消息-医生已接诊
+                $MessagePush = new MessagePush($order_inquiry['user_id'],$order_inquiry['inquiry_no']);
+                $MessagePush->patientAcceptedInquiry();
+            }
         }catch(\Exception $e){
             return success([],HttpEnumCode::HTTP_SUCCESS,$e->getMessage());
         }

app/Services/UserPharmacistService.php

@@ -257,12 +257,12 @@ class UserPharmacistService extends BaseService
                 $imService->prescriptionIssued($order_inquiry,$user_doctor['user_id'],$order_inquiry['user_id'],$product_name,(string)$order_prescription['order_prescription_id'],7);
 
                 // 发送站内、短信消息-患者的处方被药师审核通过
-                $MessagePush = new MessagePush($order_inquiry['user_id'],$order_inquiry['order_inquiry_id']);
+                $MessagePush = new MessagePush($order_inquiry['user_id'],$order_inquiry['inquiry_no']);
                 $MessagePush->patientPrescriptionVerifyPass();
 
                 // 站内、订阅失败发送短信-医生开具的处方审核通过
                 // 发送目标不同，重新实例化
-                $MessagePush = new MessagePush($user_doctor['user_id'],$order_inquiry['order_inquiry_id']);
+                $MessagePush = new MessagePush($user_doctor['user_id'],$order_inquiry['inquiry_no']);
                 $MessagePush->prescriptionVerifySuccess();
 
                 // 添加处方过期队列
@@ -279,7 +279,7 @@ class UserPharmacistService extends BaseService
                 }
             }else{
                 // 站内、订阅失败发送短信-医生开具的处方审核未通过
-                $MessagePush = new MessagePush($user_doctor['user_id'],$order_inquiry['order_inquiry_id']);
+                $MessagePush = new MessagePush($user_doctor['user_id'],$order_inquiry['inquiry_no']);
                 $MessagePush->prescriptionVerifyFail($order_prescription['order_prescription_id']);
             }
 

app/Services/UserService.php

@@ -763,7 +763,7 @@ class UserService extends BaseService
     /**
      * 通过user_id获取用户openid
      * @param string|int $user_id
-     * @param int $user_type
+     * @param int|string $user_type
      * @return string
      */
     public function getOpenIdWithUserId(string|int $user_id, int|string $user_type): string
@@ -876,6 +876,13 @@ class UserService extends BaseService
                 return true;
             }
 
+            $params = array();
+            $params['order_inquiry_id'] = $order_inquiry_id;
+            $order_inquiry = OrderInquiry::getOne($params);
+            if (empty($order_inquiry)){
+                return false;
+            }
+
             $message = "您有一条新的问诊消息";
             // 判断消息类型
             if (isset($msg_body[0]['MsgType'])){
@@ -907,7 +914,7 @@ class UserService extends BaseService
                 }
             }
 
-            $MessagePush = new MessagePush($user_id, $order_inquiry_id);
+            $MessagePush = new MessagePush($user_id, $order_inquiry['inquiry_no']);
 
             if ($user['user_type'] == 1){
                 // 患者