From cc02fee7cb4969966f89d1245b75cf9d1eb051a0 Mon Sep 17 00:00:00 2001 From: wangxiaoshuang <825034831@qq.com> Date: Thu, 28 Aug 2025 14:53:25 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=B3=E9=94=AE=E5=BA=8F=E5=88=97=E5=9C=A8?= =?UTF-8?q?=E6=A0=87=E8=AE=B0=E5=AE=8C=E6=88=90=E5=90=8E=E7=AB=8B=E5=8D=B3?= =?UTF-8?q?=E5=88=B7=E6=96=B0=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/store/modules/reading.js | 113 ++++++- .../reading/dicoms/components/DicomCanvas.vue | 22 +- .../reading/dicoms/components/DicomViewer.vue | 311 +++++++++++++++++- .../components/IRecist/QuestionForm.vue | 4 + .../components/MRecist/QuestionForm.vue | 4 + .../dicoms/components/PCWG/QuestionForm.vue | 3 + .../dicoms/components/Recist/QuestionForm.vue | 4 + .../components/RecistBM/QuestionForm.vue | 4 + .../reading/dicoms/components/StudyList.vue | 254 ++++++++------ 9 files changed, 600 insertions(+), 119 deletions(-) diff --git a/src/store/modules/reading.js b/src/store/modules/reading.js index 4a41142..0387d5a 100644 --- a/src/store/modules/reading.js +++ b/src/store/modules/reading.js @@ -908,7 +908,118 @@ const actions = { } }) }, - + getKeySeries({ state }, obj) { + return new Promise(resolve => { + console.log('getKeySeries') + let { study, idx, visitTaskId } = obj + let data = null + var index = state.visitTaskList.findIndex(i => i.VisitTaskId === visitTaskId) + var keyImages = [] + if (study) { + data = {} + const series = study.SeriesList && study.SeriesList + series.map(i => { + i.InstanceInfoList.map(k => { + keyImages.push({ instanceId: k.Id }) + }) + }) + data.StudyId = study.StudyId + data.StudyCode = study.StudyCode + data.Modalities = study.Modalities + data.SeriesCount = study.SeriesCount + data.InstanceCount = study.InstanceCount + data.InstanceCount = study.InstanceCount + data.IsDicom = study.IsDicom + data.PreviewImageCount = 0 + data.IsCriticalSequence = study.IsCriticalSequence + var seriesList = [] + study.SeriesList.forEach((series, seriesIndex) => { + const imageIds = [] + const instanceList = [] + series.InstanceInfoList.forEach(instance => { + if (instance.NumberOfFrames && instance.NumberOfFrames > 1) { + 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=${idx}|${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=${idx}|${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=${idx}|${seriesIndex}|${index}` + } else { + const imageId = `wadouri:${localStorage.getItem('location') !== 'USA' ? Vue.prototype.OSSclientConfig.basePath : Vue.prototype.OSSclientConfig.basePath}${instance.Path}?instanceId=${instance.Id}&visitTaskId=${obj.visitTaskId}&idx=${idx}|${seriesIndex}|${index}` + imageIds.push(imageId) + instance.ImageId = imageId + } + if (!study.IsCriticalSequence && series.IsBeMark) { + const i = keyImages.findIndex(i => i.instanceId === instance.Id) + if (i > -1) { + keyImages[i].idx = idx + keyImages[i].seriesIndex = seriesIndex + } + } + instanceList.push(instance.Id) + }) + seriesList.push({ + isDicom: study.IsDicom, + imageIds: imageIds, + instanceInfoList: series.InstanceInfoList, + instanceList: instanceList, + seriesId: series.Id, + imageIdIndex: 0, + seriesUid: series.SeriesInstanceUid, + seriesNumber: series.SeriesNumber, + sliceThickness: series.SliceThickness, + modality: series.Modality, + description: series.Description, + previewImageUrl: study.IsDicom ? series.ImageResizePath ? Vue.prototype.OSSclientConfig.basePath + series.ImageResizePath : `/api/series/preview/${series.Id}` : Vue.prototype.OSSclientConfig.basePath + `${series.NoneDicomFileFirstFile}`, + instanceCount: series.InstanceCount, + instanceHtmlPathList: series.InstanceHtmlPathList, + prefetchInstanceCount: 0, + loadStatus: false, + imageloadedArr: series.InstanceInfoList, + studyId: study.StudyId, + studyIndex: idx, + seriesIndex: seriesIndex, + studyCode: study.StudyCode, + taskBlindName: state.visitTaskList[index].TaskBlindName, + visitTaskId: obj.visitTaskId, + readingTaskState: state.visitTaskList[index].ReadingTaskState, + isBaseLineTask: state.visitTaskList[index].IsBaseLineTask, + isCurrentTask: state.visitTaskList[index].IsCurrentTask, + isExistsClinicalData: state.visitTaskList[index].IsExistsClinicalData, + isLoading: false, + isBeMark: series.IsBeMark, + ww: series.WindowWidth, + wc: series.WindowCenter, + isExistMutiFrames: series.IsExistMutiFrames + }) + }) + data.SeriesList = seriesList + } + let stateIndex = state.visitTaskList[index].StudyList.findIndex(item => item.IsCriticalSequence) + console.log(stateIndex, 'stateIndex') + if (data) { + if (!!~stateIndex) { + state.visitTaskList[index].StudyList.splice(stateIndex, 1, data) + } else { + state.visitTaskList[index].StudyList.unshift(data) + } + } else { + if (!!~stateIndex) { + state.visitTaskList[index].StudyList.splice(stateIndex, 1) + } + } + state.visitTaskList[index].studyListInit = true + state.visitTaskList[index].KeyImages = keyImages + // sessionStorage.setItem('visitTaskList', state.visitTaskList.length > 0 ? JSON.stringify(state.visitTaskList) : '') + resolve(data) + }) + }, updateStudyList({ state }, obj) { return new Promise(resolve => { var index = state.visitTaskList.findIndex(i => i.VisitTaskId === obj.visitTaskId) diff --git a/src/views/trials/trials-panel/reading/dicoms/components/DicomCanvas.vue b/src/views/trials/trials-panel/reading/dicoms/components/DicomCanvas.vue index 8bb2e1a..dae838b 100644 --- a/src/views/trials/trials-panel/reading/dicoms/components/DicomCanvas.vue +++ b/src/views/trials/trials-panel/reading/dicoms/components/DicomCanvas.vue @@ -292,7 +292,8 @@ export default { ], scrollSyncInfo: { offset: 0 }, - hideMeasureArr: [] + hideMeasureArr: [], + IsCriticalSequence: false } }, @@ -542,7 +543,7 @@ export default { mouseUp(e) { // console.log('mouseUp') - if (this.readingTaskState >= 2) return + if (this.readingTaskState >= 2 || this.IsCriticalSequence) return this.image = e.detail.image this.getToolStateInfo(e) }, @@ -566,6 +567,10 @@ export default { e.stopPropagation() e.preventDefault() } + } else if (this.IsCriticalSequence) { + e.stopImmediatePropagation() + e.stopPropagation() + e.preventDefault() } }, pointNearTool(e) { @@ -909,7 +914,7 @@ export default { }) }, setMeasureDataVisible() { - if (this.readingTaskState >= 2) return + if (this.readingTaskState >= 2 || this.IsCriticalSequence) return var element = cornerstone.getEnabledElement(this.canvas) var { imageId } = element.image const imageInfo = this.getInstanceInfo(imageId) @@ -974,6 +979,7 @@ export default { } }, mouseClick(e) { + if (this.IsCriticalSequence) return false const { element, currentPoints, image, viewport } = e.detail var imageId = image.imageId const imageInfo = this.getInstanceInfo(imageId) @@ -1031,6 +1037,12 @@ export default { }, loadImageStack(dicomSeries) { return new Promise(resolve => { + var idx = this.visitTaskList.findIndex(item => item.VisitTaskId === dicomSeries.visitTaskId) + if (!!~idx) { + this.IsCriticalSequence = this.visitTaskList[idx].StudyList[dicomSeries.studyIndex].IsCriticalSequence + } else { + this.IsCriticalSequence = false + } this.isCurrentTask = dicomSeries.isCurrentTask this.isBaseline = dicomSeries.isBaseLineTask this.readingTaskState = dicomSeries.readingTaskState @@ -1329,7 +1341,7 @@ export default { this.setMarkers() }, onMeasurementcompleted(e) { - if (this.readingTaskState >= 2) return + if (this.readingTaskState >= 2 || this.IsCriticalSequence) return var element = cornerstone.getEnabledElement(this.canvas) var viewport = element.viewport @@ -1453,7 +1465,7 @@ export default { onMeasurementmodified(e) { // 移动 // console.log('modified') - if (this.readingTaskState >= 2) return + if (this.readingTaskState >= 2 || this.IsCriticalSequence) return const { measurementData, toolType } = e.detail var element = cornerstone.getEnabledElement(this.canvas) var viewport = element.viewport diff --git a/src/views/trials/trials-panel/reading/dicoms/components/DicomViewer.vue b/src/views/trials/trials-panel/reading/dicoms/components/DicomViewer.vue index 65b2d88..09294b5 100644 --- a/src/views/trials/trials-panel/reading/dicoms/components/DicomViewer.vue +++ b/src/views/trials/trials-panel/reading/dicoms/components/DicomViewer.vue @@ -280,6 +280,18 @@
{{ tool.text }}
--> + +
+
+ +
+ +
{{ $t('trials:lugano:button:fusion') }}
+
+
@@ -410,7 +422,14 @@ :is-show="isShow" :is-reading-show-subject-info="isReadingShowSubjectInfo" /> - + + + + + + + + + + + + + + + +
+ +
+ +

{{ $t('trials:lugano:fusionDialog:label:ctSeries') }}

+ + + + + + + + + + + +
+ +
+ +

{{ $t('trials:lugano:fusionDialog:label:ptSeries') }}

+ + + + + + + + + +
+
+ + + {{ $t('common:button:cancel') }} + + + {{ $t('common:button:confirm') }} + + +
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/IRecist/QuestionForm.vue b/src/views/trials/trials-panel/reading/dicoms/components/IRecist/QuestionForm.vue index 20146b1..6443eb1 100644 --- a/src/views/trials/trials-panel/reading/dicoms/components/IRecist/QuestionForm.vue +++ b/src/views/trials/trials-panel/reading/dicoms/components/IRecist/QuestionForm.vue @@ -553,6 +553,7 @@ export default { .then(async res => { if (res.IsSuccess) { DicomEvent.$emit('getReportInfo', true) + DicomEvent.$emit('getKeySeries') } loading.close() resolve() @@ -862,6 +863,7 @@ export default { } deleteReadingRowAnswer(param) .then(async res => { + DicomEvent.$emit('getKeySeries') resolve() }).catch(() => { }) @@ -2003,6 +2005,7 @@ export default { this.$emit('close') DicomEvent.$emit('getReportInfo', true) DicomEvent.$emit('setMeasuredToolsPassive') + DicomEvent.$emit('getKeySeries') } loading.close() } catch (e) { @@ -2106,6 +2109,7 @@ export default { this.$emit('close', { lesionType: this.lesionType, rowIndex: this.rowIndex, visitTaskId: this.visitTaskId }) } DicomEvent.$emit('refreshStudyListMeasureData') + DicomEvent.$emit('getKeySeries') loading.close() } catch (e) { loading.close() diff --git a/src/views/trials/trials-panel/reading/dicoms/components/MRecist/QuestionForm.vue b/src/views/trials/trials-panel/reading/dicoms/components/MRecist/QuestionForm.vue index bd7a217..b0e0af7 100644 --- a/src/views/trials/trials-panel/reading/dicoms/components/MRecist/QuestionForm.vue +++ b/src/views/trials/trials-panel/reading/dicoms/components/MRecist/QuestionForm.vue @@ -443,6 +443,7 @@ export default { .then(async res => { if (res.IsSuccess) { DicomEvent.$emit('getReportInfo', true) + DicomEvent.$emit('getKeySeries') } loading.close() resolve() @@ -738,6 +739,7 @@ export default { } deleteReadingRowAnswer(param) .then(async res => { + DicomEvent.$emit('getKeySeries') resolve() }).catch(() => { }) @@ -1367,6 +1369,7 @@ export default { this.$emit('close') DicomEvent.$emit('getReportInfo', true) DicomEvent.$emit('setMeasuredToolsPassive') + DicomEvent.$emit('getKeySeries') } loading.close() } catch (e) { @@ -1454,6 +1457,7 @@ export default { DicomEvent.$emit('getReportInfo', true) // '删除成功！' this.$message.success(this.$t('common:message:deletedSuccessfully')) + DicomEvent.$emit('getKeySeries') } } else { // 移除新建病灶并关闭窗口 diff --git a/src/views/trials/trials-panel/reading/dicoms/components/PCWG/QuestionForm.vue b/src/views/trials/trials-panel/reading/dicoms/components/PCWG/QuestionForm.vue index dbcbc73..20ab4b3 100644 --- a/src/views/trials/trials-panel/reading/dicoms/components/PCWG/QuestionForm.vue +++ b/src/views/trials/trials-panel/reading/dicoms/components/PCWG/QuestionForm.vue @@ -440,6 +440,7 @@ export default { .then(async res => { if (res.IsSuccess) { DicomEvent.$emit('getReportInfo', true) + DicomEvent.$emit('getKeySeries') } resolve() }).catch(() => { @@ -751,6 +752,7 @@ export default { this.$emit('close') DicomEvent.$emit('getReportInfo', true) DicomEvent.$emit('setMeasuredToolsPassive') + DicomEvent.$emit('getKeySeries') loading.close() } } catch (e) { @@ -820,6 +822,7 @@ export default { DicomEvent.$emit('getMeasureData') this.$emit('close', { lesionType: this.lesionType, rowIndex: this.rowIndex, visitTaskId: this.visitTaskId }) DicomEvent.$emit('getReportInfo', true) + DicomEvent.$emit('getKeySeries') this.$message.success(this.$t('common:message:deletedSuccessfully')) } loading.close() diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Recist/QuestionForm.vue b/src/views/trials/trials-panel/reading/dicoms/components/Recist/QuestionForm.vue index 10e112b..238ca30 100644 --- a/src/views/trials/trials-panel/reading/dicoms/components/Recist/QuestionForm.vue +++ b/src/views/trials/trials-panel/reading/dicoms/components/Recist/QuestionForm.vue @@ -526,6 +526,7 @@ export default { .then(async res => { if (res.IsSuccess) { DicomEvent.$emit('getReportInfo', true) + DicomEvent.$emit('getKeySeries') } loading.close() resolve() @@ -791,6 +792,7 @@ export default { } deleteReadingRowAnswer(param) .then(async res => { + DicomEvent.$emit('getKeySeries') resolve() }).catch(() => { }) @@ -1348,6 +1350,7 @@ export default { this.$emit('close') DicomEvent.$emit('getReportInfo', true) DicomEvent.$emit('setMeasuredToolsPassive') + DicomEvent.$emit('getKeySeries') } loading.close() } catch (e) { @@ -1432,6 +1435,7 @@ export default { } this.$emit('close', { lesionType: this.lesionType, rowIndex: this.rowIndex, visitTaskId: this.visitTaskId }) DicomEvent.$emit('getReportInfo', true) + DicomEvent.$emit('getKeySeries') // '删除成功！' this.$message.success(this.$t('common:message:deletedSuccessfully')) } diff --git a/src/views/trials/trials-panel/reading/dicoms/components/RecistBM/QuestionForm.vue b/src/views/trials/trials-panel/reading/dicoms/components/RecistBM/QuestionForm.vue index e3a23dd..53dcf3b 100644 --- a/src/views/trials/trials-panel/reading/dicoms/components/RecistBM/QuestionForm.vue +++ b/src/views/trials/trials-panel/reading/dicoms/components/RecistBM/QuestionForm.vue @@ -483,6 +483,7 @@ export default { .then(async res => { if (res.IsSuccess) { DicomEvent.$emit('getReportInfo', true) + DicomEvent.$emit('getKeySeries') } loading.close() resolve() @@ -716,6 +717,7 @@ export default { } deleteReadingRowAnswer(param) .then(async res => { + DicomEvent.$emit('getKeySeries') resolve() }).catch(() => { }) @@ -1035,6 +1037,7 @@ export default { this.$emit('close') DicomEvent.$emit('getReportInfo', true) DicomEvent.$emit('setMeasuredToolsPassive') + DicomEvent.$emit('getKeySeries') } loading.close() } catch (e) { @@ -1127,6 +1130,7 @@ export default { this.$emit('close', { lesionType: this.lesionType, rowIndex: this.rowIndex, visitTaskId: this.visitTaskId }) } DicomEvent.$emit('refreshStudyListMeasureData') + DicomEvent.$emit('getKeySeries') loading.close() } catch (e) { console.log(e) 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 15af0d2..4b27aff 100644 --- a/src/views/trials/trials-panel/reading/dicoms/components/StudyList.vue +++ b/src/views/trials/trials-panel/reading/dicoms/components/StudyList.vue @@ -1,9 +1,11 @@
-
+
-
- +
+
#{{ series.seriesNumber }}
-
+
- - + +
- - + +
- +
-
+ :style="{ 'margin-bottom': idx < series.instanceInfoList.length - 1 ? '5px' : '0px' }" + @click.stop="showMultiFrames(index, series, i, instance)">
{{ instance.InstanceNumber }}
-
{{ `${instance.NumberOfFrames > 0 ? instance.KeyFramesList.length > 0 ? instance.KeyFramesList.length : instance.NumberOfFrames : 1} frame` }}
+
{{ `${instance.NumberOfFrames > 0 ? instance.KeyFramesList.length > 0 ? + instance.KeyFramesList.length : instance.NumberOfFrames : 1} frame` }}
- +
@@ -103,9 +94,11 @@

-
+
- + @@ -113,10 +106,10 @@
-
- +
+
@@ -126,24 +119,19 @@
- +
- - + +
- +
@@ -156,7 +144,7 @@ import DicomEvent from './DicomEvent' import { mapGetters } from 'vuex' import store from '@/store' import SrList from './SrList' - +import { getKeySeries } from '@/api/trials' export default { name: 'StudyList', components: { SrList }, @@ -247,7 +235,9 @@ export default { var idx = this.visitTaskList.findIndex(i => i.VisitTaskId === this.visitTaskId) this.measureData = this.visitTaskList[idx].MeasureData }) - + DicomEvent.$on('getKeySeries', () => { + this.getKeySeries() + }) // DicomEvent.$on('setReadingState', readingTaskState => { // var idx = this.visitTaskList.findIndex(i => i.VisitTaskId === this.visitTaskId) // if (idx > -1) { @@ -269,9 +259,28 @@ export default { // window.removeEventListener('beforeunload', e => { cornerstone.imageCache.purgeCache() }) }, methods: { + // 获取关键帧序列 + async getKeySeries() { + try { + var idx = this.visitTaskList.findIndex(i => i.VisitTaskId === this.visitTaskId) + if (!~idx) return false + let data = { + TrialId: this.$route.query.trialId, + SujectVisitId: this.visitTaskList[idx].VisitId, + VisitTaskId: this.visitTaskId + } + let res = await getKeySeries(data) + if (res.IsSuccess) { + let index = this.studyList.findIndex(item => item.IsCriticalSequence) + await store.dispatch('reading/getKeySeries', { study: res.Result, idx: !~index ? 0 : index, visitTaskId: this.visitTaskId }) + } + } catch (err) { + console.log(err) + } + }, debounce(fn, delay) { let timer = null - return function() { + return function () { const context = this const args = arguments clearTimeout(timer) @@ -285,7 +294,7 @@ export default { // 初始化待渲染序列 this.getInitSeries().then((res) => { requestPoolManager.startTaskTimer() - res.map(async(item) => { + res.map(async (item) => { // this.loadInitialImage(item) const imageId = item.imageIds[item.imageIdIndex] const p = parseInt(new Date().getTime()) @@ -407,8 +416,8 @@ export default { this.studyIndex = obj.studyIndex this.seriesIndex = obj.seriesIndex seriesList.push(obj.series) - this.activeNames = [`${this.studyList[ this.studyIndex].StudyId}`] - this.studyList[ obj.studyIndex].SeriesList[obj.seriesIndex].isFirstRender = true + this.activeNames = [`${this.studyList[this.studyIndex].StudyId}`] + this.studyList[obj.studyIndex].SeriesList[obj.seriesIndex].isFirstRender = true } else { if (this.studyList.length > 0) { // 初始化问题表单 @@ -445,7 +454,7 @@ export default { this.studyIndex = secondObj.studyIndex this.seriesIndex = secondObj.seriesIndex seriesList.push(secondObj.series) - this.studyList[ secondObj.studyIndex].SeriesList[secondObj.seriesIndex].isFirstRender = true + this.studyList[secondObj.studyIndex].SeriesList[secondObj.seriesIndex].isFirstRender = true this.studyIndex = secondObj.studyIndex this.seriesIndex = secondObj.seriesIndex @@ -895,15 +904,17 @@ export default { }