diff --git a/src/store/modules/reading.js b/src/store/modules/reading.js index efe3cbc4..b083731f 100644 --- a/src/store/modules/reading.js +++ b/src/store/modules/reading.js @@ -811,9 +811,16 @@ const actions = { // } series.InstanceInfoList.forEach(instance => { if (instance.NumberOfFrames && instance.NumberOfFrames > 1) { - for (let i = 0; i < instance.NumberOfFrames; i++) { - const imageId = `wadouri:${localStorage.getItem('location') !== 'USA' ? Vue.prototype.OSSclientConfig.basePath : Vue.prototype.OSSclientConfig.basePath}${instance.Path}?frame=${i}&instanceId=${instance.Id}&visitTaskId=${obj.visitTaskId}&idx=${studyIndex}|${seriesIndex}|${index}` - imageIds.push(imageId) + if (study.IsCriticalSequence && instance.KeyFramesList.length > 0) { + instance.KeyFramesList.map(i => { + const imageId = `wadouri:${localStorage.getItem('location') !== 'USA' ? Vue.prototype.OSSclientConfig.basePath : Vue.prototype.OSSclientConfig.basePath}${instance.Path}?frame=${i}&instanceId=${instance.Id}&visitTaskId=${obj.visitTaskId}&idx=${studyIndex}|${seriesIndex}|${index}` + imageIds.push(imageId) + }) + } else { + for (let i = 0; i < instance.NumberOfFrames; i++) { + const imageId = `wadouri:${localStorage.getItem('location') !== 'USA' ? Vue.prototype.OSSclientConfig.basePath : Vue.prototype.OSSclientConfig.basePath}${instance.Path}?frame=${i}&instanceId=${instance.Id}&visitTaskId=${obj.visitTaskId}&idx=${studyIndex}|${seriesIndex}|${index}` + imageIds.push(imageId) + } } instance.ImageId = `wadouri:${localStorage.getItem('location') !== 'USA' ? Vue.prototype.OSSclientConfig.basePath : Vue.prototype.OSSclientConfig.basePath}${instance.Path}?frame=${0}&instanceId=${instance.Id}&visitTaskId=${obj.visitTaskId}&idx=${studyIndex}|${seriesIndex}|${index}` } else { diff --git a/src/views/trials/trials-panel/reading/dicoms/components/StudyList.vue b/src/views/trials/trials-panel/reading/dicoms/components/StudyList.vue index eaf3c793..e46a2fdc 100644 --- a/src/views/trials/trials-panel/reading/dicoms/components/StudyList.vue +++ b/src/views/trials/trials-panel/reading/dicoms/components/StudyList.vue @@ -77,7 +77,7 @@ >
{{ instance.InstanceNumber }}
-
{{ `${instance.NumberOfFrames > 0 ? instance.NumberOfFrames : 1} frame` }}
+
{{ `${instance.NumberOfFrames > 0 ? instance.KeyFramesList.length > 0 ? instance.KeyFramesList.length : instance.NumberOfFrames : 1} frame` }}
@@ -668,7 +668,11 @@ export default { this.currentSeriesIndex = seriesIndex var idx = this.visitTaskIdx const imageIds = [] - if (instanceInfo.NumberOfFrames && instanceInfo.NumberOfFrames > 1) { + if (instanceInfo.KeyFramesList.length > 0) { + instanceInfo.KeyFramesList.map(i => { + imageIds.push(`wadouri:${localStorage.getItem('location') !== 'USA' ? this.OSSclientConfig.basePath : this.OSSclientConfig.basePath}${instanceInfo.Path}?frame=${i}&instanceId=${instanceInfo.Id}&visitTaskId=${this.visitTaskId}&idx=${studyIndex}|${seriesIndex}|${idx}`) + }) + } else if (instanceInfo.NumberOfFrames && instanceInfo.NumberOfFrames > 1) { for (let j = 0; j < instanceInfo.NumberOfFrames; j++) { imageIds.push(`wadouri:${localStorage.getItem('location') !== 'USA' ? this.OSSclientConfig.basePath : this.OSSclientConfig.basePath}${instanceInfo.Path}?frame=${j}&instanceId=${instanceInfo.Id}&visitTaskId=${this.visitTaskId}&idx=${studyIndex}|${seriesIndex}|${idx}`) } diff --git a/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeMeasurementList.vue b/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeMeasurementList.vue index 8952b7d0..a050d1f3 100644 --- a/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeMeasurementList.vue +++ b/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeMeasurementList.vue @@ -244,6 +244,7 @@ export default { params.StudyId = params.questionInfo.StudyId params.SeriesId = params.questionInfo.SeriesId params.InstanceId = params.questionInfo.InstanceId + params.NumberOfFrames = measureData.frame submitCustomTag(params).then(() => { this.measuredDataVisible = false DicomEvent.$emit('updateImage') @@ -282,6 +283,7 @@ export default { } else { let params = JSON.parse(JSON.stringify(this.measureData)) params.measureData = JSON.stringify(this.measureData) + params.NumberOfFrames = this.measureData.frame submitCustomTag(params).then(async (res) => { this.measuredDataVisible = false this.form.measuredDataName = '' diff --git a/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeStudyList.vue b/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeStudyList.vue index 411bca95..ffdd0d48 100644 --- a/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeStudyList.vue +++ b/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeStudyList.vue @@ -87,7 +87,7 @@ -->
{{ instance.InstanceNumber }}
-
{{ `${instance.NumberOfFrames > 0 ? instance.NumberOfFrames : 1} frame` }}
+
{{ `${instance.NumberOfFrames > 0 ? instance.KeyFramesList.length > 0 ? instance.KeyFramesList.length : instance.NumberOfFrames : 1} frame` }}
@@ -652,7 +652,11 @@ export default { this.studyList[studyIndex].SeriesList[seriesIndex].measureData = this.measureData var dicomStatck = Object.assign({},this.studyList[studyIndex].SeriesList[seriesIndex]) const imageIds = [] - if (instanceInfo.NumberOfFrames && instanceInfo.NumberOfFrames > 1) { + if (instanceInfo.KeyFramesList.length > 0) { + instanceInfo.KeyFramesList.map(i => { + imageIds.push(`wadouri:${localStorage.getItem('location') !== 'USA' ? this.OSSclientConfig.basePath : this.OSSclientConfig.basePath}${instanceInfo.Path}?frame=${i}&instanceId=${instanceInfo.Id}&visitTaskId=${this.visitTaskId}&idx=${studyIndex}|${seriesIndex}|${idx}`) + }) + } else if (instanceInfo.NumberOfFrames && instanceInfo.NumberOfFrames > 1) { for (let j = 0; j < instanceInfo.NumberOfFrames; j++) { imageIds.push(`wadouri:${localStorage.getItem('location') !== 'USA' ? this.OSSclientConfig.basePath : this.OSSclientConfig.basePath}${instanceInfo.Path}?frame=${j}&instanceId=${instanceInfo.Id}&visitTaskId=${this.visitTaskId}&idx=${studyIndex}|${seriesIndex}|${idx}`) } diff --git a/src/views/trials/trials-panel/setting/personnel-manage/components/staffExternalForm.vue b/src/views/trials/trials-panel/setting/personnel-manage/components/staffExternalForm.vue index 280eac3c..d6071671 100644 --- a/src/views/trials/trials-panel/setting/personnel-manage/components/staffExternalForm.vue +++ b/src/views/trials/trials-panel/setting/personnel-manage/components/staffExternalForm.vue @@ -103,6 +103,7 @@