diff --git a/src/components/Dicom/DicomViewer.vue b/src/components/Dicom/DicomViewer.vue index dc396c66..8a7e83e2 100644 --- a/src/components/Dicom/DicomViewer.vue +++ b/src/components/Dicom/DicomViewer.vue @@ -393,7 +393,7 @@ export default { this.customWwc = { visible: false, title: this.$t('DicomViewer:data:customWwc') } this.rotateList[0] = '1' this.colorList[0] = '' - this.wwwcList[0] = '1' + this.wwwcList[0] = '-1' this.colormapsList = cornerstone.colors.getColormapsList() this.currentDicomCanvas = this.$refs['dicomCanvas0'] }, @@ -444,7 +444,7 @@ export default { this.colorList[this.currentDicomCanvasIndex] = '' } if (!this.wwwcList[this.currentDicomCanvasIndex]) { - this.wwwcList[this.currentDicomCanvasIndex] = '1' + this.wwwcList[this.currentDicomCanvasIndex] = '-1' } } }, diff --git a/src/views/trials/trials-panel/reading/dicoms/index.vue b/src/views/trials/trials-panel/reading/dicoms/index.vue index 32c6a026..9add7fb0 100644 --- a/src/views/trials/trials-panel/reading/dicoms/index.vue +++ b/src/views/trials/trials-panel/reading/dicoms/index.vue @@ -301,19 +301,19 @@ export default { this.isShow = false this.visitTaskId = res.Result.VisitTaskId // DicomEvent.$emit('getCustomTableQuestionAnswer', res.Result.VisitTaskId) - if (this.subjectId !== res.Result.SubjectId) { - store.dispatch('reading/resetVisitTasks') - var token = getToken() - window.location.href = `/readingDicoms?TrialReadingCriterionId=${this.TrialReadingCriterionId}&trialId=${this.trialId}&subjectCode=${res.Result.SubjectCode}&subjectId=${res.Result.SubjectId}&isReadingTaskViewInOrder=${this.isReadingTaskViewInOrder}&criterionType=${this.criterionType}&readingTool=${this.readingTool}&TokenKey=${token}&isNewSubject=1` - return - } else if (!this.isReadingTaskViewInOrder || res.Result.ReadingCategory !== 1) { - store.dispatch('reading/resetVisitTasks') - if (this.firstTaskReadingCategory) { - const token = getToken() - window.location.href = `/readingDicoms?TrialReadingCriterionId=${this.TrialReadingCriterionId}&trialId=${this.trialId}&subjectCode=${res.Result.SubjectCode}&subjectId=${res.Result.SubjectId}&isReadingTaskViewInOrder=${this.isReadingTaskViewInOrder}&criterionType=${this.criterionType}&readingTool=${this.readingTool}&TokenKey=${token}` - return - } - } + // if (this.subjectId !== res.Result.SubjectId) { + // store.dispatch('reading/resetVisitTasks') + // var token = getToken() + // window.location.href = `/readingDicoms?TrialReadingCriterionId=${this.TrialReadingCriterionId}&trialId=${this.trialId}&subjectCode=${res.Result.SubjectCode}&subjectId=${res.Result.SubjectId}&isReadingTaskViewInOrder=${this.isReadingTaskViewInOrder}&criterionType=${this.criterionType}&readingTool=${this.readingTool}&TokenKey=${token}&isNewSubject=1` + // return + // } else if (!this.isReadingTaskViewInOrder || res.Result.ReadingCategory !== 1) { + // store.dispatch('reading/resetVisitTasks') + // if (this.firstTaskReadingCategory) { + // const token = getToken() + // window.location.href = `/readingDicoms?TrialReadingCriterionId=${this.TrialReadingCriterionId}&trialId=${this.trialId}&subjectCode=${res.Result.SubjectCode}&subjectId=${res.Result.SubjectId}&isReadingTaskViewInOrder=${this.isReadingTaskViewInOrder}&criterionType=${this.criterionType}&readingTool=${this.readingTool}&TokenKey=${token}` + // return + // } + // } this.subjectId = res.Result.SubjectId this.subjectCode = res.Result.SubjectCode this.taskBlindName = res.Result.TaskBlindName