阅片配置更改及影像上传页面预览规则更改

src/api/trials.js

@@ -3712,7 +3712,7 @@ export function addOrUpdateTrialSiteDicomAE(param) {
 export function deleteTrialSiteDicomAE(id) {
   return request({
     url: `/TrialSiteDicomAE/deleteTrialSiteDicomAE/${id}`,
-    method: 'delete',
+    method: 'delete'
   })
 }
 // 获取项目中dicomAE配置
@@ -3743,7 +3743,7 @@ export function addOrUpdateDicomAE(data) {
 export function testSCPServerConnect(id) {
   return request({
     url: `/TrialDicomAE/testSCPServerConnect/${id}`,
-    method: 'get',
+    method: 'get'
   })
 }
 // dicomAE配置签名

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

@@ -192,7 +192,8 @@ export default {
       loading: false,
       imageList: [],
       showSeriesList: [],
-      currentLoadIns: []
+      currentLoadIns: [],
+      isFromCRCUpload: false
     }
   },
   created: function() {
@@ -207,6 +208,7 @@ export default {
       changeURLStatic('TokenKey', '')
     }
     this.studyId = this.$router.currentRoute.query.studyId
+    this.isFromCRCUpload = !!this.$router.currentRoute.query.isFromCRCUpload
     if (this.type === 'Series') {
       // this.initStudy()
       this.showDelete = parseInt(this.$router.currentRoute.query.showDelete)
@@ -231,22 +233,20 @@ export default {
     })
   },
   methods: {
-    loadStudy() {
+    async loadStudy() {
-      var scope = this
+      const data = await getStudyInfo(this.studyId)
-      getStudyInfo(scope.studyId).then(data => {
       if (data.IsSuccess) {
-          scope.studyCode = data.Result.StudyCode
+        this.studyCode = data.Result.StudyCode
-          scope.modality = data.Result.Modalities
+        this.modality = data.Result.Modalities
-          scope.seriesCount = data.Result.SeriesCount
+        this.seriesCount = data.Result.SeriesCount
-          scope.description = data.Result.Description
+        this.description = data.Result.Description
-          var url = `/series/list/${scope.studyId}`
+        const url = `/series/list/${this.studyId}`
-          scope.getSeriesList(url)
+        this.getSeriesList(url)
       }
-      })
     },
-    getSeriesList(url) {
+    async getSeriesList(url) {
-      var scope = this
+      try {
-      getSeriesList(url).then(data => {
+        const data = await getSeriesList(url)
         if (data.IsSuccess) {
           const { Result } = data
           var seriesList = []
@@ -255,15 +255,15 @@ export default {
             item.InstanceInfoList.forEach(i => {
               if (i.NumberOfFrames && i.NumberOfFrames > 1) {
                 for (let j = 0; j < i.NumberOfFrames; j++) {
-                  imageIds.push(`wadouri:${localStorage.getItem('location') !== 'USA' ? scope.OSSclientConfig.basePath : scope.OSSclientConfig.basePath}${i.Path}?frame=${j}&instanceId=${i.Id}&seriesIndex=${index}`)
+                  imageIds.push(`wadouri:${localStorage.getItem('location') !== 'USA' ? this.OSSclientConfig.basePath : this.OSSclientConfig.basePath}${i.Path}?frame=${j}&instanceId=${i.Id}&seriesIndex=${index}`)
                 }
               } else {
-                imageIds.push(`wadouri:${localStorage.getItem('location') !== 'USA' ? scope.OSSclientConfig.basePath : scope.OSSclientConfig.basePath}${i.Path}?instanceId=${i.Id}&seriesIndex=${index}`)
+                imageIds.push(`wadouri:${localStorage.getItem('location') !== 'USA' ? this.OSSclientConfig.basePath : this.OSSclientConfig.basePath}${i.Path}?instanceId=${i.Id}&seriesIndex=${index}`)
               }
             })
-            var subjectVisitId = scope.$router.currentRoute.query.subjectVisitId
+            var subjectVisitId = this.$router.currentRoute.query.subjectVisitId
-            var studyId = scope.$router.currentRoute.query.studyId
+            var studyId = this.$router.currentRoute.query.studyId
-            var trialId = scope.$router.currentRoute.query.trialId
+            var trialId = this.$router.currentRoute.query.trialId
             seriesList.push({
               trialId,
               subjectVisitId,
@@ -278,28 +278,30 @@ export default {
               description: item.Description,
               isReading: item.IsReading,
               isDeleted: item.IsDeleted,
-              previewImageUrl: item.ImageResizePath ? scope.OSSclientConfig.basePath + item.ImageResizePath : `/api/series/preview/${item.Id}`,
+              previewImageUrl: item.ImageResizePath ? this.OSSclientConfig.basePath + item.ImageResizePath : `/api/series/preview/${item.Id}`,
               instanceCount: item.InstanceCount,
               prefetchInstanceCount: 0,
               hasLabel: item.HasLabel,
               keySeries: item.KeySeries,
-              tpCode: scope.tpCode,
+              tpCode: this.tpCode,
               loadStatus: false,
               imageloadedArr: [],
               isExistMutiFrames: item.IsExistMutiFrames
             })
           })
-          scope.seriesList = seriesList
+          this.seriesList = seriesList
-          if (scope.seriesList.length > 0) {
+          if (this.seriesList.length > 0) {
             this.loadAllImages()
-            scope.$refs.dicomViewer.loadImageStack(scope.seriesList[0], scope.labels[scope.tpCode])
+            this.$refs.dicomViewer.loadImageStack(this.seriesList[0], this.labels[this.tpCode])
-            scope.firstInstanceId = scope.seriesList[0].imageIds[0]
+            this.firstInstanceId = this.seriesList[0].imageIds[0]
           }
         }
-      })
+      } catch (e) {
+        console.log(e)
+      }
     },
-    initSeries() {
+    async initSeries() {
-      var scope = this
+      try {
         this.studyCode = this.$router.currentRoute.query.studyCode
         this.modality = this.$router.currentRoute.query.modality
         this.seriesCount = 1
@@ -309,7 +311,7 @@ export default {
         var subjectVisitId = this.$router.currentRoute.query.subjectVisitId
         var studyId = this.$router.currentRoute.query.studyId
         var trialId = this.$router.currentRoute.query.trialId
-      getInstanceList(seriesId).then(res => {
+        const res = await getInstanceList(seriesId)
         if (!res.Result || (res.Result && res.Result.length === 0)) return
         var seriesInstanceUid = res.Result[0].SeriesInstanceUid
         var sliceThickness = res.Result[0].SliceThickness
@@ -344,7 +346,7 @@ export default {
           description: this.description,
           isReading,
           isDeleted,
-          previewImageUrl: res.OtherInfo.ImageResizePath ? scope.OSSclientConfig.basePath + res.OtherInfo.ImageResizePath : res.OtherInfo.ImageResizePath,
+          previewImageUrl: res.OtherInfo.ImageResizePath ? this.OSSclientConfig.basePath + res.OtherInfo.ImageResizePath : res.OtherInfo.ImageResizePath,
           instanceCount: res.Result.length,
           prefetchInstanceCount: 0,
           loadStatus: false,
@@ -359,7 +361,9 @@ export default {
             this.firstInstanceId = this.seriesList[0].imageIds[0]
           })
         }
-      })
+      } catch (e) {
+        console.log(e)
+      }
     },
     showSeriesImage(e, seriesIndex, series) {
       // if (seriesIndex === this.currentSeriesIndex) return
@@ -372,8 +376,31 @@ export default {
       this.currentSeriesIndex = seriesIndex
       this.$refs.dicomViewer.loadImageStack(this.seriesList[seriesIndex])
       if (!series.loadStatus) {
+        series.isLoading = true
+        var isAddToTakPool = false
+        if (this.showSeriesList.includes(`0_${seriesIndex}`)) {
+          isAddToTakPool = true
+        } else {
+          this.showSeriesList.push(`0_${seriesIndex}`)
+        }
+        if (!isAddToTakPool) {
+          var priority = parseInt(new Date().getTime())
+          if (series.isExistMutiFrames) {
+            series.instanceInfoList.map(image => {
+              this.imageList.push({ imageId: image.ImageId, seriesId: series.seriesId, studyIndex: 0, seriesIndex: seriesIndex, priority })
+            })
+          } else {
+            series.imageIds.map(imageId => {
+              this.imageList.push({ imageId: imageId, seriesId: series.seriesId, studyIndex: 0, seriesIndex: seriesIndex, priority })
+            })
+          }
+          if (this.imageList.length > 0) {
+            this.loopLoad()
+          }
+        } else {
           requestPoolManager.changePriority(series.seriesId)
         }
+      }
     },
     showMultiFrames(series, seriesIndex, instanceInfo) {
       this.currentSeriesIndex = seriesIndex
@@ -403,8 +430,31 @@ export default {
       }
       this.$refs.dicomViewer.loadImageStack(seriesInfo)
       if (!series.loadStatus) {
+        var isAddToTakPool = false
+        if (this.showSeriesList.includes(`0_${seriesIndex}`)) {
+          isAddToTakPool = true
+        } else {
+          this.showSeriesList.push(`0_${seriesIndex}`)
+        }
+        if (!isAddToTakPool) {
+          var priority = parseInt(new Date().getTime())
+          if (series.isExistMutiFrames) {
+            series.instanceInfoList.map(image => {
+              this.imageList.push({ imageId: image.ImageId, seriesId: series.seriesId, studyIndex: 0, seriesIndex: seriesIndex, priority })
+            })
+          } else {
+            series.imageIds.map((imageId) => {
+              this.imageList.push({ imageId: imageId, seriesId: series.seriesId, studyIndex: 0, seriesIndex: seriesIndex, priority })
+            })
+          }
+
+          if (this.imageList.length > 0) {
+            this.loopLoad()
+          }
+        } else {
           requestPoolManager.changePriority(series.seriesId)
         }
+      }
     },
     initStudy() {
       this.studyCode = this.$router.currentRoute.query.studyCode
@@ -415,13 +465,6 @@ export default {
         const seriesInfo = JSON.parse(this.$router.currentRoute.query.series)
         var seriesList = []
         const imageIds = []
-        // const scope = this
-        // seriesInfo.InstanceList.forEach(function(item) {
-        //   imageIds.push(`wadouri:/api/instance/content/${item}`)
-        // })
-        // seriesInfo.InstanceList.forEach((id) => {
-        //   imageIds.push(`wadouri:http://123.56.94.154:7000/instance/content/${id}`)
-        // })
         seriesInfo.InstancePathList.forEach((path) => {
           imageIds.push(`wadouri:${localStorage.getItem('location') !== 'USA' ? this.OSSclientConfig.basePath : this.OSSclientConfig.basePath}${path}`)
         })
@@ -451,22 +494,25 @@ export default {
         }
       }
     },
-    deleteSeries() {
+    async deleteSeries() {
       this.loading = true
       var subjectVisitId = this.$router.currentRoute.query.subjectVisitId
       var studyId = this.$router.currentRoute.query.studyId
       var seriesId = this.$router.currentRoute.query.seriesId
-      // trialId, subjectVisitId, studyId, seriesId, state
+      try {
-      setSeriesStatus(this.trialId, subjectVisitId, studyId, seriesId, 5).then(res => {
+        const res = await setSeriesStatus(this.trialId, subjectVisitId, studyId, seriesId, 5)
         this.loading = false
         if (res.IsSuccess) {
           this.$message.success(this.$t('common:message:savedSuccessfully'))
 
           window.opener.postMessage({ type: 'refreshSeriesList', data: '' }, window.location)
         }
-      }).catch(() => { this.loading = false })
+      } catch (e) {
+        console.log(e)
+        this.loading = false
+      }
     },
-    changeReadingStatus(callback, data) {
+    async changeReadingStatus(callback, data) {
       let statusStr = ''
       if (callback) {
         statusStr = this.$t('trials:audit:label:setSeriesReading')
@@ -477,24 +523,30 @@ export default {
       }
       var message = this.$t('trials:audit:message:changeSeriesStatus').replace('xxx', statusStr)
       message = message.replace('yyy', this.$fd('YesOrNo', !data.isReading))
-      this.$confirm(message, {
+      const confirm = await this.$confirm(
-        distinguishCancelAndClose: true,
+        message,
-        type: 'warning'
+        {
-      }).then(() => {
+          type: 'warning',
+          distinguishCancelAndClose: true
+        }
+      )
+      if (confirm !== 'confirm') return
       const state = data.isReading ? 1 : 2
       this.loading = true
-
+      try {
-        setSeriesStatus(data.trialId, data.subjectVisitId, data.studyId, data.seriesId, state).then(res => {
+        const res = await setSeriesStatus(data.trialId, data.subjectVisitId, data.studyId, data.seriesId, state)
         this.loading = false
         if (res.IsSuccess) {
           data.isReading = !data.isReading
           this.$message.success(this.$t('common:message:savedSuccessfully'))
           window.opener.postMessage({ type: 'refreshSeriesList', data: '' }, window.location)
         }
-        }).catch(() => { this.loading = false })
+      } catch (e) {
-      }).catch(() => {})
+        console.log(e)
+        this.loading = false
+      }
     },
-    changeDeleteStatus(callback, data) {
+    async changeDeleteStatus(callback, data) {
       let statusStr = ''
       if (callback) {
         statusStr = this.$t('trials:audit:label:setSeriesDeleted')
@@ -505,25 +557,28 @@ export default {
       }
       var message = this.$t('trials:audit:message:changeSeriesStatus').replace('xxx', statusStr)
       message = message.replace('yyy', this.$fd('YesOrNo', !data.isDeleted))
-      this.$confirm(message, {
+      const confirm = await this.$confirm(
-        distinguishCancelAndClose: true,
+        message,
-        type: 'warning'
+        {
-      }).then(() => {
+          type: 'warning',
+          distinguishCancelAndClose: true
+        }
+      )
+      if (confirm !== 'confirm') return
       const state = data.isDeleted ? 5 : 4
       this.loading = true
-        // var trialId = this.$router.currentRoute.query.trialId
+      try {
-        // var subjectVisitId = this.$router.currentRoute.query.subjectVisitId
+        const res = await setSeriesStatus(data.trialId, data.subjectVisitId, data.studyId, data.seriesId, state)
-        // var studyId = this.$router.currentRoute.query.studyId
-        // var seriesId = this.$router.currentRoute.query.seriesId
-        setSeriesStatus(data.trialId, data.subjectVisitId, data.studyId, data.seriesId, state).then(res => {
         this.loading = false
         if (res.IsSuccess) {
           data.isDeleted = !data.isDeleted
           this.$message.success(this.$t('common:message:savedSuccessfully'))
           window.opener.postMessage({ type: 'refreshSeriesList', data: '' }, window.location)
         }
-        }).catch(() => { this.loading = false })
+      } catch (e) {
-      }).catch(() => {})
+        console.log(e)
+        this.loading = false
+      }
     },
     loadAllImages() {
       const seriesIndex = this.seriesList.findIndex(i => i.loadStatus === false)
@@ -569,60 +624,6 @@ export default {
         this.imageList = []
       }
     },
-    load(imageId, seriesId, priority = 999) {
-      return new Promise((resolve, reject) => {
-        requestPoolManager.loadAndCacheImagePlus(imageId, seriesId, priority).then(res => {
-          if (!res) return
-          this.imageLoaded(imageId, res.data.string('x0020000e'))
-          resolve(res)
-        }).catch(e => {
-          reject(e)
-        })
-      })
-    },
-    imageLoaded(image, seriesUid) {
-      var seriesIndex = image.seriesIndex
-      if (seriesIndex < 0) return
-      if (this.seriesList[seriesIndex].imageloadedArr.indexOf(image.imageId) < 0) {
-        ++this.seriesList[seriesIndex].prefetchInstanceCount
-        this.seriesList[seriesIndex].imageloadedArr.push(image.imageId)
-
-        if (this.seriesList[seriesIndex].prefetchInstanceCount >= this.seriesList[seriesIndex].instanceCount) {
-          this.seriesList[seriesIndex].prefetchInstanceCount = this.seriesList[seriesIndex].instanceCount
-          // 设置当前序列状态为已下载完成
-          this.seriesList[seriesIndex].loadStatus = true
-          // if (!this.isLoadedAll) {
-          //   this.loadAllImages()
-          // }
-        }
-      }
-    },
-    imageLoaded2(imageId, seriesUid) {
-      var seriesIndex = -1
-      for (let i = 0; i < this.seriesList.length; ++i) {
-        if (this.seriesList[i].seriesUid === seriesUid) {
-          seriesIndex = i
-          break
-        }
-      }
-      if (seriesIndex < 0) return
-
-      const imageIdIndex = this.seriesList[seriesIndex].imageIds.indexOf(imageId)
-      if (imageIdIndex < 0) return
-      if (this.seriesList[seriesIndex].imageloadedArr.indexOf(imageId) < 0) {
-        ++this.seriesList[seriesIndex].prefetchInstanceCount
-        this.seriesList[seriesIndex].imageloadedArr.push(imageId)
-
-        if (this.seriesList[seriesIndex].prefetchInstanceCount >= this.seriesList[seriesIndex].instanceCount) {
-          this.seriesList[seriesIndex].prefetchInstanceCount = this.seriesList[seriesIndex].instanceCount
-          // 设置当前序列状态为已下载完成
-          this.seriesList[seriesIndex].loadStatus = true
-          // if (!this.isLoadedAll) {
-          //   this.loadAllImages()
-          // }
-        }
-      }
-    },
     datasetsCacheChanged(e) {
       // const uri = e.detail.uri
       const cacheInfo = e.detail.cacheInfo
@@ -681,53 +682,10 @@ export default {
           this.seriesList[seriesIndex].prefetchInstanceCount = instanceCount * 100
           // 设置当前序列状态为已下载完成
           this.seriesList[seriesIndex].loadStatus = true
+          if (!this.isFromCRCUpload) {
             this.loadAllImages()
           }
         }
-    },
-    cornerstoneImageLoaded(e) {
-      if (this.firstInstanceId === e.detail.image.imageId && !this.isStartLoad) {
-        // 初始化图像加载完成时，自动下载
-        this.loadAllImages()
-        this.isStartLoad = true
-        // requestPoolManager.executeTask()
-      }
-      const uri = e.detail.image.sharedCacheKey
-      const index = this.cachedImages.findIndex(item => item.uri === uri)
-      if (index === -1) {
-        this.cachedImages.push({ uri: uri, timestamp: new Date().getTime() })
-      } else {
-        this.cachedImages[index].timestamp = new Date().getTime()
-      }
-      // loadedDataSets[uri].dataSet.byteArray.length
-      // console.log(this.cachedImages.length)
-      // console.log(cornerstoneWADOImageLoader.wadouri.dataSetCacheManager.getInfo().cacheSizeInBytes)
-      // const imageId = e.detail.image.imageId
-      var imageId = e.detail.image.imageId
-      var seriesUid = e.detail.image.data.string('x0020000e')
-      var seriesIndex = -1
-      for (let i = 0; i < this.seriesList.length; ++i) {
-        if (this.seriesList[i].seriesUid === seriesUid) {
-          seriesIndex = i
-          break
-        }
-      }
-      if (seriesIndex < 0) return
-
-      const imageIdIndex = this.seriesList[seriesIndex].imageIds.indexOf(imageId)
-      if (imageIdIndex < 0) return
-      if (this.seriesList[seriesIndex].imageloadedArr.indexOf(imageId) < 0) {
-        ++this.seriesList[seriesIndex].prefetchInstanceCount
-        this.seriesList[seriesIndex].imageloadedArr.push(imageId)
-
-        if (this.seriesList[seriesIndex].prefetchInstanceCount >= this.seriesList[seriesIndex].instanceCount) {
-          this.seriesList[seriesIndex].prefetchInstanceCount = this.seriesList[seriesIndex].instanceCount
-          // 设置当前序列状态为已下载完成
-          this.seriesList[seriesIndex].loadStatus = true
-          // if (!this.isLoadedAll) {
-          //   this.loadAllImages()
-          // }
-        }
       }
     }
   }

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

@@ -296,7 +296,8 @@ export default {
       activeNames: [],
       relationActiveName: [],
       showSeriesList: [],
-      currentLoadIns: []
+      currentLoadIns: [],
+      isFromCRCUpload: false
     }
   },
   mounted() {
@@ -312,6 +313,7 @@ export default {
     this.visitInfo = this.$router.currentRoute.query.visitInfo
     this.isReading = this.$router.currentRoute.query.isReading ? this.$router.currentRoute.query.isReading * 1 : 0
     this.showDelete = parseInt(this.$router.currentRoute.query.showDelete)
+    this.isFromCRCUpload = !!this.$router.currentRoute.query.isFromCRCUpload
     // cornerstone.events.addEventListener('cornerstoneimageloaded', this.cornerstoneImageLoaded)
     this.getStudiesInfo()
     cornerstone.events.addEventListener('cornerstoneimageloadprogress', this.cornerstoneimageloadprogress)
@@ -329,10 +331,12 @@ export default {
   },
   methods: {
     // 获取某个访视下所有的检查信息
-    getStudiesInfo() {
+    async getStudiesInfo() {
       this.studyList = []
-      getVisitStudyList(this.trialId, this.subjectVisitId, this.isReading).then(res => {
+      try {
-        res.Result.forEach((study,studyIndex) => {
+        const res = await getVisitStudyList(this.trialId, this.subjectVisitId, this.isReading)
+        if (res.IsSuccess) {
+          res.Result.forEach((study, studyIndex) => {
             const data = {}
             data.StudyId = study.StudyId
             data.StudyCode = study.StudyCode
@@ -342,7 +346,7 @@ export default {
             data.InstanceCount = study.InstanceCount
             data.PreviewImageCount = 0
             var seriesList = []
-          study.SeriesList.forEach((series,seriesIndex) => {
+            study.SeriesList.forEach((series, seriesIndex) => {
               const imageIds = []
               series.InstanceInfoList.forEach(i => {
                 if (i.NumberOfFrames && i.NumberOfFrames > 1) {
@@ -385,9 +389,34 @@ export default {
             instanceId = instanceId.split('.')[0]
             this.firstInstanceId = instanceId
             this.activeNames = [this.studyList[0].StudyId]
-          this.loadAllImages()
+            this.loadImages(this.studyList[0].SeriesList[0], 0)
+          }
+        }
+      } catch (e) {
+        console.log(e)
+      }
+    },
+    loadImages(series, seriesIndex) {
+      var priority = parseInt(new Date().getTime())
+      for (let i = 0; i < series.imageIds.length; i++) {
+        const imageId = series.imageIds[i]
+        if (series.isExistMutiFrames) {
+          const params = this.getInstanceInfo(imageId)
+          if (params.frame && params.frame > 0) {
+            continue
+          }
+        }
+        var p = null
+        if (this.firstInstanceId === imageId) {
+          p = priority * 100
+        } else {
+          p = priority - 1
+        }
+        this.imageList.push({ imageId: imageId, seriesId: series.seriesId, seriesIndex: seriesIndex, priority: p })
+      }
+      if (this.imageList.length > 0) {
+        this.loopLoad()
       }
-      })
     },
     showSeriesImage(e, studyIndex, seriesIndex, series) {
       const element = e.currentTarget
@@ -398,11 +427,37 @@ export default {
       element.classList.add('viewerSideActive')
       this.currentSeriesIndex = seriesIndex
       this.$refs.dicomViewer.loadImageStack(this.studyList[studyIndex].SeriesList[seriesIndex])
+      // if (!series.loadStatus) {
+      //   requestPoolManager.changePriority(series.seriesId)
+      // }
       if (!series.loadStatus) {
+        series.isLoading = true
+        var isAddToTakPool = false
+        if (this.showSeriesList.includes(`${studyIndex}_${seriesIndex}`)) {
+          isAddToTakPool = true
+        } else {
+          this.showSeriesList.push(`${studyIndex}_${seriesIndex}`)
+        }
+        if (!isAddToTakPool) {
+          var priority = parseInt(new Date().getTime())
+          if (series.isExistMutiFrames) {
+            series.instanceInfoList.map(image => {
+              this.imageList.push({ imageId: image.ImageId, seriesId: series.seriesId, studyIndex: studyIndex, seriesIndex: seriesIndex, priority })
+            })
+          } else {
+            series.imageIds.map(imageId => {
+              this.imageList.push({ imageId: imageId, seriesId: series.seriesId, studyIndex: studyIndex, seriesIndex: seriesIndex, priority })
+            })
+          }
+          if (this.imageList.length > 0) {
+            this.loopLoad()
+          }
+        } else {
           requestPoolManager.changePriority(series.seriesId)
         }
+      }
     },
-    showMultiFrames(studyIndex,series, seriesIndex, instanceInfo) {
+    showMultiFrames(studyIndex, series, seriesIndex, instanceInfo) {
       this.currentSeriesIndex = seriesIndex
       const imageIds = []
       if (instanceInfo.NumberOfFrames && instanceInfo.NumberOfFrames > 1) {
@@ -430,10 +485,33 @@ export default {
       }
       this.$refs.dicomViewer.loadImageStack(seriesInfo)
       if (!series.loadStatus) {
+        var isAddToTakPool = false
+        if (this.showSeriesList.includes(`${studyIndex}_${seriesIndex}`)) {
+          isAddToTakPool = true
+        } else {
+          this.showSeriesList.push(`${studyIndex}_${seriesIndex}`)
+        }
+        if (!isAddToTakPool) {
+          var priority = parseInt(new Date().getTime())
+          if (series.isExistMutiFrames) {
+            series.instanceInfoList.map(image => {
+              this.imageList.push({ imageId: image.ImageId, seriesId: series.seriesId, studyIndex: studyIndex, seriesIndex: seriesIndex, priority })
+            })
+          } else {
+            series.imageIds.map((imageId) => {
+              this.imageList.push({ imageId: imageId, seriesId: series.seriesId, studyIndex: studyIndex, seriesIndex: seriesIndex, priority })
+            })
+          }
+
+          if (this.imageList.length > 0) {
+            this.loopLoad()
+          }
+        } else {
           requestPoolManager.changePriority(series.seriesId)
         }
+      }
     },
-    changeReadingStatus(callback, data) {
+    async changeReadingStatus(callback, data) {
       let statusStr = ''
       if (callback) {
         statusStr = this.$t('trials:audit:label:setSeriesReading')
@@ -444,24 +522,29 @@ export default {
       }
       var message = this.$t('trials:audit:message:changeSeriesStatus').replace('xxx', statusStr)
       message = message.replace('yyy', this.$fd('YesOrNo', !data.isReading))
-      this.$confirm(message, {
+      const confirm = await this.$confirm(
-        distinguishCancelAndClose: true,
+        message,
-        type: 'warning'
+        {
-      }).then(() => {
+          type: 'warning',
+          distinguishCancelAndClose: true
+        }
+      )
+      if (confirm !== 'confirm') return
       const state = data.isReading ? 1 : 2
       this.loading = true
-
+      try {
-        setSeriesStatus(data.trialId, data.subjectVisitId, data.studyId, data.seriesId, state).then(res => {
+        const res = await setSeriesStatus(data.trialId, data.subjectVisitId, data.studyId, data.seriesId, state)
         this.loading = false
         if (res.IsSuccess) {
           data.isReading = !data.isReading
           this.$message.success(this.$t('common:message:savedSuccessfully'))
           window.opener.postMessage({ type: 'refreshSeriesList', data: '' }, window.location)
         }
-        }).catch(() => { this.loading = false })
+      } catch (e) {
-      }).catch(() => {})
+        this.loading = false
+      }
     },
-    changeDeleteStatus(callback, data) {
+    async changeDeleteStatus(callback, data) {
       let statusStr = ''
       if (callback) {
         statusStr = this.$t('trials:audit:label:setSeriesDeleted')
@@ -472,24 +555,31 @@ export default {
       }
       var message = this.$t('trials:audit:message:changeSeriesStatus').replace('xxx', statusStr)
       message = message.replace('yyy', this.$fd('YesOrNo', !data.isDeleted))
-      this.$confirm(message, {
+      const confirm = await this.$confirm(
-        distinguishCancelAndClose: true,
+        message,
-        type: 'warning'
+        {
-      }).then(() => {
+          type: 'warning',
+          distinguishCancelAndClose: true
+        }
+      )
+      if (confirm !== 'confirm') return
+
       const state = data.isDeleted ? 5 : 4
       this.loading = true
-        setSeriesStatus(data.trialId, data.subjectVisitId, data.studyId, data.seriesId, state).then(res => {
+      try {
+        const res = await setSeriesStatus(data.trialId, data.subjectVisitId, data.studyId, data.seriesId, state)
         this.loading = false
         if (res.IsSuccess) {
           data.isDeleted = !data.isDeleted
           this.$message.success(this.$t('common:message:savedSuccessfully'))
           window.opener.postMessage({ type: 'refreshSeriesList', data: '' }, window.location)
         }
-        }).catch(() => { this.loading = false })
+      } catch (e) {
-      }).catch(() => {})
+        this.loading = false
+      }
     },
     // 切换关联检查Tab时获取关联检查信息
-    handleTabClick(tab, event) {
+    async handleTabClick(tab, event) {
       if (tab.name === 'relation-study' && this.relationStudyList.length <= 0) {
         const loading = this.$loading({
           target: document.querySelector('.pane-relation-wrapper'),
@@ -499,11 +589,13 @@ export default {
           background: 'rgb(49 49 49 / 50%)',
           spinner: 'el-icon-loading'
         })
-        getAllRelationStudyList(this.subjectVisitId).then(res => {
+        try {
+          const res = await getAllRelationStudyList(this.subjectVisitId)
           loading.close()
           this.relationStudyList = res.Result
-          console.log(this.relationStudyList)
+        } catch (e) {
-        }).catch(() => { loading.close() })
+          loading.close()
+        }
       }
     },
     handelRelationActiveChange(v) {
@@ -515,7 +607,7 @@ export default {
       }
     },
     // 根据关联检查获取序列信息
-    getRelationSeriesByStudy(studyId, index) {
+    async getRelationSeriesByStudy(studyId, index) {
       console.log('getRelationSeriesByStudy')
       if (this.relationStudyList[index].seriesCount) {
         this.relationStudyList[index].showSeries = !this.relationStudyList[index].showSeries
@@ -530,20 +622,21 @@ export default {
           background: 'rgb(49 49 49 / 50%)',
           spinner: 'el-icon-loading'
         })
-        getSeriesList(`/series/list/${studyId}`).then(data => {
+        try {
+          const data = await getSeriesList(`/series/list/${studyId}`)
           loading.close()
           if (data.Result != null && data.Result.length > 0) {
             var seriesList = []
             const res = data.Result
-            res.forEach((item,seriesIndex)=> {
+            res.forEach((item, seriesIndex) => {
               const imageIds = []
               item.InstanceInfoList.forEach(i => {
                 if (i.NumberOfFrames && i.NumberOfFrames > 1) {
                   for (let j = 0; j < i.NumberOfFrames; j++) {
-                    imageIds.push(`wadouri:${localStorage.getItem('location') !== 'USA' ? scope.OSSclientConfig.basePath : scope.OSSclientConfig.basePath}${i.Path}?frame=${j}&instanceId=${i.Id}&idx=${index}|${seriesIndex}`)
+                    imageIds.push(`wadouri:${localStorage.getItem('location') !== 'USA' ? scope.OSSclientConfig.basePath : scope.OSSclientConfig.basePath}${i.Path}?frame=${j}&instanceId=${i.Id}&idx=${index}|${seriesIndex}&isRelation=1`)
                   }
                 } else {
-                  imageIds.push(`wadouri:${localStorage.getItem('location') !== 'USA' ? scope.OSSclientConfig.basePath : scope.OSSclientConfig.basePath}${i.Path}?instanceId=${i.Id}&idx=${index}|${seriesIndex}`)
+                  imageIds.push(`wadouri:${localStorage.getItem('location') !== 'USA' ? scope.OSSclientConfig.basePath : scope.OSSclientConfig.basePath}${i.Path}?instanceId=${i.Id}&idx=${index}|${seriesIndex}&isRelation=1`)
                 }
               })
               seriesList.push({
@@ -568,10 +661,11 @@ export default {
             scope.relationStudyList[index].seriesCount = seriesList.length
             scope.relationStudyList[index].seriesList = seriesList
             scope.relationStudyList[index].showSeries = true
-            console.log(scope.relationStudyList)
             scope.$forceUpdate()
           }
-        }).catch(() => { loading.close() })
+        } catch (e) {
+          loading.close()
+        }
       }
     },
     showRelationSeriesImage(e, series, index) {
@@ -635,26 +729,6 @@ export default {
         this.imageList = []
       }
     },
-    // load(imageId, priority = 999) {
-    //   return new Promise((resolve, reject) => {
-    //     const imageTask = this.buildImageRequestTask(imageId, { priority })
-    //     requestPoolManager.addTaskIntoPool(imageTask).then((res) => {
-    //       resolve(res)
-    //     }).catch(e => {
-    //       reject(e)
-    //       console.log(e)
-    //     })
-    //   })
-    // },
-    buildImageRequestTask(imageId, config = {}) {
-      return {
-        key: imageId,
-        ...config,
-        execute: () => {
-          return cornerstone.loadAndCacheImage(imageId)
-        }
-      }
-    },
     datasetsCacheChanged(e) {
       const cacheInfo = e.detail.cacheInfo
       const cacheSizeInBytes = cacheInfo.cacheSizeInBytes
@@ -662,22 +736,7 @@ export default {
         // 清理缓存的影像
       }
     },
-    imageLoaded(image, seriesUid) {
+    cornerstoneimageloadprogress(e) {
-      var studyIndex = image.studyIndex
-      var seriesIndex = image.seriesIndex
-      if (seriesIndex < 0 || studyIndex < 0) return
-      if (this.studyList[studyIndex].SeriesList[seriesIndex].imageloadedArr.indexOf(image.imageId) < 0) {
-        ++this.studyList[studyIndex].SeriesList[seriesIndex].prefetchInstanceCount
-        this.studyList[studyIndex].SeriesList[seriesIndex].imageloadedArr.push(image.imageId)
-
-        if (this.studyList[studyIndex].SeriesList[seriesIndex].prefetchInstanceCount >= this.studyList[studyIndex].SeriesList[seriesIndex].instanceCount) {
-          this.studyList[studyIndex].SeriesList[seriesIndex].prefetchInstanceCount = this.studyList[studyIndex].SeriesList[seriesIndex].instanceCount
-          // 设置当前序列状态为已下载完成
-          this.studyList[studyIndex].SeriesList[seriesIndex].loadStatus = true
-        }
-      }
-    },
-    cornerstoneimageloadprogress(e){
       const imageId = e.detail.imageId
       const percentComplete = e.detail.percentComplete
       const params = {}
@@ -685,12 +744,13 @@ export default {
       for (const [key, value] of searchParams.entries()) {
         params[key] = value
       }
-      if (this.visitTaskId === params.visitTaskId) {
       const studyIndex = params.idx.split('|')[0]
       const seriesIndex = params.idx.split('|')[1]
-        var prefetchInstanceCount = this.studyList[studyIndex].SeriesList[seriesIndex].prefetchInstanceCount
+      var series = !params.isRelation ? this.studyList[studyIndex].SeriesList[seriesIndex] : null
-        var instanceCount = this.studyList[studyIndex].SeriesList[seriesIndex].instanceCount
+      if (!series) return
-        if (this.studyList[studyIndex].SeriesList[seriesIndex].imageloadedArr.indexOf(imageId) < 0) {
+      var prefetchInstanceCount = series.prefetchInstanceCount
+      var instanceCount = series.instanceCount
+      if (series.imageloadedArr.indexOf(imageId) < 0) {
         const i = this.currentLoadIns.findIndex(i => i.imageId === imageId)
         if (i > -1) {
           prefetchInstanceCount = prefetchInstanceCount - this.currentLoadIns[i].percentComplete + percentComplete
@@ -704,15 +764,16 @@ export default {
           }
           prefetchInstanceCount = prefetchInstanceCount + percentComplete
         }
-          this.studyList[studyIndex].SeriesList[seriesIndex].prefetchInstanceCount = prefetchInstanceCount
+        series.prefetchInstanceCount = prefetchInstanceCount
         if (percentComplete >= 100) {
-            this.studyList[studyIndex].SeriesList[seriesIndex].imageloadedArr.push(imageId)
+          series.imageloadedArr.push(imageId)
         }
       }
       if (prefetchInstanceCount >= instanceCount * 100) {
-          this.studyList[studyIndex].SeriesList[seriesIndex].prefetchInstanceCount = instanceCount * 100
+        series.prefetchInstanceCount = instanceCount * 100
         // 设置当前序列状态为已下载完成
-          this.studyList[studyIndex].SeriesList[seriesIndex].loadStatus = true
+        series.loadStatus = true
+        if (!this.isFromCRCUpload) {
           this.loadAllImages()
         }
       }
@@ -784,7 +845,7 @@ export default {
     white-space: normal;
 }
 .viewerContainer .viewerLeftSidePanel {
-    width: 215px;
+    width: 220px;
     background-color: #323232;
     box-sizing: border-box;
     margin: 0;
@@ -821,7 +882,7 @@ export default {
 }
 .viewerContainer .viewerLeftSidePanel .viewernavigatorwrapper {
     display: flex;
-    width: 200px;
+    width: 220px;
     /* height: 84px; */
     padding: 1px 2px 1px 2px;
     margin: 2px 0 1px 1px;

src/views/trials/trials-panel/reading/ad-review/index.vue

@@ -179,12 +179,19 @@
             { max: 500, message: `${this.$t('common:ruleMessage:maxLength')} 500`, trigger: ['blur', 'change'] }
           ]"
         >
+          <div style="position: relative;">
+            <div style="position: absolute;left: 0;top: 30px;color: #606266;font-size: 13px;">
+              {{ remark }}
+            </div>
             <el-input
               v-model="adForm.judgeResultRemark"
               type="textarea"
               :autosize="{ minRows: 4, maxRows: 6}"
               :disabled="adInfo.ReadingTaskState >= 2"
+              style="margin-top:25px"
             />
+          </div>
+
         </el-form-item>
         <!-- 截图说明 -->
         <el-form-item
@@ -388,7 +395,8 @@ export default {
       criterionType: null,
       openWindow: null,
       isFixed: false,
-      images: []
+      images: [],
+      remark: ''
     }
   },
   // watch: {
@@ -450,7 +458,6 @@ export default {
           this.adInfo = res.Result
           this.adForm.judgeResultTaskId = res.Result.JudgeResultTaskId
 
-          this.adForm.judgeResultRemark = res.Result.JudgeResultRemark
           this.fileList = []
           if (res.Result.JudgeResultImagePathList) {
             res.Result.JudgeResultImagePathList.map(url => {
@@ -459,6 +466,19 @@ export default {
             this.adForm.judgeResultImagePathList = res.Result.JudgeResultImagePathList
           }
           this.visitTaskArmList = res.Result.VisitTaskArmList
+          var i = this.visitTaskArmList.findIndex(i => i.VisitTaskId === this.adForm.judgeResultTaskId)
+          if (i > -1) {
+            // 本人已完整查看两位独立阅片人的全部相关影像和评估数据，经过综合研判，更认同第一阅片人（R1）对该病例的整体评估，原因是：
+            this.judgeResultArmEnum = this.visitTaskArmList[i].ArmEnum
+            var msg = ''
+            if (this.judgeResultArmEnum === 1) {
+              msg = this.$t('trials:adReview:title:msg1')
+            } else if (this.judgeResultArmEnum === 2) {
+              msg = this.$t('trials:adReview:title:msg3')
+            }
+            this.remark = msg
+            this.adForm.judgeResultRemark = res.Result.JudgeResultRemark
+          }
         }
         this.loading = false
       } catch (e) {
@@ -489,9 +509,12 @@ export default {
           msg = this.$t('trials:adReview:title:msg3')
         }
         // this.adForm.judgeResultRemark = `本人已完整查看两位独立阅片人的全部相关影像和评估数据，经过综合研判，更认同${this.$fd('ArmEnum', this.judgeResultArmEnum)}对该病例的整体评估，原因是：`
-        this.adForm.judgeResultRemark = msg
+        this.remark = msg
+        this.adForm.judgeResultRemark = ''
       } else {
         this.judgeResultArmEnum = ''
+        this.remark = ''
+        this.adForm.judgeResultRemark = ''
       }
     },
     previewCD() {

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

@@ -102,7 +102,9 @@
               </div>
             </template>
             <template slot-scope="scope">
-              <span :style="{color: ((scope.row.isLymphNodes === 1 && scope.row.QuestionMark === 1) || (scope.row.isLymphNodes === 0 && scope.row.QuestionMark === 0)) && (scope.row.LesionType === 0 || scope.row.LesionType === 5) || (scope.row.QuestionMark === 12) ? '#f66' : '#fff'}">
+              <span :style="{color: ((scope.row.isLymphNodes === 1 && scope.row.QuestionMark === 1) || (scope.row.isLymphNodes === 0 && scope.row.QuestionMark === 0)) && (scope.row.LesionType === 0 || scope.row.LesionType === 5) || (scope.row.QuestionMark === 12) ? '#f66' : '#fff'}" :class="scope.row.HighlightAnswerList.includes(scope.row.Answers[task.VisitTaskId]) ? 'colorOfRed' : ''">
+                <!-- {{scope.row.Answers[task.VisitTaskId]}} -->
+                <template v-if="scope.row.HighlightAnswerList"><span>11</span></template>
                 <template v-if="task.VisitTaskId === visitTaskId && readingTaskState < 2 && [13,14,15,42].includes(scope.row.QuestionType)">
                   <!-- 是否存在疾病（基线时可修改） -->
                   <template v-if="task.IsBaseLine && scope.row.QuestionType=== 15">
@@ -918,4 +920,7 @@ export default {
 /deep/ .el-switch__label.is-active{
   color: #428bca;
 }
+.colorOfRed{
+  color: #f66;
+}
 </style>

src/views/trials/trials-panel/setting/reading-unit/components/QuestionsForm.vue

@@ -588,6 +588,27 @@
           />
         </el-select>
       </el-form-item>
+      <!-- 高亮标记值 -->
+      <el-form-item v-if="(form.Type === 'select' || form.Type === 'radio') && isFromSystem" :label="$t('trials:readingUnit:qsList:title:highlightAnswers')" prop="HighlightAnswerList">
+        <el-select v-model="form.HighlightAnswerList" clearable multiple>
+          <template v-if="form.TypeValue">
+            <el-option
+              v-for="item of form.TypeValue.split('|')"
+              :key="item"
+              :label="item"
+              :value="item"
+            />
+          </template>
+          <template v-else-if="form.DictionaryCode">
+            <el-option
+              v-for="item of $d[form.DictionaryCode]"
+              :key="item.id"
+              :label="item.label"
+              :value="item.value.toString()"
+            />
+          </template>
+        </el-select>
+      </el-form-item>
       <!-- 序号 -->
       <el-form-item :label="$t('trials:readingUnit:qsList:title:order')" prop="ShowOrder">
         <el-input-number
@@ -782,7 +803,8 @@ export default {
         GroupId: null,
         ClassifyQuestionId: null,
         ClassifyAlgorithms: null,
-        LimitShow: 0
+        LimitShow: 0,
+        HighlightAnswerList: []
         // IsEnable: true
       },
       rules: {

src/views/trials/trials-panel/setting/reading-unit/components/TableQsForm.vue

@@ -426,6 +426,27 @@
           />
         </el-select>
       </el-form-item>
+      <!-- 高亮标记值 -->
+      <el-form-item v-if="(form.Type === 'select' || form.Type === 'radio') && isFromSystem" :label="$t('trials:readingUnit:qsList:title:highlightAnswers')" prop="HighlightAnswerList">
+        <el-select v-model="form.HighlightAnswerList" clearable multiple>
+          <template v-if="form.TypeValue">
+            <el-option
+              v-for="item of form.TypeValue.split('|')"
+              :key="item"
+              :label="item"
+              :value="item"
+            />
+          </template>
+          <template v-else-if="form.DictionaryCode">
+            <el-option
+              v-for="item of $d[form.DictionaryCode]"
+              :key="item.id"
+              :label="item.label"
+              :value="item.value.toString()"
+            />
+          </template>
+        </el-select>
+      </el-form-item>
       <el-form-item :label="$t('trials:readingUnit:qsList:title:order')" prop="ShowOrder">
         <el-input-number
           v-model="form.ShowOrder"
@@ -544,7 +565,8 @@ export default {
         Unit: null,
         LimitEdit: 0,
         DefaultValue: null,
-        IsCopy: false
+        IsCopy: false,
+        HighlightAnswerList: []
         // IsEnable: true
       },
       rules: {

src/views/trials/trials-panel/visit/crc-upload/components/studyInfo.vue

@@ -435,7 +435,7 @@ export default {
     handlePreviewAllFiles() {
       var tokenKey = getToken();
       const routeData = this.$router.resolve({
-        path: `/showvisitdicoms?trialId=${this.data.TrialId}&visitInfo=${this.data.VisitName}(${this.data.VisitNum})&subjectVisitId=${this.data.Id}&TokenKey=${tokenKey}`,
+        path: `/showvisitdicoms?trialId=${this.data.TrialId}&visitInfo=${this.data.VisitName}(${this.data.VisitNum})&subjectVisitId=${this.data.Id}&isFromCRCUpload=1&TokenKey=${tokenKey}`,
       });
       var newWindow = window.open(routeData.href, "_blank");
       this.$emit("setOpenWindow", newWindow);
@@ -444,7 +444,7 @@ export default {
     handleViewStudy(row) {
       var token = getToken();
       const routeData = this.$router.resolve({
-        path: `/showdicom?studyId=${row.StudyId}&TokenKey=${token}&type=Study`,
+        path: `/showdicom?studyId=${row.StudyId}&isFromCRCUpload=1&TokenKey=${token}&type=Study`,
       });
       var newWindow = window.open(routeData.href, "_blank");
       this.$emit("setOpenWindow", newWindow);

src/views/trials/trials-panel/visit/crc-upload/components/uploadDicomFiles2.vue

@@ -997,11 +997,11 @@ export default {
       var token = getToken();
       if (this.$route.path === "/trials/trials-panel/visit/crc-question") {
         var routeData = this.$router.resolve({
-          path: `/showvisitdicoms?trialId=${this.trialId}&visitInfo=${this.data.VisitName}(${this.data.VisitNum})&subjectVisitId=${this.data.SubjectVisitId}&TokenKey=${token}`,
+          path: `/showvisitdicoms?trialId=${this.trialId}&visitInfo=${this.data.VisitName}(${this.data.VisitNum})&subjectVisitId=${this.data.SubjectVisitId}&isFromCRCUpload=1&TokenKey=${token}`,
         });
       } else {
         var routeData = this.$router.resolve({
-          path: `/showvisitdicoms?trialId=${this.trialId}&visitInfo=${this.data.VisitName}(${this.data.VisitNum})&subjectVisitId=${this.data.Id}&TokenKey=${token}`,
+          path: `/showvisitdicoms?trialId=${this.trialId}&visitInfo=${this.data.VisitName}(${this.data.VisitNum})&subjectVisitId=${this.data.Id}&isFromCRCUpload=1&TokenKey=${token}`,
         });
       }
       window.open(routeData.href, "_blank");