From 4890eea107dfc7815bed59408230c1c2473550e2 Mon Sep 17 00:00:00 2001
From: wucongxing <815046773@qq.com>
Date: Sun, 23 Apr 2023 15:11:05 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=82=A3=E8=80=85=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E8=AF=8A=E6=9C=8D=E5=8A=A1=E7=BB=93=E6=9D=9F=E9=80=9A?=
 =?UTF-8?q?=E7=9F=A5=EF=BC=8C=E4=BF=AE=E6=94=B9=E9=97=AE=E8=AF=8A=E7=BB=93?=
 =?UTF-8?q?=E6=9D=9F=E7=9A=84=E6=B6=88=E6=81=AF=E9=80=9A=E7=9F=A5=E4=B8=BA?=
 =?UTF-8?q?=E5=8D=95=E7=8B=ACtry=20catch?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Controller/TestController.php |  4 +---
 app/Services/InquiryService.php   | 30 +++++++++++++++++++-----------
 2 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/app/Controller/TestController.php b/app/Controller/TestController.php
index c3fe11b..a162c6a 100644
--- a/app/Controller/TestController.php
+++ b/app/Controller/TestController.php
@@ -39,6 +39,7 @@ use Extend\RegulatoryPlatform\regulatoryPlatform;
 use Extend\TencentIm\RecentContact;
 use Hyperf\Amqp\Producer;
 use Hyperf\DbConnection\Db;
+use Hyperf\Redis\Redis;
 use Hyperf\Utils\ApplicationContext;
 use Hyperf\Utils\Coroutine\Concurrent;
 use Imagick;
@@ -800,9 +801,6 @@ class TestController extends AbstractController
     }
 
     public function test_15(){
-        Log::getInstance("auto-pharmacist-ca-verify-queue")->info("ninhao");
-
-        dump(111);die;
         $wg = new \Hyperf\Utils\WaitGroup();
         $channel = new Channel();
         $wg->add(2);
diff --git a/app/Services/InquiryService.php b/app/Services/InquiryService.php
index 7b84602..495af62 100644
--- a/app/Services/InquiryService.php
+++ b/app/Services/InquiryService.php
@@ -867,17 +867,6 @@ class InquiryService extends BaseService
                 return fail(HttpEnumCode::SERVER_ERROR, "添加患者历史问诊表失败");
             }
 
-            // 发送IM消息-问诊已结束
-            $imService = new ImService();
-            $imService->inquiryEnd($order_inquiry,$user_doctor['user_id'],$order_inquiry['user_id']);
-
-            // 发送IM消息-问诊结束评价通知
-            $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->finishInquiryToDoctor();
-
             // 添加自动完成队列
             $data = array();
             $data['order_inquiry_id'] = $order_inquiry['order_inquiry_id'];
@@ -896,6 +885,25 @@ class InquiryService extends BaseService
             return fail(HttpEnumCode::SERVER_ERROR, $e->getMessage());
         }
 
+        try {
+            // 发送IM消息-问诊已结束
+            $imService = new ImService();
+            $imService->inquiryEnd($order_inquiry,$user_doctor['user_id'],$order_inquiry['user_id']);
+
+            // 发送IM消息-问诊结束评价通知
+            $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->finishInquiryToDoctor();
+
+            // 患者-发送通知消息-患者的问诊服务结束
+            $MessagePush = new MessagePush($order_inquiry['user_id'],$order_inquiry['order_inquiry_id']);
+            $MessagePush->patientInquiryFinish();
+        }catch(\Exception $e){
+            return success([],HttpEnumCode::HTTP_SUCCESS,"消息发送失败");
+        }
+
         return success();
     }