diff --git a/src/views/trials/trials-panel/reading/dicoms3D/components/customize/QuestionList.vue b/src/views/trials/trials-panel/reading/dicoms3D/components/customize/QuestionList.vue index 3cf90213..245a8aa9 100644 --- a/src/views/trials/trials-panel/reading/dicoms3D/components/customize/QuestionList.vue +++ b/src/views/trials/trials-panel/reading/dicoms3D/components/customize/QuestionList.vue @@ -944,12 +944,17 @@ export default { && Object.prototype.hasOwnProperty.call(cachedStats, prop) if (!hasProp) return null let value = cachedStats[prop] - if (this.isNoneDicom && annotation.ps) { + if (this.isNoneDicom && annotation.ps && value !== null) { let ps = annotation.ps - if (prop === 'area') value = this.reRound(csUtils.roundNumber(value * ps * ps), this.digitPlaces) - if (prop === 'length' || prop === 'perimeter') value = this.reRound(csUtils.roundNumber(value * ps), this.digitPlaces) + if (prop === 'area') { + value = this.reRound(csUtils.roundNumber(value * ps * ps), this.digitPlaces) + } else if (prop === 'length' || prop === 'perimeter') { + value = this.reRound(csUtils.roundNumber(value * ps), this.digitPlaces) + } else { + value = this.reRound(csUtils.roundNumber(value), this.digitPlaces) + } } else if (this.isNoneDicom && value !== null) { - value = this.reRound(csUtils.roundNumber(value)) + value = this.reRound(csUtils.roundNumber(value), this.digitPlaces) } return value !== null ? parseFloat(value).toFixed(this.digitPlaces) @@ -1147,12 +1152,12 @@ export default { } if (!isRemovePlottingScale) { this.questionMarkInfoList.forEach(item => { - if (item.Path === path && ['Length', 'Perimeter', 'Area'].includes(item.MarkTool)) { + let prop = this.questionImageToolAttributeInfo[item.QuestionId] + if (item.Path === path && ['length', 'perimeter', 'area'].includes(prop)) { const referencedImageId = item?.MeasureData?.metadata?.referencedImageId if (!referencedImageId) return null const cacheKey = `imageId:${referencedImageId}` const cachedStats = item?.MeasureData.data?.cachedStats?.[cacheKey] - let prop = item.MarkTool.toLowerCase(); const hasProp = cachedStats && Object.prototype.hasOwnProperty.call(cachedStats, prop) if (!hasProp) return null