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

@@ -222,8 +222,7 @@ export default {
         taskBlindName: '',
         frame: null,
         imageRendered: false,
-        isExistsClinicalData: false,
-        isExistMutiFrames: false
+        isExistsClinicalData: false
         // preventCache: true
       },
       dicomInfo: {
@@ -759,7 +758,7 @@ export default {
       const imageInfo = this.getInstanceInfo(imageId)
       var instanceId = imageInfo.instanceId
       var frame = imageInfo.frame
-      this.stack.frame = this.stack.isExistMutiFrames ? parseInt(frame) : null
+      this.stack.frame = !isNaN(parseInt(frame)) ? parseInt(frame) : 0
       const ToolStateManager = cornerstoneTools.globalImageIdSpecificToolStateManager
       for (var m = 0; m < this.measuredTools.length; m++) {
         var toolType = this.measuredTools[m]
@@ -881,6 +880,7 @@ export default {
       return seriesList[seriesIdx].loadStatus ? 1 : 0
     },
     renderMeasuredData(e) {
+      this.stack.frame = !isNaN(parseInt(this.stack.frame)) ? parseInt(this.stack.frame) : 0
       var idx = this.visitTaskList.findIndex(i => i.VisitTaskId === this.stack.visitTaskId)
       if (idx === -1) return
       this.measureData = this.visitTaskList[idx].MeasureData
@@ -899,7 +899,9 @@ export default {
           } else {
             cornerstoneTools.setToolEnabledForElement(element, data.MeasureData.type, { mouseButtonMask: 1 })
           }
-          if (this.stack.instanceId.includes(data.InstanceId) && ((this.stack.isExistMutiFrames && data.MeasureData.frame === this.stack.frame) || !data.MeasureData.frame) && data.MeasureData) {
+          // console.log('renderMeasuredData', this.stack.frame)
+
+          if (this.stack.instanceId.includes(data.InstanceId) && ((data.NumberOfFrames === this.stack.frame) || !data.NumberOfFrames) && data.MeasureData) {
             const toolState = ToolStateManager.getImageIdToolState(e.detail.image.imageId, data.MeasureData.type)
             if (toolState && toolState.data.length > 0) {
               var idx = toolState.data.findIndex(item => item.uuid === data.MeasureData.data.uuid)
@@ -986,7 +988,7 @@ export default {
       const imageInfo = this.getInstanceInfo(imageId)
       var instanceId = imageInfo.instanceId
       var frame = imageInfo.frame
-      this.stack.frame = this.stack.isExistMutiFrames ? parseInt(frame) : null
+      this.stack.frame = !isNaN(parseInt(frame)) ? parseInt(frame) : 0
       const ToolStateManager = cornerstoneTools.globalImageIdSpecificToolStateManager
       for (let t = 0; t < this.measuredTools.length; t++) {
         var toolType = this.measuredTools[t]
@@ -1065,7 +1067,6 @@ export default {
         this.stack.sliceThickness = dicomSeries.sliceThickness
         this.stack.instanceCount = dicomSeries.instanceCount
         this.stack.isExistsClinicalData = dicomSeries.isExistsClinicalData
-        this.stack.isExistMutiFrames = dicomSeries.isExistMutiFrames
         // this.measuredData = dicomSeries.measuredData
         var idx = this.visitTaskList.findIndex(i => i.VisitTaskId === dicomSeries.visitTaskId)
         this.stack.visitTaskNum = this.visitTaskList[idx].VisitTaskNum
@@ -1086,7 +1087,7 @@ export default {
         const imageInfo = this.getInstanceInfo(imageId)
         var instanceId = imageInfo.instanceId
         var frame = imageInfo.frame
-        this.stack.frame = this.stack.isExistMutiFrames ? parseInt(frame) : null
+        this.stack.frame = !isNaN(parseInt(frame)) ? parseInt(frame) : 0
         this.stack.instanceId = instanceId
         const ToolStateManager = cornerstoneTools.globalImageIdSpecificToolStateManager
         ToolStateManager.clearImageIdToolState(dicomSeries.imageIds)
@@ -1200,7 +1201,7 @@ export default {
         const imageInfo = this.getInstanceInfo(image.imageId)
         var instanceId = imageInfo.instanceId
         var frame = imageInfo.frame
-        this.stack.frame = this.stack.isExistMutiFrames ? parseInt(frame) : null
+        this.stack.frame = !isNaN(parseInt(frame)) ? parseInt(frame) : 0
         this.stack.instanceId = instanceId
         this.height = (this.stack.currentImageIdIndex) * 100 / (this.stack.imageIds.length - 1)
         this.resetWwwc()
@@ -1275,7 +1276,7 @@ export default {
       const imageInfo = this.getInstanceInfo(imageId)
       var instanceId = imageInfo.instanceId
       var frame = imageInfo.frame
-      this.stack.frame = this.stack.isExistMutiFrames ? parseInt(frame) : null
+      this.stack.frame = !isNaN(parseInt(frame)) ? parseInt(frame) : 0
       if (this.imageId !== instanceId) {
         this.getOrientationMarker(e.detail.element)
         // 初次加载时，如果该影像存在标记，则以标记的窗宽窗位为初始化默认值，否则以序列的窗宽窗位为初始化默认值
@@ -1334,13 +1335,13 @@ export default {
       const imageInfo = this.getInstanceInfo(imageId)
       var instanceId = imageInfo.instanceId
       var frame = imageInfo.frame
-      this.stack.frame = this.stack.isExistMutiFrames ? parseInt(frame) : null
+      this.stack.frame = !isNaN(parseInt(frame)) ? parseInt(frame) : 0
       if (e.detail.toolName === 'Length' || e.detail.toolName === 'ArrowAnnotate' || e.detail.toolName === 'RectangleRoi') {
         const measureData = {}
         measureData.studyId = this.stack.studyId
         measureData.seriesId = this.stack.seriesId
         measureData.instanceId = instanceId
-        measureData.frame = this.stack.frame
+        measureData.frame = this.stack.frame ? this.stack.frame : 0
         measureData.data = e.detail.measurementData
         measureData.type = e.detail.toolName
         measureData.thick = this.dicomInfo.thick
@@ -1454,7 +1455,7 @@ export default {
       const imageInfo = this.getInstanceInfo(imageId)
       var instanceId = imageInfo.instanceId
       var frame = imageInfo.frame
-      this.stack.frame = this.stack.isExistMutiFrames ? parseInt(frame) : null
+      this.stack.frame = !isNaN(parseInt(frame)) ? parseInt(frame) : 0
 
       var uuid = measurementData.uuid
       var idx = this.measureData.findIndex(item => item.MeasureData && item.MeasureData.data && item.MeasureData.data.uuid === uuid)

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

@@ -1582,9 +1582,7 @@ export default {
             var seriesIdx = studyList[studyIdx].SeriesList.findIndex(s => s.seriesId === seriesId)
             if (seriesIdx > -1) {
               var series = studyList[studyIdx].SeriesList[seriesIdx]
-              let frame = this.visitTaskList[index].MeasureData[idx].MeasureData.frame
-              let filterStr = series.isExistMutiFrames ? `frame=${frame}&instanceId=${instanceId}` : `instanceId=${instanceId}`
-              var instanceIdx = series.imageIds.findIndex(imageId => imageId.includes(filterStr))
+              var instanceIdx = series.instanceList.findIndex(imageId => !!~imageId.indexOf(instanceId))
               if (instanceIdx > -1) {
                 series.imageIdIndex = instanceIdx
                 seriesInfo = series

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

@@ -464,10 +464,7 @@ export default {
               var seriesIdx = studyList[studyIdx].SeriesList.findIndex(s => s.seriesId === seriesId)
               if (seriesIdx > -1) {
                 var series = studyList[studyIdx].SeriesList[seriesIdx]
-                // var instanceIdx = series.instanceList.findIndex(imageId => !!~imageId.indexOf(instanceId))
-                let frame = this.visitTaskList[index].MeasureData[idx].MeasureData.frame
-                let filterStr = series.isExistMutiFrames ? `frame=${frame}&instanceId=${instanceId}` : `instanceId=${instanceId}`
-                var instanceIdx = series.imageIds.findIndex(imageId => imageId.includes(filterStr))
+                var instanceIdx = series.instanceList.findIndex(imageId => !!~imageId.indexOf(instanceId))
                 if (instanceIdx > -1) {
                   series.imageIdIndex = instanceIdx
                   // series.studyIndex = studyIdx

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

@@ -440,10 +440,9 @@ export default {
           const sdIndx = studyList.findIndex(sd => sd.StudyId === measureDatas[i].StudyId)
           const seriesList = studyList[sdIndx].SeriesList
           const srIdx = seriesList.findIndex(sr => sr.seriesId === measureDatas[i].SeriesId)
-          // const instanceList = seriesList[srIdx].instanceList
-          const imageIds = seriesList[srIdx].imageIds
-          let filterStr = seriesList[srIdx].isExistMutiFrames ? `frame=${measureDatas[i].MeasureData.frame}&instanceId=${measureDatas[i].InstanceId}` : `instanceId=${measureDatas[i].InstanceId}`
-          const isIdx = imageIds.findIndex(is => is.includes(filterStr))
+          // const instanceList = seriesList[srIdx].imageIds
+          const instanceList = seriesList[srIdx].instanceList
+          const isIdx = instanceList.findIndex(is => is.includes(measureDatas[i].InstanceId))
           const series = seriesList[srIdx]
           series.imageIdIndex = isIdx
 
@@ -514,9 +513,8 @@ export default {
           const seriesList = studyList[sdIndx].SeriesList
           const srIdx = seriesList.findIndex(sr => sr.seriesId === measureDatas[mIdx].SeriesId)
           // const instanceList = seriesList[srIdx].imageIds
-          const imageIds = seriesList[srIdx].imageIds
-          let filterStr = seriesList[srIdx].isExistMutiFrames ? `frame=${measureDatas[mIdx].MeasureData.frame}&instanceId=${measureDatas[mIdx].InstanceId}` : `instanceId=${measureDatas[mIdx].InstanceId}`
-          const isIdx = imageIds.findIndex(is => is.includes(filterStr))
+          const instanceList = seriesList[srIdx].instanceList
+          const isIdx = instanceList.findIndex(is => is.includes(measureDatas[mIdx].InstanceId))
           const series = seriesList[srIdx]
           series.imageIdIndex = isIdx
 

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

@@ -221,8 +221,7 @@ export default {
         taskBlindName: '',
         frame: null,
         imageRendered: false,
-        isExistsClinicalData: false,
-        isExistMutiFrames: false
+        isExistsClinicalData: false
         // preventCache: true
       },
       dicomInfo: {
@@ -744,7 +743,7 @@ export default {
       const imageInfo = this.getInstanceInfo(imageId)
       var instanceId = imageInfo.instanceId
       var frame = imageInfo.frame
-      this.stack.frame = this.stack.isExistMutiFrames ? parseInt(frame) : null
+      this.stack.frame = !isNaN(parseInt(frame)) ? parseInt(frame) : 0
       const ToolStateManager = cornerstoneTools.globalImageIdSpecificToolStateManager
       for (var m = 0; m < this.measuredTools.length; m++) {
         var toolType = this.measuredTools[m]
@@ -866,6 +865,7 @@ export default {
       return seriesList[seriesIdx].loadStatus ? 1 : 0
     },
     renderMeasuredData(e) {
+      this.stack.frame = !isNaN(parseInt(this.stack.frame)) ? parseInt(this.stack.frame) : 0
       var idx = this.visitTaskList.findIndex(i => i.VisitTaskId === this.stack.visitTaskId)
       if (idx === -1) return
       this.measureData = this.visitTaskList[idx].MeasureData
@@ -886,7 +886,7 @@ export default {
           }
           // console.log('renderMeasuredData', this.stack.frame)
 
-          if (this.stack.instanceId.includes(data.InstanceId) && ((this.stack.isExistMutiFrames && data.MeasureData.frame === this.stack.frame) || !data.MeasureData.frame) && data.MeasureData) {
+          if (this.stack.instanceId.includes(data.InstanceId) && ((data.NumberOfFrames === this.stack.frame) || !data.NumberOfFrames) && data.MeasureData) {
             const toolState = ToolStateManager.getImageIdToolState(e.detail.image.imageId, data.MeasureData.type)
             if (toolState && toolState.data.length > 0) {
               var idx = toolState.data.findIndex(item => item.uuid === data.MeasureData.data.uuid)
@@ -973,7 +973,7 @@ export default {
       const imageInfo = this.getInstanceInfo(imageId)
       var instanceId = imageInfo.instanceId
       var frame = imageInfo.frame
-      this.stack.frame = this.stack.isExistMutiFrames ? parseInt(frame) : null
+      this.stack.frame = !isNaN(parseInt(frame)) ? parseInt(frame) : 0
       const ToolStateManager = cornerstoneTools.globalImageIdSpecificToolStateManager
       for (let t = 0; t < this.measuredTools.length; t++) {
         var toolType = this.measuredTools[t]
@@ -1062,7 +1062,7 @@ export default {
         const imageInfo = this.getInstanceInfo(imageId)
         var instanceId = imageInfo.instanceId
         var frame = imageInfo.frame
-        this.stack.frame = this.stack.isExistMutiFrames ? parseInt(frame) : null
+        this.stack.frame = !isNaN(parseInt(frame)) ? parseInt(frame) : 0
         this.stack.instanceId = instanceId
         const ToolStateManager = cornerstoneTools.globalImageIdSpecificToolStateManager
         ToolStateManager.clearImageIdToolState(dicomSeries.imageIds)
@@ -1176,7 +1176,7 @@ export default {
         const imageInfo = this.getInstanceInfo(image.imageId)
         var instanceId = imageInfo.instanceId
         var frame = imageInfo.frame
-        this.stack.frame = this.stack.isExistMutiFrames ? parseInt(frame) : null
+        this.stack.frame = !isNaN(parseInt(frame)) ? parseInt(frame) : 0
         this.stack.instanceId = instanceId
         this.height = (this.stack.currentImageIdIndex) * 100 / (this.stack.imageIds.length - 1)
         this.resetWwwc()
@@ -1251,7 +1251,7 @@ export default {
       const imageInfo = this.getInstanceInfo(imageId)
       var instanceId = imageInfo.instanceId
       var frame = imageInfo.frame
-      this.stack.frame = this.stack.isExistMutiFrames ? parseInt(frame) : null
+      this.stack.frame = !isNaN(parseInt(frame)) ? parseInt(frame) : 0
       if (this.imageId !== instanceId) {
         this.getOrientationMarker(e.detail.element)
         // 初次加载时，如果该影像存在标记，则以标记的窗宽窗位为初始化默认值，否则以序列的窗宽窗位为初始化默认值
@@ -1310,7 +1310,7 @@ export default {
       const imageInfo = this.getInstanceInfo(imageId)
       var instanceId = imageInfo.instanceId
       var frame = imageInfo.frame
-      this.stack.frame = this.stack.isExistMutiFrames ? parseInt(frame) : null
+      this.stack.frame = !isNaN(parseInt(frame)) ? parseInt(frame) : 0
       if (e.detail.toolName === 'Length' || e.detail.toolName === 'ArrowAnnotate' || e.detail.toolName === 'RectangleRoi') {
         const measureData = {}
         measureData.studyId = this.stack.studyId
@@ -1430,7 +1430,7 @@ export default {
       const imageInfo = this.getInstanceInfo(imageId)
       var instanceId = imageInfo.instanceId
       var frame = imageInfo.frame
-      this.stack.frame = this.stack.isExistMutiFrames ? parseInt(frame) : null
+      this.stack.frame = !isNaN(parseInt(frame)) ? parseInt(frame) : 0
 
       var uuid = measurementData.uuid
       var idx = this.measureData.findIndex(item => item.MeasureData && item.MeasureData.data && item.MeasureData.data.uuid === uuid)

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

@@ -1700,12 +1700,9 @@ export default {
             );
             if (seriesIdx > -1) {
               var series = studyList[studyIdx].SeriesList[seriesIdx];
-              let frame = this.visitTaskList[index].MeasureData[idx].MeasureData.frame
-              let filterStr = series.isExistMutiFrames ? `frame=${frame}&instanceId=${instanceId}` : `instanceId=${instanceId}`
-              var instanceIdx = series.imageIds.findIndex(imageId => imageId.includes(filterStr))
-              // var instanceIdx = series.instanceList.findIndex(
-              //   (imageId) => !!~imageId.indexOf(instanceId)
-              // );
+              var instanceIdx = series.instanceList.findIndex(
+                (imageId) => !!~imageId.indexOf(instanceId)
+              );
               if (instanceIdx > -1) {
                 series.imageIdIndex = instanceIdx;
                 seriesInfo = series;

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

@@ -607,12 +607,9 @@ export default {
               );
               if (seriesIdx > -1) {
                 var series = studyList[studyIdx].SeriesList[seriesIdx];
-                // var instanceIdx = series.instanceList.findIndex(
-                //   (imageId) => !!~imageId.indexOf(instanceId)
-                // );
-                let frame = this.visitTaskList[index].MeasureData[idx].MeasureData.frame
-                let filterStr = series.isExistMutiFrames ? `frame=${frame}&instanceId=${instanceId}` : `instanceId=${instanceId}`
-                var instanceIdx = series.imageIds.findIndex(imageId => imageId.includes(filterStr))
+                var instanceIdx = series.instanceList.findIndex(
+                  (imageId) => !!~imageId.indexOf(instanceId)
+                );
                 if (instanceIdx > -1) {
                   series.imageIdIndex = instanceIdx;
                   // series.studyIndex = studyIdx

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

@@ -415,11 +415,9 @@ export default {
           const sdIndx = studyList.findIndex(sd => sd.StudyId === measureDatas[i].StudyId)
           const seriesList = studyList[sdIndx].SeriesList
           const srIdx = seriesList.findIndex(sr => sr.seriesId === measureDatas[i].SeriesId)
-          // const instanceList = seriesList[srIdx].instanceList
-          // const isIdx = instanceList.findIndex(is => is.includes(measureDatas[i].InstanceId))
-          const imageIds = seriesList[srIdx].imageIds
-          let filterStr = seriesList[srIdx].isExistMutiFrames ? `frame=${measureDatas[i].MeasureData.frame}&instanceId=${measureDatas[i].InstanceId}` : `instanceId=${measureDatas[i].InstanceId}`
-          const isIdx = imageIds.findIndex(is => is.includes(filterStr))
+          // const instanceList = seriesList[srIdx].imageIds
+          const instanceList = seriesList[srIdx].instanceList
+          const isIdx = instanceList.findIndex(is => is.includes(measureDatas[i].InstanceId))
           const series = seriesList[srIdx]
           series.imageIdIndex = isIdx
 
@@ -489,11 +487,9 @@ export default {
         if (sdIndx > -1) {
           const seriesList = studyList[sdIndx].SeriesList
           const srIdx = seriesList.findIndex(sr => sr.seriesId === measureDatas[mIdx].SeriesId)
-          // const instanceList = seriesList[srIdx].instanceList
-          // const isIdx = instanceList.findIndex(is => is.includes(measureDatas[mIdx].InstanceId))
-          const imageIds = seriesList[srIdx].imageIds
-          let filterStr = seriesList[srIdx].isExistMutiFrames ? `frame=${measureDatas[mIdx].MeasureData.frame}&instanceId=${measureDatas[mIdx].InstanceId}` : `instanceId=${measureDatas[mIdx].InstanceId}`
-          const isIdx = imageIds.findIndex(is => is.includes(filterStr))
+          // const instanceList = seriesList[srIdx].imageIds
+          const instanceList = seriesList[srIdx].instanceList
+          const isIdx = instanceList.findIndex(is => is.includes(measureDatas[mIdx].InstanceId))
           const series = seriesList[srIdx]
           series.imageIdIndex = isIdx