纵隔血池、肝脏血池、脾尖、脾底标记保存优化

src/views/trials/trials-panel/reading/dicoms/components/DicomCanvas.vue

@@ -1127,8 +1127,8 @@ export default {
         //   resolve()
         // })
         cornerstone.loadAndCacheImage(this.stack.imageIds[this.stack.currentImageIdIndex])
-          .then(image => {
+          .then(async image => {
-            scope.onFirstImageLoaded(image)
+            await scope.onFirstImageLoaded(image)
             resolve()
           })
           .catch((error) => {
@@ -1141,84 +1141,86 @@ export default {
     },
     onFirstImageLoaded(image) {
       console.log('onFirstImageLoaded')
+      return new Promise(async resolve => {
+        const element = this.$refs.canvas
+        var viewport = cornerstone.getDefaultViewportForImage(this.canvas, image)
+        cornerstone.displayImage(this.canvas, image, viewport)
 
-      const element = this.$refs.canvas
+        if (!this.toolState.initialized) {
-      var viewport = cornerstone.getDefaultViewportForImage(this.canvas, image)
+          this.toolState.initialized = true
-      cornerstone.displayImage(this.canvas, image, viewport)
+          const toolButtons = document.querySelectorAll('[data-tool]')
 
-      if (!this.toolState.initialized) {
+          // const scope = this
-        this.toolState.initialized = true
+          Array.from(toolButtons).forEach((toolBtn) => {
-        const toolButtons = document.querySelectorAll('[data-tool]')
-
-        // const scope = this
-        Array.from(toolButtons).forEach((toolBtn) => {
           // Add the tool
-          const toolName = toolBtn.getAttribute('data-tool')
+            const toolName = toolBtn.getAttribute('data-tool')
-          const apiTool = cornerstoneTools[`${toolName}Tool`]
+            const apiTool = cornerstoneTools[`${toolName}Tool`]
-          if (apiTool) {
+            if (apiTool) {
-            const toolAlreadyAddedToElement = cornerstoneTools.getToolForElement(element, apiTool)
+              const toolAlreadyAddedToElement = cornerstoneTools.getToolForElement(element, apiTool)
 
-            if (!toolAlreadyAddedToElement) {
+              if (!toolAlreadyAddedToElement) {
-              if (toolName === 'Length') {
+                if (toolName === 'Length') {
-                cornerstoneTools.addToolForElement(element, LengthTool, { configuration: { handleRadius: false, drawHandlesOnHover: true, hideHandlesIfMoving: true, digits: this.digitPlaces, drawHandles: true }})
+                  cornerstoneTools.addToolForElement(element, LengthTool, { configuration: { handleRadius: false, drawHandlesOnHover: true, hideHandlesIfMoving: true, digits: this.digitPlaces, drawHandles: true }})
-              } else if (toolName === 'Bidirectional') {
+                } else if (toolName === 'Bidirectional') {
                 // cornerstoneTools.addToolForElement(element, BidirectionalTool, { digits: this.digitPlaces })
                 // , handleRadius: false, drawHandlesOnHover: true, hideHandlesIfMoving: true
-                cornerstoneTools.addToolForElement(element, BidirectionalTool, { configuration: { digits: this.digitPlaces, hideHandlesIfMoving: true }})
+                  cornerstoneTools.addToolForElement(element, BidirectionalTool, { configuration: { digits: this.digitPlaces, hideHandlesIfMoving: true }})
-              } else if (toolName === 'ArrowAnnotate') {
+                } else if (toolName === 'ArrowAnnotate') {
-                cornerstoneTools.addToolForElement(element, ArrowAnnotateTool, { configuration: { allowEmptyLabel: true, handleRadius: false, drawHandlesOnHover: true, hideHandlesIfMoving: true }})
+                  cornerstoneTools.addToolForElement(element, ArrowAnnotateTool, { configuration: { allowEmptyLabel: true, handleRadius: false, drawHandlesOnHover: true, hideHandlesIfMoving: true }})
-              } else if (toolName === 'RectangleRoi') {
+                } else if (toolName === 'RectangleRoi') {
-                cornerstoneTools.addToolForElement(element, RectangleRoiTool, { configuration: { allowEmptyLabel: true, handleRadius: false, drawHandlesOnHover: true, hideHandlesIfMoving: true }})
+                  cornerstoneTools.addToolForElement(element, RectangleRoiTool, { configuration: { allowEmptyLabel: true, handleRadius: false, drawHandlesOnHover: true, hideHandlesIfMoving: true }})
-              } else {
+                } else {
-                cornerstoneTools.addToolForElement(element, apiTool)
+                  cornerstoneTools.addToolForElement(element, apiTool)
+                }
               }
             }
+          })
+          if (!cornerstoneTools.getToolForElement(element, cornerstoneTools.WwwcRegionTool)) {
+            cornerstoneTools.addToolForElement(element, cornerstoneTools.WwwcRegionTool)
           }
-        })
+          if (!cornerstoneTools.getToolForElement(element, cornerstoneTools.StackScrollMouseWheelTool)) {
-        if (!cornerstoneTools.getToolForElement(element, cornerstoneTools.WwwcRegionTool)) {
+            cornerstoneTools.addToolForElement(element, cornerstoneTools.StackScrollMouseWheelTool)
-          cornerstoneTools.addToolForElement(element, cornerstoneTools.WwwcRegionTool)
+          }
-        }
+          cornerstoneTools.setToolActiveForElement(element, 'StackScrollMouseWheel', {})
-        if (!cornerstoneTools.getToolForElement(element, cornerstoneTools.StackScrollMouseWheelTool)) {
-          cornerstoneTools.addToolForElement(element, cornerstoneTools.StackScrollMouseWheelTool)
-        }
-        cornerstoneTools.setToolActiveForElement(element, 'StackScrollMouseWheel', {})
 
-        if (!cornerstoneTools.getToolForElement(element, ScaleOverlayTool)) {
+          if (!cornerstoneTools.getToolForElement(element, ScaleOverlayTool)) {
-          cornerstoneTools.addToolForElement(element, ScaleOverlayTool)
+            cornerstoneTools.addToolForElement(element, ScaleOverlayTool)
-        }
+          }
-        cornerstoneTools.setToolActiveForElement(element, 'ScaleOverlay', {})
+          cornerstoneTools.setToolActiveForElement(element, 'ScaleOverlay', {})
-        cornerstoneTools.setToolActiveForElement(this.canvas, 'Zoom', {
+          cornerstoneTools.setToolActiveForElement(this.canvas, 'Zoom', {
-          mouseButtonMask: 2
+            mouseButtonMask: 2
-        })
+          })
-        cornerstoneTools.setToolActiveForElement(this.canvas, 'Pan', {
+          cornerstoneTools.setToolActiveForElement(this.canvas, 'Pan', {
-          mouseButtonMask: 4
+            mouseButtonMask: 4
-        })
+          })
 
         // if (!cornerstoneTools.getToolForElement(element, OrientationMarkersTool)) {
         //   cornerstoneTools.addToolForElement(element, OrientationMarkersTool)
         // }
         // cornerstoneTools.setToolActiveForElement(element, 'OrientationMarkers', { })
-      }
+        }
 
-      // cornerstoneTools.addStackStateManager(this.canvas, ['stack', 'stackPrefetch', 'playClip'])
+        // cornerstoneTools.addStackStateManager(this.canvas, ['stack', 'stackPrefetch', 'playClip'])
-      cornerstoneTools.addStackStateManager(this.canvas, ['stack', 'playClip'])
+        cornerstoneTools.addStackStateManager(this.canvas, ['stack', 'playClip'])
-      cornerstoneTools.addToolState(this.canvas, 'stack', this.stack)
+        cornerstoneTools.addToolState(this.canvas, 'stack', this.stack)
-      // cornerstoneTools.stackPrefetch.enable(this.canvas)
+        // cornerstoneTools.stackPrefetch.enable(this.canvas)
-      cornerstone.updateImage(element, true)
+        cornerstone.updateImage(element, true)
 
-      this.stack.firstImageLoading = false
+        this.stack.firstImageLoading = false
-      this.toolState.dicomInfoVisible = true
+        this.toolState.dicomInfoVisible = true
-      var instanceId = image.imageId.split('/')[image.imageId.split('/').length - 1]
+        var instanceId = image.imageId.split('/')[image.imageId.split('/').length - 1]
-      var frame = null
+        var frame = null
-      if (instanceId.includes('?frame=')) {
+        if (instanceId.includes('?frame=')) {
-        frame = instanceId.split('?frame=')[1]
+          frame = instanceId.split('?frame=')[1]
-        instanceId = instanceId.split('?frame=')[0]
+          instanceId = instanceId.split('?frame=')[0]
-      }
+        }
-      this.stack.frame = !isNaN(parseInt(frame)) ? parseInt(frame) : 0
+        this.stack.frame = !isNaN(parseInt(frame)) ? parseInt(frame) : 0
-      instanceId = instanceId.split('.')[0]
+        instanceId = instanceId.split('.')[0]
-      this.stack.instanceId = instanceId
+        this.stack.instanceId = instanceId
-      this.height = (this.stack.currentImageIdIndex) * 100 / (this.stack.imageIds.length - 1)
+        this.height = (this.stack.currentImageIdIndex) * 100 / (this.stack.imageIds.length - 1)
-      this.resetWwwc()
+        this.resetWwwc()
+        resolve()
+      })
     },
     onNewImage(e) {
       console.log('cornerstonenewimage')

src/views/trials/trials-panel/reading/dicoms/components/DicomViewer.vue

@@ -828,7 +828,7 @@ export default {
     activeSeries: {
       immediate: true,
       handler(v) {
-        if (v) {
+        if (v && v.isCurrentTask && this.studyList.length === 0) {
           this.activeTaskInfo.taskName = v.taskBlindName
           this.activeTaskInfo.visitTaskId = v.visitTaskId
           const i = this.visitTaskList.findIndex(i => i.VisitTaskId === v.visitTaskId)
@@ -838,8 +838,6 @@ export default {
           studyList = studyList.filter(i => !i.IsCriticalSequence && i.Modalities.indexOf('CT') !== -1 && i.Modalities.indexOf('PT') !== -1)
           if (studyList.length === 0) return
           this.studyList = studyList
-        } else {
-          this.studyList = []
         }
       }
     }
@@ -887,24 +885,48 @@ export default {
       }
       console.log('getMeasureData')
     })
-    DicomEvent.$on('getScreenshots', async(callback) => {
+    DicomEvent.$on('getScreenshots', async(measuredData, callback) => {
       if (this.currentDicomCanvasIndex > -1) {
-        // var base64Str = this.$refs[`dicomCanvas${this.currentDicomCanvasIndex}`][0].getScreenshots()
+        if (!measuredData) return
-        const divForDownloadViewport = document.querySelector(
+        await this.imageLocation(measuredData)
-          `div[data-canvas-uid="dicomCanvas${this.currentDicomCanvasIndex}"]`
+        setTimeout(async() => {
-        )
+          // var base64Str = this.$refs[`dicomCanvas${this.currentDicomCanvasIndex}`][0].getScreenshots()
-        var canvas = await html2canvas(divForDownloadViewport)
+          const divForDownloadViewport = document.querySelector(
-        var base64Str = canvas.toDataURL('image/png', 1)
+            `div[data-canvas-uid="dicomCanvas${this.currentDicomCanvasIndex}"]`
-        callback(base64Str)
+          )
+          var canvas = await html2canvas(divForDownloadViewport)
+          var base64Str = canvas.toDataURL('image/png', 1)
+          console.log('getScreenshots')
+          callback(base64Str)
+        }, 50)
       }
-      console.log('getScreenshots')
     })
-    DicomEvent.$on('imageLocation', measuredData => {
+    DicomEvent.$on('imageLocation', async(measuredData) => {
-      if (!measuredData) return
+      return new Promise(async resolve => {
-      this.imageLocation(measuredData)
+        if (!measuredData) return
+        await this.imageLocation(measuredData)
 
-      console.log('imageLocation')
+        console.log('imageLocation')
+        resolve()
+      })
     })
+    // DicomEvent.$on('imageLocation', async(measuredData, callback) => {
+    //   if (measuredData) {
+    //     await this.imageLocation(measuredData)
+    //   }
+    //   console.log('imageLocation')
+    //   this.$nextTick(() => {
+    //     if (callback) {
+    //       callback()
+    //     }
+    //   })
+    // })
+    // DicomEvent.$on('imageLocation', measuredData => {
+    //   if (!measuredData) return
+    //   this.imageLocation(measuredData)
+
+    //   console.log('imageLocation')
+    // })
     DicomEvent.$on('setReadingState', readingTaskState => {
       this.canvasObj[this.currentDicomCanvasIndex].readingTaskState = readingTaskState
       if (this.activeTool) {
@@ -934,6 +956,11 @@ export default {
       if (!this.petctWindow) return
       this.petctWindow.postMessage({ type: 'setReadingState', data: data }, window.location)
     })
+    DicomEvent.$on('reload', () => {
+      if (this.petctWindow) {
+        this.petctWindow.close()
+      }
+    })
   },
   beforeDestroy() {
     DicomEvent.$off('updateImage')
@@ -945,6 +972,7 @@ export default {
     DicomEvent.$off('setMeasuredToolsPassive')
     DicomEvent.$off('readingPageUpdate')
     DicomEvent.$off('setReadingState')
+    DicomEvent.$off('reload')
     if (this.petctWindow) {
       this.petctWindow.close()
     }
@@ -1302,108 +1330,117 @@ export default {
 
     // 最后一个窗口显示当前访视下病灶所在的影像序列
     // 其他窗口显示该病灶第一次出现的序列信息
-    async imageLocation(obj) {
+    imageLocation(obj) {
-      var loading = null
+      return new Promise(async resolve => {
-      var loadImagePromises = []
+        var loading = null
-      var isScrollSync = this.isScrollSync
+        var loadImagePromises = []
-      if (this.isScrollSync) {
+        var isScrollSync = this.isScrollSync
+        if (this.isScrollSync) {
         // 取消滚动同步
-        this.isScrollSync = false
+          this.isScrollSync = false
-      }
+        }
 
-      var activeCanvasTaskId = obj.visitTaskId
+        var activeCanvasTaskId = obj.visitTaskId
 
-      var index = this.visitTaskList.findIndex(i => i.VisitTaskId === activeCanvasTaskId)
+        var index = this.visitTaskList.findIndex(i => i.VisitTaskId === activeCanvasTaskId)
-      if (index === -1) return
+        if (index === -1) {
+          resolve()
+          return
+        }
 
-      var firstAddSeries = null
+        var firstAddSeries = null
-      var currentAddSeries = null
+        var currentAddSeries = null
-      if (this.isReadingTaskViewInOrder) {
+        if (this.isReadingTaskViewInOrder) {
         // 有序
         // 获取病灶第一次出现的访视序列
-        var firstAddVisitTaskId = null
+          var firstAddVisitTaskId = null
 
-        var idx = this.visitTaskList[index].MeasureData.findIndex(item => {
+          var idx = this.visitTaskList[index].MeasureData.findIndex(item => {
-          return item.OrderMarkName === obj.lesionName
+            return item.OrderMarkName === obj.lesionName
-        })
+          })
-        if (idx > -1) {
+          if (idx > -1) {
-          firstAddVisitTaskId = this.visitTaskList[index].MeasureData[idx].FristAddTaskId
+            firstAddVisitTaskId = this.visitTaskList[index].MeasureData[idx].FristAddTaskId
-        }
-        if (firstAddVisitTaskId) {
-          var taskIdx = this.visitTaskList.findIndex(i => i.VisitTaskId === firstAddVisitTaskId)
-          if (taskIdx > -1 && !this.visitTaskList[taskIdx].IsInit) {
-            loading = this.$loading({ fullscreen: true })
-            if (!this.visitTaskList[taskIdx].measureDataInit) {
-              await store.dispatch('reading/getMeasuredData', this.visitTaskList[taskIdx].VisitTaskId)
-            }
-            if (!this.visitTaskList[taskIdx].studyListInit) {
-              await store.dispatch('reading/getStudyInfo', { trialId: this.trialId, subjectVisitId: this.visitTaskList[taskIdx].VisitId, visitTaskId: this.visitTaskList[taskIdx].VisitTaskId, taskBlindName: this.visitTaskList[taskIdx].TaskBlindName })
-            }
-            if (!this.visitTaskList[taskIdx].readingQuestionsInit) {
-              await store.dispatch('reading/getReadingQuestionAndAnswer', { trialId: this.trialId, visitTaskId: this.visitTaskList[taskIdx].VisitTaskId })
-            }
-            if (!this.visitTaskList[taskIdx].questionsInit) {
-              await store.dispatch('reading/getDicomReadingQuestionAnswer', { trialId: this.trialId, visitTaskId: this.visitTaskList[taskIdx].VisitTaskId })
-            }
-
-            await store.dispatch('reading/setStatus', { visitTaskId: this.visitTaskList[taskIdx].VisitTaskId })
           }
-          if (this.CriterionType === 3 && obj.lesionType === 7 && obj.fromMark) {
+          if (firstAddVisitTaskId) {
-            const measureDataInfo = Object.assign({}, obj)
+            var taskIdx = this.visitTaskList.findIndex(i => i.VisitTaskId === firstAddVisitTaskId)
-            measureDataInfo.lesionName = obj.fromMark
+            if (taskIdx > -1 && !this.visitTaskList[taskIdx].IsInit) {
-            firstAddSeries = this.getSeriesInfoByMark(firstAddVisitTaskId, measureDataInfo)
+              loading = this.$loading({ fullscreen: true })
-          } else {
+              if (!this.visitTaskList[taskIdx].measureDataInit) {
-            firstAddSeries = this.getSeriesInfoByMark(firstAddVisitTaskId, obj)
+                await store.dispatch('reading/getMeasuredData', this.visitTaskList[taskIdx].VisitTaskId)
-          }
+              }
-        }
+              if (!this.visitTaskList[taskIdx].studyListInit) {
-        // 获取当前访视病灶所在的序列
+                await store.dispatch('reading/getStudyInfo', { trialId: this.trialId, subjectVisitId: this.visitTaskList[taskIdx].VisitId, visitTaskId: this.visitTaskList[taskIdx].VisitTaskId, taskBlindName: this.visitTaskList[taskIdx].TaskBlindName })
-        currentAddSeries = this.getSeriesInfoByMark(activeCanvasTaskId, obj)
+              }
-        if (!firstAddSeries && currentAddSeries) {
+              if (!this.visitTaskList[taskIdx].readingQuestionsInit) {
-        // 存在首次出现的病灶及当前病灶
+                await store.dispatch('reading/getReadingQuestionAndAnswer', { trialId: this.trialId, visitTaskId: this.visitTaskList[taskIdx].VisitTaskId })
-          firstAddSeries = currentAddSeries
+              }
-        } else if (!firstAddSeries && !currentAddSeries) {
+              if (!this.visitTaskList[taskIdx].questionsInit) {
-        // 当前新病灶，且未画标记则显示当前的序列信息，不做处理
+                await store.dispatch('reading/getDicomReadingQuestionAnswer', { trialId: this.trialId, visitTaskId: this.visitTaskList[taskIdx].VisitTaskId })
-          loading && loading.close()
+              }
-          this.isScrollSync = isScrollSync
-          this.setToolToTarget(obj)
-          return
-        } else if (firstAddSeries && !currentAddSeries) {
-        // 当前访视序列与首次出现病灶的序列对齐
-          currentAddSeries = this.getLinkedSeries(firstAddSeries, activeCanvasTaskId)
 
+              await store.dispatch('reading/setStatus', { visitTaskId: this.visitTaskList[taskIdx].VisitTaskId })
+            }
+            if (this.CriterionType === 3 && obj.lesionType === 7 && obj.fromMark) {
+              const measureDataInfo = Object.assign({}, obj)
+              measureDataInfo.lesionName = obj.fromMark
+              firstAddSeries = this.getSeriesInfoByMark(firstAddVisitTaskId, measureDataInfo)
+            } else {
+              firstAddSeries = this.getSeriesInfoByMark(firstAddVisitTaskId, obj)
+            }
+          }
+          // 获取当前访视病灶所在的序列
+          currentAddSeries = this.getSeriesInfoByMark(activeCanvasTaskId, obj)
+          if (!firstAddSeries && currentAddSeries) {
+            // 存在首次出现的病灶及当前病灶
+            firstAddSeries = currentAddSeries
+          } else if (!firstAddSeries && !currentAddSeries) {
+            // 当前新病灶，且未画标记则显示当前的序列信息，不做处理
+            loading && loading.close()
+            this.isScrollSync = isScrollSync
+            this.setToolToTarget(obj)
+            resolve()
+            return
+          } else if (firstAddSeries && !currentAddSeries) {
+            // 当前访视序列与首次出现病灶的序列对齐
+            currentAddSeries = this.getLinkedSeries(firstAddSeries, activeCanvasTaskId)
+
+            if (!currentAddSeries) {
+              // 未找到对齐的，则就显示当前最后一个窗口现实的序列信息
+              currentAddSeries = this.$refs[`dicomCanvas${this.maxCanvas - 1}`][0].series
+            }
+          }
+        } else {
+        // 无序
+          currentAddSeries = this.getSeriesInfoByMark(activeCanvasTaskId, obj)
           if (!currentAddSeries) {
           // 未找到对齐的，则就显示当前最后一个窗口现实的序列信息
             currentAddSeries = this.$refs[`dicomCanvas${this.maxCanvas - 1}`][0].series
           }
+          firstAddSeries = currentAddSeries
         }
-      } else {
-        // 无序
-        currentAddSeries = this.getSeriesInfoByMark(activeCanvasTaskId, obj)
-        if (!currentAddSeries) {
-          // 未找到对齐的，则就显示当前最后一个窗口现实的序列信息
-          currentAddSeries = this.$refs[`dicomCanvas${this.maxCanvas - 1}`][0].series
-        }
-        firstAddSeries = currentAddSeries
-      }
 
-      for (let i = 0; i < this.maxCanvas; i++) {
+        for (let i = 0; i < this.maxCanvas; i++) {
-        if (i === this.maxCanvas - 1) {
+          if (i === this.maxCanvas - 1) {
-          loadImagePromises.push(this.$refs[`dicomCanvas${i}`][0].loadImageStack(currentAddSeries))
+            loadImagePromises.push(this.$refs[`dicomCanvas${i}`][0].loadImageStack(currentAddSeries))
-          this.currentDicomCanvasIndex = i
+            this.currentDicomCanvasIndex = i
-          this.activeSeries = currentAddSeries
+            this.activeSeries = currentAddSeries
-          store.dispatch('reading/setActiveSeries', currentAddSeries)
+            store.dispatch('reading/setActiveSeries', currentAddSeries)
-        } else {
+          } else {
-          loadImagePromises.push(this.$refs[`dicomCanvas${i}`][0].loadImageStack(firstAddSeries))
+            loadImagePromises.push(this.$refs[`dicomCanvas${i}`][0].loadImageStack(firstAddSeries))
+          }
         }
-      }
+        Promise.all(loadImagePromises)
-      Promise.all(loadImagePromises)
+          .then(() => {
-        .then(() => {
+            this.isScrollSync = isScrollSync
-          this.isScrollSync = isScrollSync
+            this.setToolToTarget(obj)
-          this.setToolToTarget(obj)
+            resolve()
-        })
+          }).catch(() => {
-      if (loading) {
+            resolve()
-        loading.close()
+          })
-      }
+        if (loading) {
+          loading.close()
+        }
+      })
     },
     setToolToTarget(obj) {
       if (obj.readingTaskState < 2 && obj.markTool && !obj.isMarked) {

src/views/trials/trials-panel/reading/dicoms/components/Fusion/HistoryScreenshot.vue

@@ -75,7 +75,10 @@ export default {
       translateX: 0,
       pageSize: 0, // 一页展示的图片数
       previewImages: [],
-      imgSize: { width: '120px', height: '120px' }
+      imgSize: { width: '120px', height: '120px' },
+      lesionId: '',
+      visitTaskId: '',
+      questionType: null
     }
   },
   computed: {
@@ -112,7 +115,10 @@ export default {
       store.dispatch('user/setToken', this.$route.query.TokenKey)
       changeURLStatic('TokenKey', '')
     }
-    this.lesionId = this.$route.query.rowId
+    this.lesionId = this.$route.query.rowId ? this.$route.query.rowId : ''
+    this.visitTaskId = this.$route.query.visitTaskId ? this.$route.query.visitTaskId : ''
+    var questionType = this.$route.query.questionType
+    this.questionType = questionType ? Number(questionType) : null
     this.initPage()
   },
   methods: {
@@ -128,7 +134,7 @@ export default {
     getScreenshot() {
       return new Promise(resolve => {
         const loading = this.$loading({ fullscreen: true })
-        getPreviousOtherPicturePath({ rowId: this.lesionId }).then(res => {
+        getPreviousOtherPicturePath({ rowId: this.lesionId, visitTaskId: this.visitTaskId, questionType: this.questionType }).then(res => {
           this.previewImages = res.Result
           if (this.previewImages.length === 0) {
             this.$alert(this.$t('trials:lugano:message:noScreenshot'), this.$t('trials:lugano:message:warnTip'), {

src/views/trials/trials-panel/reading/dicoms/components/Fusion/PetCt.vue

@@ -483,6 +483,7 @@ export default {
         { label: this.$t('trials:reading:button:rotateTurnRight'), val: 5 }// 右转90度
       ],
       isCurrentTask: false,
+      isBaseLineTask: false,
       ctSeries: {},
       petSeries: {},
       renderingEngineId: renderingEngineId,
@@ -562,6 +563,7 @@ export default {
     this.subjectCode = this.$route.query.subjectCode
     this.taskBlindName = this.$route.query.taskBlindName
     this.isCurrentTask = this.$route.query.isCurrentTask === 'true'
+    this.isBaseLineTask = this.$route.query.isCurrentTask === 'true'
     this.customWwc = { visible: false, title: this.$t('trials:reading:dagTitle:wwwcCustom') }
     const digitPlaces = parseInt(this.$route.query.digitPlaces)
     this.digitPlaces = digitPlaces === -1 ? 2 : digitPlaces
@@ -606,9 +608,10 @@ export default {
       console.log('imageLocation')
       this.imageLocation(obj)
     })
-    FusionEvent.$on('getScreenshots', async(callback) => {
+    FusionEvent.$on('getScreenshots', async(measuredData, callback) => {
       // var base64Str = await this.$refs['FUSION_AXIAL'].getScreenshots()
       const loading = this.$loading({ fullscreen: true })
+      await this.imageLocation(measuredData)
       const divForDownloadViewport = document.querySelector(
         '.dicom-container'
       )
@@ -712,8 +715,9 @@ export default {
       const debouncedCallback = this.debounce((e) => {
         const { annotation } = e.detail
         const { remark } = annotation.data
-        if (this.initAnnotations.length > 0 && this.initAnnotations[0].orderMark === remark && !this.initAnnotations[0].isInit) {
+        var idx = this.initAnnotations.findIndex(i => i.orderMark === remark)
-          this.initAnnotations[0].isInit = true
+        if (this.initAnnotations.length > 0 && idx > -1 && this.initAnnotations[idx].orderMark === remark && !this.initAnnotations[idx].isInit) {
+          this.initAnnotations[idx].isInit = true
         } else {
           this.onAnnotationModified(e)
         }
@@ -1972,28 +1976,33 @@ export default {
       })
     },
     imageLocation(obj) {
-      this.setToolToTarget(obj)
+      return new Promise(resolve => {
-      if (!obj.otherMeasureData) return
+        console.log('imageLocation')
-      this.isLocate = true
+        this.setToolToTarget(obj)
-      const { metadata } = obj.otherMeasureData
+        if (!obj.otherMeasureData) {
-      var imageArr = metadata.referencedImageId.split('/')
+          resolve()
-      var instanceId = imageArr[imageArr.length - 1]
+          return
-      var viewportId = null
+        }
-      // var seriesId = data.seriesId
+        this.isLocate = true
-      // var instanceId = data.instanceId
+        const { metadata } = obj.otherMeasureData
-      var index = -1
+        var imageArr = metadata.referencedImageId.split('/')
-      index = this.petSeries.instanceList.findIndex(i => i === instanceId)
+        var instanceId = imageArr[imageArr.length - 1]
-      if (index > -1) {
+        var viewportId = null
-        viewportId = 'PT_AXIAL'
+        // var seriesId = data.seriesId
-        this.$refs[viewportId].scroll(index)
+        // var instanceId = data.instanceId
-        return
+        var index = -1
-      }
+        index = this.petSeries.instanceList.findIndex(i => i === instanceId)
-      index = this.ctSeries.instanceList.findIndex(i => i === instanceId)
+        if (index > -1) {
-      if (index > -1) {
+          viewportId = 'PT_AXIAL'
-        viewportId = 'CT_AXIAL'
+          this.$refs[viewportId].scroll(index)
-        this.$refs[viewportId].scroll(index)
+        }
-        return
+        index = this.ctSeries.instanceList.findIndex(i => i === instanceId)
-      }
+        if (index > -1) {
+          viewportId = 'CT_AXIAL'
+          this.$refs[viewportId].scroll(index)
+        }
+        resolve()
+      })
     },
     setToolToTarget(obj) {
       var toolGroupIds = [ctToolGroupId, ptToolGroupId, fusionToolGroupId]

src/views/trials/trials-panel/reading/dicoms/components/Fusion/QuestionItem.vue

@@ -35,16 +35,24 @@
             <!-- 测量 -->
             <el-button v-if="(!questionForm[question.Id] && ((question.QuestionType === 51 && liverIsInsideVolume) || (question.QuestionType === 52 && lungIsInsideVolume)) && readingTaskState!== 2)" size="mini" type="text" @click="addAnnotation(question)">{{ $t('trials:lugano:button:addAnnotation') }}</el-button>
             <!-- 清除标记 -->
-            <el-button v-if="(questionForm[question.Id] || (question.QuestionType === 51 && !liverIsInsideVolume) || (question.QuestionType === 52 && !lungIsInsideVolume)) && readingTaskState!== 2" size="mini" type="text" style="padding: 7px 5px;" @click="removeAnnotation(question)">{{ $t('trials:lugano:button:clearAnnotation') }}</el-button>
+            <el-button v-if="(questionForm[question.Id] || (question.QuestionType === 51 && !liverIsInsideVolume) || (question.QuestionType === 52 && !lungIsInsideVolume)) && readingTaskState!== 2" size="mini" type="text" style="padding: 7px 5px;margin-left:5px;" @click="removeAnnotation(question)">{{ $t('trials:lugano:button:clearAnnotation') }}</el-button>
             <!-- 定位 -->
             <el-button
               v-if="(questionForm[question.Id] || (question.QuestionType === 51 && !liverIsInsideVolume) || (question.QuestionType === 52 && !lungIsInsideVolume))"
               size="mini"
               type="text"
-              style="padding: '7px 5px'"
+              style="padding: '7px 5px';margin-left:-5px;"
-              :style="{marginLeft: readingTaskState!== 2?'-5px':'5px'}"
               @click="locateAnnotation(question)"
             >{{ $t('trials:lugano:button:locateAnnotation') }}</el-button>
+            <!-- 保存 -->
+            <el-button v-if="questionForm[question.Id] && readingTaskState!== 2 && question.SaveEnum === 1" size="mini" type="text" style="padding: '7px 5px';margin-left:-5px;" @click="saveAnnotation(question)">
+              <!-- 未保存 -->
+              <el-tooltip class="item" effect="dark" :content="$t('trials:reading:button:unsaved')" placement="bottom">
+                <i class="el-icon-warning" style="color:red" />
+              </el-tooltip>
+              {{ $t('common:button:save') }}
+            </el-button>
+            <el-button v-if="!question.IsBaseLineTask" size="mini" type="text" style="padding: '7px 5px';margin-left:-5px;" @click="viewAnnotations(question)">{{ $t('trials:lugano:button:suvscreenshot') }}</el-button>
           </div>
         </template>
         <template v-else-if="question.QuestionType === 53">
@@ -339,11 +347,16 @@ export default {
           FusionEvent.$emit('removeAnnotation', question)
         })
         .catch(() => {})
-      
     },
     locateAnnotation(question) {
       FusionEvent.$emit('locateAnnotation', question)
     },
+    saveAnnotation(question) {
+      FusionEvent.$emit('saveAnnotation', question)
+    },
+    viewAnnotations(question) {
+      FusionEvent.$emit('viewAnnotations', question)
+    },
     async uploadScreenshot(param) {
       if (!this.visitTaskId) return
       const loading = this.$loading({

src/views/trials/trials-panel/reading/dicoms/components/Fusion/Questions.vue

@@ -33,9 +33,11 @@
 <script>
 
 import { saveImageQuality, getDicomReadingQuestionAnswer, getReadingCalculationData } from '@/api/trials'
+import { getToken } from '@/utils/auth'
 import QuestionItem from './QuestionItem'
 import { mapGetters } from 'vuex'
 import FusionEvent from './FusionEvent'
+
 export default {
   name: 'ECRF',
   components: {
@@ -103,6 +105,7 @@ export default {
       this.resetSuvQuestions()
     })
     FusionEvent.$on('addAnnotation', obj => {
+      this.$set(obj, 'SaveEnum', 0)
       this.addAnnotation(obj)
     })
     FusionEvent.$on('removeAnnotation', obj => {
@@ -111,6 +114,13 @@ export default {
     FusionEvent.$on('locateAnnotation', obj => {
       this.locateAnnotation(obj)
     })
+    FusionEvent.$on('saveAnnotation', obj => {
+      this.saveAnnotation(obj)
+    })
+    FusionEvent.$on('viewAnnotations', obj => {
+      console.log('viewAnnotations')
+      this.viewAnnotations(obj)
+    })
   },
   beforeDestroy() {
     FusionEvent.$off('refreshQuestions')
@@ -193,10 +203,12 @@ export default {
           if (i.QuestionType === 51) {
             // 肝脏血池SUVmax(51);
             this.liverSuvmaxId = i.Id
+            this.$set(i, 'SaveEnum', 0)
           }
           if (i.QuestionType === 52) {
             // 纵膈血池SUVmax(52);
             this.lungSuvmaxId = i.Id
+            this.$set(i, 'SaveEnum', 0)
           }
           if (i.QuestionType === 53) {
             // SUVmax;
@@ -223,18 +235,7 @@ export default {
     handleSave() {
       this.$refs['questions'].validate((valid) => {
         if (!valid) return
-        if (!this.lungIsInsideVolume || !this.liverIsInsideVolume) {
+
-          // 当前标记在图像外
-          this.$alert(this.$t('trials:reading:lugano:warnning:outsideVolume'), this.$t('trials:lugano:fusionDialog:warning'), {
-            callback: action => {
-              this.$message({
-                type: 'info',
-                message: `action: ${action}`
-              })
-            }
-          })
-          return
-        }
         // 肝脏血池SUVmax
         const liverSUVmax = !isNaN(parseFloat(this.questionForm[this.liverSuvmaxId])) ? parseFloat(this.questionForm[this.liverSuvmaxId]) : 0
         // 纵膈血池SUVmax
@@ -268,22 +269,22 @@ export default {
       for (const k in this.questionForm) {
         answers.push({ id: k, answer: this.questionForm[k] })
       }
-      var questionMarkInfoList = []
+      // var questionMarkInfoList = []
-      this.measurements.forEach(item => {
+      // this.measurements.forEach(item => {
-        var i = Object.assign({}, item)
+      //   var i = Object.assign({}, item)
-        if (i.OtherMeasureData) {
+      //   if (i.OtherMeasureData) {
-          for (const k in i.OtherMeasureData.data.cachedStats) {
+      //     for (const k in i.OtherMeasureData.data.cachedStats) {
-            i.OtherMeasureData.data.cachedStats[k].pointsInShape = []
+      //       i.OtherMeasureData.data.cachedStats[k].pointsInShape = []
-          }
+      //     }
-          i.OtherMeasureData = JSON.stringify(i.OtherMeasureData)
+      //     i.OtherMeasureData = JSON.stringify(i.OtherMeasureData)
-        }
+      //   }
 
-        questionMarkInfoList.push(i)
+      //   questionMarkInfoList.push(i)
-      })
+      // })
       var params = {
         visitTaskId: this.visitTaskId,
-        answers: answers,
+        answers: answers
-        questionMarkInfoList
+        // questionMarkInfoList
       }
       saveImageQuality(params).then(async res => {
         this.$message.success(this.$t('common:message:savedSuccessfully'))
@@ -336,6 +337,70 @@ export default {
 
       FusionEvent.$emit('imageLocation', { otherMeasureData: otherMeasureData })
     },
+    saveAnnotation(question) {
+      if (!this.lungIsInsideVolume || !this.liverIsInsideVolume) {
+        // 当前标记在图像外
+        this.$alert(this.$t('trials:reading:lugano:warnning:outsideVolume'), this.$t('trials:lugano:fusionDialog:warning'), {
+          callback: action => {
+            this.$message({
+              type: 'info',
+              message: `action: ${action}`
+            })
+          }
+        })
+        return
+      }
+      const loading = this.$loading({ fullscreen: true })
+
+      // 获取截图
+      var answers = []
+      var questionMarkInfoList = []
+      var annotationObj = this.measurements.find(i => i.QuestionType === question.QuestionType)
+      if (!annotationObj) {
+        loading.close()
+        return
+      }
+      FusionEvent.$emit('getScreenshots', { otherMeasureData: annotationObj.OtherMeasureData }, async val => {
+        var pictureObj = await this.uploadScreenshots(`${new Date().getTime()}`, val)
+        var picturePath = pictureObj.isSuccess ? this.$getObjectName(pictureObj.result.url) : ''
+
+        if (annotationObj && annotationObj.OtherMeasureData) {
+          var otherMeasureData = Object.assign({}, annotationObj.OtherMeasureData)
+          for (const k in otherMeasureData.data.cachedStats) {
+            otherMeasureData.data.cachedStats[k].pointsInShape = []
+          }
+          annotationObj.OtherMeasureData = JSON.stringify(otherMeasureData)
+          annotationObj.OtherPicturePath = picturePath
+          questionMarkInfoList.push(annotationObj)
+        }
+        for (const k in this.questionForm) {
+          if (k === question.Id) {
+            answers.push({ id: k, answer: this.questionForm[k] })
+            break
+          }
+        }
+        var params = {
+          visitTaskId: this.visitTaskId,
+          answers,
+          questionMarkInfoList
+        }
+        saveImageQuality(params).then(async res => {
+          this.$message.success(this.$t('common:message:savedSuccessfully'))
+          loading.close()
+          this.$set(question, 'SaveEnum', 0)
+          window.opener.postMessage({ type: 'petctLesionUpdate' }, window.location)
+        }).catch(() => {
+          loading.close()
+        })
+      })
+    },
+    viewAnnotations(question) {
+      var token = getToken()
+      var subjectCode = this.$route.query.subjectCode
+      var path = `/historyScreenshot?&subjectCode=${subjectCode}&visitTaskId=${this.visitTaskId}&questionType=${question.QuestionType}&TokenKey=${token}`
+      const routeData = this.$router.resolve({ path })
+      window.open(routeData.href, '_blank')
+    },
     setMeasuredData(measurement) {
       if (measurement.data.isHandleOutsideImage) {
         this.setOutsideMeasuredData(measurement)
@@ -374,6 +439,19 @@ export default {
         }
         FusionEvent.$emit('addOrUpdateAnnotations', { data })
         this.questionFormChangeState = true
+        this.setQuestionStatus(this.questions, this.measurements[idx].QuestionType)
+      }
+    },
+    setQuestionStatus(obj, questionType) {
+      console.log(obj, questionType)
+      for (let i = 0; i < obj.length; i++) {
+        if (obj[i].QuestionType === questionType) {
+          this.$set(obj[i], 'SaveEnum', 1)
+          break
+        }
+        if (obj[i].Childrens && obj[i].Childrens.length > 0) {
+          this.setQuestionStatus(obj[i].Childrens, questionType)
+        }
       }
     },
     setOutsideMeasuredData(measurement) {
@@ -415,6 +493,7 @@ export default {
       }
       FusionEvent.$emit('addOrUpdateAnnotations', { data })
       this.questionFormChangeState = true
+      this.setQuestionStatus(this.questions, this.measurements[idx].QuestionType)
     },
     clearMeasuredData(remark) {
       var idx = this.measurements.findIndex(i => i.OrderMarkName === remark)
@@ -538,6 +617,45 @@ export default {
           this.setSuvChild(i.Childrens)
         }
       })
+    },
+    async uploadScreenshots(fileName, file) {
+      try {
+        file = this.convertBase64ToBlob(file)
+        var trialId = this.$route.query.trialId
+        var subjectId = this.$route.query.trialId
+        const result = await this.OSSclient.put(`/${trialId}/Read/${subjectId}/Visit/${fileName}.png`, file)
+        return { isSuccess: true, result: result }
+      } catch (e) {
+        console.log(e)
+        return { isSuccess: false, result: e }
+      }
+    },
+    convertBase64ToBlob(imageEditorBase64) {
+      var base64Arr = imageEditorBase64.split(',')
+      var imgtype = ''
+      var base64String = ''
+      if (base64Arr.length > 1) {
+        // 如果是图片base64，去掉头信息
+        base64String = base64Arr[1]
+        imgtype = base64Arr[0].substring(
+          base64Arr[0].indexOf(':') + 1,
+          base64Arr[0].indexOf(';')
+        )
+      }
+      // 将base64解码
+      var bytes = atob(base64String)
+      // var bytes = base64;
+      var bytesCode = new ArrayBuffer(bytes.length)
+      // 转换为类型化数组
+      var byteArray = new Uint8Array(bytesCode)
+
+      // 将base64转换为ascii码
+      for (var i = 0; i < bytes.length; i++) {
+        byteArray[i] = bytes.charCodeAt(i)
+      }
+
+      // 生成Blob对象（文件对象）
+      return new Blob([bytesCode], { type: imgtype })
     }
   }
 }

src/views/trials/trials-panel/reading/dicoms/components/Fusion/TableQuestionItem.vue

@@ -794,7 +794,7 @@ export default {
             otherMeasureData.data.cachedStats[k].pointsInShape = []
           }
         }
-        FusionEvent.$emit('getScreenshots', async val => {
+        FusionEvent.$emit('getScreenshots', { otherMeasureData: this.questionForm.OtherMeasureData }, async val => {
           // 靶病灶状态为0（存在）时，一定存在长径或者长短径（长径、十字线 ）
           // 普通靶病灶：长径大于10mm且不小于2倍层厚（基线校验）
           // 淋巴结靶病灶：短径大于15mm且不小于2倍层厚（基线校验）

src/views/trials/trials-panel/reading/dicoms/components/Fusion/Viewport.vue

@@ -205,11 +205,17 @@ export default {
     document.addEventListener('mouseup', () => {
       this.sliderMouseup()
     })
+    // document.addEventListener('mousewheel', (e) => {
+    //   this.mousewheel(e)
+    // })
   },
   destroyed() {
 
   },
   methods: {
+    // mousewheel(e){
+    //   console.log(e)
+    // },
     handleVolumeNewImage(e) {
       const { imageIndex } = e.detail
       this.seriesInfo.imageIdIndex = imageIndex
@@ -297,6 +303,7 @@ export default {
       var zoom = viewport.getZoom()
       if (!zoom) return
       this.imageInfo.zoom = zoom.toFixed(4)
+      // console.log(e)
     },
     handleVOIModified(e) {
       renderingEngine = getRenderingEngine(this.renderingEngineId)

src/views/trials/trials-panel/reading/dicoms/components/IRecist/QuestionForm.vue

@@ -519,7 +519,7 @@ export default {
             item.Answer = this.questionForm[item.Id]
             arr.push(item)
           })
-          var obj = { questionId: this.parentQsId, rowIndex: this.questionForm.RowIndex, visitTaskId: this.visitTaskId, lesionType: this.lesionType }
+          var obj = { questionId: this.parentQsId, rowIndex: this.questionForm.RowIndex, visitTaskId: this.visitTaskId, lesionName: this.lesionMark, lesionType: this.lesionType }
 
           DicomEvent.$emit('imageLocation', obj)
           var type = null
@@ -1957,7 +1957,7 @@ export default {
           }
         }
 
-        DicomEvent.$emit('getScreenshots', async val => {
+        DicomEvent.$emit('getScreenshots', { questionId: this.parentQsId, rowIndex: this.questionForm.RowIndex, visitTaskId: this.visitTaskId, lesionName: this.lesionMark, lesionType: this.lesionType }, async val => {
           // 靶病灶状态为0（存在）时，一定存在长径或者长短径（长径、十字线 ）
           // 普通靶病灶：长径大于10mm且不小于2倍层厚（基线校验）
           // 淋巴结靶病灶：短径大于15mm且不小于2倍层厚（基线校验）

src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionForm.vue

@@ -640,7 +640,7 @@ export default {
             item.Answer = this.questionForm[item.Id] ? this.questionForm[item.Id] : ''
             arr.push(item)
           })
-          var obj = { questionId: this.parentQsId, rowIndex: this.questionForm.RowIndex, visitTaskId: this.visitTaskId, lesionType: this.lesionType }
+          var obj = { questionId: this.parentQsId, rowIndex: this.questionForm.RowIndex, visitTaskId: this.visitTaskId, lesionName: this.lesionMark, lesionType: this.lesionType }
           DicomEvent.$emit('imageLocation', obj)
           var type = null
           if (this.questionForm.RowId) {
@@ -1653,8 +1653,13 @@ export default {
             }
           }
         }
+        // DicomEvent.$emit('imageLocation', { questionId: this.parentQsId, rowIndex: this.questionForm.RowIndex, visitTaskId: this.visitTaskId, lesionName: this.lesionName, lesionType: this.lesionType }, () => {
+        //   console.log(11111)
 
-        DicomEvent.$emit('getScreenshots', async val => {
+        // })
+        // await DicomEvent.$emit('imageLocation', { questionId: this.parentQsId, rowIndex: this.questionForm.RowIndex, visitTaskId: this.visitTaskId, lesionName: this.lesionName, lesionType: this.lesionType })
+        // console.log(5555)
+        DicomEvent.$emit('getScreenshots', { questionId: this.parentQsId, rowIndex: this.questionForm.RowIndex, visitTaskId: this.visitTaskId, lesionName: this.lesionMark, lesionType: this.lesionType }, async val => {
           // 靶病灶状态为0（存在）时，一定存在长径或者长短径（长径、十字线 ）
           // 普通靶病灶：长径大于10mm且不小于2倍层厚（基线校验）
           // 淋巴结靶病灶：短径大于15mm且不小于2倍层厚（基线校验）

src/views/trials/trials-panel/reading/dicoms/components/PCWG/QuestionForm.vue

@@ -690,7 +690,7 @@ export default {
           }
         }
         const loading = this.$loading({ fullscreen: true })
-        DicomEvent.$emit('getScreenshots', async val => {
+        DicomEvent.$emit('getScreenshots', { questionId: this.parentQsId, rowIndex: this.questionForm.RowIndex, visitTaskId: this.visitTaskId, lesionName: this.lesionMark, lesionType: this.lesionType }, async val => {
           var picturePath = ''
           if (val && measureData) {
             var pictureObj = await this.uploadScreenshots(`${new Date().getTime()}`, val)

src/views/trials/trials-panel/reading/dicoms/components/QuestionItem.vue

@@ -15,6 +15,7 @@
     </div>
     <template v-else-if="((question.QuestionType === 56 || question.QuestionType === 57) && question.IsBaseLineTask)" />
     <template v-else>
+
       <el-form-item
         v-if="(question.ShowQuestion===1 && question.ParentTriggerValueList.includes(String(questionForm[question.ParentId]))) || question.ShowQuestion===0 "
         :label="`${question.QuestionName}`"
@@ -26,7 +27,8 @@
         :class="[question.Type==='group'?'mb':question.Type==='upload'?'uploadWrapper':'']"
       >
         <template v-if="question.QuestionType === 60 || question.QuestionType === 61">
-          <div style="display: flex;flex-direction: row;justify-content: flex-start;">
+          <div style="display: flex;flex-direction: row;justify-content: flex-start;align-items: center;">
+
             <el-input
               v-if="question.Type==='calculation'"
               v-model="questionForm[question.Id]"
@@ -42,7 +44,15 @@
             <!-- 清除标记 -->
             <el-button v-if="questionForm[question.Id]&& readingTaskState!== 2" size="mini" type="text" @click="removeAnnotation(question)">{{ $t('trials:lugano:button:clearAnnotation') }}</el-button>
             <!-- 定位 -->
-            <el-button v-if="questionForm[question.Id]" size="mini" type="text" style="margin-left: -5px;" @click="locateAnnotation(question)">{{ $t('trials:lugano:button:locateAnnotation') }}</el-button>
+            <el-button v-if="questionForm[question.Id]" size="mini" type="text" @click="locateAnnotation(question)">{{ $t('trials:lugano:button:locateAnnotation') }}</el-button>
+            <!-- 保存 -->
+            <el-button v-if="questionForm[question.Id] && readingTaskState!== 2 && question.SaveEnum === 1" size="mini" type="text" @click="saveAnnotation(question)">
+              <!-- 未保存 -->
+              <el-tooltip class="item" effect="dark" :content="$t('trials:reading:button:unsaved')" placement="bottom">
+                <i class="el-icon-warning" style="color:red" />
+              </el-tooltip>
+              {{ $t('common:button:save') }}
+            </el-button>
           </div>
         </template>
 
@@ -361,6 +371,9 @@ export default {
     addAnnotation(question) {
       DicomEvent.$emit('addAnnotation', question)
     },
+    saveAnnotation(question) {
+      DicomEvent.$emit('saveAnnotation', question)
+    },
     removeAnnotation(question) {
       DicomEvent.$emit('locateAnnotation', question)
       // 是否确认清除标记？

src/views/trials/trials-panel/reading/dicoms/components/Questions.vue

@@ -113,24 +113,31 @@ export default {
     DicomEvent.$on('setReadingState', readingTaskState => {
       this.readingTaskState = readingTaskState
     })
-    DicomEvent.$on('handleSaveQuestions', readingTaskState => {
+    if (this.groupClassify === 3) {
-      this.handleSave()
+      DicomEvent.$on('addAnnotation', obj => {
-    })
+        this.$set(obj, 'SaveEnum', 1)
-    DicomEvent.$on('addAnnotation', obj => {
+        this.addAnnotation(obj)
-      this.addAnnotation(obj)
+      })
-    })
+      DicomEvent.$on('removeAnnotation', obj => {
-    DicomEvent.$on('removeAnnotation', obj => {
+        this.removeAnnotation(obj)
-      this.removeAnnotation(obj)
+      })
-    })
+      DicomEvent.$on('saveAnnotation', obj => {
-    DicomEvent.$on('locateAnnotation', obj => {
+        this.saveAnnotation(obj)
-      this.locateAnnotation(obj)
+      })
-    })
+
+      DicomEvent.$on('locateAnnotation', obj => {
+        this.locateAnnotation(obj)
+      })
+    }
   },
   beforeDestroy() {
     DicomEvent.$off('setReadingState')
-    DicomEvent.$off('addAnnotation')
+    if (this.groupClassify === 3) {
-    DicomEvent.$off('removeAnnotation')
+      DicomEvent.$off('addAnnotation')
-    DicomEvent.$off('locateAnnotation')
+      DicomEvent.$off('removeAnnotation')
+      DicomEvent.$off('saveAnnotation')
+      DicomEvent.$off('locateAnnotation')
+    }
   },
   methods: {
     async getQuestions(visitTaskId) {
@@ -227,10 +234,12 @@ export default {
           if (i.QuestionType === 60) {
             // 脾尖位置
             this.spleenTopId = i.Id
+            this.$set(i, 'SaveEnum', 0)
           }
           if (i.QuestionType === 61) {
             // 脾底位置
             this.spleenBottomId = i.Id
+            this.$set(i, 'SaveEnum', 0)
           }
         }
         if (i.Childrens && i.Childrens.length > 0) {
@@ -276,10 +285,6 @@ export default {
       this.loading = true
       var answers = []
       var imageQuality = null
-      if (this.groupClassify === 3) {
-        await this.uploadScreenshot()
-      }
-
       for (const k in this.questionForm) {
         answers.push({ id: k, answer: this.questionForm[k] })
         if (k === this.imageQualityId) {
@@ -291,17 +296,17 @@ export default {
         answers: answers
 
       }
-      if (this.groupClassify === 3) {
+      // if (this.groupClassify === 3) {
-        var questionMarkInfoList = []
+      //   var questionMarkInfoList = []
-        this.measurements.forEach(item => {
+      //   this.measurements.forEach(item => {
-          var i = Object.assign({}, item)
+      //     var i = Object.assign({}, item)
-          if (i.MeasureData) {
+      //     if (i.MeasureData) {
-            i.MeasureData = JSON.stringify(i.MeasureData)
+      //       i.MeasureData = JSON.stringify(i.MeasureData)
-          }
+      //     }
-          questionMarkInfoList.push(i)
+      //     questionMarkInfoList.push(i)
-        })
+      //   })
-        params.questionMarkInfoList = questionMarkInfoList
+      //   params.questionMarkInfoList = questionMarkInfoList
-      }
+      // }
 
       saveImageQuality(params).then(async res => {
         this.$message.success(this.$t('common:message:savedSuccessfully'))
@@ -359,16 +364,6 @@ export default {
         return { isSuccess: false, result: e }
       }
     },
-    // 上传截图
-    async uploadScreenshot() {
-      for (let i = 0; i < this.measurements.length; i++) {
-        if (this.measurements[i].pictureBaseStr) {
-          var pictureObj = await this.uploadScreenshots(`${new Date().getTime()}`, this.measurements[i].pictureBaseStr)
-          this.measurements[i].PicturePath = pictureObj.isSuccess ? this.$getObjectName(pictureObj.result.url) : ''
-          this.measurements[i].pictureBaseStr = ''
-        }
-      }
-    },
     async uploadScreenshots(fileName, file) {
       try {
         file = this.convertBase64ToBlob(file)
@@ -436,6 +431,73 @@ export default {
       this.setSpleenCommentDisplay()
       this.formChanged = true
     },
+    saveAnnotation(question) {
+      this.loading = true
+      // 获取截图
+      var answers = []
+      var questionMarkInfoList = []
+      var annotationObj = this.measurements.find(i => i.QuestionType === question.QuestionType)
+      if (!annotationObj) {
+        this.loading = false
+        return
+      }
+      DicomEvent.$emit('getScreenshots', { questionId: annotationObj.Id, visitTaskId: this.visitTaskId, lesionName: annotationObj.OrderMarkName, markTool: annotationObj.MarkTool, readingTaskState: this.readingTaskState, isMarked: !!annotationObj.MeasureData }, async val => {
+        var pictureObj = await this.uploadScreenshots(`${new Date().getTime()}`, val)
+        var picturePath = pictureObj.isSuccess ? this.$getObjectName(pictureObj.result.url) : ''
+        if (annotationObj && annotationObj.MeasureData) {
+          annotationObj.MeasureData = JSON.stringify(annotationObj.MeasureData)
+          annotationObj.PicturePath = picturePath
+          questionMarkInfoList.push(annotationObj)
+        }
+        for (const k in this.questionForm) {
+          if (k === question.Id) {
+            answers.push({ id: k, answer: this.questionForm[k] })
+            break
+          }
+        }
+        var params = {
+          visitTaskId: this.visitTaskId,
+          answers,
+          questionMarkInfoList
+        }
+        saveImageQuality(params).then(async res => {
+          this.$message.success(this.$t('common:message:savedSuccessfully'))
+          this.loading = false
+          this.$set(question, 'SaveEnum', 0)
+          DicomEvent.$emit('getReportInfo', true)
+        }).catch(() => {
+          this.loading = false
+        })
+      })
+
+      // if (this.criterionType === 2 && this.groupClassify === 3) {
+      //   var currentSpleenStatus = this.questionForm[this.spleenStatusId]
+      //   var currentSpleenLength = this.questionForm[this.spleenLengthId]
+      //   currentSpleenStatus = isNaN(parseInt(currentSpleenStatus)) ? null : parseInt(currentSpleenStatus)
+      //   var stIdx = this.measurements.findIndex(i => i.QuestionType === 60)
+      //   var slIdx = this.measurements.findIndex(i => i.QuestionType === 60)
+      //   if (currentSpleenLength && currentSpleenStatus === 5) {
+      //     // '脾脏状态为不可评估，不需要添加标记!'
+      //     this.$alert(this.$t('trials:lugano:message:validSpleen1'), this.$t('trials:lugano:fusionDialog:warning'), {
+      //       callback: _ => {}
+      //     })
+      //   } else if (currentSpleenStatus === 5 && ((stIdx > -1 && this.measurements[stIdx].MeasureData) || (slIdx > -1 && this.measurements[slIdx].MeasureData))) {
+      //     // 若有标记，状态不可为“无法评估”
+      //     this.$alert(this.$t('trials:lugano:message:validSpleen1'), this.$t('trials:lugano:fusionDialog:warning'), {
+      //       callback: _ => {}
+      //     })
+      //   } else if (((stIdx > -1 && this.measurements[stIdx].MeasureData) || (slIdx > -1 && this.measurements[slIdx].MeasureData)) && !currentSpleenLength) {
+      //     this.$alert(this.$t('trials:lugano:message:validSpleen2'), this.$t('trials:lugano:fusionDialog:warning'), {
+      //       callback: _ => {}
+      //     })
+      //   } else {
+      //     this.saveQuestionsList()
+      //   }
+      // } else {
+      //   this.saveQuestionsList()
+      // }
+      // this.saveQuestionsList()
+    },
     locateAnnotation(obj) {
       const { Id } = obj
       var idx = this.measurements.findIndex(i => i.QuestionId === Id)
@@ -504,6 +566,19 @@ export default {
         DicomEvent.$emit('questionFormChange', true)
       }
       this.formChanged = true
+      this.setQuestionStatus(this.questions, this.measurements[idx].QuestionType)
+    },
+    setQuestionStatus(obj, questionType) {
+      console.log(obj, questionType)
+      for (let i = 0; i < obj.length; i++) {
+        if (obj[i].QuestionType === questionType) {
+          this.$set(obj[i], 'SaveEnum', 1)
+          break
+        }
+        if (obj[i].Childrens && obj[i].Childrens.length > 0) {
+          this.setQuestionStatus(obj[i].Childrens, questionType)
+        }
+      }
     },
     getSpleenL() {
       var length = null

src/views/trials/trials-panel/reading/dicoms/components/Recist/QuestionForm.vue

@@ -496,7 +496,7 @@ export default {
             item.Answer = this.questionForm[item.Id] ? this.questionForm[item.Id] : ''
             arr.push(item)
           })
-          var obj = { questionId: this.parentQsId, rowIndex: this.questionForm.RowIndex, visitTaskId: this.visitTaskId, lesionType: this.lesionType }
+          var obj = { questionId: this.parentQsId, rowIndex: this.questionForm.RowIndex, visitTaskId: this.visitTaskId, lesionName: this.lesionMark, lesionType: this.lesionType }
           DicomEvent.$emit('imageLocation', obj)
           var type = null
           if (this.questionForm.RowId) {
@@ -1319,7 +1319,7 @@ export default {
           }
         }
 
-        DicomEvent.$emit('getScreenshots', async val => {
+        DicomEvent.$emit('getScreenshots', { questionId: this.parentQsId, rowIndex: this.questionForm.RowIndex, visitTaskId: this.visitTaskId, lesionName: this.lesionMark, lesionType: this.lesionType }, async val => {
           // 靶病灶状态为0（存在）时，一定存在长径或者长短径（长径、十字线 ）
           // 普通靶病灶：长径大于10mm且不小于2倍层厚（基线校验）
           // 淋巴结靶病灶：短径大于15mm且不小于2倍层厚（基线校验）

src/views/trials/trials-panel/reading/dicoms/components/RecistBM/QuestionForm.vue

@@ -454,7 +454,7 @@ export default {
             item.Answer = this.questionForm[item.Id] ? this.questionForm[item.Id] : ''
             arr.push(item)
           })
-          var obj = { questionId: this.parentQsId, rowIndex: this.questionForm.RowIndex, visitTaskId: this.visitTaskId, lesionType: this.lesionType }
+          var obj = { questionId: this.parentQsId, rowIndex: this.questionForm.RowIndex, visitTaskId: this.visitTaskId, lesionName: this.lesionMark, lesionType: this.lesionType }
           DicomEvent.$emit('imageLocation', obj)
           var type = null
           if (this.questionForm.RowId) {
@@ -970,7 +970,7 @@ export default {
           }
         }
 
-        DicomEvent.$emit('getScreenshots', async val => {
+        DicomEvent.$emit('getScreenshots', { questionId: this.parentQsId, rowIndex: this.questionForm.RowIndex, visitTaskId: this.visitTaskId, lesionName: this.lesionMark, lesionType: this.lesionType }, async val => {
           var picturePath = ''
           if (val && measureData) {
             var pictureObj = await this.uploadScreenshots(`${new Date().getTime()}`, val)

src/views/trials/trials-panel/reading/dicoms/components/ReportPage.vue

@@ -690,6 +690,7 @@ export default {
           await store.dispatch('reading/setCurrentReadingTaskState', 2)
           var isAutoTask = await this.getAutoTaskVal()
           if (isAutoTask) {
+            DicomEvent.$emit('reload')
             // DicomEvent.$emit('getNextTask')
             window.location.reload()
           } else {

src/views/trials/trials-panel/reading/dicoms/components/StudyList.vue

@@ -78,7 +78,7 @@
                   </p>
 
                   <div class="flex-div">
-                    <div v-if="measureData.findIndex(v=>v.SeriesId === series.seriesId && v.MeasureData) > -1">
+                    <div v-if="measureData && measureData.findIndex(v=>v.SeriesId === series.seriesId && v.MeasureData) > -1">
                       <!-- 有标注 -->
                       <el-tooltip class="item" effect="dark" :content="$t('trials:reading:button:marked')" placement="right">
                         <i class="el-icon-star-on" style="font-size: 16px;color: #ff5722;" />
@@ -718,7 +718,7 @@ export default {
         // requestPoolManager.startTaskTimer()
         this.imageList.map(image => {
           requestPoolManager.loadAndCacheImagePlus(image.imageId, image.seriesId, image.priority).then(res => {
-            if(res){
+            if (res) {
               this.imageLoaded(image, res.data.string('x0020000e'))
             }
           })

src/views/trials/trials-panel/reading/dicoms/customize/CustomizeStudyList.vue

@@ -78,7 +78,7 @@
                   </p>
 
                   <div class="flex-div">
-                    <div v-if="measureData.findIndex(v=>v.SeriesId === series.seriesId && v.MeasureData) > -1">
+                    <div v-if="measureData && measureData.findIndex(v=>v.SeriesId === series.seriesId && v.MeasureData) > -1">
                       <!-- 有标注 -->
                       <el-tooltip class="item" effect="dark" :content="$t('trials:reading:button:marked')" placement="right">
                         <i class="el-icon-star-on" style="font-size: 16px;color: #ff5722;" />