From fe6ed7a2e6990da8da4626285df6d515bd79e834 Mon Sep 17 00:00:00 2001
From: lxd <1004405501@qq.com>
Date: Tue, 2 Sep 2025 22:35:18 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8C=BB=E7=94=9F=E9=80=9A?=
 =?UTF-8?q?=E7=9F=A5=20=E5=92=8C=E7=95=99=E8=A8=80=E6=9D=BF=E7=9B=B8?=
 =?UTF-8?q?=E5=85=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/feedback/index.ts                            |  2 ++
 .../devices/Device_Data_Components/ECG_datas.vue     | 12 ++++++------
 src/views/doctornotice/index.vue                     | 12 ++++++++----
 src/views/notice/FeedbackReply.vue                   |  9 ++++++---
 src/views/notice/msgboard.vue                        |  4 +++-
 5 files changed, 25 insertions(+), 14 deletions(-)

diff --git a/src/api/feedback/index.ts b/src/api/feedback/index.ts
index 62f85cd9a..8322734b5 100644
--- a/src/api/feedback/index.ts
+++ b/src/api/feedback/index.ts
@@ -11,6 +11,8 @@ export interface FeedbackVO {
   backTime: Date | number // 医生回复时间（支持Date对象或时间戳）
   orgid: number // 机构ID
   orgname: string // 机构名称
+  status: number // 回复状态
+  deviceid: number // 设备号
 }
 
 // 留言板 API
diff --git a/src/views/devices/Device_Data_Components/ECG_datas.vue b/src/views/devices/Device_Data_Components/ECG_datas.vue
index e8f92679c..574ac1ee6 100644
--- a/src/views/devices/Device_Data_Components/ECG_datas.vue
+++ b/src/views/devices/Device_Data_Components/ECG_datas.vue
@@ -390,12 +390,12 @@ export default {
       }
 
       try {
-        // 检查用户是否为会员
-        const userResponse = await PersonApi.getPerson(this.selectedPerson.userid)
-        if (!userResponse || userResponse.isvip === 0) {
-          this.message.warning('该用户不是会员，无法发送通知')
-          return
-        }
+        // // 检查用户是否为会员
+        // const userResponse = await PersonApi.getPerson(this.selectedPerson.userid)
+        // if (!userResponse || userResponse.isvip === 0) {
+        //   this.message.warning('该用户不是会员，无法发送通知')
+        //   return
+        // }
 
         // 构建通知数据
         const noticeData = {
diff --git a/src/views/doctornotice/index.vue b/src/views/doctornotice/index.vue
index a2ea18d99..023893261 100644
--- a/src/views/doctornotice/index.vue
+++ b/src/views/doctornotice/index.vue
@@ -299,12 +299,12 @@
 <script setup lang="ts">
 import { dateFormatter, formatDate } from '@/utils/formatTime'
 import * as DoctornoticeApi from '@/api/doctornotice'
-
+import { getUserProfile } from '@/api/system/user/profile'
 defineOptions({ name: 'DoctorNotice' })
 
 const message = useMessage() // 消息弹窗
 const { t } = useI18n() // 国际化
-
+const userProfile = ref()
 // 响应式数据
 const loading = ref(true) // 列表加载状态
 const list = ref<DoctornoticeApi.DoctornoticeVO[]>([]) // 通知列表
@@ -319,7 +319,8 @@ const queryParams = reactive({
   noticetype: undefined as number | undefined,
   noticelevel: undefined as number | undefined,
   readstatus: undefined as number | undefined,
-  datatime: [] as string[]
+  datatime: [] as string[],
+  orgid: undefined as number | undefined
 })
 
 const queryFormRef = ref() // 查询表单引用
@@ -341,6 +342,7 @@ const unreadCount = computed(() => {
 const getList = async () => {
   loading.value = true
   try {
+    queryParams.orgid = userProfile.value.dept.orgid
     const data = await DoctornoticeApi.DoctornoticeApi.getDoctornoticePage(queryParams)
     list.value = data.list
     total.value = data.total
@@ -509,7 +511,9 @@ const handleRowClick = (row: DoctornoticeApi.DoctornoticeVO) => {
 }
 
 // 生命周期
-onMounted(() => {
+onMounted(async () => {
+      //首先获取用户信息
+   userProfile.value = await getUserProfile()
   getList()
 })
 </script>
diff --git a/src/views/notice/FeedbackReply.vue b/src/views/notice/FeedbackReply.vue
index 4f9a35f1a..41ac6518b 100644
--- a/src/views/notice/FeedbackReply.vue
+++ b/src/views/notice/FeedbackReply.vue
@@ -14,7 +14,7 @@
           <p>{{ feedbackData.content }}</p>
           <div class="message-info">
             <span>客户ID: {{ feedbackData.userId }}</span>
-            <span>机构: {{ feedbackData.orgname }}</span>
+            <span>设备号: {{ feedbackData.deviceid }}</span>
           </div>
         </div>
       </div>
@@ -89,7 +89,9 @@ const replyForm = reactive<FeedbackVO>({
   doctorId: 0,
   backTime: Date.now(),
   orgid: 0,
-  orgname: ''
+  orgname: '',
+  status: 0,
+  deviceid: 0
 })
 
 // 表单验证规则
@@ -126,7 +128,8 @@ const handleSubmit = async () => {
     const submitData = {
       ...replyForm,
       backTime: Date.now(),
-      doctorName: props.doctorName || '未知医生'
+      doctorName: props.doctorName || '未知医生',
+      status:2 // 回复状态
     }
     
     await FeedbackApi.updateFeedback(submitData)
diff --git a/src/views/notice/msgboard.vue b/src/views/notice/msgboard.vue
index 85f0e9dbc..901032006 100644
--- a/src/views/notice/msgboard.vue
+++ b/src/views/notice/msgboard.vue
@@ -182,7 +182,9 @@ const currentFeedback = ref<FeedbackVO>({
   doctorId: 0,
   backTime: Date.now(),
   orgid: 0,
-  orgname: ''
+  orgname: '',
+  status: 0,
+  deviceid: 0
 })
 const userProfile = ref<any>({})