diff --git a/src/views/trials/trials-panel/reading/dicoms3D/components/ReadPage.vue b/src/views/trials/trials-panel/reading/dicoms3D/components/ReadPage.vue index 0f0b0da0..b019dd7a 100644 --- a/src/views/trials/trials-panel/reading/dicoms3D/components/ReadPage.vue +++ b/src/views/trials/trials-panel/reading/dicoms3D/components/ReadPage.vue @@ -1600,7 +1600,7 @@ export default { } else { annotations[idx].data.label = obj.name } - + annotations[idx].data.status = obj.status const renderingEngine = getRenderingEngine(renderingEngineId) const viewportId = `${this.viewportKey}-${this.activeViewportIndex}` const viewport = renderingEngine.getViewport(viewportId) @@ -1614,7 +1614,8 @@ export default { } const textLines = [] if (data.label) { - textLines.push(data.label) + // textLines.push(data.label) + textLines.push(data.status ? `${data.label}(${data.status})` : data.label) } textLines.push(`${parseFloat(length).toFixed(this.digitPlaces)} ${unit}`) return textLines @@ -1676,7 +1677,7 @@ export default { const textLines = [] if (data.label) { - textLines.push(data.label) + textLines.push(data.status ? `${data.label}(${data.status})` : data.label) } // textLines.push(`Area: ${parseFloat(area).toFixed(this.digitPlaces)} ${areaUnit}`) @@ -1695,7 +1696,8 @@ export default { // textLines.push(label); // } if (label) { - textLines.push(label) + // textLines.push(label) + textLines.push(data.status ? `${label}(${data.status})` : label) } if (length === undefined) { return textLines @@ -1725,7 +1727,8 @@ export default { } = cachedVolumeStats const textLines = [] if (data.label) { - textLines.push(data.label) + // textLines.push(data.label) + textLines.push(data.status ? `${data.label}(${data.status})` : data.label) } if (radius) { diff --git a/src/views/trials/trials-panel/reading/dicoms3D/components/Recist/QuestionList.vue b/src/views/trials/trials-panel/reading/dicoms3D/components/Recist/QuestionList.vue index b5f4bba0..2fcda215 100644 --- a/src/views/trials/trials-panel/reading/dicoms3D/components/Recist/QuestionList.vue +++ b/src/views/trials/trials-panel/reading/dicoms3D/components/Recist/QuestionList.vue @@ -543,11 +543,8 @@ export default { } } this.$set(this.innerFormData[`${tableId}_${rowIndex}`], 'SaveTypeEnum', innerForm.RowId ? 1 : 0) - this.$emit('setMarkName', { - annotationUID: annotation.annotationUID, - name: this.innerFormData[`${tableId}_${rowIndex}`].LesionName - } - ) + this.setMarkName(this.innerFormData[`${tableId}_${rowIndex}`].LesionType, this.innerFormData[`${tableId}_${rowIndex}`][stateId], this.innerFormData[`${tableId}_${rowIndex}`].LesionName, annotation) + } } else { if (this.isBaseLineTask) { @@ -628,9 +625,24 @@ export default { } } } + this.setMarkName(this.innerFormData[`${tableId}_${rowIndex}`].LesionType, this.innerFormData[`${tableId}_${rowIndex}`][stateId], this.innerFormData[`${tableId}_${rowIndex}`].LesionName, annotation) this.$set(this.innerFormData[`${tableId}_${rowIndex}`], 'SaveTypeEnum', formData.RowId ? 1 : 0) this.activeName = `${tableId}_${rowIndex}` }, + setMarkName(lesionType, lesionState, lesionName, annotation) { + let status = '' + if (lesionType === 0 && lesionState === 1) { + status = 'T' + } + if ((lesionType === 0 && lesionState === 3) || (lesionType === 1 && lesionState === 3) || (lesionType === 2 && lesionState === 3)) { + status = 'D' + } + this.$emit('setMarkName', { + annotationUID: annotation.annotationUID, + name: lesionName, + status + }) + }, // 新增病灶 addTarget(tableInfo, annotation) { // 判断是否存在未保存的病灶,否则不允许添加 @@ -1374,6 +1386,11 @@ export default { if (obj.questionMark === 7) { this.$set(this.innerFormData[`${obj.tableId}_${obj.rowIndex}`], 'LesionState', obj.val) + let annotation = this.innerFormData[`${obj.tableId}_${obj.rowIndex}`].MeasureData + if (annotation) { + this.setMarkName(this.innerFormData[`${obj.tableId}_${obj.rowIndex}`].LesionType, obj.val, this.innerFormData[`${obj.tableId}_${obj.rowIndex}`].LesionName, annotation) + } + } if (obj.questionMark === 8) { this.$set(this.innerFormData[`${obj.tableId}_${obj.rowIndex}`], 'LesionPart', obj.val) diff --git a/src/views/trials/trials-panel/reading/dicoms3D/components/mRecist/QuestionList.vue b/src/views/trials/trials-panel/reading/dicoms3D/components/mRecist/QuestionList.vue index 60b3acf5..b376bb43 100644 --- a/src/views/trials/trials-panel/reading/dicoms3D/components/mRecist/QuestionList.vue +++ b/src/views/trials/trials-panel/reading/dicoms3D/components/mRecist/QuestionList.vue @@ -555,11 +555,11 @@ export default { } } this.$set(this.innerFormData[`${tableId}_${rowIndex}`], 'SaveTypeEnum', innerForm.RowId ? 1 : 0) - this.$emit('setMarkName', { - annotationUID: annotation.annotationUID, - name: this.innerFormData[`${tableId}_${rowIndex}`].LesionName - } - ) + // this.$emit('setMarkName', { + // annotationUID: annotation.annotationUID, + // name: this.innerFormData[`${tableId}_${rowIndex}`].LesionName + // }) + this.setMarkName(this.innerFormData[`${tableId}_${rowIndex}`].LesionType, this.innerFormData[`${tableId}_${rowIndex}`][stateId], this.innerFormData[`${tableId}_${rowIndex}`].LesionName, annotation) } } else { if (this.isBaseLineTask) { @@ -644,9 +644,24 @@ export default { } } } + this.setMarkName(this.innerFormData[`${tableId}_${rowIndex}`].LesionType, this.innerFormData[`${tableId}_${rowIndex}`][stateId], this.innerFormData[`${tableId}_${rowIndex}`].LesionName, annotation) this.$set(this.innerFormData[`${tableId}_${rowIndex}`], 'SaveTypeEnum', formData.RowId ? 1 : 0) this.activeName = `${tableId}_${rowIndex}` }, + setMarkName(lesionType, lesionState, lesionName, annotation) { + let status = '' + if (lesionType === 0 && lesionState === 1) { + status = 'T' + } + if ((lesionType === 0 && lesionState === 3) || (lesionType === 1 && lesionState === 3) || (lesionType === 2 && lesionState === 3)) { + status = 'D' + } + this.$emit('setMarkName', { + annotationUID: annotation.annotationUID, + name: lesionName, + status + }) + }, // 新增病灶 addTarget(tableInfo, annotation) { // 判断是否存在未保存的病灶,否则不允许添加 @@ -721,8 +736,7 @@ export default { this.$emit('setMarkName', { annotationUID: annotation.annotationUID, name: answer.LesionName - } - ) + }) } this.$set(this.innerFormData, `${tableInfo.Id}_${answer.RowIndex}`, {}) for (const key in answer) { @@ -1462,6 +1476,10 @@ export default { if (obj.questionMark === 7) { this.$set(this.innerFormData[`${obj.tableId}_${obj.rowIndex}`], 'LesionState', obj.val) + let annotation = this.innerFormData[`${obj.tableId}_${obj.rowIndex}`].MeasureData + if (annotation) { + this.setMarkName(this.innerFormData[`${obj.tableId}_${obj.rowIndex}`].LesionType, obj.val, this.innerFormData[`${obj.tableId}_${obj.rowIndex}`].LesionName, annotation) + } } if (obj.questionMark === 8) { this.$set(this.innerFormData[`${obj.tableId}_${obj.rowIndex}`], 'LesionPart', obj.val)