Compare commits

..

No commits in common. "c2f3e02ef1e2ecf07c87ff7e9c89c714408f7aef" and "faaaf8f28f182823c3946732c1699ba0b9560ff9" have entirely different histories.

2 changed files with 1 additions and 23 deletions

View File

@ -1102,7 +1102,6 @@ export default {
annotation.studyId = series.StudyId
annotation.seriesId = series.Id
annotation.instanceId = params.instanceId
annotation.sliceThickness = series.SliceThickness
annotation.numberOfFrames = isNaN(parseInt(params.frame)) ? null : parseInt(params.frame)
annotation.markTool = annotation.metadata.toolName
this.$refs['ecrf'].setAnnotation({ annotation, toolName: annotation.metadata.toolName })

View File

@ -724,7 +724,6 @@ export default {
this.$set(this.innerFormData[`${table.Id}_${rowIndex}`], 'MeasureData', null)
//
this.$set(this.innerFormData[`${table.Id}_${rowIndex}`], 'SaveTypeEnum', innerForm.RowId ? 1 : 0)
this.$refs[`${table.Id}_${rowIndex}`][0].getOrganList()
},
//
async deleteLesion(table, rowIndex) {
@ -817,7 +816,7 @@ export default {
}
} else {
// 10mm2
if (!(measureData && measureData.markTool === 'Length' && lesionLength >= 10 && (measureData.sliceThickness && lesionLength >= 2 * measureData.sliceThickness || !measureData.sliceThickness))) {
if (!(measureData && measureData.markTool === 'Length' && lesionLength >= 10 && (measureData.thick && lesionLength >= 2 * measureData.thick || !measureData.thick))) {
// 使10mm2
this.$confirm(this.$t('trials:reading:warnning:msg20'), {
type: 'warning',
@ -1128,16 +1127,6 @@ export default {
loading.close()
return
}
if (measureData && measureData.markTool === 'Length' && innerForm.IntrahepaticLesion && lesionLength < 10) {
// 10mm
this.$confirm(this.$t('trials:mRecist:warnning:msg3'), {
type: 'warning',
showCancelButton: false,
callback: action => {}
})
loading.close()
return
}
}
}
@ -1167,16 +1156,6 @@ export default {
loading.close()
return
}
if (measureData && measureData.markTool === 'Length' && innerForm.IntrahepaticLesion && lesionLength >= 10) {
// 10mm
this.$confirm(this.$t('trials:mRecist:warnning:msg4'), {
type: 'warning',
showCancelButton: false,
callback: action => {}
})
loading.close()
return
}
}
}