From fb68892cd4636aaa95bcf4698208a1ea2ff24a94 Mon Sep 17 00:00:00 2001 From: wangxiaoshuang <825034831@qq.com> Date: Mon, 12 May 2025 17:22:05 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=9F=BA=E7=BA=BF=E4=BA=8C=E7=BB=B4?= =?UTF-8?q?=E4=B8=8A=E7=9A=84=E7=97=85=E7=81=B6=E8=A2=AB=E6=B8=B2=E6=9F=93?= =?UTF-8?q?=E5=88=B0=E4=BA=86=E9=9A=8F=E8=AE=BF=E7=9A=84=E8=9E=8D=E5=90=88?= =?UTF-8?q?=E4=B8=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../reading/dicoms3D/components/ReadPage.vue | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/views/trials/trials-panel/reading/dicoms3D/components/ReadPage.vue b/src/views/trials/trials-panel/reading/dicoms3D/components/ReadPage.vue index c3b4d767..31cb75b7 100644 --- a/src/views/trials/trials-panel/reading/dicoms3D/components/ReadPage.vue +++ b/src/views/trials/trials-panel/reading/dicoms3D/components/ReadPage.vue @@ -708,7 +708,8 @@ export default { studyList: [], volumeData: {}, fusionSerieId: {}, - loadingText: null + loadingText: null, + resetAnnotation: false , // 是否初始化标记 （融合时使用） } }, computed: { @@ -1471,6 +1472,7 @@ export default { async customAnnotationRemovedListener(e) { const { annotation } = e.detail try{ + if ( this.resetAnnotation && this.isFusion ) return false if (!annotation) return false if (this.readingTaskState === 2) throw 'annotation Not allowed to operate' if (annotation.visitTaskId === this.taskInfo.VisitTaskId && annotation.seriesId) { @@ -2733,6 +2735,9 @@ export default { let { ct, pt } = data this.loading = true this.loadingText = this.$t('trials:lugano:message:loadVolumes') + this.resetAnnotation = true + cornerstoneTools.annotation.state.removeAllAnnotations() + this.renderedTaskIds = [] if ( this.verifyFusionData(ct, pt) ) { this.loading = false this.loadingText = null @@ -2740,6 +2745,7 @@ export default { this.$refs[`viewport-1`][0].setSeriesInfo(pt) this.$refs[`viewport-2`][0].setSeriesInfo(pt) this.$refs[`viewport-3`][0].setSeriesInfo(pt) + this.resetAnnotation = false return true } if (!this.fusionSerieId.ct || this.fusionSerieId.ct !== ct.SeriesInstanceUid ) { @@ -2779,6 +2785,7 @@ export default { this.$refs[`viewport-fusion-1`][0].setSeriesInfo(ptData, { colorMap: true}) this.$refs[`viewport-fusion-2`][0].setSeriesInfo(fusionData, { isFusion: true, colorMap: true }) this.$refs[`viewport-fusion-3`][0].setSeriesInfo(ptData, { isMip: true, colorMap: true }) + this.resetAnnotation = false this.$nextTick(() => { this.$refs[`colorMap`].init() }) From 39f7ba7181731131b796520fb9c294e5efc556a8 Mon Sep 17 00:00:00 2001 From: wangxiaoshuang <825034831@qq.com> Date: Tue, 13 May 2025 15:24:32 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=A0=87=E8=AE=B0=E7=BC=93=E5=AD=98?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../trials-panel/reading/dicoms3D/components/PetCtViewport.vue | 2 +- .../trials-panel/reading/dicoms3D/components/ReadPage.vue | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/views/trials/trials-panel/reading/dicoms3D/components/PetCtViewport.vue b/src/views/trials/trials-panel/reading/dicoms3D/components/PetCtViewport.vue index e5fda1b2..00e12ca8 100644 --- a/src/views/trials/trials-panel/reading/dicoms3D/components/PetCtViewport.vue +++ b/src/views/trials/trials-panel/reading/dicoms3D/components/PetCtViewport.vue @@ -244,7 +244,7 @@ export default { this.imageInfo.size = `${imagePlaneModule.columns}*${imagePlaneModule.rows}` this.imageInfo.location = imagePlaneModule.sliceLocation this.getOrientationMarker() - this.$emit('renderAnnotations', this.series) + // this.$emit('renderAnnotations', this.series) let properties = viewport.getProperties() if (this.isFusion) { properties = viewport.getProperties(this.ptVolumeId) diff --git a/src/views/trials/trials-panel/reading/dicoms3D/components/ReadPage.vue b/src/views/trials/trials-panel/reading/dicoms3D/components/ReadPage.vue index 31cb75b7..518ae79a 100644 --- a/src/views/trials/trials-panel/reading/dicoms3D/components/ReadPage.vue +++ b/src/views/trials/trials-panel/reading/dicoms3D/components/ReadPage.vue @@ -2736,7 +2736,8 @@ export default { this.loading = true this.loadingText = this.$t('trials:lugano:message:loadVolumes') this.resetAnnotation = true - cornerstoneTools.annotation.state.removeAllAnnotations() + // console.log(cornerstoneTools.annotation.state.getAllAnnotations(),'cornerstoneTools.annotation.state') + // cornerstoneTools.annotation.state.removeAllAnnotations() this.renderedTaskIds = [] if ( this.verifyFusionData(ct, pt) ) { this.loading = false From 9852d99a4ae5dde3e215ea2479c03311e6493a89 Mon Sep 17 00:00:00 2001 From: wangxiaoshuang <825034831@qq.com> Date: Tue, 13 May 2025 15:40:30 +0800 Subject: [PATCH 3/3] =?UTF-8?q?crc=E4=B8=8A=E4=BC=A0=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E5=A4=A7=E5=B0=8F=E7=BB=9F=E8=AE=A1=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../visit/crc-upload/components/uploadDicomFiles2.vue | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/views/trials/trials-panel/visit/crc-upload/components/uploadDicomFiles2.vue b/src/views/trials/trials-panel/visit/crc-upload/components/uploadDicomFiles2.vue index 6c773385..376b2fcd 100644 --- a/src/views/trials/trials-panel/visit/crc-upload/components/uploadDicomFiles2.vue +++ b/src/views/trials/trials-panel/visit/crc-upload/components/uploadDicomFiles2.vue @@ -1459,6 +1459,11 @@ export default { ) { dicomInfo.uploadFileSize = dicomInfo.fileSize } + if ( + Math.abs(dicomInfo.uploadFileSize - dicomInfo.fileSize) < 5000 + ) { + dicomInfo.uploadFileSize = dicomInfo.fileSize + } } ) if (!res || !res.url) {