diff --git a/src/store/modules/reading.js b/src/store/modules/reading.js
index 5a13663e..e2c5a5e4 100644
--- a/src/store/modules/reading.js
+++ b/src/store/modules/reading.js
@@ -891,7 +891,12 @@ const actions = {
   },
   setLastCanvasTaskId({ state }, taskId) {
     return new Promise(resolve => {
-      state.lastCanvasTaskId = taskId
+      var isReadingTaskViewInOrder =  localStorage.getItem('isReadingTaskViewInOrder')
+      if (parseInt(isReadingTaskViewInOrder) === 2) {
+        if (!state.lastCanvasTaskId) state.lastCanvasTaskId = taskId
+      } else {
+        state.lastCanvasTaskId = taskId
+      }
       resolve()
     })
   },
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/DicomViewer.vue b/src/views/trials/trials-panel/reading/dicoms/components/DicomViewer.vue
index 68450171..eb3bdb53 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/DicomViewer.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/DicomViewer.vue
@@ -1045,7 +1045,11 @@ export default {
     if (this.petctWindow) {
       this.petctWindow.close()
     }
-    window.removeEventListener('beforeunload')
+    window.removeEventListener('beforeunload', () => {
+      if (this.petctWindow) {
+        this.petctWindow.close()
+      }
+    })
   },
   methods: {
     getWwcTpl() {
diff --git a/src/views/trials/trials-panel/reading/dicoms/index.vue b/src/views/trials/trials-panel/reading/dicoms/index.vue
index 32978b6d..4dd7ebd7 100644
--- a/src/views/trials/trials-panel/reading/dicoms/index.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/index.vue
@@ -265,6 +265,7 @@ export default {
     this.readingTool = this.$router.currentRoute.query.readingTool
     this.TrialReadingCriterionId = this.$router.currentRoute.query.TrialReadingCriterionId
     this.isNewSubject = this.$router.currentRoute.query.isNewSubject
+    localStorage.setItem('isReadingTaskViewInOrder', this.isReadingTaskViewInOrder)
     if (this.isNewSubject && this.isReadingTaskViewInOrder !== 0) {
       // 已开始受试者${this.subjectCode}阅片任务
       var msg = this.$t('trials:reading:warnning:msg1')