diff --git a/src/api/reading.js b/src/api/reading.js index d0697f26..a7fa5a6d 100644 --- a/src/api/reading.js +++ b/src/api/reading.js @@ -133,9 +133,11 @@ export function AddAdjudicationReport(param) { }) } -export function getVisitStudyList(trialId, subjectVisitId, isReading) { +export function getVisitStudyList(trialId, subjectVisitId, isReading, visitTaskId) { + let url = `/SubjectVisit/getVisitStudyList/${trialId}/${subjectVisitId}/${isReading}` + url = visitTaskId ? `${url}?visitTaskId=${visitTaskId}` : url return request({ - url: `/SubjectVisit/getVisitStudyList/${trialId}/${subjectVisitId}/${isReading}`, + url: url, method: 'get' }) } diff --git a/src/views/dicom-show/dicom-visit.vue b/src/views/dicom-show/dicom-visit.vue index 85f236d5..9ed14b4e 100644 --- a/src/views/dicom-show/dicom-visit.vue +++ b/src/views/dicom-show/dicom-visit.vue @@ -303,7 +303,8 @@ export default { showSeriesList: [], currentLoadIns: [], isFromCRCUpload: false, - visitTaskId: null + visitTaskId: null, + page: '' } }, mounted() { @@ -321,6 +322,7 @@ export default { this.showDelete = parseInt(this.$router.currentRoute.query.showDelete) this.isFromCRCUpload = !!this.$router.currentRoute.query.isFromCRCUpload this.visitTaskId = this.$router.currentRoute.query.visitTaskId + this.page = this.$route.query.page // cornerstone.events.addEventListener('cornerstoneimageloaded', this.cornerstoneImageLoaded) this.getStudiesInfo() cornerstone.events.addEventListener('cornerstoneimageloadprogress', this.cornerstoneimageloadprogress) @@ -342,8 +344,10 @@ export default { this.studyList = [] try { let res = null - if (this.visitTaskId) { + if (this.page === 'upload') { res = await getTaskUploadedDicomStudyList({ visitTaskId: this.visitTaskId }) + } else if (this.page === 'download'){ + res = await getVisitStudyList(this.trialId, this.subjectVisitId, this.isReading, this.visitTaskId) } else { res = await getVisitStudyList(this.trialId, this.subjectVisitId, this.isReading) }