Compare commits

..

No commits in common. "118acc70f3d675cc95e02d8b6003b9d8f1db40e2" and "06ac1a660c855f3fb652d67d7cf396268be8cf5f" have entirely different histories.

4 changed files with 218 additions and 215 deletions

View File

@ -1966,67 +1966,68 @@ export default {
var pictureObj = await this.uploadScreenshots(`${new Date().getTime()}`, val) var pictureObj = await this.uploadScreenshots(`${new Date().getTime()}`, val)
picturePath = pictureObj.isSuccess ? pictureObj.result.url : '' picturePath = pictureObj.isSuccess ? pictureObj.result.url : ''
}
var answers = [] 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}$/) 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) { for (const k in this.questionForm) {
if (reg.test(k)) { if (reg.test(k)) {
if (answers.findIndex(i => i.tableQuestionId === k) === -1) { if (answers.findIndex(i => i.tableQuestionId === k) === -1) {
answers.push({ tableQuestionId: k, answer: this.questionForm[k] }) answers.push({ tableQuestionId: k, answer: this.questionForm[k] })
}
} }
} }
}
var params = { var params = {
questionId: this.parentQsId, questionId: this.parentQsId,
rowId: this.questionForm.RowId, rowId: this.questionForm.RowId,
rowIndex: this.answers.RowIndex, rowIndex: this.answers.RowIndex,
visitTaskId: this.visitTaskId, visitTaskId: this.visitTaskId,
trialId: this.trialId, trialId: this.trialId,
measureData: measureData ? JSON.stringify(measureData) : '', measureData: measureData ? JSON.stringify(measureData) : '',
answerList: answers, answerList: answers,
isCanEditPosition: this.questionForm.IsCanEditPosition, isCanEditPosition: this.questionForm.IsCanEditPosition,
studyId: measureData ? this.questionForm.MeasureData.studyId : '', studyId: measureData ? this.questionForm.MeasureData.studyId : '',
seriesId: measureData ? this.questionForm.MeasureData.seriesId : '', seriesId: measureData ? this.questionForm.MeasureData.seriesId : '',
instanceId: measureData ? this.questionForm.MeasureData.instanceId : '', instanceId: measureData ? this.questionForm.MeasureData.instanceId : '',
numberOfFrames: measureData && !isNaN(parseInt(this.questionForm.MeasureData.frame)) ? parseInt(this.questionForm.MeasureData.frame) : 0, numberOfFrames: measureData && !isNaN(parseInt(this.questionForm.MeasureData.frame)) ? parseInt(this.questionForm.MeasureData.frame) : 0,
picturePath: picturePath, picturePath: picturePath,
organInfoId: this.questionForm.OrganInfoId, organInfoId: this.questionForm.OrganInfoId,
markTool: measureData ? measureData.type : '', markTool: measureData ? measureData.type : '',
fromMark: this.answers.FromMark, fromMark: this.answers.FromMark,
reportMark: this.answers.FromMark reportMark: this.answers.FromMark
} }
if (this.questionForm.IsDicomReading === false) { if (this.questionForm.IsDicomReading === false) {
params.isDicomReading = false params.isDicomReading = false
} }
if (this.deleteInfo) { if (this.deleteInfo) {
await this.deleteOldLesion(this.deleteInfo.rowId) await this.deleteOldLesion(this.deleteInfo.rowId)
this.deleteInfo = null this.deleteInfo = null
params.rowId = '' params.rowId = ''
} }
submitTableQuestion(params).then(async res => { submitTableQuestion(params).then(async res => {
// //
this.$message.success(this.$t('common:message:savedSuccessfully')) this.$message.success(this.$t('common:message:savedSuccessfully'))
this.currentMarkTool = measureData ? measureData.type : '' this.currentMarkTool = measureData ? measureData.type : ''
// saveTypeEnum 01访/2 // saveTypeEnum 01访/2
this.$set(this.questionForm, 'saveTypeEnum', 2) this.$set(this.questionForm, 'saveTypeEnum', 2)
this.originalQuestionForm = { ...this.questionForm } this.originalQuestionForm = { ...this.questionForm }
loading.close() loading.close()
var isLymphLesion = this.getQuestionVal(2) var isLymphLesion = this.getQuestionVal(2)
isLymphLesion = isLymphLesion ? parseInt(isLymphLesion) : null isLymphLesion = isLymphLesion ? parseInt(isLymphLesion) : null
var lesionOrgan = this.getQuestionVal(6) var lesionOrgan = this.getQuestionVal(6)
this.$set(this.questionForm, 'RowId', res.Result.RowId) this.$set(this.questionForm, 'RowId', res.Result.RowId)
const lesionPart = this.getQuestionVal(8) const lesionPart = this.getQuestionVal(8)
const lesionState = Number(this.getQuestionVal(7)) 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 }) 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) // await store.dispatch('reading/refreshMeasuredData', this.visitTaskId)
// DicomEvent.$emit('getMeasureData') // DicomEvent.$emit('getMeasureData')
this.$emit('close') this.$emit('close')
DicomEvent.$emit('getReportInfo', true) DicomEvent.$emit('getReportInfo', true)
DicomEvent.$emit('setMeasuredToolsPassive') DicomEvent.$emit('setMeasuredToolsPassive')
}).catch(() => { loading.close() }) }).catch(() => { loading.close() })
}
}) })
}) })
}, },

View File

@ -1583,66 +1583,67 @@ export default {
var pictureObj = await this.uploadScreenshots(`${new Date().getTime()}`, val) var pictureObj = await this.uploadScreenshots(`${new Date().getTime()}`, val)
picturePath = pictureObj.isSuccess ? pictureObj.result.url : '' picturePath = pictureObj.isSuccess ? pictureObj.result.url : ''
}
var answers = [] 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}$/) 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) { for (const k in this.questionForm) {
if (reg.test(k)) { if (reg.test(k)) {
if (answers.findIndex(i => i.tableQuestionId === k) === -1) { if (answers.findIndex(i => i.tableQuestionId === k) === -1) {
answers.push({ tableQuestionId: k, answer: this.questionForm[k] }) answers.push({ tableQuestionId: k, answer: this.questionForm[k] })
}
} }
} }
}
var params = { var params = {
questionId: this.parentQsId, questionId: this.parentQsId,
rowId: this.questionForm.RowId, rowId: this.questionForm.RowId,
rowIndex: this.answers.RowIndex, rowIndex: this.answers.RowIndex,
visitTaskId: this.visitTaskId, visitTaskId: this.visitTaskId,
trialId: this.trialId, trialId: this.trialId,
measureData: measureData ? JSON.stringify(measureData) : '', measureData: measureData ? JSON.stringify(measureData) : '',
answerList: answers, answerList: answers,
isCanEditPosition: this.questionForm.IsCanEditPosition, isCanEditPosition: this.questionForm.IsCanEditPosition,
studyId: measureData ? this.questionForm.MeasureData.studyId : '', studyId: measureData ? this.questionForm.MeasureData.studyId : '',
seriesId: measureData ? this.questionForm.MeasureData.seriesId : '', seriesId: measureData ? this.questionForm.MeasureData.seriesId : '',
instanceId: measureData ? this.questionForm.MeasureData.instanceId : '', instanceId: measureData ? this.questionForm.MeasureData.instanceId : '',
numberOfFrames: measureData && !isNaN(parseInt(this.questionForm.MeasureData.frame)) ? parseInt(this.questionForm.MeasureData.frame) : 0, numberOfFrames: measureData && !isNaN(parseInt(this.questionForm.MeasureData.frame)) ? parseInt(this.questionForm.MeasureData.frame) : 0,
picturePath: picturePath, picturePath: picturePath,
organInfoId: this.questionForm.OrganInfoId, organInfoId: this.questionForm.OrganInfoId,
markTool: measureData ? measureData.type : '' markTool: measureData ? measureData.type : ''
} }
if (this.questionForm.IsDicomReading === false) { if (this.questionForm.IsDicomReading === false) {
params.isDicomReading = false params.isDicomReading = false
} }
if (this.deleteInfo) { if (this.deleteInfo) {
await this.deleteOldLesion(this.deleteInfo.questionId, this.deleteInfo.rowId) await this.deleteOldLesion(this.deleteInfo.questionId, this.deleteInfo.rowId)
this.deleteInfo = null this.deleteInfo = null
params.rowId = '' params.rowId = ''
} }
submitTableQuestion(params).then(async res => { submitTableQuestion(params).then(async res => {
// //
this.$message.success(this.$t('common:message:savedSuccessfully')) this.$message.success(this.$t('common:message:savedSuccessfully'))
this.currentMarkTool = measureData ? measureData.type : '' this.currentMarkTool = measureData ? measureData.type : ''
// saveTypeEnum 01访/2 // saveTypeEnum 01访/2
this.$set(this.questionForm, 'saveTypeEnum', 2) this.$set(this.questionForm, 'saveTypeEnum', 2)
this.originalQuestionForm = { ...this.questionForm } this.originalQuestionForm = { ...this.questionForm }
loading.close() loading.close()
var isLymphLesion = this.getQuestionVal(2) var isLymphLesion = this.getQuestionVal(2)
isLymphLesion = isLymphLesion ? parseInt(isLymphLesion) : null isLymphLesion = isLymphLesion ? parseInt(isLymphLesion) : null
var lesionOrgan = this.getQuestionVal(6) var lesionOrgan = this.getQuestionVal(6)
this.$set(this.questionForm, 'RowId', res.Result.RowId) this.$set(this.questionForm, 'RowId', res.Result.RowId)
const lesionPart = this.getQuestionVal(8) const lesionPart = this.getQuestionVal(8)
const lesionState = Number(this.getQuestionVal(7)) 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 }) 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) // await store.dispatch('reading/refreshMeasuredData', this.visitTaskId)
// DicomEvent.$emit('getMeasureData') // DicomEvent.$emit('getMeasureData')
this.$emit('close') this.$emit('close')
DicomEvent.$emit('readingPageUpdate', {}) DicomEvent.$emit('readingPageUpdate', {})
DicomEvent.$emit('getReportInfo', true) DicomEvent.$emit('getReportInfo', true)
DicomEvent.$emit('setMeasuredToolsPassive') DicomEvent.$emit('setMeasuredToolsPassive')
}).catch(() => { loading.close() }) }).catch(() => { loading.close() })
}
}) })
}) })
}, },

View File

@ -1323,71 +1323,71 @@ export default {
// 0线 // 0线
// 10mm2线 // 10mm2线
// 15mm2线 // 15mm2线
var picturePath = '' var picturePath = ''
if (val && measureData) { if (val && measureData) {
var pictureObj = await this.uploadScreenshots(`${new Date().getTime()}`, val) var pictureObj = await this.uploadScreenshots(`${new Date().getTime()}`, val)
picturePath = pictureObj.isSuccess ? pictureObj.result.url : '' picturePath = pictureObj.isSuccess ? pictureObj.result.url : ''
}
var answers = [] 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}$/) 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) { for (const k in this.questionForm) {
if (reg.test(k)) { if (reg.test(k)) {
if (answers.findIndex(i => i.tableQuestionId === k) === -1) { if (answers.findIndex(i => i.tableQuestionId === k) === -1) {
answers.push({ tableQuestionId: k, answer: this.questionForm[k] }) answers.push({ tableQuestionId: k, answer: this.questionForm[k] })
}
} }
} }
}
var params = { var params = {
questionId: this.parentQsId, questionId: this.parentQsId,
rowId: this.questionForm.RowId, rowId: this.questionForm.RowId,
rowIndex: this.answers.RowIndex, rowIndex: this.answers.RowIndex,
visitTaskId: this.visitTaskId, visitTaskId: this.visitTaskId,
trialId: this.trialId, trialId: this.trialId,
measureData: measureData ? JSON.stringify(measureData) : '', measureData: measureData ? JSON.stringify(measureData) : '',
answerList: answers, answerList: answers,
isCanEditPosition: this.questionForm.IsCanEditPosition, isCanEditPosition: this.questionForm.IsCanEditPosition,
studyId: measureData ? this.questionForm.MeasureData.studyId : '', studyId: measureData ? this.questionForm.MeasureData.studyId : '',
seriesId: measureData ? this.questionForm.MeasureData.seriesId : '', seriesId: measureData ? this.questionForm.MeasureData.seriesId : '',
instanceId: measureData ? this.questionForm.MeasureData.instanceId : '', instanceId: measureData ? this.questionForm.MeasureData.instanceId : '',
numberOfFrames: measureData && !isNaN(parseInt(this.questionForm.MeasureData.frame)) ? parseInt(this.questionForm.MeasureData.frame) : 0, numberOfFrames: measureData && !isNaN(parseInt(this.questionForm.MeasureData.frame)) ? parseInt(this.questionForm.MeasureData.frame) : 0,
picturePath: picturePath, picturePath: picturePath,
organInfoId: this.questionForm.OrganInfoId, organInfoId: this.questionForm.OrganInfoId,
markTool: measureData ? measureData.type : '' markTool: measureData ? measureData.type : ''
} }
if (this.questionForm.IsDicomReading === false) { if (this.questionForm.IsDicomReading === false) {
params.isDicomReading = false params.isDicomReading = false
} }
if (this.deleteInfo) { if (this.deleteInfo) {
await this.deleteOldLesion(this.deleteInfo.questionId, this.deleteInfo.rowId) await this.deleteOldLesion(this.deleteInfo.questionId, this.deleteInfo.rowId)
this.deleteInfo = null this.deleteInfo = null
params.rowId = '' params.rowId = ''
} }
submitTableQuestion(params).then(async res => { submitTableQuestion(params).then(async res => {
// //
this.$message.success(this.$t('common:message:savedSuccessfully')) this.$message.success(this.$t('common:message:savedSuccessfully'))
this.currentMarkTool = measureData ? measureData.type : '' this.currentMarkTool = measureData ? measureData.type : ''
// saveTypeEnum 01访/2 // saveTypeEnum 01访/2
this.$set(this.questionForm, 'saveTypeEnum', 2) this.$set(this.questionForm, 'saveTypeEnum', 2)
this.originalQuestionForm = { ...this.questionForm } this.originalQuestionForm = { ...this.questionForm }
loading.close() loading.close()
var isLymphLesion = this.getQuestionVal(2) var isLymphLesion = this.getQuestionVal(2)
isLymphLesion = isLymphLesion ? parseInt(isLymphLesion) : null isLymphLesion = isLymphLesion ? parseInt(isLymphLesion) : null
var lesionOrgan = this.getQuestionVal(6) var lesionOrgan = this.getQuestionVal(6)
this.$set(this.questionForm, 'RowId', res.Result.RowId) this.$set(this.questionForm, 'RowId', res.Result.RowId)
const lesionPart = this.getQuestionVal(8) const lesionPart = this.getQuestionVal(8)
const lesionState = Number(this.getQuestionVal(7)) 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 }) 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) // await store.dispatch('reading/refreshMeasuredData', this.visitTaskId)
// DicomEvent.$emit('getMeasureData') // DicomEvent.$emit('getMeasureData')
this.$emit('close') this.$emit('close')
DicomEvent.$emit('getReportInfo', true) DicomEvent.$emit('getReportInfo', true)
DicomEvent.$emit('setMeasuredToolsPassive') DicomEvent.$emit('setMeasuredToolsPassive')
}).catch(() => { loading.close() }) }).catch(() => { loading.close() })
}
}) })
}) })
}, },

View File

@ -976,60 +976,61 @@ export default {
var pictureObj = await this.uploadScreenshots(`${new Date().getTime()}`, val) var pictureObj = await this.uploadScreenshots(`${new Date().getTime()}`, val)
picturePath = pictureObj.isSuccess ? pictureObj.result.url : '' picturePath = pictureObj.isSuccess ? pictureObj.result.url : ''
}
var answers = [] 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}$/) 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) { for (const k in this.questionForm) {
if (reg.test(k)) { if (reg.test(k)) {
if (answers.findIndex(i => i.tableQuestionId === k) === -1) { if (answers.findIndex(i => i.tableQuestionId === k) === -1) {
answers.push({ tableQuestionId: k, answer: this.questionForm[k] }) answers.push({ tableQuestionId: k, answer: this.questionForm[k] })
}
} }
} }
}
var params = { var params = {
questionId: this.parentQsId, questionId: this.parentQsId,
rowId: this.questionForm.RowId, rowId: this.questionForm.RowId,
rowIndex: this.answers.RowIndex, rowIndex: this.answers.RowIndex,
visitTaskId: this.visitTaskId, visitTaskId: this.visitTaskId,
trialId: this.trialId, trialId: this.trialId,
measureData: measureData ? JSON.stringify(measureData) : '', measureData: measureData ? JSON.stringify(measureData) : '',
answerList: answers, answerList: answers,
isCanEditPosition: this.questionForm.IsCanEditPosition, isCanEditPosition: this.questionForm.IsCanEditPosition,
studyId: measureData ? this.questionForm.MeasureData.studyId : '', studyId: measureData ? this.questionForm.MeasureData.studyId : '',
seriesId: measureData ? this.questionForm.MeasureData.seriesId : '', seriesId: measureData ? this.questionForm.MeasureData.seriesId : '',
instanceId: measureData ? this.questionForm.MeasureData.instanceId : '', instanceId: measureData ? this.questionForm.MeasureData.instanceId : '',
numberOfFrames: measureData && !isNaN(parseInt(this.questionForm.MeasureData.frame)) ? parseInt(this.questionForm.MeasureData.frame) : 0, numberOfFrames: measureData && !isNaN(parseInt(this.questionForm.MeasureData.frame)) ? parseInt(this.questionForm.MeasureData.frame) : 0,
picturePath: picturePath, picturePath: picturePath,
organInfoId: this.questionForm.OrganInfoId, organInfoId: this.questionForm.OrganInfoId,
markTool: measureData ? measureData.type : '' markTool: measureData ? measureData.type : ''
} }
if (this.questionForm.IsDicomReading === false) { if (this.questionForm.IsDicomReading === false) {
params.isDicomReading = false params.isDicomReading = false
} }
if (this.deleteInfo) { if (this.deleteInfo) {
await this.deleteOldLesion(this.deleteInfo.questionId, this.deleteInfo.rowId) await this.deleteOldLesion(this.deleteInfo.questionId, this.deleteInfo.rowId)
this.deleteInfo = null this.deleteInfo = null
} }
submitTableQuestion(params).then(async res => { submitTableQuestion(params).then(async res => {
// //
this.$message.success(this.$t('common:message:savedSuccessfully')) this.$message.success(this.$t('common:message:savedSuccessfully'))
this.currentMarkTool = measureData ? measureData.type : '' this.currentMarkTool = measureData ? measureData.type : ''
// saveTypeEnum 01访/2 // saveTypeEnum 01访/2
this.$set(this.questionForm, 'saveTypeEnum', 2) this.$set(this.questionForm, 'saveTypeEnum', 2)
this.originalQuestionForm = { ...this.questionForm } this.originalQuestionForm = { ...this.questionForm }
loading.close() loading.close()
var lesionOrgan = this.getQuestionVal(6) var lesionOrgan = this.getQuestionVal(6)
this.$set(this.questionForm, 'RowId', res.Result.RowId) this.$set(this.questionForm, 'RowId', res.Result.RowId)
const lesionPart = this.getQuestionVal(8) const lesionPart = this.getQuestionVal(8)
const lesionState = Number(this.getQuestionVal(7)) 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('resetQuestions', { isLymphLesion: 0, lesionPart, lesionOrgan, saveTypeEnum: this.questionForm.saveTypeEnum, lesionLength, lesionState, rowIndex: this.rowIndex, questionId: this.parentQsId, anwsers: this.questionForm })
this.$emit('close') this.$emit('close')
DicomEvent.$emit('getReportInfo', true) DicomEvent.$emit('getReportInfo', true)
DicomEvent.$emit('setMeasuredToolsPassive') DicomEvent.$emit('setMeasuredToolsPassive')
}).catch(() => { loading.close() }) }).catch(() => { loading.close() })
}
}) })
}) })
}, },