From e043e85630021e1f1ac8bfd6833935115c101578 Mon Sep 17 00:00:00 2001
From: "DESKTOP-6C3NK6N\\WXS" <815034831@qq.com>
Date: Fri, 6 Sep 2024 20:09:26 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E5=90=8D=E7=A7=B0=E6=A0=BC?=
 =?UTF-8?q?=E5=BC=8F=E5=8C=96=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/uploadDicomAndNonedicom/nonedicomFile.vue   | 5 ++++-
 .../visit/crc-upload/components/uploadDicomFiles2.vue      | 4 +---
 .../visit/crc-upload/components/uploadNonDicomFiles.vue    | 7 +++++--
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/components/uploadDicomAndNonedicom/nonedicomFile.vue b/src/components/uploadDicomAndNonedicom/nonedicomFile.vue
index 6eb6e95b..a928bdbf 100644
--- a/src/components/uploadDicomAndNonedicom/nonedicomFile.vue
+++ b/src/components/uploadDicomAndNonedicom/nonedicomFile.vue
@@ -645,7 +645,10 @@ export default {
       file.status = 1
       let path = `/${this.$route.query.trialId}/TaskImage/${
         this.currentRow.SubjectId
-      }/${this.currentRow.VisitTaskId}/${new Date().getTime()}_${file.name}`
+      }/${this.currentRow.VisitTaskId}/${new Date().getTime()}${file.name
+        .substring(file.name.lastIndexOf('.'))
+        .toLocaleLowerCase()}`
+      console.log(path)
       const fileData = await this.fileToBlob(file.file)
       let res = await this.fileToOss(path, fileData, file)
       if (res) {
diff --git a/src/views/trials/trials-panel/visit/crc-upload/components/uploadDicomFiles2.vue b/src/views/trials/trials-panel/visit/crc-upload/components/uploadDicomFiles2.vue
index cee25238..991d3103 100644
--- a/src/views/trials/trials-panel/visit/crc-upload/components/uploadDicomFiles2.vue
+++ b/src/views/trials/trials-panel/visit/crc-upload/components/uploadDicomFiles2.vue
@@ -1679,9 +1679,7 @@ export default {
                             dicomInfo.failedFileCount++
                             Record.FileCount++
                           } else {
-                            let path = `/${params.trialId}/Image/${
-                              params.trialSiteId
-                            }/${params.subjectId}/${params.subjectVisitId}/${
+                            let path = `/${params.trialId}/Image/${params.subjectId}/${params.subjectVisitId}/${
                               dicomInfo.studyUid
                             }/${scope.getGuid(
                               dicomInfo.studyUid +
diff --git a/src/views/trials/trials-panel/visit/crc-upload/components/uploadNonDicomFiles.vue b/src/views/trials/trials-panel/visit/crc-upload/components/uploadNonDicomFiles.vue
index 4b5a3e63..c4a4eb80 100644
--- a/src/views/trials/trials-panel/visit/crc-upload/components/uploadNonDicomFiles.vue
+++ b/src/views/trials/trials-panel/visit/crc-upload/components/uploadNonDicomFiles.vue
@@ -587,6 +587,7 @@ export default {
     }
   },
   async mounted() {
+    console.log(this.data)
     this.BodyPart.Bodypart = await this.$getBodyPart(this.$route.query.trialId)
     this.getNoneDicomList()
     this.trialBodyPartTypes = this.bodyParts ? this.bodyParts.split('|') : []
@@ -947,8 +948,10 @@ export default {
       let file = this.fileList.filter((item) => item.id === arr[index].id)[0]
       file.status = 1
       let path = `/${this.trialId}/Image/${this.data.SubjectId}/${
-        this.data.VisitName
-      }/${new Date().getTime()}_${file.name}`
+        this.data.Id
+      }/${new Date().getTime()}${file.name
+        .substring(file.name.lastIndexOf('.'))
+        .toLocaleLowerCase()}`
       const fileData = await this.fileToBlob(file.file)
       let res = await this.fileToOss(path, fileData, file)
       if (res) {