From 13c9c9b4c388361c6a57d475a578c111dd861a1a Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Mon, 22 Sep 2025 14:26:28 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A3=80=E6=9F=A5=E9=83=A8=E4=BD=8D=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../uploadDicomAndNonedicom/dicomFile.vue     |  8 ++++----
 .../uploadDicomAndNonedicom/nonedicomFile.vue |  2 +-
 .../uploadDicomAndNonedicom/study-view.vue    | 20 +++++--------------
 src/views/none-dicom-show/index.vue           |  2 +-
 .../reading/dicoms/none-dicoms.vue            |  2 +-
 .../none-dicoms/components/VisitReview.vue    |  2 +-
 6 files changed, 13 insertions(+), 23 deletions(-)

diff --git a/src/components/uploadDicomAndNonedicom/dicomFile.vue b/src/components/uploadDicomAndNonedicom/dicomFile.vue
index 0b165d78..625d8df4 100644
--- a/src/components/uploadDicomAndNonedicom/dicomFile.vue
+++ b/src/components/uploadDicomAndNonedicom/dicomFile.vue
@@ -406,7 +406,7 @@ export default {
       subjectVisitId: null,
       errStudyUidList: [],
       open: null,
-      bodyPart: [],
+      bodyPart: {},
       openIsUpload: false,
       TrialModality: [],
     }
@@ -416,7 +416,7 @@ export default {
   },
   async mounted() {
     this.trialId = this.$route.query.trialId
-    this.bodyPart = await this.$getBodyPart(this.$route.query.trialId)
+    this.bodyPart.Bodypart = await this.$getBodyPart(this.$route.query.trialId)
     this.uploadQueues = []
     this.OSSclient.close()
   },
@@ -1125,7 +1125,7 @@ export default {
                               seriesInstanceUid: v.seriesUid,
                               SOPClassUID: o.SOPClassUID,
                               TransferSytaxUID: o.TransferSytaxUID,
-                              MediaStorageSOPInstanceUID:o.MediaStorageSOPInstanceUID,
+                              MediaStorageSOPInstanceUID: o.MediaStorageSOPInstanceUID,
                               MediaStorageSOPClassUID: o.MediaStorageSOPClassUID,
                               sopInstanceUid: o.instanceUid,
                               instanceNumber: o.instanceNumber,
@@ -1210,7 +1210,7 @@ export default {
                                 sopInstanceUid: o.instanceUid,
                                 SOPClassUID: o.SOPClassUID,
                                 TransferSytaxUID: o.TransferSytaxUID,
-                                MediaStorageSOPInstanceUID:o.MediaStorageSOPInstanceUID,
+                                MediaStorageSOPInstanceUID: o.MediaStorageSOPInstanceUID,
                                 MediaStorageSOPClassUID: o.MediaStorageSOPClassUID,
                                 instanceNumber: o.instanceNumber,
                                 instanceTime: o.instanceTime,
diff --git a/src/components/uploadDicomAndNonedicom/nonedicomFile.vue b/src/components/uploadDicomAndNonedicom/nonedicomFile.vue
index 60135769..047f7924 100644
--- a/src/components/uploadDicomAndNonedicom/nonedicomFile.vue
+++ b/src/components/uploadDicomAndNonedicom/nonedicomFile.vue
@@ -295,8 +295,8 @@ export default {
     },
   },
   async created() {
-    this.getList()
     this.BodyPart.Bodypart = await this.$getBodyPart(this.$route.query.trialId)
+    this.getList()
   },
   beforeDestroy() {
     store.dispatch('trials/setUnLock', false)
diff --git a/src/components/uploadDicomAndNonedicom/study-view.vue b/src/components/uploadDicomAndNonedicom/study-view.vue
index 16486b17..4d5eb91e 100644
--- a/src/components/uploadDicomAndNonedicom/study-view.vue
+++ b/src/components/uploadDicomAndNonedicom/study-view.vue
@@ -14,15 +14,7 @@
           <el-table-column prop="BodyPartForEdit" :label="$t('trials:uploadImage:table:BodyPartForEdit')"
             v-if="IsDicom">
             <template slot-scope="scope">
-              <span>{{
-                $fd(
-                  'Bodypart',
-                  scope.row.BodyPartForEdit,
-                  'Code',
-                  { Bodypart: bodyPart },
-                  'Name'
-                )
-              }}</span>
+              <span>{{ getBodyPart(scope.row.BodyPartForEdit, scope.row.BodyPartForEditOther) }}</span>
             </template>
           </el-table-column>
           <!--序列数量-->
@@ -97,9 +89,9 @@ export default {
       },
     },
     bodyPart: {
-      type: Array,
+      type: Object,
       default: () => {
-        return []
+        return {}
       },
     },
     modelList: {
@@ -155,9 +147,6 @@ export default {
       BodyPart: {}
     }
   },
-  async created() {
-    this.BodyPart.Bodypart = await this.$getBodyPart(this.$route.query.trialId)
-  },
   methods: {
     // 预览
     preview(row) {
@@ -215,8 +204,9 @@ export default {
         separator = '，'
       }
       var arr = bodyPart.split(separator)
+      console.log(this.bodyPart)
       var newArr = arr.map((i) => {
-        return this.$fd('Bodypart', i.trim(), 'Code', this.BodyPart, 'Name')
+        return this.$fd('Bodypart', i.trim(), 'Code', this.bodyPart, 'Name')
       })
       if (other) {
         newArr.push(other)
diff --git a/src/views/none-dicom-show/index.vue b/src/views/none-dicom-show/index.vue
index ba6c881e..ec4b07c0 100644
--- a/src/views/none-dicom-show/index.vue
+++ b/src/views/none-dicom-show/index.vue
@@ -15,7 +15,7 @@
                   {{ study.StudyName }}
                 </span>
                 <span style="margin: 0 5px">{{ study.Modality }}</span>
-                <span>{{ getBodyPart(scope.row.BodyPart, scope.row.BodyPartForEditOther) }}</span>
+                <span>{{ getBodyPart(study.BodyPart, study.BodyPartForEditOther) }}</span>
               </div>
             </template>
             <!-- 文件层级 -->
diff --git a/src/views/trials/trials-panel/reading/dicoms/none-dicoms.vue b/src/views/trials/trials-panel/reading/dicoms/none-dicoms.vue
index 5420a69f..a0273280 100644
--- a/src/views/trials/trials-panel/reading/dicoms/none-dicoms.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/none-dicoms.vue
@@ -11,7 +11,7 @@
           <div class="study-desc">
             <span>{{ study.CodeView }}</span>
             <span style="margin:0 5px">{{ study.Modality }}</span>
-            <span>{{ getBodyPart(scope.row.BodyPart, scope.row.BodyPartForEditOther) }}</span>
+            <span>{{ getBodyPart(study.BodyPart, study.BodyPartForEditOther) }}</span>
           </div>
           <!-- 文件层级 -->
           <div v-if="study.NoneDicomStudyFileList.length === 0" class="empty-text">
diff --git a/src/views/trials/trials-panel/reading/none-dicoms/components/VisitReview.vue b/src/views/trials/trials-panel/reading/none-dicoms/components/VisitReview.vue
index 098c5a13..5146bfe9 100644
--- a/src/views/trials/trials-panel/reading/none-dicoms/components/VisitReview.vue
+++ b/src/views/trials/trials-panel/reading/none-dicoms/components/VisitReview.vue
@@ -13,7 +13,7 @@
               <div class="study-desc">
                 <span>{{ study.CodeView }}</span>
                 <span style="margin:0 5px">{{ study.Modality }}</span>
-                <span>{{ getBodyPart(scope.row.BodyPart, scope.row.BodyPartForEditOther) }}</span>
+                <span>{{ getBodyPart(study.BodyPart, study.BodyPartForEditOther) }}</span>
               </div>
               <!-- 文件层级 -->
               <div v-if="study.NoneDicomStudyFileList.length === 0" class="empty-text">