src/components/downloadDicomAndNonedicom/index.vue

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