Merge branch 'main' of https://gitea.frp.extimaging.com/XCKJ/irc_web

src/views/dicom-show/dicom-study.vue

@@ -155,7 +155,7 @@ import store from '@/store'
 import { changeURLStatic } from '@/utils/history.js'
 cornerstoneWADOImageLoader.external.dicomParser = dicomParser
 cornerstoneWADOImageLoader.external.cornerstone = cornerstone
-const maximumSizeInBytes = 1024 * 1024 * 1024 * 3 // 1 GB
+const maximumSizeInBytes = 1024 * 1024 * 1024 * 6 // 1 GB
 export default {
   components: {
     'dicom-viewer': dicomViewer

src/views/dicom-show/dicom-visit.vue

@@ -275,7 +275,7 @@ import { changeURLStatic } from '@/utils/history.js'
 // import * as cornerstoneTools from 'cornerstone-tools'
 cornerstoneWADOImageLoader.external.dicomParser = dicomParser
 cornerstoneWADOImageLoader.external.cornerstone = cornerstone
-const maximumSizeInBytes = 1024 * 1024 * 1024 * 3 // 1 GB
+const maximumSizeInBytes = 1024 * 1024 * 1024 * 6 // 1 GB
 export default {
   name: 'DicomsOfVisit',
   components: {

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

@@ -8,12 +8,12 @@
 
               <div v-if="(visitTaskList.length > 0)" style="display: flex;flex-direction: row;">
                 <div
-                  v-for="(s,index) in visitTaskList"
+                  v-for="s in visitTaskList"
                   :key="s.VisitTaskId"
                   class="visit-item"
                   :class="{'visit-item-active': activeTaskVisitId==s.VisitTaskId}"
 
-                  @click.prevent="handleClick(s,index)"
+                  @click.prevent="handleClick(s)"
                 >{{ s.TaskBlindName }}</div>
 
               </div>

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

@@ -213,10 +213,7 @@ export default {
       srDialogVisible: false,
       srInfo: {},
       digitPlaces: 2,
-      visitTaskIdx: -1,
-      currentLoadIns: [],
-      keySeriesLoad: [],
-      markedImages: {}
+      visitTaskIdx: -1
     }
   },
 
@@ -351,9 +348,6 @@ export default {
         if (idx > -1 && this.visitTaskList[idx].StudyList && this.visitTaskList[idx].StudyList.length > 0) {
           this.measureData = this.visitTaskList[idx].MeasureData
           this.studyList = this.visitTaskList[idx].StudyList
-          if (Object.keys(this.markedImages).length === 0) {
-            this.getKeySeriesInfo()
-          }
           var sIdx = this.studyList.findIndex(s => s.IsDicom)
           if (sIdx > -1) {
             this.studyIndex = sIdx
@@ -387,12 +381,10 @@ export default {
     },
 
     async getInitSeries() {
-      console.log('getInitSeries')
       var seriesList = []
       var isReadingTaskViewInOrder = parseInt(this.$router.currentRoute.query.isReadingTaskViewInOrder)
       var idx = this.visitTaskList.findIndex(i => i.VisitTaskId === this.visitTaskId)
       this.studyList = this.visitTaskList[idx].StudyList
-      this.getKeySeriesInfo()
       if (this.visitTaskList[idx].IsBaseLineTask || isReadingTaskViewInOrder !== 1) {
         // 基线
         const obj = this.getFirstMarkedSeries(this.visitTaskList[idx].MeasureData, [...this.visitTaskList[idx].StudyList])
@@ -453,30 +445,6 @@ export default {
 
       return seriesList
     },
-    getKeySeriesInfo() {
-      console.log('getKeySeriesInfo')
-      const i = this.studyList.findIndex(i => i.IsCriticalSequence)
-      if (i > -1 && this.studyList[i].SeriesList.length > 0) {
-        var keyInstance = this.studyList[i].SeriesList[0].instanceList
-        // const keySeriesId = this.studyList[i].SeriesList[0].seriesId
-        const studyList = this.studyList.filter(i => !i.IsCriticalSequence)
-        var seriesList = studyList.map(s => s.SeriesList).flat().filter(i => i.isBeMark)
-        seriesList.map(i => {
-          const set = new Set()
-          var instances = i.instanceList.concat(keyInstance).filter((item) => {
-            if (set.has(item)) {
-              return true
-            } else {
-              set.add(item)
-              return false
-            }
-          })
-          instances.map(item => {
-            this.markedImages[item] = { seriesId: i.seriesId, studyIndex: i.studyIndex, seriesIndex: i.seriesIndex }
-          })
-        })
-      }
-    },
     getSecondMarkedSeries(baseObj, visitTaskInfo) {
       var obj = {}
       var studyList = visitTaskInfo.StudyList
@@ -754,9 +722,6 @@ export default {
       var idx = this.visitTaskList.findIndex(i => i.VisitTaskId === this.visitTaskId)
       if (idx === -1) return
       this.studyList = this.visitTaskList[idx].StudyList
-      if (Object.keys(this.markedImages).length === 0) {
-        this.getKeySeriesInfo()
-      }
       this.studyIndex = obj.studyIndex
       this.seriesIndex = obj.seriesIndex
       var activeNames = `${this.studyList[obj.studyIndex].StudyId}`
@@ -785,9 +750,6 @@ export default {
       var idx = this.visitTaskList.findIndex(i => i.VisitTaskId === series.visitTaskId)
       if (idx === -1) return
       this.studyList = this.visitTaskList[idx].StudyList
-      if (Object.keys(this.markedImages).length === 0) {
-        this.getKeySeriesInfo()
-      }
       var activeNames = `${this.studyList[series.studyIndex].StudyId}`
       if (this.activeNames.includes(activeNames)) return
       this.activeNames.push(activeNames)

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

@@ -210,10 +210,7 @@ export default {
       srDialogVisible: false,
       srInfo: {},
       digitPlaces: 2,
-      visitTaskIdx: -1,
-      currentLoadIns: [],
-      keySeriesLoad: [],
-      markedImages: {}
+      visitTaskIdx: -1
     }
   },
 
@@ -315,15 +312,11 @@ export default {
       requestPoolManager.loadAndCacheImagePlus(imageId, seriesInfo.seriesId, p * 100)
     },
     getStudyList() {
-      console.log('getStudyList')
       if (!this.isRender) {
         var idx = this.visitTaskList.findIndex(i => i.VisitTaskId === this.visitTaskId)
         if (idx > -1 && this.visitTaskList[idx].StudyList && this.visitTaskList[idx].StudyList.length > 0) {
           this.measureData = this.visitTaskList[idx].MeasureData
           this.studyList = this.visitTaskList[idx].StudyList
-          if (Object.keys(this.markedImages).length === 0) {
-            this.getKeySeriesInfo()
-          }
           var sIdx = this.studyList.findIndex(s => s.IsDicom)
           if (sIdx > -1) {
             this.studyIndex = sIdx
@@ -361,7 +354,6 @@ export default {
       var isReadingTaskViewInOrder = JSON.parse(this.$router.currentRoute.query.isReadingTaskViewInOrder)
       var idx = this.visitTaskList.findIndex(i => i.VisitTaskId === this.visitTaskId)
       this.studyList = this.visitTaskList[idx].StudyList
-      this.getKeySeriesInfo()
       if (this.visitTaskList[idx].IsBaseLineTask || isReadingTaskViewInOrder !== 1) {
         // 基线
         const obj = this.getFirstMarkedSeries(this.visitTaskList[idx].MeasureData, [...this.visitTaskList[idx].StudyList])
@@ -422,29 +414,6 @@ export default {
 
       return seriesList
     },
-    getKeySeriesInfo() {
-      const i = this.studyList.findIndex(i => i.IsCriticalSequence)
-      if (i > -1 && this.studyList[i].SeriesList.length > 0) {
-        var keyInstance = this.studyList[i].SeriesList[0].instanceList
-        // const keySeriesId = this.studyList[i].SeriesList[0].seriesId
-        const studyList = this.studyList.filter(i => !i.IsCriticalSequence)
-        var seriesList = studyList.map(s => s.SeriesList).flat().filter(i => i.isBeMark)
-        seriesList.map(i => {
-          const set = new Set()
-          var instances = i.instanceList.concat(keyInstance).filter((item) => {
-            if (set.has(item)) {
-              return true
-            } else {
-              set.add(item)
-              return false
-            }
-          })
-          instances.map(item => {
-            this.markedImages[item] = { seriesId: i.seriesId, studyIndex: i.studyIndex, seriesIndex: i.seriesIndex }
-          })
-        })
-      }
-    },
     getSecondMarkedSeries(baseObj, visitTaskInfo) {
       var obj = {}
       var studyList = visitTaskInfo.StudyList
@@ -722,9 +691,6 @@ export default {
       var idx = this.visitTaskList.findIndex(i => i.VisitTaskId === this.visitTaskId)
       if (idx === -1) return
       this.studyList = this.visitTaskList[idx].StudyList
-      if (Object.keys(this.markedImages).length === 0) {
-        this.getKeySeriesInfo()
-      }
       this.studyIndex = obj.studyIndex
       this.seriesIndex = obj.seriesIndex
       var activeNames = `${this.studyList[obj.studyIndex].StudyId}`
@@ -753,9 +719,6 @@ export default {
       var idx = this.visitTaskList.findIndex(i => i.VisitTaskId === series.visitTaskId)
       if (idx === -1) return
       this.studyList = this.visitTaskList[idx].StudyList
-      if (Object.keys(this.markedImages).length === 0) {
-        this.getKeySeriesInfo()
-      }
       var activeNames = `${this.studyList[series.studyIndex].StudyId}`
       if (this.activeNames.includes(activeNames)) return
       this.activeNames.push(activeNames)