From 17737d901c93be83cb6f965a8fa84c69ddbd7d7b Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Fri, 18 Jul 2025 11:43:29 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BD=B1=E5=83=8F=E6=B5=8F=E8=A7=88=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2-=E5=85=B3=E8=81=94=E8=AE=BF=E8=A7=86=EF=BC=8C?=
 =?UTF-8?q?=E5=B7=A6=E4=BE=A7=E7=9A=84=E5=BD=B1=E5=83=8F=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E6=8C=89=E7=85=A7=E8=AE=BF=E8=A7=86-=E6=A3=80=E6=9F=A5-?=
 =?UTF-8?q?=E5=BA=8F=E5=88=97=E7=9A=84=E5=B1=82=E7=BA=A7=E5=B1=95=E7=A4=BA?=
 =?UTF-8?q?=EF=BC=9B=E7=82=B9=E5=87=BB=E5=8D=95=E4=B8=AA=E5=BA=8F=E5=88=97?=
 =?UTF-8?q?=E6=97=B6=EF=BC=8C=E8=87=AA=E5=8A=A8=E4=B8=8B=E8=BD=BD=E5=BD=93?=
 =?UTF-8?q?=E5=89=8D=E5=BA=8F=E5=88=97=E5=BD=B1=E5=83=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/dicom-show/dicom-visit.vue | 175 ++++++++++++++++-----------
 1 file changed, 103 insertions(+), 72 deletions(-)

diff --git a/src/views/dicom-show/dicom-visit.vue b/src/views/dicom-show/dicom-visit.vue
index b06d13c8..b30ca52c 100644
--- a/src/views/dicom-show/dicom-visit.vue
+++ b/src/views/dicom-show/dicom-visit.vue
@@ -152,92 +152,106 @@
               <el-tab-pane v-show="!visitTaskId" :label="$t('trials:dicom-show:relatedVisit')" name="relation-study"
                 class="pane-relation-wrapper">
                 <div class="viewerSidethumbinner">
-                  <el-collapse v-model="relationActiveName" @change="handelRelationActiveChange">
-                    <el-collapse-item v-for="(study, studyIndex) in relationStudyList" :key="`${study.StudyId}`"
-                      :name="`${study.StudyId}`">
-                      <template slot="title">
 
-                        <div class="text-desc">
-                          {{ study.StudyCode }}
+                  <el-collapse v-model="relationActiveName" @change="handelRelationActiveChange">
+                    <template v-for="item in relationStudyListByVisitName">
+                      <div :key="`${item.VisitName}`">
+                        <div v-show="item.VisitName" class="text-desc" style="background-color: #1f1f1f;">
+                          {{ item.VisitName }}
                         </div>
-                        <!-- <div v-show="study.Description" class="text-desc">
+                        <template v-for="(study, studyIndex) in relationStudyList">
+                          <el-collapse-item :key="`${study.StudyId}`" :name="`${study.StudyId}`"
+                            v-if="study.VisitName === item.VisitName">
+                            <template slot="title">
+
+                              <div class="text-desc">
+                                {{ study.StudyCode }}
+                              </div>
+                              <!-- <div v-show="study.Description" class="text-desc">
                           {{ study.Description }}
                         </div> -->
 
-                        <div v-show="study.SeriesCount" class="text-desc">
-                          {{ study.Modalities }} : {{ study.SeriesCount }} Series
-                        </div>
-                      </template>
-                      <div v-show="study.Description" class="text-desc" style="background-color: #1f1f1f;">
-                        {{ study.Description }}
-                      </div>
-                      <div class="viewerSidethumbs ps" style="position: relative;">
-                        <div class="viewerSidethumbinner">
-                          <div v-for="(seriesItem, index) in study.seriesList" :key="seriesItem.seriesId">
-                            <div class="viewernavigatorwrapper" style="position: relative;border:1px solid #434343;"
-                              series-type="relation"
-                              @click="showRelationSeriesImage($event, seriesItem, studyIndex, index)">
-                              <img class="image-preview" :src="seriesItem.previewImageUrl" crossorigin="anonymous"
-                                alt="" style="width: 85px;height:85px;" fit="fill">
-
-                              <div class="viewernavitextwrapper">
-                                <div style="padding: 1px 5px 1px 1px;display: flex;justify-content: space-between;">
-                                  <div v-if="seriesItem.keySeries" style="color:red">
-                                    Key Images
-                                  </div>
-                                  <div v-else>#{{ seriesItem.seriesNumber }}</div>
-                                  <div v-if="seriesItem.isExistMutiFrames && seriesItem.instanceCount > 1">
-                                    <el-popover placement="right-start" trigger="click"
-                                      popper-class="instance_frame_wrapper">
-                                      <div class="frame_list">
-                                        <div v-for="(instance, idx) in seriesItem.instanceInfoList" :key="instance.Id"
-                                          class="frame_content"
-                                          :style="{ 'margin-bottom': idx < seriesItem.instanceInfoList.length - 1 ? '5px' : '0px' }"
-                                          @click="showMultiFrames(studyIndex, seriesItem, index, instance)">
-                                          <div>
-                                            <div>{{ instance.InstanceNumber }}</div>
-                                            <div>{{ `${instance.NumberOfFrames > 0 ? instance.NumberOfFrames : 1} frame`
-                                            }}</div>
-                                          </div>
-
-                                        </div>
-                                      </div>
-                                      <i slot="reference" class="el-icon-connection"
-                                        style="font-size: 15px;cursor: pointer;" />
-                                    </el-popover>
-                                  </div>
-
-                                </div>
-                                <div v-show="seriesItem.instanceCount" style="padding: 1px;">
-                                  {{ seriesItem.modality }}: {{ seriesItem.instanceCount }} image
-                                </div>
-                                <div v-show="seriesItem.sliceThickness" style="padding: 1px;">
-                                  T: {{ seriesItem.sliceThickness }}
-                                </div>
-                                <el-tooltip v-show="seriesItem.description" class="item" effect="dark"
-                                  :content="seriesItem.description" placement="bottom">
-                                  <div v-show="seriesItem.description"
-                                    style="width: 120px;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;padding: 1x;">
-                                    {{ seriesItem.description }}
-                                  </div>
-                                </el-tooltip>
+                              <div v-show="study.SeriesCount" class="text-desc">
+                                {{ study.Modalities }} : {{ study.SeriesCount }} Series
                               </div>
+                            </template>
+                            <div v-show="study.Description" class="text-desc" style="background-color: #1f1f1f;">
+                              {{ study.Description }}
                             </div>
-                            <!-- <el-image
+                            <div class="viewerSidethumbs ps" style="position: relative;">
+                              <div class="viewerSidethumbinner">
+                                <div v-for="(seriesItem, index) in study.seriesList" :key="seriesItem.seriesId">
+                                  <div class="viewernavigatorwrapper"
+                                    style="position: relative;border:1px solid #434343;" series-type="relation"
+                                    @click="showRelationSeriesImage($event, seriesItem, studyIndex, index)">
+                                    <img class="image-preview" :src="seriesItem.previewImageUrl" crossorigin="anonymous"
+                                      alt="" style="width: 85px;height:85px;" fit="fill">
+
+                                    <div class="viewernavitextwrapper">
+                                      <div
+                                        style="padding: 1px 5px 1px 1px;display: flex;justify-content: space-between;">
+                                        <div v-if="seriesItem.keySeries" style="color:red">
+                                          Key Images
+                                        </div>
+                                        <div v-else>#{{ seriesItem.seriesNumber }}</div>
+                                        <div v-if="seriesItem.isExistMutiFrames && seriesItem.instanceCount > 1">
+                                          <el-popover placement="right-start" trigger="click"
+                                            popper-class="instance_frame_wrapper">
+                                            <div class="frame_list">
+                                              <div v-for="(instance, idx) in seriesItem.instanceInfoList"
+                                                :key="instance.Id" class="frame_content"
+                                                :style="{ 'margin-bottom': idx < seriesItem.instanceInfoList.length - 1 ? '5px' : '0px' }"
+                                                @click="showMultiFrames(studyIndex, seriesItem, index, instance)">
+                                                <div>
+                                                  <div>{{ instance.InstanceNumber }}</div>
+                                                  <div>{{ `${instance.NumberOfFrames > 0 ? instance.NumberOfFrames : 1}
+                                                    frame`
+                                                  }}</div>
+                                                </div>
+
+                                              </div>
+                                            </div>
+                                            <i slot="reference" class="el-icon-connection"
+                                              style="font-size: 15px;cursor: pointer;" />
+                                          </el-popover>
+                                        </div>
+
+                                      </div>
+                                      <div v-show="seriesItem.instanceCount" style="padding: 1px;">
+                                        {{ seriesItem.modality }}: {{ seriesItem.instanceCount }} image
+                                      </div>
+                                      <div v-show="seriesItem.sliceThickness" style="padding: 1px;">
+                                        T: {{ seriesItem.sliceThickness }}
+                                      </div>
+                                      <el-tooltip v-show="seriesItem.description" class="item" effect="dark"
+                                        :content="seriesItem.description" placement="bottom">
+                                        <div v-show="seriesItem.description"
+                                          style="width: 120px;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;padding: 1x;">
+                                          {{ seriesItem.description }}
+                                        </div>
+                                      </el-tooltip>
+                                    </div>
+                                  </div>
+                                  <!-- <el-image
                             class="image-preview"
                             style="height:72px;width:72px;"
                             :src="seriesItem.previewImageUrl"
                             fit="fill"
                           /> -->
-                            <div
-                              v-if="seriesItem.prefetchInstanceCount > 0 && seriesItem.prefetchInstanceCount < seriesItem.instanceCount * 100">
-                              <el-progress
-                                :percentage="parseInt((seriesItem.prefetchInstanceCount / seriesItem.instanceCount).toFixed(2))" />
+                                  <div
+                                    v-if="seriesItem.prefetchInstanceCount > 0 && seriesItem.prefetchInstanceCount < seriesItem.instanceCount * 100">
+                                    <el-progress
+                                      :percentage="parseInt((seriesItem.prefetchInstanceCount / seriesItem.instanceCount).toFixed(2))" />
+                                  </div>
+                                </div>
+                              </div>
                             </div>
-                          </div>
-                        </div>
+                          </el-collapse-item>
+                        </template>
+
                       </div>
-                    </el-collapse-item>
+                    </template>
+
                   </el-collapse>
 
                 </div>
@@ -293,6 +307,7 @@ export default {
       visitInfo: '',
       activeName: 'current-study',
       relationStudyList: [],
+      relationStudyListByVisitName: [],
       cachedImages: [],
       isReading: null,
       isStartLoad: false,
@@ -692,7 +707,20 @@ export default {
           const res = await getAllRelationStudyList(this.subjectVisitId)
           loading.close()
           this.relationStudyList = res.Result
+          this.relationStudyListByVisitName = []
+          res.Result.forEach(item => {
+            let index = this.relationStudyListByVisitName.findIndex(d => d.VisitName === item.VisitName)
+            if (index < 0) {
+              this.relationStudyListByVisitName.push({
+                VisitName: item.VisitName,
+                series: [item]
+              })
+            } else {
+              this.relationStudyListByVisitName[index].series.push(item)
+            }
+          })
         } catch (e) {
+          console.log(e)
           loading.close()
         }
       }
@@ -798,6 +826,9 @@ export default {
             this.imageList.push({ imageId: imageId, seriesId: series.seriesId, priority })
           })
         }
+        if (this.imageList.length > 0) {
+          this.loopLoad()
+        }
       }
     },
     loadAllImages() {