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(); }