From e52378d5d460b090e5ca39a0393db6e99815ec50 Mon Sep 17 00:00:00 2001
From: "DESKTOP-6C3NK6N\\WXS" <815034831@qq.com>
Date: Thu, 5 Sep 2024 18:01:05 +0800
Subject: [PATCH] =?UTF-8?q?ir=E4=B8=8A=E4=BC=A0dicom?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../uploadDicomAndNonedicom/dicomFile.vue     | 21 +++++++++++++++----
 .../qc-check/components/qualityAssurance.vue  |  4 ++--
 2 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/src/components/uploadDicomAndNonedicom/dicomFile.vue b/src/components/uploadDicomAndNonedicom/dicomFile.vue
index ef54efa9..a7292172 100644
--- a/src/components/uploadDicomAndNonedicom/dicomFile.vue
+++ b/src/components/uploadDicomAndNonedicom/dicomFile.vue
@@ -417,6 +417,7 @@
     <study-view
       v-if="model_cfg.visible"
       :model_cfg="model_cfg"
+      :IsDicom="true"
       :modelList="modelList"
     />
   </div>
@@ -1172,7 +1173,7 @@ export default {
                                     o.imageColumns,
                                     o.imageRows
                                   )
-                                  let thumbnailPath = `/${params.trialId}/Image/${params.trialSiteId}/${params.subjectId}/${params.subjectVisitId}/${dicomInfo.studyUid}/${v.seriesUid}.png`
+                                  let thumbnailPath = `/${params.trialId}/Image/${params.subjectId}/${params.subjectVisitId}/${dicomInfo.visitTaskId}/${dicomInfo.studyUid}/${v.seriesUid}.png`
                                   let OSSclient = scope.OSSclient
                                   let seriesRes = await OSSclient.put(
                                     thumbnailPath,
@@ -1257,7 +1258,7 @@ export default {
               }
               let text = JSON.stringify(Record)
               let logJsonBlob = scope.generateTxtFile(text)
-              let logJsonObjectName = `/${params.trialId}/Image/${params.trialSiteId}/${params.subjectId}/${params.subjectVisitId}/${dicomInfo.studyUid}/${params.studyMonitorId}.txt`
+              let logJsonObjectName = `/${params.trialId}/Image/${params.subjectId}/${params.subjectVisitId}/${dicomInfo.visitTaskId}/${dicomInfo.studyUid}/${params.studyMonitorId}.txt`
               let logRes
               try {
                 logRes = await scope.OSSclient.put(
@@ -1302,7 +1303,7 @@ export default {
                 params.RecordPath = scope.$getObjectName(logRes.url)
                 if (scope.isClose) return false
                 console.log(params)
-                params.VisitTaskId = dicomInfo.VisitTaskId
+                params.VisitTaskId = dicomInfo.visitTaskId
                 addOrUpdateArchiveTaskStudy(params)
                   .then((res) => {
                     if (dicomInfo.failedFileCount === dicomInfo.fileCount) {
@@ -1336,7 +1337,8 @@ export default {
                 resolve()
               }
             })
-            .catch(() => {
+            .catch((err) => {
+              console.log(err)
               let Record = {
                 Failed: [],
                 Existed: [],
@@ -1376,6 +1378,17 @@ export default {
         reason()
       })
     },
+    canvasToBlob(canvas) {
+      return new Promise((resolve) => {
+        canvas.toBlob((blob) => {
+          resolve(blob)
+        })
+      })
+    },
+    generateTxtFile(text) {
+      let blob = new Blob(['\ufeff', text], { type: 'text/plain' })
+      return blob
+    },
   },
 }
 </script>
diff --git a/src/views/trials/trials-panel/visit/qc-check/components/qualityAssurance.vue b/src/views/trials/trials-panel/visit/qc-check/components/qualityAssurance.vue
index 408326c0..50b31011 100644
--- a/src/views/trials/trials-panel/visit/qc-check/components/qualityAssurance.vue
+++ b/src/views/trials/trials-panel/visit/qc-check/components/qualityAssurance.vue
@@ -1467,7 +1467,7 @@ export default {
                     name: `${data.SubjectCode}_${data.VisitName}_${this.$fd(
                       'IsDicom',
                       true
-                    )}/${study.StudyCode}_${study.StudyTime}_${
+                    )}/${study.StudyCode}_${study.StudyTime.split(" ")[0]}_${
                       series.Modality
                     }/${fileName}`,
                     url: this.OSSclientConfig.basePath + instance.Path,
@@ -1504,7 +1504,7 @@ export default {
                 name: `${data.SubjectCode}_${data.VisitName}_${this.$fd(
                   'IsDicom',
                   true
-                )}/${study.StudyCode}_${study.ImageDate}_${study.Modality}/${
+                )}/${study.StudyCode}_${study.ImageDate.split(" ")[0]}_${study.Modality}/${
                   item.FileName
                 }`,
                 url: this.OSSclientConfig.basePath + item.Path,