diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionList.vue b/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionList.vue index 0ea0d2b2..16cb7e1f 100644 --- a/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionList.vue +++ b/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionList.vue @@ -1118,7 +1118,7 @@ export default { } }, modifyMeasuredData(measureObj) { - if (measureObj.measureData.data.remark === 'Spleen Tip' || measureObj.measureData.data.remark === 'Spleen Floor') { + if (measureObj.measureData.data.remark === 'Spleen Top' || measureObj.measureData.data.remark === 'Spleen Bottom') { this.$refs['ecrf3'].setMeasuredData(measureObj.measureData) this.isNonTargetMeasurement = false } else { @@ -1133,7 +1133,7 @@ export default { }, // 设置测量数据 setMeasuredData(measureData) { - if (this.isNonTargetMeasurement || measureData.data.remark === 'Spleen Tip' || measureData.data.remark === 'Spleen Floor') { + if (this.isNonTargetMeasurement || measureData.data.remark === 'Spleen Top' || measureData.data.remark === 'Spleen Bottom') { this.$refs['ecrf3'].setMeasuredData(measureData) this.isNonTargetMeasurement = false return diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Questions.vue b/src/views/trials/trials-panel/reading/dicoms/components/Questions.vue index 056c9fe2..5c02b2e5 100644 --- a/src/views/trials/trials-panel/reading/dicoms/components/Questions.vue +++ b/src/views/trials/trials-panel/reading/dicoms/components/Questions.vue @@ -74,8 +74,8 @@ export default { spleenStatusId: '', spleenLengthId: '', spleenCommentsId: '', - spleenTipId: '', - spleenFloorId: '', + spleenTopId: '', + spleenBottomId: '', isBaseLineTask: false, criterionType: null, spleenInfo: null, @@ -179,11 +179,11 @@ export default { } if (v.QuestionType === 60) { // 脾尖位置 - this.spleenTipId = v.Id + this.spleenTopId = v.Id } if (v.QuestionType === 61) { // 脾底位置 - this.spleenFloorId = v.Id + this.spleenBottomId = v.Id } } if (v.Childrens.length > 0) { @@ -223,11 +223,11 @@ export default { } if (i.QuestionType === 60) { // 脾尖位置 - this.spleenTipId = i.Id + this.spleenTopId = i.Id } if (i.QuestionType === 61) { // 脾底位置 - this.spleenFloorId = i.Id + this.spleenBottomId = i.Id } } if (i.Childrens && i.Childrens.length > 0) { @@ -409,7 +409,7 @@ export default { const { Id, QuestionType } = obj this.currentQsId = Id var idx = this.measurements.findIndex(i => i.QuestionId === Id) - var orderMarkName = QuestionType === 60 ? 'Spleen Tip' : QuestionType === 61 ? 'Spleen Floor' : '' + var orderMarkName = QuestionType === 60 ? 'Spleen Top' : QuestionType === 61 ? 'Spleen Bottom' : '' if (idx === -1) { this.measurements.push({ QuestionId: Id, QuestionType: QuestionType, StudyId: '', SeriesId: '', InstanceId: '', MarkTool: '', PicturePath: '', NumberOfFrames: '', MeasureData: '', OrderMarkName: orderMarkName }) } @@ -451,7 +451,7 @@ export default { idx = this.measurements.findIndex(i => i.OrderMarkName === measurement.data.remark) } if (idx === -1) return - var remark = this.measurements[idx].QuestionType === 60 ? 'Spleen Tip' : this.measurements[idx].QuestionType === 61 ? 'Spleen Floor' : '' + var remark = this.measurements[idx].QuestionType === 60 ? 'Spleen Top' : this.measurements[idx].QuestionType === 61 ? 'Spleen Bottom' : '' measurement.data.remark = remark this.measurements[idx].StudyId = measurement.studyId this.measurements[idx].SeriesId = measurement.seriesId @@ -505,13 +505,13 @@ export default { getSpleenL() { var length = null // 脾尖位置 - var st = this.questionForm[this.spleenTipId] + var st = this.questionForm[this.spleenTopId] st = isNaN(parseFloat(st)) ? null : parseFloat(st) // 脾底位置 - var sf = this.questionForm[this.spleenFloorId] - sf = isNaN(parseFloat(sf)) ? null : parseFloat(sf) - if (st && sf) { - length = Math.abs(st - sf) + var sb = this.questionForm[this.spleenBottomId] + sb = isNaN(parseFloat(sb)) ? null : parseFloat(sb) + if (st && sb) { + length = Math.abs(st - sb) } return length },