From 4212eb0f5235486842a5859beb7988f0ac6078ee Mon Sep 17 00:00:00 2001 From: caiyiling <1321909229@qq.com> Date: Tue, 30 Jul 2024 16:58:33 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8C=BB=E5=AD=A6=E5=AE=A1=E6=A0=B8=E6=9F=A5?= =?UTF-8?q?=E7=9C=8B=E5=9B=BE=E7=89=87=E5=8F=8A=E5=A4=9A=E5=B8=A7bug?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../reading/dicoms/components/DicomCanvas.vue | 5 ++- .../reading/dicoms/components/StudyList.vue | 2 +- .../dicoms/customize/CustomizeDicomCanvas.vue | 5 ++- .../dicoms/customize/CustomizeStudyList.vue | 11 +++--- .../medical-feedback/components/ChatForm.vue | 23 +++++++++---- .../mim-medical-audit/components/AdReview.vue | 34 ++++++++++--------- .../mim-medical-audit/components/ChatForm.vue | 23 +++++++++---- 7 files changed, 68 insertions(+), 35 deletions(-) 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 37a76e12..6b44c1af 100644 --- a/src/views/trials/trials-panel/reading/dicoms/components/DicomCanvas.vue +++ b/src/views/trials/trials-panel/reading/dicoms/components/DicomCanvas.vue @@ -1203,7 +1203,7 @@ export default { this.stack.frame = this.stack.isExistMutiFrames ? parseInt(frame) : null this.stack.instanceId = instanceId this.height = (this.stack.currentImageIdIndex) * 100 / (this.stack.imageIds.length - 1) - this.resetWwwc() + // this.resetWwwc() resolve() }) }, @@ -1941,6 +1941,9 @@ export default { for (const [key, value] of searchParams.entries()) { params[key] = value } + if (isNaN(params.frame)){ + params.frame = 0 + } return params }, preventDefault(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 b310032b..957f09d2 100644 --- a/src/views/trials/trials-panel/reading/dicoms/components/StudyList.vue +++ b/src/views/trials/trials-panel/reading/dicoms/components/StudyList.vue @@ -672,7 +672,7 @@ export default { }, showMultiFrames(studyIndex, series, seriesIndex, instanceInfo) { this.currentSeriesIndex = seriesIndex - var idx = this.visitTaskList.findIndex(i => i.VisitTaskId === this.visitTaskId) + var idx = this.visitTaskIdx const imageIds = [] if (instanceInfo.NumberOfFrames && instanceInfo.NumberOfFrames > 1) { for (let j = 0; j < instanceInfo.NumberOfFrames; j++) { diff --git a/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeDicomCanvas.vue b/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeDicomCanvas.vue index bf21b24d..8b28216d 100644 --- a/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeDicomCanvas.vue +++ b/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeDicomCanvas.vue @@ -1181,7 +1181,7 @@ export default { this.stack.frame = this.stack.isExistMutiFrames ? parseInt(frame) : null this.stack.instanceId = instanceId this.height = (this.stack.currentImageIdIndex) * 100 / (this.stack.imageIds.length - 1) - this.resetWwwc() + // this.resetWwwc() resolve() }) }, @@ -1921,6 +1921,9 @@ export default { for (const [key, value] of searchParams.entries()) { params[key] = value } + if (isNaN(params.frame)){ + params.frame = 0 + } return params }, preventDefault(e) { 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 d68ef8c6..1afeecca 100644 --- a/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeStudyList.vue +++ b/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeStudyList.vue @@ -600,7 +600,8 @@ export default { this.studyIndex = studyIndex this.seriesIndex = seriesIndex this.studyList[studyIndex].SeriesList[seriesIndex].measureData = this.measureData - var dicomStatck = this.studyList[studyIndex].SeriesList[seriesIndex] + // var dicomStatck = this.studyList[studyIndex].SeriesList[seriesIndex] + var dicomStatck = Object.assign({},this.studyList[studyIndex].SeriesList[seriesIndex]) this.$emit('loadImageStack', dicomStatck) if (!series.loadStatus && series.modality !== 'SR') { this.loopLoadStatus = -1 @@ -642,18 +643,20 @@ export default { }, showMultiFrames(studyIndex, series, seriesIndex, instanceInfo) { this.currentSeriesIndex = seriesIndex + var idx = this.visitTaskIdx const imageIds = [] 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}`) + 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}`) } } else { - imageIds.push(`wadouri:${localStorage.getItem('location') !== 'USA' ? this.OSSclientConfig.basePath : this.OSSclientConfig.basePath}${instanceInfo.Path}?instanceId=${instanceInfo.Id}&visitTaskId=${this.visitTaskId}&idx=${studyIndex}|${seriesIndex}`) + imageIds.push(`wadouri:${localStorage.getItem('location') !== 'USA' ? this.OSSclientConfig.basePath : this.OSSclientConfig.basePath}${instanceInfo.Path}?instanceId=${instanceInfo.Id}&visitTaskId=${this.visitTaskId}&idx=${studyIndex}|${seriesIndex}|${idx}`) } this.studyIndex = studyIndex this.seriesIndex = seriesIndex this.studyList[studyIndex].SeriesList[seriesIndex].measureData = this.measureData - var dicomStatck = this.studyList[studyIndex].SeriesList[seriesIndex] + // var dicomStatck = this.studyList[studyIndex].SeriesList[seriesIndex] + var dicomStatck = Object.assign({},this.studyList[studyIndex].SeriesList[seriesIndex]) dicomStatck.imageIds = imageIds dicomStatck.imageIdIndex = 0 this.$emit('loadImageStack', dicomStatck) diff --git a/src/views/trials/trials-panel/reading/medical-feedback/components/ChatForm.vue b/src/views/trials/trials-panel/reading/medical-feedback/components/ChatForm.vue index 35d7bb17..1280f856 100644 --- a/src/views/trials/trials-panel/reading/medical-feedback/components/ChatForm.vue +++ b/src/views/trials/trials-panel/reading/medical-feedback/components/ChatForm.vue @@ -77,12 +77,23 @@ {{ $t('trials:medicalFeedback:message:msg5') }}
    -
  1. - {{ file.FileName }} +
  2. + + + {{ file.FileName }} + + Image +
diff --git a/src/views/trials/trials-panel/reading/mim-medical-audit/components/AdReview.vue b/src/views/trials/trials-panel/reading/mim-medical-audit/components/AdReview.vue index c1aafe9d..9dcd6339 100644 --- a/src/views/trials/trials-panel/reading/mim-medical-audit/components/AdReview.vue +++ b/src/views/trials/trials-panel/reading/mim-medical-audit/components/AdReview.vue @@ -138,20 +138,22 @@ >
- - - - - - + + + + + + + +
this.OSSclientConfig.basePath + f.url) + this.$refs[file.url].$viewer.show() }, handleViewDetail(visitTaskId) { console.log(this.rowData) diff --git a/src/views/trials/trials-panel/reading/mim-medical-audit/components/ChatForm.vue b/src/views/trials/trials-panel/reading/mim-medical-audit/components/ChatForm.vue index a51c3169..272555a2 100644 --- a/src/views/trials/trials-panel/reading/mim-medical-audit/components/ChatForm.vue +++ b/src/views/trials/trials-panel/reading/mim-medical-audit/components/ChatForm.vue @@ -77,12 +77,23 @@ {{ $t('trials:medicalFeedback:message:msg5') }}
    -
  1. - {{ file.FileName }} +
  2. + + + {{ file.FileName }} + + Image +