src/components/downloadDicomAndNonedicom/index.vue

@@ -314,52 +314,49 @@ export default {
       }
     },
     // 格式化下载文件路径
-    formatDownloadFile(list) {
+    formatDownloadFile(data) {
       let files = [],
-        name = `${list[0].SubjectCode}_${new Date().getTime()}.zip`
+        name = `${data.SubjectCode}_${data.VisitName}.zip`
-      list.forEach((data) => {
+      if (data.StudyList && data.StudyList.length > 0) {
-        if (data.StudyList && data.StudyList.length > 0) {
+        let StudyList = data.StudyList
-          let StudyList = data.StudyList
+        StudyList.forEach((study) => {
-          StudyList.forEach((study) => {
+          if (study.SeriesList.length > 0) {
-            if (study.SeriesList.length > 0) {
+            study.SeriesList.forEach((series) => {
-              study.SeriesList.forEach((series) => {
+              if (series.InstancePathList.length > 0) {
-                if (series.InstancePathList.length > 0) {
+                series.InstancePathList.forEach((instance) => {
-                  series.InstancePathList.forEach((instance) => {
+                  let fileName = instance.Path.split('/').pop()
-                    let fileName = instance.Path.split('/').pop()
+                  let obj = {
-                    let obj = {
+                    name: `${data.SubjectCode}_${data.VisitName}/${this.$fd(
-                      name: `${data.SubjectCode}/${data.VisitName}/${this.$fd(
+                      'IsDicom',
-                        'IsDicom',
+                      true
-                        true
+                    )}/${study.StudyCode}/${fileName}`,
-                      )}/${study.StudyCode}/${fileName}`,
+                    url: this.OSSclientConfig.basePath + instance.Path,
-                      url: this.OSSclientConfig.basePath + instance.Path,
+                  }
-                    }
+                  files.push(obj)
-                    files.push(obj)
+                })
-                  })
+              }
-                }
+            })
-              })
+          }
-            }
+        })
-          })
+      }
-        }
+      if (data.NoneDicomStudyList && data.NoneDicomStudyList.length > 0) {
-        if (data.NoneDicomStudyList && data.NoneDicomStudyList.length > 0) {
+        let NoneDicomStudyList = data.NoneDicomStudyList
-          let NoneDicomStudyList = data.NoneDicomStudyList
+        // 多文件
-          // 多文件
+        NoneDicomStudyList.forEach((study) => {
-          NoneDicomStudyList.forEach((study) => {
+          if (study.FileList.length > 0) {
-            if (study.FileList.length > 0) {
+            study.FileList.forEach((item) => {
-              study.FileList.forEach((item) => {
+              let obj = {
-                let obj = {
+                name: `${data.SubjectCode}_${data.VisitName}/${this.$fd(
-                  name: `${data.SubjectCode}/${data.VisitName}/${this.$fd(
+                  'IsDicom',
-                    'IsDicom',
+                  false
-                    false
+                )}/${study.StudyCode}/${item.FileName}`,
-                  )}/${study.StudyCode}/${item.FileName}`,
+                url: this.OSSclientConfig.basePath + item.Path,
-                  url: this.OSSclientConfig.basePath + item.Path,
+              }
-                }
+              files.push(obj)
-                files.push(obj)
+            })
-              })
+          }
-            }
+        })
-          })
+      }
-        }
-      })
-
       return { files, name }
     },
     handleOpenDialog(item) {