From afc04c4026bdab3732148c1b71f206b7043eb127 Mon Sep 17 00:00:00 2001
From: wucongxing <815046773@qq.com>
Date: Mon, 27 Mar 2023 09:08:34 +0800
Subject: [PATCH] 1

---
 app/Controller/MessageNoticeController.php | 11 ++++++
 app/Services/InquiryService.php            |  2 +-
 app/Services/MessageNoticeService.php      | 42 +++++++++++-----------
 config/routes.php                          |  3 ++
 4 files changed, 35 insertions(+), 23 deletions(-)

diff --git a/app/Controller/MessageNoticeController.php b/app/Controller/MessageNoticeController.php
index 7c4885f..056b573 100644
--- a/app/Controller/MessageNoticeController.php
+++ b/app/Controller/MessageNoticeController.php
@@ -32,4 +32,15 @@ class MessageNoticeController extends AbstractController
         $data = $MessageNoticeService->getDoctorMessageSystem();
         return $this->response->json($data);
     }
+
+    /**
+     * 获取医生系统公告详情
+     * @return ResponseInterface
+     */
+    public function getDoctorMessageSystemInfo(): ResponseInterface
+    {
+        $MessageNoticeService = new MessageNoticeService();
+        $data = $MessageNoticeService->getDoctorMessageSystemInfo();
+        return $this->response->json($data);
+    }
 }
\ No newline at end of file
diff --git a/app/Services/InquiryService.php b/app/Services/InquiryService.php
index 2d82bbc..32eeec3 100644
--- a/app/Services/InquiryService.php
+++ b/app/Services/InquiryService.php
@@ -590,7 +590,7 @@ class InquiryService extends BaseService
             return fail();
         }
 
-        if ($order_inquiry['doctor_id'] != $user_info['client_user_id'] || $order_inquiry['patient_id'] != $user_info['client_user_id']){
+        if ($order_inquiry['doctor_id'] != $user_info['client_user_id'] && $order_inquiry['patient_id'] != $user_info['client_user_id']){
             return fail();
         }
 
diff --git a/app/Services/MessageNoticeService.php b/app/Services/MessageNoticeService.php
index 07204d9..864c07a 100644
--- a/app/Services/MessageNoticeService.php
+++ b/app/Services/MessageNoticeService.php
@@ -27,14 +27,14 @@ class MessageNoticeService extends BaseService
         $params['notice_type'] = 1; // 消息类型（1:医生服务通知 2:医生系统公告 3:患者系统消息
         $params['send_status'] = 1;
 
-        $result = MessageNotice::getMessageNoticePage($params,["*"],$page,$per_page);
-        if (!empty($result['data'])){
-            foreach ($result['data'] as &$item){
-                if (!empty($item['link_params'])){
+        $result = MessageNotice::getMessageNoticePage($params, ["*"], $page, $per_page);
+        if (!empty($result['data'])) {
+            foreach ($result['data'] as &$item) {
+                if (!empty($item['link_params'])) {
                     $item['link_params'] = json_decode($item['link_params']);
                 }
 
-                if (!empty($item['show_params'])){
+                if (!empty($item['show_params'])) {
                     $item['show_params'] = json_decode($item['show_params']);
                 }
             }
@@ -59,24 +59,22 @@ class MessageNoticeService extends BaseService
         $params['notice_type'] = 2; // 消息类型（1:医生服务通知 2:医生系统公告 3:患者系统消息
         $params['send_status'] = 1;
 
-        $message_notice_system_params = array();
-        $message_notice_system_params["notice_type"] = 2;
-        $message_notice_system_params["send_status"] = 1;
-
-        $fields = [
-            'notice_id',
-            'notice_system_type',
-            'from_name',
-            'notice_title',
-            'notice_content',
-            'send_status',
-            'notice_send_time',
-            'link_type',
-            'notice_params',
-        ];
-
-        $result = MessageNotice::getMessageNoticePage($params,$message_notice_system_params,$fields,$page,$per_page);
+        $result = MessageNotice::getMessageNoticePage($params, ["*"], $page, $per_page);
+        if (!empty($result['data'])) {
+            foreach ($result['data'] as &$item) {
+                if (!empty($item['link_params'])) {
+                    $item['link_params'] = json_decode($item['link_params'], true);
+                }
 
+                if (!empty($item['show_params'])) {
+                    $item['show_params'] = json_decode($item['show_params'], true);
+                }
+            }
+        }
         return success($result);
     }
+
+    public function getDoctorMessageSystemInfo(){
+
+    }
 }
\ No newline at end of file
diff --git a/config/routes.php b/config/routes.php
index c6c71d4..e850dc3 100644
--- a/config/routes.php
+++ b/config/routes.php
@@ -194,6 +194,9 @@ Router::addGroup('/doctor', function () {
 
         // 获取医生系统公告列表-分页
         Router::get('/system', [MessageNoticeController::class, 'getDoctorMessageSystem']);
+
+        // 获取医生系统公告列表-分页
+        Router::get('/system/{notice_id:\d+}', [MessageNoticeController::class, 'getDoctorMessageSystemInfo']);
     });
 });