diff --git a/src/api/user.js b/src/api/user.js
index 2e6ac82f13236a6cb315af71e474c44678a71eb4..6acb3eae504ffff813c53e3a093e085308b2215a 100644
--- a/src/api/user.js
+++ b/src/api/user.js
@@ -183,3 +183,11 @@ export function baseEnable(params = {}) {
     params,
   })
 }
+// 获取消息列表
+export function getMessage(params = {}) {
+  return request({
+    url: "/disease-data/sys/message/list",
+    method: "get",
+    params,
+  })
+}
diff --git a/src/layouts/components/NavBar/index.vue b/src/layouts/components/NavBar/index.vue
index 13f8f014b54d1ca9ed1a3ae87a26835d0cc2ae5b..b19dd0b721e17b3e7381f12fc6c483877e342eed 100644
--- a/src/layouts/components/NavBar/index.vue
+++ b/src/layouts/components/NavBar/index.vue
@@ -38,20 +38,23 @@
       </div>
       <el-popover
         placement="top-start"
-        width="200"
-        trigger="click"
+        width="300"
+        trigger="hover"
         popper-class="message-pop"
       >
-        <div
-          v-for="(item, index) in messageList"
-          :key="index"
-          class="message-box mb-24"
-        >
-          <div class="top-box mb-12">
-            <span class="blue-dot mt-5 mr-8"></span>
-            <span class="top-text">{{ item.date }}</span>
+        <div class="messageBox">
+          <div
+            v-for="(item, index) in messageList"
+            :key="index"
+            class="message-box mb-24"
+          >
+            <div class="top-box mb-12">
+              <span class="blue-dot mt-5 mr-8"></span>
+              <span class="top-text">{{ item.createTime }}</span>
+            </div>
+            <div class="main-text ml-8">{{ item.content }}</div>
           </div>
-          <div class="main-text ml-8">{{ item.message }}</div>
+          <div v-show="loading" v-loading="loading" class="loading"></div>
         </div>
         <template slot="reference">
           <el-badge :value="messageCount" :class-name="'badge'">
@@ -72,7 +75,8 @@
 
 <script>
 import { mapGetters } from "vuex"
-
+import { getMessage } from "@/api/user"
+import Message from "@/mixins/getMessage"
 import {
   Avatar,
   Breadcrumb,
@@ -90,6 +94,7 @@ export default {
     FullScreenBar,
     ThemeBar,
   },
+  mixins: [Message],
   props: {
     curSelectedIndex: {
       type: String,
@@ -100,7 +105,6 @@ export default {
     return {
       pulse: false,
       isDot: true,
-      messageCount: 10,
       screeningList: [
         {
           title: "社区筛查",
@@ -124,16 +128,6 @@ export default {
         { fontSize: "+", label: "A+" },
       ],
       fontSize: localStorage.getItem("fontSize") - 0 || 14,
-      messageList: [
-        {
-          date: "2022-12-12",
-          message: "驳回修改病例【6条】",
-        },
-        {
-          date: "2022-12-12",
-          message: "驳回修改病例【6条】",
-        },
-      ],
     }
   },
   computed: {
@@ -143,11 +137,65 @@ export default {
       device: "settings/device",
       routes: "routes/routes",
       feedBackNumber: "user/feedBackNumber",
+      getMessageFlag: "user/getMessageFlag",
     }),
   },
-  created() {},
-  mounted() {},
+  watch: {
+    curSelectedIndex(v) {
+      this.messageList = []
+      this.pageNum = 1
+      this.getMessage()
+    },
+    getMessageFlag(v) {
+      if (v) {
+        this.messageList = []
+        this.pageNum = 1
+        this.getMessage()
+      }
+    },
+  },
+  created() {
+    this.getMessage()
+  },
+  mounted() {
+    document
+      .querySelector(".messageBox")
+      .addEventListener("scroll", this.scrolling)
+  },
   methods: {
+    scrolling() {
+      let scrollHeight = document.querySelector(".messageBox").scrollHeight //实际高度
+      let scrollTop = document.querySelector(".messageBox").scrollTop //滚动高度
+      let height = document.querySelector(".messageBox").clientHeight //滚动高度
+      console.log(scrollHeight, scrollTop)
+      if (
+        scrollTop + height + 10 >= scrollHeight &&
+        this.messageList.length < this.messageCount &&
+        !this.loading
+      ) {
+        this.pageNum++
+        this.loading = true
+        this.getMessage()
+      }
+    },
+    getMessage() {
+      this.loading = true
+      getMessage({
+        pageSize: this.pageSize,
+        pageNum: this.pageNum,
+        patientFrom: this.curSelectedIndex,
+      }).then((res) => {
+        if (res.code == 1) {
+          this.$store.commit("user/setGetMessageFlag", false)
+          this.messageCount = res.data.total
+          this.messageList = [...this.messageList, ...res.data.records]
+          // console.log(res.data.total)
+        } else {
+          this.messageCount = 0
+        }
+        this.loading = false
+      })
+    },
     handleCollapse() {
       this.$store.dispatch("settings/changeCollapse")
     },
@@ -308,6 +356,19 @@ export default {
     }
   }
 }
+.messageBox {
+  padding: 40px 28px 12px;
+  height: 380px;
+  // background: pink;
+  overflow: auto;
+  .loading {
+    width: 100%;
+    height: 100%;
+    position: absolute;
+    top: 0;
+    left: 0;
+  }
+}
 // .el-popper {
 //   ::v-deep .popper__arrow {
 //     display: none;
@@ -316,7 +377,7 @@ export default {
 </style>
 <style lang="scss">
 .message-pop {
-  padding: 40px 28px 12px;
+  padding: 0px !important;
   z-index: 10;
 
   .popper__arrow::after {
diff --git a/src/mixins/getMessage.js b/src/mixins/getMessage.js
new file mode 100644
index 0000000000000000000000000000000000000000..0eea56eca8771f77b0f9ba5906c356cff138b216
--- /dev/null
+++ b/src/mixins/getMessage.js
@@ -0,0 +1,32 @@
+import { getMessage } from "@/api/user"
+
+export default {
+  data() {
+    return {
+      messageCount: 0,
+      messageList: [],
+      loading: false,
+      pageNum: 1,
+      pageSize: 6,
+    }
+  },
+  methods: {
+    getMessage() {
+      this.loading = true
+      getMessage({
+        pageSize: this.pageSize,
+        pageNum: this.pageNum,
+        patientFrom: this.curSelectedIndex,
+      }).then((res) => {
+        if (res.code == 1) {
+          this.messageCount = res.data.total
+          this.messageList = [...this.messageList, ...res.data.records]
+          // console.log(res.data.total)
+        } else {
+          this.messageCount = 0
+        }
+        this.loading = false
+      })
+    },
+  },
+}
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index 8c2481d22f2e0716a61a39822655eb3a131e1850..432f78526a3f74e83dac67ab0c6d228515eabad7 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -20,6 +20,7 @@ const state = {
   menuList: [],
   group: "",
   feedBackNumber: 0,
+  getMessageFlag: false,
 }
 const getters = {
   accessToken: (state) => state.accessToken,
@@ -28,8 +29,12 @@ const getters = {
   roles: (state) => state.roles,
   menuList: (state) => state.menuList,
   feedBackNumber: (state) => state.feedBackNumber,
+  getMessageFlag: (state) => state.getMessageFlag,
 }
 const mutations = {
+  setGetMessageFlag(state, MessageFlag) {
+    state.getMessageFlag = MessageFlag
+  },
   setAccessToken(state, accessToken) {
     state.accessToken = accessToken
     setAccessToken(accessToken)
diff --git a/src/views/audit-detail/components/screenReview.vue b/src/views/audit-detail/components/screenReview.vue
index cd8cbf8aa9738983706cf903fdd7227ac150811a..0a5f3602504c357474c8ee87fe4cdf397f9a34a1 100644
--- a/src/views/audit-detail/components/screenReview.vue
+++ b/src/views/audit-detail/components/screenReview.vue
@@ -86,6 +86,11 @@ export default {
     patientId(v) {
       this.getCurrentFormByType()
     },
+    noData(v) {
+      if (v) {
+        this.jsonList = []
+      }
+    },
   },
   created() {},
   mounted() {},
diff --git a/src/views/audit-detail/index.vue b/src/views/audit-detail/index.vue
index 6ae40737373ff3d387c0a39daef138978e330dfe..26e108743b95661bc35bb862fc129c198ef219f1 100644
--- a/src/views/audit-detail/index.vue
+++ b/src/views/audit-detail/index.vue
@@ -393,6 +393,7 @@ export default {
             this.isEmpty = false
           } else {
             this.isEmpty = true
+            this.$forceUpdate()
           }
         })
         .finally(() => {
@@ -503,6 +504,8 @@ export default {
       }
     },
     nextExample() {
+      // !
+      this.$store.commit("user/setGetMessageFlag", true)
       if (this.editStatus) {
         this.loading = false
         this.onCancel()