1

src/utils/dcmUpload/anonymization.js

@@ -57,7 +57,7 @@ export const anonymization = function (file, config) {
         }
 
         try {
-          let newDicomFile = dataset.write({ fragmentMultiframe: false }) // fragmentMultiframe 原始数据是否进行分割
+          let newDicomFile = dataset.write() // fragmentMultiframe 原始数据是否进行分割
           const bufferArray = new Uint8Array(newDicomFile)
           const blob = new Blob([bufferArray], { type: 'application/octet-stream' })
           resolve({ blob, pixelDataElement })

src/views/trials/trials-panel/visit/qc-check/components/qualityAssurance.vue

@@ -49,8 +49,8 @@
               <el-button v-if="
                 $store.state.trials.config.IsSupportQCDownloadImage &&
                 !hasPermi(['role:spm'])
-              " :loading="downloading" :disabled="selectTableDicom.length <= 0" size="small"
+              " :loading="downloading" :disabled="selectTableDicom.length <= 0" size="small" type="primary"
-                type="primary" style="margin-left: 10px" @click="getCRCUploadedStudyInfo('dicom')">
+                style="margin-left: 10px" @click="getCRCUploadedStudyInfo('dicom')">
                 {{ $t('trials:audit:button:downLoadAllDiocms') }}
               </el-button>
               <!-- 预览所有影像 -->
@@ -247,8 +247,8 @@
               <el-button v-if="
                 $store.state.trials.config.IsSupportQCDownloadImage &&
                 !hasPermi(['role:spm'])
-              " :loading="downloading" :disabled="selectTableNonedicom.length <= 0"
+              " :loading="downloading" :disabled="selectTableNonedicom.length <= 0" size="small" type="primary"
-                size="small" type="primary" style="margin-left: 10px" @click="getCRCUploadedStudyInfo('noneDicom')">
+                style="margin-left: 10px" @click="getCRCUploadedStudyInfo('noneDicom')">
                 {{ $t('trials:audit:button:downLoadAllNonDiocms') }}
               </el-button>
               <!-- 预览 -->
@@ -1139,6 +1139,7 @@ export default {
         this.downloading = true
         let res = await getCRCUploadedStudyInfo(data)
         this.downloading = false
+        return
         if (res.IsSuccess) {
           this.downloadId = res.OtherInfo
           this.downloadImage(res.Result, type)
@@ -1176,17 +1177,29 @@ export default {
         )}.zip`
         let StudyList = data.StudyList
         StudyList.forEach((study) => {
+          if (study.StudyDIRPath) {
+            let obj = {
+              name: `${data.SubjectCode}_${data.VisitName}_${this.$fd(
+                'IsDicom',
+                true
+              )}/${study.StudyCode}_${study.StudyTime.split(' ')[0]}/DICOMDIR`,
+              url: this.OSSclientConfig.basePath + series.StudyDIRPath,
+            }
+            files.push(obj)
+          }
           if (study.SeriesList.length > 0) {
             study.SeriesList.forEach((series) => {
               if (series.InstanceList.length > 0) {
                 series.InstanceList.forEach((instance) => {
                   let fileName = instance.Path.split('/').pop()
+                  if (instance.FileName) {
+                    fileName = instance.FileName
+                  }
                   let obj = {
                     name: `${data.SubjectCode}_${data.VisitName}_${this.$fd(
                       'IsDicom',
                       true
-                    )}/${study.StudyCode}_${study.StudyTime.split(' ')[0]}_${series.Modality
+                    )}/${study.StudyCode}_${study.StudyTime.split(' ')[0]}/IMAGE/${fileName}`,
-                      }/${fileName}`,
                     url: this.OSSclientConfig.basePath + instance.Path,
                   }
                   files.push(obj)