diff --git a/src/views/trials/trials-panel/reading/dicoms/components/ReportPage.vue b/src/views/trials/trials-panel/reading/dicoms/components/ReportPage.vue index 3b4e0786..5c9afa9d 100644 --- a/src/views/trials/trials-panel/reading/dicoms/components/ReportPage.vue +++ b/src/views/trials/trials-panel/reading/dicoms/components/ReportPage.vue @@ -505,15 +505,23 @@ export default { var idx = item.Childrens.findIndex(i => i.QuestionMark === 8) var idxLoc = item.Childrens.findIndex(i => i.QuestionMark === 10) var state = item.Childrens.findIndex(i => i.QuestionMark === 7) + if (this.CriterionType === 22) { + idx = item.Childrens.findIndex(i => i.QuestionMark === 1106) + } if (idx > -1) { if (item.Childrens[idx].Answer.length > 0) { var k = item.Childrens[idx].Answer.findIndex(v => v.Answer !== '') var part = '' - if (obj.IsCanEditPosition) { - part = `${item.Childrens[idx].Answer[k].Answer}--${item.Childrens[idxLoc].Answer[k].Answer}` + if (this.CriterionType === 22) { + part = item.Childrens[idx].Answer[k].Answer ? this.$fd('Liver4Segmentation', parseInt(item.Childrens[idx].Answer[k].Answer)) : '' } else { - part = `${item.Childrens[idx].Answer[k].Answer}` + if (obj.IsCanEditPosition) { + part = `${item.Childrens[idx].Answer[k].Answer}--${item.Childrens[idxLoc].Answer[k].Answer}` + } else { + part = `${item.Childrens[idx].Answer[k].Answer}` + } } + if (item.SplitOrMergeLesionName && k > -1) { // obj.QuestionName = `${obj.QuestionName} --${part} (Split from ${item.SplitOrMergeLesionName})` obj.QuestionName = `${obj.QuestionName} --${part}` @@ -531,6 +539,7 @@ export default { this.$set(obj, 'Answers', Answers) // obj.QuestionName = `${obj.QuestionName} ` } else if (!item.SplitOrMergeLesionName && k > -1) { + console.log(part) obj.QuestionName = `${obj.QuestionName}--${part}` const Answers = {} if (state >= 0) { diff --git a/src/views/trials/trials-panel/reading/read-task/index.vue b/src/views/trials/trials-panel/reading/read-task/index.vue index 4bc0b838..8bbb8a88 100644 --- a/src/views/trials/trials-panel/reading/read-task/index.vue +++ b/src/views/trials/trials-panel/reading/read-task/index.vue @@ -209,7 +209,7 @@ @@ -482,9 +482,9 @@ export default { if (!valid) return this.loading = true this.btnLoading = true - if (!this.ApplyforReasonForm.IsCopyOrigenalForms || !this.isTumor) { - this.ApplyforReasonForm.IsCopyFollowForms = false - } + // if (!this.ApplyforReasonForm.IsCopyOrigenalForms || !this.isTumor) { + // this.ApplyforReasonForm.IsCopyFollowForms = false + // } var params = { TaskIdList: [ this.rowData.Id