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/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) { 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') }, 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()