靶段标注问题修改

src/components/downloadDicomAndNonedicom/index.vue

@@ -35,8 +35,7 @@
       <el-table-column :label="$t('download:table:subjectCode')" min-width="130" prop="SubjectCode"
         show-overflow-tooltip />
       <!--访视名称-->
-      <el-table-column prop="VisitName" :label="$t('download:table:VisitName')" sortable="custom"
-        v-if="IsImageSegment" />
+      <el-table-column prop="VisitName" :label="$t('download:table:VisitName')" sortable v-if="IsImageSegment" />
       <!--任务名称-->
       <el-table-column :label="$t('download:table:taskName')" min-width="130" show-overflow-tooltip prop="TaskBlindName"
         sortable v-else />
@@ -307,7 +306,7 @@ export default {
       let files = [],
         name = `${list[0].SubjectCode}_${new Date().getTime()}.zip`
       if (this.IsImageSegment) {
-        name = `${list[0].SubjectCode}_${list[0].VisitName}.zip`
+        name = `${list[0].SubjectCode}.zip`
       } else {
         if (this.IsReadingTaskViewInOrder === 1) {
           name = `${list[0].SubjectCode}_${list[0].TaskBlindName}.zip`

src/components/uploadDicomAndNonedicom/dicomFile.vue

@@ -11,8 +11,10 @@
     <el-table :data="list" style="width: 100%" height="300" :loading="loading">
       <!--受试者-->
       <el-table-column prop="SubjectCode" :label="$t('upload:dicom:table:subjectCode')" />
+      <!--访视名称-->
+      <el-table-column prop="VisitName" :label="$t('download:table:VisitName')" v-if="IsImageSegment" />
       <!--任务名称-->
-      <el-table-column prop="TaskBlindName" :label="$t('upload:dicom:table:taskBlindName')" />
+      <el-table-column prop="TaskBlindName" :label="$t('upload:dicom:table:taskBlindName')" v-else />
       <!--原始检查数-->
       <el-table-column prop="OrginalStudyList" :label="$t('upload:dicom:table:orginalStudyListNum')">
         <template slot-scope="scope">
@@ -445,10 +447,10 @@ export default {
           params.VisitTaskId = this.TaskId
         }
         if (this.IsImageSegment) {
-          this.searchData.IsImageSegmentLabel = true
+          params.IsImageSegmentLabel = true
         }
         else if (this.Criterion.CriterionType == 19 || this.Criterion.CriterionType == 20) {
-          this.searchData.IsImageSegmentLabel = false
+          params.IsImageSegmentLabel = false
         }
         this.loading = true
         let res = await getSubjectImageUploadList(params)
@@ -531,7 +533,7 @@ export default {
     // 打开弹窗
     handleOpenDialog(item, list, isUpload = false) {
       this.openIsUpload = isUpload
-      this.model_cfg.title = `${item.SubjectCode || ''} > ${item.TaskBlindName}`
+      this.model_cfg.title = `${item.SubjectCode || ''} > ${this.IsImageSegment ? item.VisitName : item.TaskBlindName}`
       this.modelList = item[list]
       this.model_cfg.visible = true
     },
@@ -578,7 +580,7 @@ export default {
           let item = checkFiles[i]
           var dicom = await parseDicom(item, ['StudyInstanceUid', 'Modality'])
           if (!dicom.StudyInstanceUid) continue
-          if (this.IsImageSegment && dicom.Modality !== 'US') continue
+          if (this.IsImageSegment && dicom.Modality !== 'IVUS') continue
           let has = true,
             has2 = false,
             has3 = false
@@ -632,8 +634,8 @@ export default {
         if (this.errStudyUidList && this.errStudyUidList.length > 0) {
           for (let i = 0; i < checkFiles.length; i++) {
             let item = checkFiles[i]
-            var dicom = await parseDicom(item, 'StudyInstanceUid')
-            if (!!~this.errStudyUidList.indexOf(dicom.StudyInstanceUid)) {
+            var dicom = await parseDicom(item, ['StudyInstanceUid', 'Modality'])
+            if (!!~this.errStudyUidList.indexOf(dicom.StudyInstanceUid) || (this.IsImageSegment && dicom.Modality !== 'IVUS')) {
               this.hasOtherStudy = true
               checkFiles.splice(i, 1)
               i--
@@ -1168,7 +1170,7 @@ export default {
                                 o.instanceUid +
                                 params.trialId
                               )}`
-                            if (this.IsImageSegment) {
+                            if (scope.IsImageSegment) {
                               path = `/${params.trialId}/Image/${params.subjectId
                                 }/${params.subjectVisitId}/AnnotationImage/${dicomInfo.visitTaskId
                                 }/${scope.getGuid(
@@ -1211,7 +1213,7 @@ export default {
                                     o.imageRows
                                   )
                                   let thumbnailPath = `/${params.trialId}/Image/${params.subjectId}/${params.subjectVisitId}/${dicomInfo.visitTaskId}/${dicomInfo.studyUid}/${v.seriesUid}.jpg`
-                                  if (this.IsImageSegment) {
+                                  if (scope.IsImageSegment) {
                                     thumbnailPath = `/${params.trialId}/Image/${params.subjectId}/${params.subjectVisitId}/AnnotationImage/${dicomInfo.visitTaskId}/${dicomInfo.studyUid}/${v.seriesUid}.jpg`
                                   }
                                   let OSSclient = scope.OSSclient
@@ -1305,7 +1307,7 @@ export default {
               let text = JSON.stringify(Record)
               let logJsonBlob = scope.generateTxtFile(text)
               let logJsonObjectName = `/${params.trialId}/Image/${params.subjectId}/${params.subjectVisitId}/${dicomInfo.visitTaskId}/${dicomInfo.studyUid}/${params.studyMonitorId}.txt`
-              if (this.IsImageSegment) {
+              if (scope.IsImageSegment) {
                 logJsonObjectName = `/${params.trialId}/Image/${params.subjectId}/${params.subjectVisitId}/AnnotationImage/${dicomInfo.visitTaskId}/${dicomInfo.studyUid}/${params.studyMonitorId}.txt`
               }
               let logRes
@@ -1336,7 +1338,7 @@ export default {
                     v.instanceList[0].imageRows
                   )
                   let thumbnailPath = `/${params.trialId}/Image/${params.subjectId}/${params.subjectVisitId}/${dicomInfo.studyUid}/${v.seriesUid}.jpg`
-                  if (this.IsImageSegment) {
+                  if (scope.IsImageSegment) {
                     thumbnailPath = `/${params.trialId}/Image/${params.subjectId}/${params.subjectVisitId}/AnnotationImage/${dicomInfo.studyUid}/${v.seriesUid}.jpg`
                   }
                   let OSSclient = scope.OSSclient
@@ -1356,7 +1358,7 @@ export default {
                 if (scope.isClose) return false
                 console.log(params)
                 params.VisitTaskId = dicomInfo.visitTaskId
-                if (this.IsImageSegment) {
+                if (scope.IsImageSegment) {
                   params.IsImageSegmentLabel = true
                 }
                 addOrUpdateArchiveTaskStudy(params)

src/components/uploadDicomAndNonedicom/nonedicomFile.vue

@@ -4,7 +4,10 @@
       <span>{{ $t('upload:nonedicom:title') }}</span>
       <div class="tip">
         <i class="el-icon-warning-outline"></i>
-        <div v-html="$t('upload:nonedicom:tip:message')"></div>
+        <div v-html="$t('upload:nonedicom:tip:message').replace(
+          'xxx',
+          relationInfo.ImageFormatList.join('、')
+        )"></div>
       </div>
     </div>
     <!--检查列表-->
@@ -131,7 +134,10 @@
       <!-- 多文件上传 -->
       <form id="inputForm" ref="uploadForm">
         <el-divider content-position="left">{{
-          $t('trials:uploadNonDicoms:label:fileType')
+          $t('trials:uploadNonDicoms:label:fileType').replace(
+            'xxx',
+            relationInfo.ImageFormatList.join('、')
+          )
         }}</el-divider>
         <div class="form-group">
           <div class="upload" style="margin-right: 10px">
@@ -273,7 +279,10 @@ export default {
       currentRow: {},
       studyMonitorId: null,
       open: null,
-      BodyPart: {}
+      BodyPart: {},
+      relationInfo: {
+        ImageFormatList: []
+      }
     }
   },
   watch: {
@@ -329,6 +338,11 @@ export default {
         this.loading = false
         if (res.IsSuccess) {
           this.list = res.Result
+          this.relationInfo = res.OtherInfo
+          this.faccept = []
+          this.relationInfo.ImageFormatList.forEach((item) => {
+            this.faccept.push(`.${item}`)
+          })
         }
       } catch (err) {
         this.loading = false

src/views/dicom-show/dicom-visit.vue

@@ -364,7 +364,7 @@ export default {
       try {
         let res = null
         if (this.page === 'upload') {
-          res = await getTaskUploadedDicomStudyList({ visitTaskId: this.visitTaskId })
+          res = await getTaskUploadedDicomStudyList({ visitTaskId: this.visitTaskId !== 'undefined' ? this.visitTaskId : null, subjectVisitId: this.subjectVisitId })
         } else if (this.page === 'download') {
           res = await getVisitStudyList(this.trialId, this.subjectVisitId, this.isReading, this.visitTaskId)
         } else {