From 010a5867b5f6ab5d6824da5381b8064e9019ac91 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Thu, 27 Nov 2025 13:30:42 +0800
Subject: [PATCH] =?UTF-8?q?=E9=9D=B6=E6=AE=B5=E6=A0=87=E6=B3=A8=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/downloadDicomAndNonedicom/index.vue    |  2 +-
 src/components/uploadDicomAndNonedicom/dicomFile.vue  |  4 +++-
 src/components/uploadDicomAndNonedicom/study-view.vue |  8 ++++++--
 src/views/dicom-show/dicom-visit.vue                  | 11 +++++++----
 .../reading/reading-task/components/TargetSection.vue |  8 ++++----
 5 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/src/components/downloadDicomAndNonedicom/index.vue b/src/components/downloadDicomAndNonedicom/index.vue
index 5995a728..05f623dd 100644
--- a/src/components/downloadDicomAndNonedicom/index.vue
+++ b/src/components/downloadDicomAndNonedicom/index.vue
@@ -77,7 +77,7 @@
       </el-table-column>
     </el-table>
     <study-view v-if="model_cfg.visible" :model_cfg="model_cfg" :modelList="modelList" :bodyPart="bodyPart"
-      :subjectVisitId="modelSubjectVisitId" :IsDicom="IsDicom" :visitTaskId="modelTaskId"
+      :subjectVisitId="modelSubjectVisitId" :IsDicom="IsDicom" :isDownload="true" :visitTaskId="modelTaskId"
       :IsImageSegment="IsImageSegment" :Criterion="Criterion" />
   </el-dialog>
 </template>
diff --git a/src/components/uploadDicomAndNonedicom/dicomFile.vue b/src/components/uploadDicomAndNonedicom/dicomFile.vue
index 842eef4f..0c00b0f7 100644
--- a/src/components/uploadDicomAndNonedicom/dicomFile.vue
+++ b/src/components/uploadDicomAndNonedicom/dicomFile.vue
@@ -302,7 +302,7 @@
     </el-table>
     <study-view v-if="model_cfg.visible" :model_cfg="model_cfg" :IsDicom="true" :bodyPart="bodyPart"
       :subjectVisitId="openSubjectVisitId" :modelList="modelList" :isUpload="openIsUpload"
-      :TrialModality="TrialModality" @getList="getList" />
+      :visitTaskId="openVisitTaskId" :TrialModality="TrialModality" @getList="getList" />
   </div>
 </template>
 <script>
@@ -417,6 +417,7 @@ export default {
       bodyPart: {},
       openIsUpload: false,
       openSubjectVisitId: null,
+      openVisitTaskId: null,
       TrialModality: [],
     }
   },
@@ -536,6 +537,7 @@ export default {
     handleOpenDialog(item, list, isUpload = false) {
       this.openIsUpload = isUpload
       this.openSubjectVisitId = item.SubjectVisitId || item.SourceSubjectVisitId
+      this.openVisitTaskId = item.VisitTaskId
       this.model_cfg.title = `${item.SubjectCode || ''} > ${this.IsImageSegment ? item.VisitName : item.TaskBlindName}`
       this.modelList = item[list]
       this.model_cfg.visible = true
diff --git a/src/components/uploadDicomAndNonedicom/study-view.vue b/src/components/uploadDicomAndNonedicom/study-view.vue
index f41ee4f6..14ae0aa3 100644
--- a/src/components/uploadDicomAndNonedicom/study-view.vue
+++ b/src/components/uploadDicomAndNonedicom/study-view.vue
@@ -2,7 +2,7 @@
   <div v-if="model_cfg.visible">
     <base-model :config="model_cfg">
       <div slot="dialog-body">
-        <el-button v-if="!isUpload" type='primary' size="small" style="float:right;" @click="preview">
+        <el-button v-if="!isUpload && !isDownload" type='primary' size="small" style="float:right;" @click="preview">
           {{ $t("common:button:preview") }}
         </el-button>
         <el-table :data="modelList" style="width: 100%" height="300">
@@ -129,6 +129,10 @@ export default {
       type: Boolean,
       default: false,
     },
+    isDownload: {
+      type: Boolean,
+      default: false,
+    },
     Criterion: {
       type: Object,
       default: () => {
@@ -172,7 +176,7 @@ export default {
         var token = getToken()
         let trialId = this.$route.query.trialId
         routeData = this.$router.resolve({
-          path: `/showvisitdicoms?trialId=${trialId}&subjectVisitId=${this.subjectVisitId}&isReading=1&TokenKey=${token}`,
+          path: `/showvisitdicoms?trialId=${trialId}&visitTaskId=${this.visitTaskId}&subjectVisitId=${this.subjectVisitId}&isReading=1&TokenKey=${token}`,
         })
       } else {
         let trialId = this.$route.query.trialId
diff --git a/src/views/dicom-show/dicom-visit.vue b/src/views/dicom-show/dicom-visit.vue
index 65cdd535..71cea67d 100644
--- a/src/views/dicom-show/dicom-visit.vue
+++ b/src/views/dicom-show/dicom-visit.vue
@@ -154,7 +154,7 @@
                 <div class="viewerSidethumbinner">
 
                   <el-collapse v-model="relationActiveName" @change="handelRelationActiveChange">
-                    <template v-for="item in relationStudyListByVisitName" >
+                    <template v-for="item in relationStudyListByVisitName">
                       <div :key="`${item.VisitName}`">
                         <div v-show="item.VisitName" class="text-desc" style="background-color: #1f1f1f;">
                           {{ item.VisitName }}
@@ -365,10 +365,13 @@ export default {
         let res = null
         if (this.page === 'upload') {
           res = await getTaskUploadedDicomStudyList({ visitTaskId: this.visitTaskId !== 'undefined' ? this.visitTaskId : null, subjectVisitId: this.subjectVisitId })
-        } else if (this.page === 'download') {
+        }
+        // else if (this.page === 'download') {
+        //   res = await getVisitStudyList(this.trialId, this.subjectVisitId, this.isReading, this.visitTaskId)
+        // }
+        else {
+          // res = await getVisitStudyList(this.trialId, this.subjectVisitId, this.isReading)
           res = await getVisitStudyList(this.trialId, this.subjectVisitId, this.isReading, this.visitTaskId)
-        } else {
-          res = await getVisitStudyList(this.trialId, this.subjectVisitId, this.isReading)
         }
         if (res.IsSuccess) {
           res.Result.forEach((study, studyIndex) => {
diff --git a/src/views/trials/trials-panel/reading/reading-task/components/TargetSection.vue b/src/views/trials/trials-panel/reading/reading-task/components/TargetSection.vue
index 60d7a846..969152e0 100644
--- a/src/views/trials/trials-panel/reading/reading-task/components/TargetSection.vue
+++ b/src/views/trials/trials-panel/reading/reading-task/components/TargetSection.vue
@@ -38,12 +38,12 @@
                 <el-table-column prop="VisitCount" :label="$t('trials:pendingReadingTasks:table:VisitCount')"
                     show-overflow-tooltip sortable="custom" />
                 <!-- dicom检查数量 -->
-                <el-table-column prop="DicomStudyCount" :label="$t('trials:pendingReadingTasks:table:DicomStudyCount')"
-                    show-overflow-tooltip sortable="custom" />
+                <!-- <el-table-column prop="DicomStudyCount" :label="$t('trials:pendingReadingTasks:table:DicomStudyCount')"
+                    show-overflow-tooltip sortable="custom" /> -->
                 <!-- 非dicom检查数量 -->
-                <el-table-column prop="NoneDicomStudyCount"
+                <!-- <el-table-column prop="NoneDicomStudyCount"
                     :label="$t('trials:pendingReadingTasks:table:NoneDicomStudyCount')" show-overflow-tooltip
-                    sortable="custom" />
+                    sortable="custom" /> -->
                 <!-- 标记访视数量 -->
                 <el-table-column prop="MarkVisitCount" :label="$t('trials:pendingReadingTasks:table:MarkVisitCount')"
                     show-overflow-tooltip sortable="custom" />