From b2290ca7398cb43effaae606f3bce969c3d1153f Mon Sep 17 00:00:00 2001 From: caiyiling <1321909229@qq.com> Date: Mon, 11 Mar 2024 09:09:33 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E8=84=BE=E8=84=8F=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E8=AE=A1=E7=AE=97=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../trials/trials-panel/reading/dicoms/components/Questions.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Questions.vue b/src/views/trials/trials-panel/reading/dicoms/components/Questions.vue index efb69398..af74c9a6 100644 --- a/src/views/trials/trials-panel/reading/dicoms/components/Questions.vue +++ b/src/views/trials/trials-panel/reading/dicoms/components/Questions.vue @@ -315,7 +315,7 @@ export default { async getSplenicState() { try { var spleenLength = this.questionForm[this.spleenLengthId] - spleenLength = isNaN(parseFloat(spleenLength)) ? 0 : parseFloat(spleenLength) + spleenLength = isNaN(parseFloat(spleenLength)) ? -1 : parseFloat(spleenLength) const result = await getSplenicState(this.visitTaskId, spleenLength) return { isSuccess: true, result: result.Result } } catch (e) { From 313bc28a96527147eaa87bbcf7617bce6ca1f514 Mon Sep 17 00:00:00 2001 From: caiyiling <1321909229@qq.com> Date: Mon, 11 Mar 2024 10:53:16 +0800 Subject: [PATCH 2/3] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../trials-panel/reading/dicoms/components/StudyList.vue | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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 102d20ef..2f0070d4 100644 --- a/src/views/trials/trials-panel/reading/dicoms/components/StudyList.vue +++ b/src/views/trials/trials-panel/reading/dicoms/components/StudyList.vue @@ -718,7 +718,9 @@ export default { // requestPoolManager.startTaskTimer() this.imageList.map(image => { requestPoolManager.loadAndCacheImagePlus(image.imageId, image.seriesId, image.priority).then(res => { - this.imageLoaded(image, res.data.string('x0020000e')) + if(res){ + this.imageLoaded(image, res.data.string('x0020000e')) + } }) }) requestPoolManager.sortTaskPool() From 10fdbc427dcdc796d0d85551e0a06e141ffad8d6 Mon Sep 17 00:00:00 2001 From: caiyiling <1321909229@qq.com> Date: Mon, 11 Mar 2024 11:08:31 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=8A=A5=E5=91=8A=E9=A1=B5=E6=9F=A5?= =?UTF-8?q?=E7=9C=8B=E5=8E=86=E5=8F=B2=E5=BD=B1=E5=83=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../reading/dicoms/components/Fusion/QuestionItem.vue | 3 ++- .../trials-panel/reading/dicoms/components/ReportPage.vue | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/QuestionItem.vue b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/QuestionItem.vue index 0a1ebb29..088e03e4 100644 --- a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/QuestionItem.vue +++ b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/QuestionItem.vue @@ -41,7 +41,8 @@ v-if="(questionForm[question.Id] || (question.QuestionType === 51 && !liverIsInsideVolume) || (question.QuestionType === 52 && !lungIsInsideVolume))" size="mini" type="text" - style="margin-left: -5px;padding: 7px 5px;" + style="padding: '7px 5px'" + :style="{marginLeft: readingTaskState!== 2?'-5px':'5px'}" @click="locateAnnotation(question)" >{{ $t('trials:lugano:button:locateAnnotation') }} diff --git a/src/views/trials/trials-panel/reading/dicoms/components/ReportPage.vue b/src/views/trials/trials-panel/reading/dicoms/components/ReportPage.vue index 1b3ea62b..a7f99c49 100644 --- a/src/views/trials/trials-panel/reading/dicoms/components/ReportPage.vue +++ b/src/views/trials/trials-panel/reading/dicoms/components/ReportPage.vue @@ -730,13 +730,14 @@ export default { this.openWindow.close() } var token = getToken() + var trialReadingCriterionId = this.$router.currentRoute.query.TrialReadingCriterionId var subjectCode = this.$router.currentRoute.query.subjectCode var subjectId = this.$router.currentRoute.query.subjectId var trialId = this.$router.currentRoute.query.trialId var isReadingTaskViewInOrder = this.$router.currentRoute.query.isReadingTaskViewInOrder var criterionType = this.$router.currentRoute.query.criterionType var readingTool = this.$router.currentRoute.query.readingTool - var path = `/readingDicoms?trialId=${trialId}&subjectCode=${subjectCode}&subjectId=${subjectId}&visitTaskId=${task.VisitTaskId}&isReadingTaskViewInOrder=${isReadingTaskViewInOrder}&criterionType=${criterionType}&readingTool=${readingTool}&TokenKey=${token}` + var path = `/readingDicoms?TrialReadingCriterionId=${trialReadingCriterionId}&trialId=${trialId}&subjectCode=${subjectCode}&subjectId=${subjectId}&visitTaskId=${task.VisitTaskId}&isReadingTaskViewInOrder=${isReadingTaskViewInOrder}&criterionType=${criterionType}&readingTool=${readingTool}&TokenKey=${token}` const routeData = this.$router.resolve({ path }) this.openWindow = window.open(routeData.href, '_blank') },