diff --git a/src/views/trials/trials-panel/reading/dicoms/components/MRIPDFF/QuestionForm.vue b/src/views/trials/trials-panel/reading/dicoms/components/MRIPDFF/QuestionForm.vue index 3dfe995c..dd6ceaf5 100644 --- a/src/views/trials/trials-panel/reading/dicoms/components/MRIPDFF/QuestionForm.vue +++ b/src/views/trials/trials-panel/reading/dicoms/components/MRIPDFF/QuestionForm.vue @@ -333,7 +333,12 @@ export default { this.markList.push({tableQuestionId: i.TableQuestionId, measureData: i, saveEnum: 1}) }) } - + const mean = this.getQuestionVal(1104) + let newMean = this.getMean() + if (newMean !== mean) { + let meanId = this.getQuestionId(1104) + this.$set(this.questionForm, meanId, newMean ? newMean : '') + } this.isRender = true // loading.close() }, @@ -398,10 +403,12 @@ export default { }, getMean() { let mean = null + let isMeasurable = this.getQuestionVal(1105) + isMeasurable = !isNaN(parseInt(isMeasurable)) ? parseInt(isMeasurable) : null let l1 = this.getQuestionVal(1101) let l2 = this.getQuestionVal(1102) let l3 = this.getQuestionVal(1103) - if (!isNaN(parseFloat(l1)) && !isNaN(parseFloat(l2)) && !isNaN(parseFloat(l3))) { + if ( isMeasurable && !isNaN(parseFloat(l1)) && !isNaN(parseFloat(l2)) && !isNaN(parseFloat(l3))) { const sum = l1 + l2 + l3 mean = sum / 3 } @@ -701,7 +708,7 @@ export default { const loading = this.$loading({ fullscreen: true }) try { - let isResetMarks = this.markList.findIndex(i=>i.measureData && i.measureData.MeasureData) > -1 ? true : false + // let isResetMarks = this.markList.findIndex(i=>i.measureData && i.measureData.MeasureData) > -1 ? true : false if (parseInt(this.questionForm[this.isMeasurableId]) === 0 && this.isExitsMarks) { await deleteTableQuestionMark({rowId: this.questionForm.RowId}, 11) this.markList.forEach(i => { @@ -744,11 +751,9 @@ export default { this.$emit('close') DicomEvent.$emit('getReportInfo', true) DicomEvent.$emit('setMeasuredToolsPassive') - if (parseInt(this.questionForm[this.isMeasurableId]) === 0 && isResetMarks) { - // this.$emit('getReadingQuestionAndAnswer') - await store.dispatch('reading/refreshMeasuredData', this.visitTaskId) - DicomEvent.$emit('getMeasureData') - } + // await store.dispatch('reading/refreshMeasuredData', this.visitTaskId) + // DicomEvent.$emit('getMeasureData') + this.$emit('getReadingQuestionAndAnswer') } loading.close() } catch (e) {