diff --git a/src/components/downloadDicomAndNonedicom/index.vue b/src/components/downloadDicomAndNonedicom/index.vue index 4bf2c294..a86bb72d 100644 --- a/src/components/downloadDicomAndNonedicom/index.vue +++ b/src/components/downloadDicomAndNonedicom/index.vue @@ -243,7 +243,7 @@ export default { SubjectId: this.SubjectId, TrialReadingCriterionId: this.Criterion.TrialReadingCriterionId, SubjectCode: this.SubjectCode, - SubjectVisitIdList: [], + SubjectVisitTaskList: [], DicomStudyIdList: [], NoneDicomStudyIdList: [], } @@ -254,7 +254,10 @@ export default { item.DicomStudyList && item.DicomStudyList.length > 0 ) { - data.SubjectVisitIdList.push(item.SourceSubjectVisitId) + data.SubjectVisitTaskList.push({ + SubjectvisitId: item.SourceSubjectVisitId, + TaskId: item.VisitTaskId, + }) let arr = item.DicomStudyList.map((d) => d.Id) data.DicomStudyIdList = [...data.DicomStudyIdList, ...arr] } @@ -267,7 +270,10 @@ export default { item.NoneDicomStudyList && item.NoneDicomStudyList.length > 0 ) { - data.SubjectVisitIdList.push(item.SourceSubjectVisitId) + data.SubjectVisitTaskList.push({ + SubjectvisitId: item.SourceSubjectVisitId, + TaskId: item.VisitTaskId, + }) let arr = item.NoneDicomStudyList.map((d) => d.Id) data.NoneDicomStudyIdList = [...data.NoneDicomStudyIdList, ...arr] } @@ -279,7 +285,10 @@ export default { row.DicomStudyList && row.DicomStudyList.length > 0 ) { - data.SubjectVisitIdList.push(row.SourceSubjectVisitId) + data.SubjectVisitTaskList.push({ + SubjectvisitId: item.SourceSubjectVisitId, + TaskId: item.VisitTaskId, + }) let arr = row.DicomStudyList.map((d) => d.Id) data.DicomStudyIdList = [...data.DicomStudyIdList, ...arr] } @@ -288,7 +297,10 @@ export default { row.NoneDicomStudyList && row.NoneDicomStudyList.length > 0 ) { - data.SubjectVisitIdList.push(row.SourceSubjectVisitId) + data.SubjectVisitTaskList.push({ + SubjectvisitId: item.SourceSubjectVisitId, + TaskId: item.VisitTaskId, + }) let arr = row.NoneDicomStudyList.map((d) => d.Id) data.NoneDicomStudyIdList = [...data.NoneDicomStudyIdList, ...arr] } @@ -327,7 +339,7 @@ export default { series.InstancePathList.forEach((instance) => { let fileName = instance.Path.split('/').pop() let obj = { - name: `${data.SubjectCode}/${data.VisitName}/${this.$fd( + name: `${data.SubjectCode}/${data.TaskBlindName}/${this.$fd( 'IsDicom', true )}/${study.StudyCode}/${fileName}`, @@ -347,7 +359,7 @@ export default { if (study.FileList.length > 0) { study.FileList.forEach((item) => { let obj = { - name: `${data.SubjectCode}/${data.VisitName}/${this.$fd( + name: `${data.SubjectCode}/${data.TaskBlindName}/${this.$fd( 'IsDicom', false )}/${study.StudyCode}/${item.FileName}`,