From e2cd2680e43d3abd6e464706e3002f5651418e72 Mon Sep 17 00:00:00 2001 From: caiyiling <1321909229@qq.com> Date: Thu, 25 Apr 2024 14:46:46 +0800 Subject: [PATCH] =?UTF-8?q?=E7=97=85=E7=81=B6=E6=9C=AA=E7=94=BB=E6=A0=87?= =?UTF-8?q?=E6=B3=A8=E4=B8=8D=E4=B8=8A=E4=BC=A0=E6=88=AA=E5=9B=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../trials-panel/reading/dicoms/components/DicomViewer.vue | 5 ++++- .../reading/dicoms/components/IRecist/QuestionForm.vue | 2 +- .../reading/dicoms/components/PCWG/QuestionForm.vue | 2 +- .../reading/dicoms/components/Recist/QuestionForm.vue | 2 +- .../reading/dicoms/components/RecistBM/QuestionForm.vue | 2 +- 5 files changed, 8 insertions(+), 5 deletions(-) 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 99a701b..b9e59d0 100644 --- a/src/views/trials/trials-panel/reading/dicoms/components/DicomViewer.vue +++ b/src/views/trials/trials-panel/reading/dicoms/components/DicomViewer.vue @@ -705,8 +705,11 @@ export default { }) DicomEvent.$on('getScreenshots', async(measuredData, callback) => { if (this.currentDicomCanvasIndex > -1) { - if (!measuredData) return await this.imageLocation(measuredData) + if (!measuredData.isMarked) { + callback() + return + } setTimeout(async() => { // var base64Str = this.$refs[`dicomCanvas${this.currentDicomCanvasIndex}`][0].getScreenshots() const divForDownloadViewport = document.querySelector( 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 50ced27..03b7182 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 @@ -1957,7 +1957,7 @@ export default { } } - DicomEvent.$emit('getScreenshots', { questionId: this.parentQsId, rowIndex: this.questionForm.RowIndex, visitTaskId: this.visitTaskId, lesionName: this.lesionMark, lesionType: this.lesionType }, async val => { + DicomEvent.$emit('getScreenshots', { questionId: this.parentQsId, rowIndex: this.questionForm.RowIndex, visitTaskId: this.visitTaskId, lesionName: this.lesionMark, lesionType: this.lesionType, isMarked: !!measureData }, async val => { // 靶病灶状态为0（存在）时，一定存在长径或者长短径（长径、十字线 ） // 普通靶病灶：长径大于10mm且不小于2倍层厚（基线校验） // 淋巴结靶病灶：短径大于15mm且不小于2倍层厚（基线校验） 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 9e37ef8..d118c22 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 @@ -690,7 +690,7 @@ export default { } } const loading = this.$loading({ fullscreen: true }) - DicomEvent.$emit('getScreenshots', { questionId: this.parentQsId, rowIndex: this.questionForm.RowIndex, visitTaskId: this.visitTaskId, lesionName: this.lesionMark, lesionType: this.lesionType }, async val => { + DicomEvent.$emit('getScreenshots', { questionId: this.parentQsId, rowIndex: this.questionForm.RowIndex, visitTaskId: this.visitTaskId, lesionName: this.lesionMark, lesionType: this.lesionType, isMarked: !!measureData }, async val => { var picturePath = '' if (val && measureData) { var pictureObj = await this.uploadScreenshots(`${new Date().getTime()}`, val) 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 55a0aa9..6ec7d79 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 @@ -1320,7 +1320,7 @@ export default { } } - DicomEvent.$emit('getScreenshots', { questionId: this.parentQsId, rowIndex: this.questionForm.RowIndex, visitTaskId: this.visitTaskId, lesionName: this.lesionMark, lesionType: this.lesionType }, async val => { + DicomEvent.$emit('getScreenshots', { questionId: this.parentQsId, rowIndex: this.questionForm.RowIndex, visitTaskId: this.visitTaskId, lesionName: this.lesionMark, lesionType: this.lesionType, isMarked: !!measureData }, async val => { // 靶病灶状态为0（存在）时，一定存在长径或者长短径（长径、十字线 ） // 普通靶病灶：长径大于10mm且不小于2倍层厚（基线校验） // 淋巴结靶病灶：短径大于15mm且不小于2倍层厚（基线校验） 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 3691e7e..344169b 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 @@ -970,7 +970,7 @@ export default { } } - DicomEvent.$emit('getScreenshots', { questionId: this.parentQsId, rowIndex: this.questionForm.RowIndex, visitTaskId: this.visitTaskId, lesionName: this.lesionMark, lesionType: this.lesionType }, async val => { + DicomEvent.$emit('getScreenshots', { questionId: this.parentQsId, rowIndex: this.questionForm.RowIndex, visitTaskId: this.visitTaskId, lesionName: this.lesionMark, lesionType: this.lesionType, isMarked: !!measureData }, async val => { var picturePath = '' if (val && measureData && this.questionForm.IsDicomReading) { var pictureObj = await this.uploadScreenshots(`${new Date().getTime()}`, val)