From d7b11c02e5f06e1ea30167ae56a63b068bc3c439 Mon Sep 17 00:00:00 2001
From: "DESKTOP-6C3NK6N\\WXS" <815034831@qq.com>
Date: Thu, 19 Sep 2024 10:20:19 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E4=B8=8D=E5=90=8C=E7=9A=84?=
 =?UTF-8?q?=E9=98=85=E7=89=87=E6=A0=87=E5=87=86=E6=89=93=E5=8C=85=E4=B8=8B?=
 =?UTF-8?q?=E8=BD=BD=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../downloadDicomAndNonedicom/index.vue       | 29 +++++++++++++++++--
 1 file changed, 27 insertions(+), 2 deletions(-)

diff --git a/src/components/downloadDicomAndNonedicom/index.vue b/src/components/downloadDicomAndNonedicom/index.vue
index 4b93da47..ed72d860 100644
--- a/src/components/downloadDicomAndNonedicom/index.vue
+++ b/src/components/downloadDicomAndNonedicom/index.vue
@@ -214,6 +214,7 @@ export default {
       IsDicom: true,
       open: null,
       downloadId: null,
+      IsReadingTaskViewInOrder: 0, // 阅片规则
       bodyPart: [],
     }
   },
@@ -325,7 +326,8 @@ export default {
         let res = await getIRReadingDownloadStudyInfo(data)
         this.btnLoading = false
         if (res.IsSuccess) {
-          this.downloadId = res.OtherInfo
+          this.downloadId = res.OtherInfo.PreDownloadId
+          this.IsReadingTaskViewInOrder = res.OtherInfo.IsReadingTaskViewInOrder
           this.downloadImage(res.Result)
         }
       } catch (err) {
@@ -349,6 +351,12 @@ export default {
     formatDownloadFile(list) {
       let files = [],
         name = `${list[0].SubjectCode}_${new Date().getTime()}.zip`
+      if (this.IsReadingTaskViewInOrder === 1) {
+        name = `${list[0].SubjectCode}_${list[0].TaskBlindName}.zip`
+      }
+      if (this.IsReadingTaskViewInOrder === 0) {
+        name = `${list[0].TaskBlindName}.zip`
+      }
       list.forEach((data) => {
         if (data.StudyList && data.StudyList.length > 0) {
           let StudyList = data.StudyList
@@ -366,6 +374,15 @@ export default {
                       }/${fileName}`,
                       url: this.OSSclientConfig.basePath + instance.Path,
                     }
+                    if (this.IsReadingTaskViewInOrder === 0) {
+                      obj = {
+                        name: `${data.TaskBlindName}/${this.$fd(
+                          'IsDicom',
+                          true
+                        )}/${fileName}`,
+                        url: this.OSSclientConfig.basePath + instance.Path,
+                      }
+                    }
                     files.push(obj)
                   })
                 }
@@ -386,13 +403,21 @@ export default {
                   )}/${study.StudyCode}/${item.FileName}`,
                   url: this.OSSclientConfig.basePath + item.Path,
                 }
+                if (this.IsReadingTaskViewInOrder === 0) {
+                  obj = {
+                    name: `${data.TaskBlindName}/${this.$fd(
+                      'IsDicom',
+                      false
+                    )}/${item.FileName}`,
+                    url: this.OSSclientConfig.basePath + item.Path,
+                  }
+                }
                 files.push(obj)
               })
             }
           })
         }
       })
-
       return { files, name }
     },
     // 影像下载成功确认