切换序列更改

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

@@ -878,7 +878,7 @@ export default {
     activeSeries: {
       immediate: true,
       handler(v) {
-        console.log('activeSeries', v)
+        // console.log('activeSeries', v)
         if (v && v.isCurrentTask && this.studyList.length === 0) {
           this.activeTaskInfo.taskName = v.taskBlindName
           this.activeTaskInfo.visitTaskId = v.visitTaskId
@@ -1108,7 +1108,7 @@ export default {
       var container = this.$refs['container']
       // window.addEventListener
       container.addEventListener('keydown', event => {
-        console.log(event)
+        // console.log(event)
         event.preventDefault()
 
         var idx = this.hotKeyList.findIndex(i => i.code === event.code && i.ctrlKey === event.ctrlKey && i.shiftKey === event.shiftKey && i.altKey === event.altKey)

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

@@ -364,8 +364,27 @@ export default {
             this.studyIndex = sIdx
             this.seriesIndex = 0
             this.activeNames = [`${this.studyList[sIdx].StudyId}`]
-
+            // 下载关键序列
-            this.loadImages(this.visitTaskList[idx])
+            const i = this.studyList.findIndex(i => i.IsCriticalSequence)
+            if (i > -1 && this.studyList[i].SeriesList[0].length > 0) {
+              const series = this.studyList[i].SeriesList[0]
+              if (!series.loadStatus) {
+                let priority = parseInt(new Date().getTime())
+                if (series.isExistMutiFrames) {
+                  series.instanceInfoList.map(image => {
+                    priority = priority - 1
+                    this.imageList.push({ imageId: image.ImageId, seriesId: series.seriesId, studyIndex: i, seriesIndex: 0, visitTaskId: series.visitTaskId, priority })
+                  })
+                } else {
+                  series.imageIds.map(imageId => {
+                    priority = priority - 1
+                    this.imageList.push({ imageId: imageId, seriesId: series.seriesId, studyIndex: i, seriesIndex: 0, visitTaskId: series.visitTaskId, priority })
+                  })
+                }
+              }
+            }
+            this.loopLoad()
+            // this.loadImages(this.visitTaskList[idx])
           }
         }
         this.isRender = true
@@ -746,7 +765,8 @@ export default {
       var activeNames = `${this.studyList[obj.studyIndex].StudyId}`
       if (this.activeNames.includes(activeNames)) return
       this.activeNames.push(activeNames)
-      this.loadImages(this.visitTaskList[idx])
+      // console.log('setSeriesActive', obj)
+      this.loadImages(obj)
     },
     selectSeries(obj) {
       var seriseList = this.studyList.map(s => s.SeriesList).flat()
@@ -774,10 +794,27 @@ export default {
       var activeNames = `${this.studyList[series.studyIndex].StudyId}`
       if (this.activeNames.includes(activeNames)) return
       this.activeNames.push(activeNames)
-      this.loadImages(this.visitTaskList[idx])
+      this.loadImages(series)
       store.dispatch('reading/setActiveSeries', series)
     },
-    loadImages(taskInfo) {
+    loadImages(series) {
+      var priority = parseInt(new Date().getTime())
+      if (!series.loadStatus && series.isDicom && series.modality !== 'SR') {
+        if (series.isExistMutiFrames) {
+          series.instanceInfoList.map(image => {
+            priority = priority - 1
+            this.imageList.push({ imageId: image.ImageId, seriesId: series.seriesId, studyIndex: series.studyIndex, seriesIndex: series.seriesIndex, visitTaskId: series.visitTaskId, priority })
+          })
+        } else {
+          series.imageIds.map(imageId => {
+            priority = priority - 1
+            this.imageList.push({ imageId: imageId, seriesId: series.seriesId, studyIndex: series.studyIndex, seriesIndex: series.seriesIndex, visitTaskId: series.visitTaskId, priority })
+          })
+        }
+      }
+      this.loopLoad()
+    },
+    loadImages1(taskInfo) {
       // const isBaseLineTask = taskInfo.IsBaseLineTask
       const isCurrentTask = taskInfo.IsCurrentTask
       // var priority = isCurrentTask ? parseInt(new Date().getTime()) : 999

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

@@ -345,8 +345,27 @@ export default {
             this.studyIndex = sIdx
             this.seriesIndex = 0
             this.activeNames = [`${this.studyList[sIdx].StudyId}`]
-
+            // 下载关键序列
-            this.loadImages(this.visitTaskList[idx])
+            const i = this.studyList.findIndex(i => i.IsCriticalSequence)
+            if (i > -1 && this.studyList[i].SeriesList[0].length > 0) {
+              const series = this.studyList[i].SeriesList[0]
+              if (!series.loadStatus) {
+                let priority = parseInt(new Date().getTime())
+                if (series.isExistMutiFrames) {
+                  series.instanceInfoList.map(image => {
+                    priority = priority - 1
+                    this.imageList.push({ imageId: image.ImageId, seriesId: series.seriesId, studyIndex: i, seriesIndex: 0, visitTaskId: series.visitTaskId, priority })
+                  })
+                } else {
+                  series.imageIds.map(imageId => {
+                    priority = priority - 1
+                    this.imageList.push({ imageId: imageId, seriesId: series.seriesId, studyIndex: i, seriesIndex: 0, visitTaskId: series.visitTaskId, priority })
+                  })
+                }
+              }
+            }
+            this.loopLoad()
+            // this.loadImages(this.visitTaskList[idx])
           }
         }
         this.isRender = true
@@ -727,7 +746,8 @@ export default {
       var activeNames = `${this.studyList[obj.studyIndex].StudyId}`
       if (this.activeNames.includes(activeNames)) return
       this.activeNames.push(activeNames)
-      this.loadImages(this.visitTaskList[idx])
+      // this.loadImages(this.visitTaskList[idx])
+      this.loadImages(obj)
     },
     selectSeries(obj) {
       var seriseList = this.studyList.map(s => s.SeriesList).flat()
@@ -755,45 +775,25 @@ export default {
       var activeNames = `${this.studyList[series.studyIndex].StudyId}`
       if (this.activeNames.includes(activeNames)) return
       this.activeNames.push(activeNames)
-      this.loadImages(this.visitTaskList[idx])
+      this.loadImages(series)
+      // this.loadImages(this.visitTaskList[idx])
       store.dispatch('reading/setActiveSeries', series)
     },
-    loadImages(taskInfo) {
+    loadImages(series) {
-      // const isBaseLineTask = taskInfo.IsBaseLineTask
-      const isCurrentTask = taskInfo.IsCurrentTask
-      // var priority = isCurrentTask ? parseInt(new Date().getTime()) : 999
       var priority = parseInt(new Date().getTime())
-      this.studyList.map((study, studyIndex) => {
+      if (!series.loadStatus && series.isDicom && series.modality !== 'SR') {
-        study.SeriesList.map((series, seriesIndex) => {
+        if (series.isExistMutiFrames) {
-          if (!series.loadStatus && series.isDicom && series.modality !== 'SR') {
+          series.instanceInfoList.map(image => {
-            // if (isCurrentTask || isBaseLineTask) {
+            priority = priority - 1
-            //   // 当前任务/基线任务下载所有影像
+            this.imageList.push({ imageId: image.ImageId, seriesId: series.seriesId, studyIndex: series.studyIndex, seriesIndex: series.seriesIndex, visitTaskId: series.visitTaskId, priority })
-            //   series.imageIds.map(image => {
+          })
-            //     this.imageList.push({ imageId: image, seriesId: series.seriesId, studyIndex: studyIndex, seriesIndex: seriesIndex, visitTaskId: series.visitTaskId, priority })
+        } else {
-            //   })
+          series.imageIds.map(imageId => {
-            // } else if (!isBaseLineTask && !isCurrentTask && study.IsCriticalSequence) {
+            priority = priority - 1
-            //   // 非当前随访任务下载关键影像
+            this.imageList.push({ imageId: imageId, seriesId: series.seriesId, studyIndex: series.studyIndex, seriesIndex: series.seriesIndex, visitTaskId: series.visitTaskId, priority })
-            //   series.imageIds.map(image => {
+          })
-            //     this.imageList.push({ imageId: image, seriesId: series.seriesId, studyIndex: studyIndex, seriesIndex: seriesIndex, visitTaskId: series.visitTaskId, priority })
+        }
-            //   })
+      }
-            // }
-            // 均只下载关键序列
-            if (!isCurrentTask && study.IsCriticalSequence) {
-              if (series.isExistMutiFrames) {
-                series.instanceInfoList.map(image => {
-                  priority = priority - 1
-                  this.imageList.push({ imageId: image.ImageId, seriesId: series.seriesId, studyIndex: studyIndex, seriesIndex: seriesIndex, visitTaskId: series.visitTaskId, priority })
-                })
-              } else {
-                series.imageIds.map(imageId => {
-                  priority = priority - 1
-                  this.imageList.push({ imageId: imageId, seriesId: series.seriesId, studyIndex: studyIndex, seriesIndex: seriesIndex, visitTaskId: series.visitTaskId, priority })
-                })
-              }
-            }
-          }
-        })
-      })
       this.loopLoad()
     },