From d5c0e15f466632bd5f81f8956b9a12c0e55b6b96 Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Tue, 10 Sep 2024 18:29:22 +0800
Subject: [PATCH] =?UTF-8?q?=E9=98=85=E7=89=87=E9=A1=B5=E9=9D=A2=E4=B8=8B?=
 =?UTF-8?q?=E8=BD=BD=E5=BD=B1=E5=83=8F=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../trials-panel/reading/dicoms/components/DicomViewer.vue  | 6 ++++++
 .../reading/dicoms/customize/CustomizeDicomViewer.vue       | 6 ++++++
 2 files changed, 12 insertions(+)

diff --git a/src/views/trials/trials-panel/reading/dicoms/components/DicomViewer.vue b/src/views/trials/trials-panel/reading/dicoms/components/DicomViewer.vue
index 75d467be..e2adddf3 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/DicomViewer.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/DicomViewer.vue
@@ -725,6 +725,7 @@
       :SubjectId="uploadSubjectId"
       :SubjectCode="uploadSubjectCode"
       :Criterion="uploadTrialCriterion"
+      :TaskId="taskId"
       :visible.sync="downloadImageVisible"
     />
   </div>
@@ -930,6 +931,7 @@ export default {
       uploadSubjectCode: null,
       uploadTrialCriterion: {},
       uploadStatus: 'upload',
+      taskId: ''
     }
   },
 
@@ -1168,6 +1170,10 @@ export default {
         .catch(() => {})
     },
     openUploadImage(status) {
+      const idx = this.visitTaskList.findIndex(i => i.IsCurrentTask)
+      if (idx > -1) {
+        this.taskId = this.visitTaskList[idx].VisitTaskId
+      }
       this.uploadSubjectCode = this.$route.query.subjectCode
       this.uploadSubjectId = this.$route.query.subjectId
       this.uploadTrialCriterion = this.trialCriterion
diff --git a/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeDicomViewer.vue b/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeDicomViewer.vue
index db3330e3..795bf388 100644
--- a/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeDicomViewer.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeDicomViewer.vue
@@ -669,6 +669,7 @@
       :SubjectId="uploadSubjectId"
       :SubjectCode="uploadSubjectCode"
       :Criterion="uploadTrialCriterion"
+      :TaskId="taskId"
       :visible.sync="downloadImageVisible"
     />
   </div>
@@ -889,6 +890,7 @@ export default {
       uploadSubjectCode: null,
       uploadTrialCriterion: {},
       uploadStatus: 'upload',
+      taskId: ''
     }
   },
 
@@ -1073,6 +1075,10 @@ export default {
         .catch(() => {})
     },
     openUploadImage(status) {
+      const idx = this.visitTaskList.findIndex(i => i.IsCurrentTask)
+      if (idx > -1) {
+        this.taskId = this.visitTaskList[idx].VisitTaskId
+      }
       this.uploadSubjectCode = this.$route.query.subjectCode
       this.uploadSubjectId = this.$route.query.subjectId
       this.uploadTrialCriterion = this.trialCriterion