XCKJ
/
irc_web
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

靶段标注问题修改
continuous-integration/drone/push Build encountered an error Details

uat
wangxiaoshuang 2025-11-26 14:57:44 +08:00
parent 8aa067e52f
commit c675e21c40
4 changed files with 34 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/components/downloadDicomAndNonedicom/index.vue
View File

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

26
src/components/uploadDicomAndNonedicom/dicomFile.vue
View File

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

20
src/components/uploadDicomAndNonedicom/nonedicomFile.vue
View File

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

2
src/views/dicom-show/dicom-visit.vue
View File

@ -364,7 +364,7 @@ export default {
try { try {
let res = null let res = null
if (this.page === 'upload') { 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') { } else if (this.page === 'download') {
res = await getVisitStudyList(this.trialId, this.subjectVisitId, this.isReading, this.visitTaskId) res = await getVisitStudyList(this.trialId, this.subjectVisitId, this.isReading, this.visitTaskId)
} else { } else {