From bdb45c7b4e3639738cb52ab45a7eb9864637f6f2 Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Fri, 27 Sep 2024 16:16:18 +0800
Subject: [PATCH 1/2] 1

---
 src/components/downloadDicomAndNonedicom/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/downloadDicomAndNonedicom/index.vue b/src/components/downloadDicomAndNonedicom/index.vue
index 560f4b80..2307a355 100644
--- a/src/components/downloadDicomAndNonedicom/index.vue
+++ b/src/components/downloadDicomAndNonedicom/index.vue
@@ -483,7 +483,7 @@ export default {
       var token = getToken()
       let trialId = this.$route.query.trialId
       const routeData = this.$router.resolve({
-        path: `/showvisitdicoms?trialId=${trialId}&subjectVisitId=${row.SourceSubjectVisitId}&isReading=1&TokenKey=${token}`,
+        path: `/showvisitdicoms?trialId=${trialId}&visitTaskId=${row.VisitTaskId}&subjectVisitId=${row.SourceSubjectVisitId}&isReading=1&TokenKey=${token}`,
       })
       this.open = window.open(routeData.href, '_blank')
     },

From 7874f69bfe5f0088144da5994c512a8be256c95b Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Fri, 27 Sep 2024 16:23:19 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E9=A2=84=E8=A7=88=E5=BD=B1=E5=83=8F?=
 =?UTF-8?q?=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/reading.js                   | 10 ++++++++--
 src/views/dicom-show/dicom-study.vue | 13 ++++++++++---
 2 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/src/api/reading.js b/src/api/reading.js
index d0697f26..ca4d71f2 100644
--- a/src/api/reading.js
+++ b/src/api/reading.js
@@ -45,9 +45,15 @@ export function saveImageLabelList(param) {
   })
 }
 
-export function getStudyInfo(studyId) {
+export function getStudyInfo(studyId, visitTaskId) {
+  let url = ''
+  if (visitTaskId) {
+    url = `/Study/item/${studyId}?visitTaskId=${visitTaskId}`
+  } else {
+    url = `/Study/item/${studyId}`
+  }
   return request({
-    url: `/Study/item/${studyId}`,
+    url: url,
     method: 'get'
   })
 }
diff --git a/src/views/dicom-show/dicom-study.vue b/src/views/dicom-show/dicom-study.vue
index 6e1f26d8..54b23e29 100644
--- a/src/views/dicom-show/dicom-study.vue
+++ b/src/views/dicom-show/dicom-study.vue
@@ -194,7 +194,8 @@ export default {
       imageList: [],
       showSeriesList: [],
       currentLoadIns: [],
-      isFromCRCUpload: false
+      isFromCRCUpload: false,
+      visitTaskId: null
     }
   },
   created: function() {
@@ -216,6 +217,7 @@ export default {
       this.initSeries()
     } else if (this.type === 'Study') {
       this.showDelete = parseInt(this.$router.currentRoute.query.showDelete)
+      this.visitTaskId = this.$router.currentRoute.visitTaskId
       this.loadStudy()
     } else if (this.type === 'Share') {
       this.loadStudy()
@@ -237,7 +239,12 @@ export default {
   },
   methods: {
     async loadStudy() {
-      const data = await getStudyInfo(this.studyId)
+      let data = null
+      if (this.visitTaskId) {
+        data = await getStudyInfo(this.studyId, this.visitTaskId)
+      } else {
+        data = await getStudyInfo(this.studyId)
+      }
       if (data.IsSuccess) {
         if (data.Result) {
           this.studyCode = data.Result.StudyCode
@@ -251,7 +258,7 @@ export default {
     },
     async loadPatientStudy() {
       try {
-        let data = await getPatientSeriesList(this.studyId);
+        const data = await getPatientSeriesList(this.studyId)
         if (data.IsSuccess) {
           const { Result } = data
           var seriesList = []