Merge branch 'main' of https://gitea.frp.extimaging.com/XCKJ/irc_web
continuous-integration/drone/push Build is passing
Details
continuous-integration/drone/push Build is passing
Details
commit
12d4a28751
|
@ -1966,68 +1966,67 @@ export default {
|
|||
var pictureObj = await this.uploadScreenshots(`${new Date().getTime()}`, val)
|
||||
|
||||
picturePath = pictureObj.isSuccess ? pictureObj.result.url : ''
|
||||
|
||||
var answers = []
|
||||
var reg = new RegExp(/^[0-9a-zA-Z]{8}-[0-9a-zA-Z]{4}-[0-9a-zA-Z]{4}-[0-9a-zA-Z]{4}-[0-9a-zA-Z]{12}$/)
|
||||
for (const k in this.questionForm) {
|
||||
if (reg.test(k)) {
|
||||
if (answers.findIndex(i => i.tableQuestionId === k) === -1) {
|
||||
answers.push({ tableQuestionId: k, answer: this.questionForm[k] })
|
||||
}
|
||||
}
|
||||
var answers = []
|
||||
var reg = new RegExp(/^[0-9a-zA-Z]{8}-[0-9a-zA-Z]{4}-[0-9a-zA-Z]{4}-[0-9a-zA-Z]{4}-[0-9a-zA-Z]{12}$/)
|
||||
for (const k in this.questionForm) {
|
||||
if (reg.test(k)) {
|
||||
if (answers.findIndex(i => i.tableQuestionId === k) === -1) {
|
||||
answers.push({ tableQuestionId: k, answer: this.questionForm[k] })
|
||||
}
|
||||
}
|
||||
|
||||
var params = {
|
||||
questionId: this.parentQsId,
|
||||
rowId: this.questionForm.RowId,
|
||||
rowIndex: this.answers.RowIndex,
|
||||
visitTaskId: this.visitTaskId,
|
||||
trialId: this.trialId,
|
||||
measureData: measureData ? JSON.stringify(measureData) : '',
|
||||
answerList: answers,
|
||||
isCanEditPosition: this.questionForm.IsCanEditPosition,
|
||||
studyId: measureData ? this.questionForm.MeasureData.studyId : '',
|
||||
seriesId: measureData ? this.questionForm.MeasureData.seriesId : '',
|
||||
instanceId: measureData ? this.questionForm.MeasureData.instanceId : '',
|
||||
numberOfFrames: measureData && !isNaN(parseInt(this.questionForm.MeasureData.frame)) ? parseInt(this.questionForm.MeasureData.frame) : 0,
|
||||
picturePath: picturePath,
|
||||
organInfoId: this.questionForm.OrganInfoId,
|
||||
markTool: measureData ? measureData.type : '',
|
||||
fromMark: this.answers.FromMark,
|
||||
reportMark: this.answers.FromMark
|
||||
}
|
||||
if (this.questionForm.IsDicomReading === false) {
|
||||
params.isDicomReading = false
|
||||
}
|
||||
if (this.deleteInfo) {
|
||||
await this.deleteOldLesion(this.deleteInfo.rowId)
|
||||
this.deleteInfo = null
|
||||
params.rowId = ''
|
||||
}
|
||||
submitTableQuestion(params).then(async res => {
|
||||
// 保存成功!
|
||||
this.$message.success(this.$t('common:message:savedSuccessfully'))
|
||||
this.currentMarkTool = measureData ? measureData.type : ''
|
||||
// saveTypeEnum 0:未保存过(新建病灶);1:已保存,信息不完整(随访初始化病灶/分裂病灶,通过状态判断);2:已保存,信息完整
|
||||
|
||||
this.$set(this.questionForm, 'saveTypeEnum', 2)
|
||||
this.originalQuestionForm = { ...this.questionForm }
|
||||
loading.close()
|
||||
var isLymphLesion = this.getQuestionVal(2)
|
||||
isLymphLesion = isLymphLesion ? parseInt(isLymphLesion) : null
|
||||
var lesionOrgan = this.getQuestionVal(6)
|
||||
this.$set(this.questionForm, 'RowId', res.Result.RowId)
|
||||
const lesionPart = this.getQuestionVal(8)
|
||||
const lesionState = Number(this.getQuestionVal(7))
|
||||
this.$emit('resetQuestions', { isLymphLesion, lesionPart, lesionOrgan, lesionShort, saveTypeEnum: this.questionForm.saveTypeEnum, lesionLength, lesionState, rowIndex: this.rowIndex, rowId: res.Result.RowId, questionId: this.parentQsId, anwsers: this.questionForm })
|
||||
|
||||
// await store.dispatch('reading/refreshMeasuredData', this.visitTaskId)
|
||||
// DicomEvent.$emit('getMeasureData')
|
||||
this.$emit('close')
|
||||
DicomEvent.$emit('getReportInfo', true)
|
||||
DicomEvent.$emit('setMeasuredToolsPassive')
|
||||
}).catch(() => { loading.close() })
|
||||
}
|
||||
|
||||
var params = {
|
||||
questionId: this.parentQsId,
|
||||
rowId: this.questionForm.RowId,
|
||||
rowIndex: this.answers.RowIndex,
|
||||
visitTaskId: this.visitTaskId,
|
||||
trialId: this.trialId,
|
||||
measureData: measureData ? JSON.stringify(measureData) : '',
|
||||
answerList: answers,
|
||||
isCanEditPosition: this.questionForm.IsCanEditPosition,
|
||||
studyId: measureData ? this.questionForm.MeasureData.studyId : '',
|
||||
seriesId: measureData ? this.questionForm.MeasureData.seriesId : '',
|
||||
instanceId: measureData ? this.questionForm.MeasureData.instanceId : '',
|
||||
numberOfFrames: measureData && !isNaN(parseInt(this.questionForm.MeasureData.frame)) ? parseInt(this.questionForm.MeasureData.frame) : 0,
|
||||
picturePath: picturePath,
|
||||
organInfoId: this.questionForm.OrganInfoId,
|
||||
markTool: measureData ? measureData.type : '',
|
||||
fromMark: this.answers.FromMark,
|
||||
reportMark: this.answers.FromMark
|
||||
}
|
||||
if (this.questionForm.IsDicomReading === false) {
|
||||
params.isDicomReading = false
|
||||
}
|
||||
if (this.deleteInfo) {
|
||||
await this.deleteOldLesion(this.deleteInfo.rowId)
|
||||
this.deleteInfo = null
|
||||
params.rowId = ''
|
||||
}
|
||||
submitTableQuestion(params).then(async res => {
|
||||
// 保存成功!
|
||||
this.$message.success(this.$t('common:message:savedSuccessfully'))
|
||||
this.currentMarkTool = measureData ? measureData.type : ''
|
||||
// saveTypeEnum 0:未保存过(新建病灶);1:已保存,信息不完整(随访初始化病灶/分裂病灶,通过状态判断);2:已保存,信息完整
|
||||
|
||||
this.$set(this.questionForm, 'saveTypeEnum', 2)
|
||||
this.originalQuestionForm = { ...this.questionForm }
|
||||
loading.close()
|
||||
var isLymphLesion = this.getQuestionVal(2)
|
||||
isLymphLesion = isLymphLesion ? parseInt(isLymphLesion) : null
|
||||
var lesionOrgan = this.getQuestionVal(6)
|
||||
this.$set(this.questionForm, 'RowId', res.Result.RowId)
|
||||
const lesionPart = this.getQuestionVal(8)
|
||||
const lesionState = Number(this.getQuestionVal(7))
|
||||
this.$emit('resetQuestions', { isLymphLesion, lesionPart, lesionOrgan, lesionShort, saveTypeEnum: this.questionForm.saveTypeEnum, lesionLength, lesionState, rowIndex: this.rowIndex, rowId: res.Result.RowId, questionId: this.parentQsId, anwsers: this.questionForm })
|
||||
|
||||
// await store.dispatch('reading/refreshMeasuredData', this.visitTaskId)
|
||||
// DicomEvent.$emit('getMeasureData')
|
||||
this.$emit('close')
|
||||
DicomEvent.$emit('getReportInfo', true)
|
||||
DicomEvent.$emit('setMeasuredToolsPassive')
|
||||
}).catch(() => { loading.close() })
|
||||
})
|
||||
})
|
||||
},
|
||||
|
|
|
@ -1583,67 +1583,66 @@ export default {
|
|||
var pictureObj = await this.uploadScreenshots(`${new Date().getTime()}`, val)
|
||||
|
||||
picturePath = pictureObj.isSuccess ? pictureObj.result.url : ''
|
||||
|
||||
var answers = []
|
||||
var reg = new RegExp(/^[0-9a-zA-Z]{8}-[0-9a-zA-Z]{4}-[0-9a-zA-Z]{4}-[0-9a-zA-Z]{4}-[0-9a-zA-Z]{12}$/)
|
||||
for (const k in this.questionForm) {
|
||||
if (reg.test(k)) {
|
||||
if (answers.findIndex(i => i.tableQuestionId === k) === -1) {
|
||||
answers.push({ tableQuestionId: k, answer: this.questionForm[k] })
|
||||
}
|
||||
}
|
||||
var answers = []
|
||||
var reg = new RegExp(/^[0-9a-zA-Z]{8}-[0-9a-zA-Z]{4}-[0-9a-zA-Z]{4}-[0-9a-zA-Z]{4}-[0-9a-zA-Z]{12}$/)
|
||||
for (const k in this.questionForm) {
|
||||
if (reg.test(k)) {
|
||||
if (answers.findIndex(i => i.tableQuestionId === k) === -1) {
|
||||
answers.push({ tableQuestionId: k, answer: this.questionForm[k] })
|
||||
}
|
||||
}
|
||||
|
||||
var params = {
|
||||
questionId: this.parentQsId,
|
||||
rowId: this.questionForm.RowId,
|
||||
rowIndex: this.answers.RowIndex,
|
||||
visitTaskId: this.visitTaskId,
|
||||
trialId: this.trialId,
|
||||
measureData: measureData ? JSON.stringify(measureData) : '',
|
||||
answerList: answers,
|
||||
isCanEditPosition: this.questionForm.IsCanEditPosition,
|
||||
studyId: measureData ? this.questionForm.MeasureData.studyId : '',
|
||||
seriesId: measureData ? this.questionForm.MeasureData.seriesId : '',
|
||||
instanceId: measureData ? this.questionForm.MeasureData.instanceId : '',
|
||||
numberOfFrames: measureData && !isNaN(parseInt(this.questionForm.MeasureData.frame)) ? parseInt(this.questionForm.MeasureData.frame) : 0,
|
||||
picturePath: picturePath,
|
||||
organInfoId: this.questionForm.OrganInfoId,
|
||||
markTool: measureData ? measureData.type : ''
|
||||
}
|
||||
if (this.questionForm.IsDicomReading === false) {
|
||||
params.isDicomReading = false
|
||||
}
|
||||
if (this.deleteInfo) {
|
||||
await this.deleteOldLesion(this.deleteInfo.questionId, this.deleteInfo.rowId)
|
||||
this.deleteInfo = null
|
||||
params.rowId = ''
|
||||
}
|
||||
submitTableQuestion(params).then(async res => {
|
||||
// 保存成功!
|
||||
this.$message.success(this.$t('common:message:savedSuccessfully'))
|
||||
this.currentMarkTool = measureData ? measureData.type : ''
|
||||
// saveTypeEnum 0:未保存过(新建病灶);1:已保存,信息不完整(随访初始化病灶/分裂病灶,通过状态判断);2:已保存,信息完整
|
||||
|
||||
this.$set(this.questionForm, 'saveTypeEnum', 2)
|
||||
this.originalQuestionForm = { ...this.questionForm }
|
||||
loading.close()
|
||||
var isLymphLesion = this.getQuestionVal(2)
|
||||
isLymphLesion = isLymphLesion ? parseInt(isLymphLesion) : null
|
||||
var lesionOrgan = this.getQuestionVal(6)
|
||||
this.$set(this.questionForm, 'RowId', res.Result.RowId)
|
||||
const lesionPart = this.getQuestionVal(8)
|
||||
const lesionState = Number(this.getQuestionVal(7))
|
||||
this.$emit('resetQuestions', { isLymphLesion, lesionPart, lesionOrgan, lesionShort, saveTypeEnum: this.questionForm.saveTypeEnum, lesionLength, lesionState, rowIndex: this.rowIndex, questionId: this.parentQsId, anwsers: this.questionForm })
|
||||
|
||||
// await store.dispatch('reading/refreshMeasuredData', this.visitTaskId)
|
||||
// DicomEvent.$emit('getMeasureData')
|
||||
this.$emit('close')
|
||||
DicomEvent.$emit('readingPageUpdate', {})
|
||||
DicomEvent.$emit('getReportInfo', true)
|
||||
DicomEvent.$emit('setMeasuredToolsPassive')
|
||||
}).catch(() => { loading.close() })
|
||||
}
|
||||
|
||||
var params = {
|
||||
questionId: this.parentQsId,
|
||||
rowId: this.questionForm.RowId,
|
||||
rowIndex: this.answers.RowIndex,
|
||||
visitTaskId: this.visitTaskId,
|
||||
trialId: this.trialId,
|
||||
measureData: measureData ? JSON.stringify(measureData) : '',
|
||||
answerList: answers,
|
||||
isCanEditPosition: this.questionForm.IsCanEditPosition,
|
||||
studyId: measureData ? this.questionForm.MeasureData.studyId : '',
|
||||
seriesId: measureData ? this.questionForm.MeasureData.seriesId : '',
|
||||
instanceId: measureData ? this.questionForm.MeasureData.instanceId : '',
|
||||
numberOfFrames: measureData && !isNaN(parseInt(this.questionForm.MeasureData.frame)) ? parseInt(this.questionForm.MeasureData.frame) : 0,
|
||||
picturePath: picturePath,
|
||||
organInfoId: this.questionForm.OrganInfoId,
|
||||
markTool: measureData ? measureData.type : ''
|
||||
}
|
||||
if (this.questionForm.IsDicomReading === false) {
|
||||
params.isDicomReading = false
|
||||
}
|
||||
if (this.deleteInfo) {
|
||||
await this.deleteOldLesion(this.deleteInfo.questionId, this.deleteInfo.rowId)
|
||||
this.deleteInfo = null
|
||||
params.rowId = ''
|
||||
}
|
||||
submitTableQuestion(params).then(async res => {
|
||||
// 保存成功!
|
||||
this.$message.success(this.$t('common:message:savedSuccessfully'))
|
||||
this.currentMarkTool = measureData ? measureData.type : ''
|
||||
// saveTypeEnum 0:未保存过(新建病灶);1:已保存,信息不完整(随访初始化病灶/分裂病灶,通过状态判断);2:已保存,信息完整
|
||||
|
||||
this.$set(this.questionForm, 'saveTypeEnum', 2)
|
||||
this.originalQuestionForm = { ...this.questionForm }
|
||||
loading.close()
|
||||
var isLymphLesion = this.getQuestionVal(2)
|
||||
isLymphLesion = isLymphLesion ? parseInt(isLymphLesion) : null
|
||||
var lesionOrgan = this.getQuestionVal(6)
|
||||
this.$set(this.questionForm, 'RowId', res.Result.RowId)
|
||||
const lesionPart = this.getQuestionVal(8)
|
||||
const lesionState = Number(this.getQuestionVal(7))
|
||||
this.$emit('resetQuestions', { isLymphLesion, lesionPart, lesionOrgan, lesionShort, saveTypeEnum: this.questionForm.saveTypeEnum, lesionLength, lesionState, rowIndex: this.rowIndex, questionId: this.parentQsId, anwsers: this.questionForm })
|
||||
|
||||
// await store.dispatch('reading/refreshMeasuredData', this.visitTaskId)
|
||||
// DicomEvent.$emit('getMeasureData')
|
||||
this.$emit('close')
|
||||
DicomEvent.$emit('readingPageUpdate', {})
|
||||
DicomEvent.$emit('getReportInfo', true)
|
||||
DicomEvent.$emit('setMeasuredToolsPassive')
|
||||
}).catch(() => { loading.close() })
|
||||
})
|
||||
})
|
||||
},
|
||||
|
|
|
@ -1323,71 +1323,71 @@ export default {
|
|||
// 靶病灶状态为0(存在)时,一定存在长径或者长短径(长径、十字线 )
|
||||
// 普通靶病灶:长径大于10mm且不小于2倍层厚(基线校验)
|
||||
// 淋巴结靶病灶:短径大于15mm且不小于2倍层厚(基线校验)
|
||||
|
||||
var picturePath = ''
|
||||
if (val && measureData) {
|
||||
var pictureObj = await this.uploadScreenshots(`${new Date().getTime()}`, val)
|
||||
|
||||
picturePath = pictureObj.isSuccess ? pictureObj.result.url : ''
|
||||
|
||||
var answers = []
|
||||
var reg = new RegExp(/^[0-9a-zA-Z]{8}-[0-9a-zA-Z]{4}-[0-9a-zA-Z]{4}-[0-9a-zA-Z]{4}-[0-9a-zA-Z]{12}$/)
|
||||
for (const k in this.questionForm) {
|
||||
if (reg.test(k)) {
|
||||
if (answers.findIndex(i => i.tableQuestionId === k) === -1) {
|
||||
answers.push({ tableQuestionId: k, answer: this.questionForm[k] })
|
||||
}
|
||||
}
|
||||
var answers = []
|
||||
var reg = new RegExp(/^[0-9a-zA-Z]{8}-[0-9a-zA-Z]{4}-[0-9a-zA-Z]{4}-[0-9a-zA-Z]{4}-[0-9a-zA-Z]{12}$/)
|
||||
for (const k in this.questionForm) {
|
||||
if (reg.test(k)) {
|
||||
if (answers.findIndex(i => i.tableQuestionId === k) === -1) {
|
||||
answers.push({ tableQuestionId: k, answer: this.questionForm[k] })
|
||||
}
|
||||
}
|
||||
|
||||
var params = {
|
||||
questionId: this.parentQsId,
|
||||
rowId: this.questionForm.RowId,
|
||||
rowIndex: this.answers.RowIndex,
|
||||
visitTaskId: this.visitTaskId,
|
||||
trialId: this.trialId,
|
||||
measureData: measureData ? JSON.stringify(measureData) : '',
|
||||
answerList: answers,
|
||||
isCanEditPosition: this.questionForm.IsCanEditPosition,
|
||||
studyId: measureData ? this.questionForm.MeasureData.studyId : '',
|
||||
seriesId: measureData ? this.questionForm.MeasureData.seriesId : '',
|
||||
instanceId: measureData ? this.questionForm.MeasureData.instanceId : '',
|
||||
numberOfFrames: measureData && !isNaN(parseInt(this.questionForm.MeasureData.frame)) ? parseInt(this.questionForm.MeasureData.frame) : 0,
|
||||
picturePath: picturePath,
|
||||
organInfoId: this.questionForm.OrganInfoId,
|
||||
markTool: measureData ? measureData.type : ''
|
||||
}
|
||||
if (this.questionForm.IsDicomReading === false) {
|
||||
params.isDicomReading = false
|
||||
}
|
||||
if (this.deleteInfo) {
|
||||
await this.deleteOldLesion(this.deleteInfo.questionId, this.deleteInfo.rowId)
|
||||
this.deleteInfo = null
|
||||
params.rowId = ''
|
||||
}
|
||||
submitTableQuestion(params).then(async res => {
|
||||
// 保存成功!
|
||||
this.$message.success(this.$t('common:message:savedSuccessfully'))
|
||||
this.currentMarkTool = measureData ? measureData.type : ''
|
||||
// saveTypeEnum 0:未保存过(新建病灶);1:已保存,信息不完整(随访初始化病灶/分裂病灶,通过状态判断);2:已保存,信息完整
|
||||
|
||||
this.$set(this.questionForm, 'saveTypeEnum', 2)
|
||||
this.originalQuestionForm = { ...this.questionForm }
|
||||
loading.close()
|
||||
var isLymphLesion = this.getQuestionVal(2)
|
||||
isLymphLesion = isLymphLesion ? parseInt(isLymphLesion) : null
|
||||
var lesionOrgan = this.getQuestionVal(6)
|
||||
this.$set(this.questionForm, 'RowId', res.Result.RowId)
|
||||
const lesionPart = this.getQuestionVal(8)
|
||||
const lesionState = Number(this.getQuestionVal(7))
|
||||
this.$emit('resetQuestions', { isLymphLesion, lesionPart, lesionOrgan, lesionShort, saveTypeEnum: this.questionForm.saveTypeEnum, lesionLength, lesionState, rowIndex: this.rowIndex, questionId: this.parentQsId, anwsers: this.questionForm })
|
||||
|
||||
// await store.dispatch('reading/refreshMeasuredData', this.visitTaskId)
|
||||
// DicomEvent.$emit('getMeasureData')
|
||||
this.$emit('close')
|
||||
DicomEvent.$emit('getReportInfo', true)
|
||||
DicomEvent.$emit('setMeasuredToolsPassive')
|
||||
}).catch(() => { loading.close() })
|
||||
}
|
||||
|
||||
var params = {
|
||||
questionId: this.parentQsId,
|
||||
rowId: this.questionForm.RowId,
|
||||
rowIndex: this.answers.RowIndex,
|
||||
visitTaskId: this.visitTaskId,
|
||||
trialId: this.trialId,
|
||||
measureData: measureData ? JSON.stringify(measureData) : '',
|
||||
answerList: answers,
|
||||
isCanEditPosition: this.questionForm.IsCanEditPosition,
|
||||
studyId: measureData ? this.questionForm.MeasureData.studyId : '',
|
||||
seriesId: measureData ? this.questionForm.MeasureData.seriesId : '',
|
||||
instanceId: measureData ? this.questionForm.MeasureData.instanceId : '',
|
||||
numberOfFrames: measureData && !isNaN(parseInt(this.questionForm.MeasureData.frame)) ? parseInt(this.questionForm.MeasureData.frame) : 0,
|
||||
picturePath: picturePath,
|
||||
organInfoId: this.questionForm.OrganInfoId,
|
||||
markTool: measureData ? measureData.type : ''
|
||||
}
|
||||
if (this.questionForm.IsDicomReading === false) {
|
||||
params.isDicomReading = false
|
||||
}
|
||||
if (this.deleteInfo) {
|
||||
await this.deleteOldLesion(this.deleteInfo.questionId, this.deleteInfo.rowId)
|
||||
this.deleteInfo = null
|
||||
params.rowId = ''
|
||||
}
|
||||
submitTableQuestion(params).then(async res => {
|
||||
// 保存成功!
|
||||
this.$message.success(this.$t('common:message:savedSuccessfully'))
|
||||
this.currentMarkTool = measureData ? measureData.type : ''
|
||||
// saveTypeEnum 0:未保存过(新建病灶);1:已保存,信息不完整(随访初始化病灶/分裂病灶,通过状态判断);2:已保存,信息完整
|
||||
|
||||
this.$set(this.questionForm, 'saveTypeEnum', 2)
|
||||
this.originalQuestionForm = { ...this.questionForm }
|
||||
loading.close()
|
||||
var isLymphLesion = this.getQuestionVal(2)
|
||||
isLymphLesion = isLymphLesion ? parseInt(isLymphLesion) : null
|
||||
var lesionOrgan = this.getQuestionVal(6)
|
||||
this.$set(this.questionForm, 'RowId', res.Result.RowId)
|
||||
const lesionPart = this.getQuestionVal(8)
|
||||
const lesionState = Number(this.getQuestionVal(7))
|
||||
this.$emit('resetQuestions', { isLymphLesion, lesionPart, lesionOrgan, lesionShort, saveTypeEnum: this.questionForm.saveTypeEnum, lesionLength, lesionState, rowIndex: this.rowIndex, questionId: this.parentQsId, anwsers: this.questionForm })
|
||||
|
||||
// await store.dispatch('reading/refreshMeasuredData', this.visitTaskId)
|
||||
// DicomEvent.$emit('getMeasureData')
|
||||
this.$emit('close')
|
||||
DicomEvent.$emit('getReportInfo', true)
|
||||
DicomEvent.$emit('setMeasuredToolsPassive')
|
||||
}).catch(() => { loading.close() })
|
||||
})
|
||||
})
|
||||
},
|
||||
|
|
|
@ -976,61 +976,60 @@ export default {
|
|||
var pictureObj = await this.uploadScreenshots(`${new Date().getTime()}`, val)
|
||||
|
||||
picturePath = pictureObj.isSuccess ? pictureObj.result.url : ''
|
||||
|
||||
var answers = []
|
||||
var reg = new RegExp(/^[0-9a-zA-Z]{8}-[0-9a-zA-Z]{4}-[0-9a-zA-Z]{4}-[0-9a-zA-Z]{4}-[0-9a-zA-Z]{12}$/)
|
||||
for (const k in this.questionForm) {
|
||||
if (reg.test(k)) {
|
||||
if (answers.findIndex(i => i.tableQuestionId === k) === -1) {
|
||||
answers.push({ tableQuestionId: k, answer: this.questionForm[k] })
|
||||
}
|
||||
}
|
||||
var answers = []
|
||||
var reg = new RegExp(/^[0-9a-zA-Z]{8}-[0-9a-zA-Z]{4}-[0-9a-zA-Z]{4}-[0-9a-zA-Z]{4}-[0-9a-zA-Z]{12}$/)
|
||||
for (const k in this.questionForm) {
|
||||
if (reg.test(k)) {
|
||||
if (answers.findIndex(i => i.tableQuestionId === k) === -1) {
|
||||
answers.push({ tableQuestionId: k, answer: this.questionForm[k] })
|
||||
}
|
||||
}
|
||||
|
||||
var params = {
|
||||
questionId: this.parentQsId,
|
||||
rowId: this.questionForm.RowId,
|
||||
rowIndex: this.answers.RowIndex,
|
||||
visitTaskId: this.visitTaskId,
|
||||
trialId: this.trialId,
|
||||
measureData: measureData ? JSON.stringify(measureData) : '',
|
||||
answerList: answers,
|
||||
isCanEditPosition: this.questionForm.IsCanEditPosition,
|
||||
studyId: measureData ? this.questionForm.MeasureData.studyId : '',
|
||||
seriesId: measureData ? this.questionForm.MeasureData.seriesId : '',
|
||||
instanceId: measureData ? this.questionForm.MeasureData.instanceId : '',
|
||||
numberOfFrames: measureData && !isNaN(parseInt(this.questionForm.MeasureData.frame)) ? parseInt(this.questionForm.MeasureData.frame) : 0,
|
||||
picturePath: picturePath,
|
||||
organInfoId: this.questionForm.OrganInfoId,
|
||||
markTool: measureData ? measureData.type : ''
|
||||
}
|
||||
if (this.questionForm.IsDicomReading === false) {
|
||||
params.isDicomReading = false
|
||||
}
|
||||
if (this.deleteInfo) {
|
||||
await this.deleteOldLesion(this.deleteInfo.questionId, this.deleteInfo.rowId)
|
||||
this.deleteInfo = null
|
||||
}
|
||||
submitTableQuestion(params).then(async res => {
|
||||
// 保存成功!
|
||||
this.$message.success(this.$t('common:message:savedSuccessfully'))
|
||||
this.currentMarkTool = measureData ? measureData.type : ''
|
||||
// saveTypeEnum 0:未保存过(新建病灶);1:已保存,信息不完整(随访初始化病灶/分裂病灶,通过状态判断);2:已保存,信息完整
|
||||
|
||||
this.$set(this.questionForm, 'saveTypeEnum', 2)
|
||||
this.originalQuestionForm = { ...this.questionForm }
|
||||
loading.close()
|
||||
|
||||
var lesionOrgan = this.getQuestionVal(6)
|
||||
this.$set(this.questionForm, 'RowId', res.Result.RowId)
|
||||
const lesionPart = this.getQuestionVal(8)
|
||||
const lesionState = Number(this.getQuestionVal(7))
|
||||
this.$emit('resetQuestions', { isLymphLesion: 0, lesionPart, lesionOrgan, saveTypeEnum: this.questionForm.saveTypeEnum, lesionLength, lesionState, rowIndex: this.rowIndex, questionId: this.parentQsId, anwsers: this.questionForm })
|
||||
this.$emit('close')
|
||||
DicomEvent.$emit('getReportInfo', true)
|
||||
DicomEvent.$emit('setMeasuredToolsPassive')
|
||||
}).catch(() => { loading.close() })
|
||||
}
|
||||
|
||||
var params = {
|
||||
questionId: this.parentQsId,
|
||||
rowId: this.questionForm.RowId,
|
||||
rowIndex: this.answers.RowIndex,
|
||||
visitTaskId: this.visitTaskId,
|
||||
trialId: this.trialId,
|
||||
measureData: measureData ? JSON.stringify(measureData) : '',
|
||||
answerList: answers,
|
||||
isCanEditPosition: this.questionForm.IsCanEditPosition,
|
||||
studyId: measureData ? this.questionForm.MeasureData.studyId : '',
|
||||
seriesId: measureData ? this.questionForm.MeasureData.seriesId : '',
|
||||
instanceId: measureData ? this.questionForm.MeasureData.instanceId : '',
|
||||
numberOfFrames: measureData && !isNaN(parseInt(this.questionForm.MeasureData.frame)) ? parseInt(this.questionForm.MeasureData.frame) : 0,
|
||||
picturePath: picturePath,
|
||||
organInfoId: this.questionForm.OrganInfoId,
|
||||
markTool: measureData ? measureData.type : ''
|
||||
}
|
||||
if (this.questionForm.IsDicomReading === false) {
|
||||
params.isDicomReading = false
|
||||
}
|
||||
if (this.deleteInfo) {
|
||||
await this.deleteOldLesion(this.deleteInfo.questionId, this.deleteInfo.rowId)
|
||||
this.deleteInfo = null
|
||||
}
|
||||
submitTableQuestion(params).then(async res => {
|
||||
// 保存成功!
|
||||
this.$message.success(this.$t('common:message:savedSuccessfully'))
|
||||
this.currentMarkTool = measureData ? measureData.type : ''
|
||||
// saveTypeEnum 0:未保存过(新建病灶);1:已保存,信息不完整(随访初始化病灶/分裂病灶,通过状态判断);2:已保存,信息完整
|
||||
|
||||
this.$set(this.questionForm, 'saveTypeEnum', 2)
|
||||
this.originalQuestionForm = { ...this.questionForm }
|
||||
loading.close()
|
||||
|
||||
var lesionOrgan = this.getQuestionVal(6)
|
||||
this.$set(this.questionForm, 'RowId', res.Result.RowId)
|
||||
const lesionPart = this.getQuestionVal(8)
|
||||
const lesionState = Number(this.getQuestionVal(7))
|
||||
this.$emit('resetQuestions', { isLymphLesion: 0, lesionPart, lesionOrgan, saveTypeEnum: this.questionForm.saveTypeEnum, lesionLength, lesionState, rowIndex: this.rowIndex, questionId: this.parentQsId, anwsers: this.questionForm })
|
||||
this.$emit('close')
|
||||
DicomEvent.$emit('getReportInfo', true)
|
||||
DicomEvent.$emit('setMeasuredToolsPassive')
|
||||
}).catch(() => { loading.close() })
|
||||
})
|
||||
})
|
||||
},
|
||||
|
|
Loading…
Reference in New Issue