Compare commits

..

No commits in common. "5328217853b8e7218ed59d8a648468c22dd818f7" and "907371b6935b564906535a97c886af1684305f91" have entirely different histories.

1 changed files with 8 additions and 13 deletions

View File

@ -333,12 +333,7 @@ export default {
this.markList.push({tableQuestionId: i.TableQuestionId, measureData: i, saveEnum: 1}) 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 this.isRender = true
// loading.close() // loading.close()
}, },
@ -403,12 +398,10 @@ export default {
}, },
getMean() { getMean() {
let mean = null let mean = null
let isMeasurable = this.getQuestionVal(1105)
isMeasurable = !isNaN(parseInt(isMeasurable)) ? parseInt(isMeasurable) : null
let l1 = this.getQuestionVal(1101) let l1 = this.getQuestionVal(1101)
let l2 = this.getQuestionVal(1102) let l2 = this.getQuestionVal(1102)
let l3 = this.getQuestionVal(1103) let l3 = this.getQuestionVal(1103)
if ( isMeasurable && !isNaN(parseFloat(l1)) && !isNaN(parseFloat(l2)) && !isNaN(parseFloat(l3))) { if (!isNaN(parseFloat(l1)) && !isNaN(parseFloat(l2)) && !isNaN(parseFloat(l3))) {
const sum = l1 + l2 + l3 const sum = l1 + l2 + l3
mean = sum / 3 mean = sum / 3
} }
@ -708,7 +701,7 @@ export default {
const loading = this.$loading({ fullscreen: true }) const loading = this.$loading({ fullscreen: true })
try { 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) { if (parseInt(this.questionForm[this.isMeasurableId]) === 0 && this.isExitsMarks) {
await deleteTableQuestionMark({rowId: this.questionForm.RowId}, 11) await deleteTableQuestionMark({rowId: this.questionForm.RowId}, 11)
this.markList.forEach(i => { this.markList.forEach(i => {
@ -751,9 +744,11 @@ export default {
this.$emit('close') this.$emit('close')
DicomEvent.$emit('getReportInfo', true) DicomEvent.$emit('getReportInfo', true)
DicomEvent.$emit('setMeasuredToolsPassive') DicomEvent.$emit('setMeasuredToolsPassive')
// await store.dispatch('reading/refreshMeasuredData', this.visitTaskId) if (parseInt(this.questionForm[this.isMeasurableId]) === 0 && isResetMarks) {
// DicomEvent.$emit('getMeasureData') // this.$emit('getReadingQuestionAndAnswer')
this.$emit('getReadingQuestionAndAnswer') await store.dispatch('reading/refreshMeasuredData', this.visitTaskId)
DicomEvent.$emit('getMeasureData')
}
} }
loading.close() loading.close()
} catch (e) { } catch (e) {