From 14d71fc3f9b44e00f4ef1840bf441a5a7f186c71 Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Mon, 15 Apr 2024 09:21:12 +0800
Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E9=98=85=E7=89=87?=
 =?UTF-8?q?=E4=B8=B4=E5=BA=8A=E6=95=B0=E6=8D=AE=E6=9F=A5=E7=9C=8B=E5=8F=8A?=
 =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E6=97=B6=E5=9F=BA=E7=BA=BF=E6=9F=A5=E7=9C=8B?=
 =?UTF-8?q?=E8=AE=BF=E8=A7=86=E7=BA=A7=E5=88=AB=E4=B8=B4=E5=BA=8A=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../reading/dicoms/components/StudyList.vue   |  2 +-
 .../dicoms/customize/CustomizeDicomCanvas.vue | 23 ++++++++++++++++++-
 .../dicoms/customize/CustomizeStudyList.vue   |  2 +-
 .../trials-panel/visit/crc-upload/index.vue   |  4 ++--
 4 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/dicoms/components/StudyList.vue b/src/views/trials/trials-panel/reading/dicoms/components/StudyList.vue
index cb0b2f8e..886fc4c1 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/StudyList.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/StudyList.vue
@@ -485,7 +485,7 @@ export default {
         idx > -1 ? seriesInfo = seriesList[idx] : seriesInfo = seriesList[0]
       }
       if (seriesInfo) {
-        const index = Math.floor(seriesInfo.imageIds.length * ((baseObj.series.imageIdIndex + 1) / baseObj.series.instanceCount))
+        const index = Math.floor(seriesInfo.imageIds.length * ((baseObj.series.imageIdIndex + 1) / baseObj.series.imageIds.length))
         seriesInfo.imageIdIndex = index > 0 ? index - 1 : 0
         obj.studyIndex = seriesInfo.studyIndex
         obj.seriesIndex = seriesInfo.seriesIndex
diff --git a/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeDicomCanvas.vue b/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeDicomCanvas.vue
index 2430b365..3a4bc8a1 100644
--- a/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeDicomCanvas.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeDicomCanvas.vue
@@ -10,6 +10,13 @@
     @mouseup="sliderMouseup"
     @contextmenu.prevent="onContextmenu"
   >
+    <!-- 临床数据 -->
+    <div v-if="stack.isExistsClinicalData" class="info-cd" @click.stop="handleViewCD($event)">
+      <el-tooltip class="item" effect="dark" :content="$t('trials:reading:button:clinicalData')" placement="bottom">
+        <svg-icon icon-class="documentation" class="svg-icon" />
+      </el-tooltip>
+
+    </div>
     <!-- 切换访视 -->
     <div
       v-if="stack.imageRendered && isReadingTaskViewInOrder"
@@ -1920,6 +1927,12 @@ export default {
       e.stopImmediatePropagation()
       e.stopPropagation()
       e.preventDefault()
+    },
+    handleViewCD(e) {
+      DicomEvent.$emit('previewCD', this.stack.visitTaskId)
+      e.stopImmediatePropagation()
+      e.stopPropagation()
+      e.preventDefault()
     }
 
   }
@@ -2008,7 +2021,15 @@ export default {
     font-size: 14px;
   }
 }
-
+.info-cd{
+  position: absolute;
+  left: 10px;
+  top: 5px;
+  text-align: left;
+  color: #ddd;
+  font-size: 18px;
+  cursor: pointer;
+}
 .info-series {
   position: absolute;
   left: 10px;
diff --git a/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeStudyList.vue b/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeStudyList.vue
index 9d846ebe..f3fe708b 100644
--- a/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeStudyList.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeStudyList.vue
@@ -476,7 +476,7 @@ export default {
         idx > -1 ? seriesInfo = seriesList[idx] : seriesInfo = seriesList[0]
       }
       if (seriesInfo) {
-        const index = Math.floor(seriesInfo.imageIds.length * ((baseObj.series.imageIdIndex + 1) / baseObj.series.instanceCount))
+        const index = Math.floor(seriesInfo.imageIds.length * ((baseObj.series.imageIdIndex + 1) / baseObj.series.imageIds.length))
         seriesInfo.imageIdIndex = index > 0 ? index - 1 : 0
         obj.studyIndex = seriesInfo.studyIndex
         obj.seriesIndex = seriesInfo.seriesIndex
diff --git a/src/views/trials/trials-panel/visit/crc-upload/index.vue b/src/views/trials/trials-panel/visit/crc-upload/index.vue
index f3108d4a..f3b09025 100644
--- a/src/views/trials/trials-panel/visit/crc-upload/index.vue
+++ b/src/views/trials/trials-panel/visit/crc-upload/index.vue
@@ -572,10 +572,10 @@
           <UploadNonDicomFiles v-if="rowData.Id" :data="rowData" :subject-visit-id="rowData.Id" :body-parts="otherInfo.BodyPartTypes" :modalities="otherInfo.Modalitys" :allow-add-or-edit="false" @getList="getList"/>
         </el-card>
         <!-- 临床数据 -->
-        <h4 v-if="rowData.IsBaseLine && otherInfo.ClinicalInformationTransmissionEnum > 0 && otherInfo.IsHaveSubjectClinicalData" class="box-title" style="margin-top:10px;">
+        <h4 v-if="rowData.IsBaseLine && otherInfo.ClinicalInformationTransmissionEnum > 0 && (otherInfo.IsHaveSubjectClinicalData ||otherInfo.IsHaveVisitClinicalData)" class="box-title" style="margin-top:10px;">
           {{ $t('trials:crcUpload:label:clinicalData') }}
         </h4>
-        <el-card v-if="rowData.IsBaseLine && otherInfo.ClinicalInformationTransmissionEnum > 0 && otherInfo.IsHaveSubjectClinicalData" class="box-card">
+        <el-card v-if="rowData.IsBaseLine && otherInfo.ClinicalInformationTransmissionEnum > 0 && (otherInfo.IsHaveSubjectClinicalData || otherInfo.IsHaveVisitClinicalData)" class="box-card">
           <UploadClinicalData v-if="rowData.Id && rowData.IsBaseLine" :enum-type="otherInfo.ClinicalInformationTransmissionEnum" :allow-add-or-edit="false" :data="rowData" :subject-visit-id="rowData.Id" @getList="getList" />
         </el-card>
         <h4 v-if="!rowData.IsBaseLine && otherInfo.ClinicalInformationTransmissionEnum > 0 && otherInfo.IsHaveVisitClinicalData" class="box-title" style="margin-top:10px;">