From 4b10b567e0d28ebd54bf2f3a7c9fbf190a125cc1 Mon Sep 17 00:00:00 2001 From: caiyiling <1321909229@qq.com> Date: Fri, 31 May 2024 14:02:47 +0800 Subject: [PATCH] =?UTF-8?q?Lugano=E8=AF=84=E4=BC=B0=E9=80=BB=E8=BE=91?= =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=8F=8A=E5=85=A8=E5=B1=80=E8=B7=B3=E8=BD=AC?= =?UTF-8?q?=E8=AE=BF=E8=A7=86=E9=98=85=E7=89=87=E9=A1=B5=E9=9D=A2bug?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dicoms/components/Fusion/QuestionItem.vue | 46 ++++++++++++++++++- .../dicoms/components/Fusion/Questions.vue | 15 ++++++ .../dicoms/customize/CustomizeReportPage.vue | 3 +- .../global-review/components/IRecistTable.vue | 5 +- .../global-review/components/LuganoTable.vue | 3 +- .../components/RecistBMTable.vue | 5 +- .../global-review/components/RecistTable.vue | 5 +- .../reading/global-review/index.vue | 5 +- 8 files changed, 76 insertions(+), 11 deletions(-) diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/QuestionItem.vue b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/QuestionItem.vue index d620d7d8..eee5f60a 100644 --- a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/QuestionItem.vue +++ b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/QuestionItem.vue @@ -66,6 +66,38 @@ + + 0) { this.setChild(i.Childrens) } @@ -573,6 +579,7 @@ export default { if (obj.key === this.pet5PSId) { this.setPet5PSCommentDisplay() this.setUptakeFormBaseline() + this.setfocalFDG() } }, setPet5PSCommentDisplay() { @@ -604,11 +611,19 @@ export default { } else if (this.questionForm[this.pet5PSId] < this.baseLinePET5PS) { this.questionForm[this.uptakeFromBaselineId] = '2' } + } else if (this.questionForm[this.pet5PSId] !== '-1' && this.questionForm[this.uptakeFromBaselineId] === '4') { + this.questionForm[this.uptakeFromBaselineId] = '' } else if (this.questionForm[this.pet5PSId] === '' || this.questionForm[this.pet5PSId] === null) { this.questionForm[this.uptakeFromBaselineId] = '' } } }, + setfocalFDG() { + console.log('setfocalFDG') + if (this.questionForm[this.pet5PSId] !== '-1' && this.questionForm[this.focalFDGId] === '1') { + this.questionForm[this.focalFDGId] = '' + } + }, setpet5PS() { console.log('setpet5PS') // 无需标记，自主选择 1分 diff --git a/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeReportPage.vue b/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeReportPage.vue index b418abb8..119d3edd 100644 --- a/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeReportPage.vue +++ b/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeReportPage.vue @@ -781,7 +781,8 @@ export default { var isReadingTaskViewInOrder = this.$router.currentRoute.query.isReadingTaskViewInOrder var criterionType = this.$router.currentRoute.query.criterionType var readingTool = this.$router.currentRoute.query.readingTool - var path = `/readingDicoms?trialId=${trialId}&subjectCode=${subjectCode}&subjectId=${subjectId}&visitTaskId=${task.VisitTaskId}&isReadingTaskViewInOrder=${isReadingTaskViewInOrder}&criterionType=${criterionType}&readingTool=${readingTool}&TokenKey=${token}` + var trialReadingCriterionId = this.$router.currentRoute.query.TrialReadingCriterionId + var path = `/readingDicoms?TrialReadingCriterionId=${trialReadingCriterionId}&trialId=${trialId}&subjectCode=${subjectCode}&subjectId=${subjectId}&visitTaskId=${task.VisitTaskId}&isReadingTaskViewInOrder=${isReadingTaskViewInOrder}&criterionType=${criterionType}&readingTool=${readingTool}&TokenKey=${token}` const routeData = this.$router.resolve({ path }) window.open(routeData.href, '_blank') }, diff --git a/src/views/trials/trials-panel/reading/global-review/components/IRecistTable.vue b/src/views/trials/trials-panel/reading/global-review/components/IRecistTable.vue index 3e9065d1..93e6589a 100644 --- a/src/views/trials/trials-panel/reading/global-review/components/IRecistTable.vue +++ b/src/views/trials/trials-panel/reading/global-review/components/IRecistTable.vue @@ -356,11 +356,12 @@ export default { var readingTool = this.$router.currentRoute.query.readingTool readingTool = isNaN(parseInt(readingTool)) ? null : parseInt(readingTool) var isReadingTaskViewInOrder = this.$router.currentRoute.query.isReadingTaskViewInOrder + var trialReadingCriterionId = this.$router.currentRoute.query.TrialReadingCriterionId var path = '' if (readingTool === 0) { - path = `/readingDicoms?trialId=${this.globalInfo.trialId}&subjectCode=${this.globalInfo.subjectCode}&subjectId=${this.globalInfo.subjectId}&visitTaskId=${visitTaskId}&isReadingTaskViewInOrder=${isReadingTaskViewInOrder}&criterionType=${criterionType}&readingTool=${readingTool}&TokenKey=${token}` + path = `/readingDicoms?TrialReadingCriterionId=${trialReadingCriterionId}&trialId=${this.globalInfo.trialId}&subjectCode=${this.globalInfo.subjectCode}&subjectId=${this.globalInfo.subjectId}&visitTaskId=${visitTaskId}&isReadingTaskViewInOrder=${isReadingTaskViewInOrder}&criterionType=${criterionType}&readingTool=${readingTool}&TokenKey=${token}` } else { - path = `/noneDicomReading?trialId=${this.globalInfo.trialId}&subjectCode=${this.globalInfo.subjectCode}&subjectId=${this.globalInfo.subjectId}&visitTaskId=${visitTaskId}&isReadingTaskViewInOrder=${isReadingTaskViewInOrder}&criterionType=${criterionType}&readingTool=${readingTool}&TokenKey=${token}` + path = `/noneDicomReading?TrialReadingCriterionId=${trialReadingCriterionId}&trialId=${this.globalInfo.trialId}&subjectCode=${this.globalInfo.subjectCode}&subjectId=${this.globalInfo.subjectId}&visitTaskId=${visitTaskId}&isReadingTaskViewInOrder=${isReadingTaskViewInOrder}&criterionType=${criterionType}&readingTool=${readingTool}&TokenKey=${token}` } const routeData = this.$router.resolve({ path }) var newWindow = window.open(routeData.href, '_blank') diff --git a/src/views/trials/trials-panel/reading/global-review/components/LuganoTable.vue b/src/views/trials/trials-panel/reading/global-review/components/LuganoTable.vue index 0022c210..cc1e6d96 100644 --- a/src/views/trials/trials-panel/reading/global-review/components/LuganoTable.vue +++ b/src/views/trials/trials-panel/reading/global-review/components/LuganoTable.vue @@ -360,9 +360,10 @@ export default { var readingTool = this.$router.currentRoute.query.readingTool readingTool = isNaN(parseInt(readingTool)) ? null : parseInt(readingTool) var isReadingTaskViewInOrder = this.$router.currentRoute.query.isReadingTaskViewInOrder + var trialReadingCriterionId = this.$router.currentRoute.query.TrialReadingCriterionId var path = '' if (readingTool === 0) { - path = `/readingDicoms?trialId=${this.globalInfo.trialId}&subjectCode=${this.globalInfo.subjectCode}&subjectId=${this.globalInfo.subjectId}&visitTaskId=${visitTaskId}&isReadingTaskViewInOrder=${isReadingTaskViewInOrder}&criterionType=${criterionType}&readingTool=${readingTool}&TokenKey=${token}` + path = `/readingDicoms?TrialReadingCriterionId=${trialReadingCriterionId}&trialId=${this.globalInfo.trialId}&subjectCode=${this.globalInfo.subjectCode}&subjectId=${this.globalInfo.subjectId}&visitTaskId=${visitTaskId}&isReadingTaskViewInOrder=${isReadingTaskViewInOrder}&criterionType=${criterionType}&readingTool=${readingTool}&TokenKey=${token}` } else { path = `/noneDicomReading?trialId=${this.globalInfo.trialId}&subjectCode=${this.globalInfo.subjectCode}&subjectId=${this.globalInfo.subjectId}&visitTaskId=${visitTaskId}&isReadingTaskViewInOrder=${isReadingTaskViewInOrder}&criterionType=${criterionType}&readingTool=${readingTool}&TokenKey=${token}` } diff --git a/src/views/trials/trials-panel/reading/global-review/components/RecistBMTable.vue b/src/views/trials/trials-panel/reading/global-review/components/RecistBMTable.vue index 8687fb2e..ff94183a 100644 --- a/src/views/trials/trials-panel/reading/global-review/components/RecistBMTable.vue +++ b/src/views/trials/trials-panel/reading/global-review/components/RecistBMTable.vue @@ -353,11 +353,12 @@ export default { var readingTool = this.$router.currentRoute.query.readingTool readingTool = isNaN(parseInt(readingTool)) ? null : parseInt(readingTool) var isReadingTaskViewInOrder = this.$router.currentRoute.query.isReadingTaskViewInOrder + var trialReadingCriterionId = this.$router.currentRoute.query.TrialReadingCriterionId var path = '' if (readingTool === 0) { - path = `/readingDicoms?trialId=${this.globalInfo.trialId}&subjectCode=${this.globalInfo.subjectCode}&subjectId=${this.globalInfo.subjectId}&visitTaskId=${visitTaskId}&isReadingTaskViewInOrder=${isReadingTaskViewInOrder}&criterionType=${criterionType}&readingTool=${readingTool}&TokenKey=${token}` + path = `/readingDicoms?TrialReadingCriterionId=${trialReadingCriterionId}&trialId=${this.globalInfo.trialId}&subjectCode=${this.globalInfo.subjectCode}&subjectId=${this.globalInfo.subjectId}&visitTaskId=${visitTaskId}&isReadingTaskViewInOrder=${isReadingTaskViewInOrder}&criterionType=${criterionType}&readingTool=${readingTool}&TokenKey=${token}` } else { - path = `/noneDicomReading?trialId=${this.globalInfo.trialId}&subjectCode=${this.globalInfo.subjectCode}&subjectId=${this.globalInfo.subjectId}&visitTaskId=${visitTaskId}&isReadingTaskViewInOrder=${isReadingTaskViewInOrder}&criterionType=${criterionType}&readingTool=${readingTool}&TokenKey=${token}` + path = `/noneDicomReading?TrialReadingCriterionId=${trialReadingCriterionId}&trialId=${this.globalInfo.trialId}&subjectCode=${this.globalInfo.subjectCode}&subjectId=${this.globalInfo.subjectId}&visitTaskId=${visitTaskId}&isReadingTaskViewInOrder=${isReadingTaskViewInOrder}&criterionType=${criterionType}&readingTool=${readingTool}&TokenKey=${token}` } const routeData = this.$router.resolve({ path }) var newWindow = window.open(routeData.href, '_blank') diff --git a/src/views/trials/trials-panel/reading/global-review/components/RecistTable.vue b/src/views/trials/trials-panel/reading/global-review/components/RecistTable.vue index a38257c8..d5bf2b1a 100644 --- a/src/views/trials/trials-panel/reading/global-review/components/RecistTable.vue +++ b/src/views/trials/trials-panel/reading/global-review/components/RecistTable.vue @@ -347,11 +347,12 @@ export default { var readingTool = this.$router.currentRoute.query.readingTool readingTool = isNaN(parseInt(readingTool)) ? null : parseInt(readingTool) var isReadingTaskViewInOrder = this.$router.currentRoute.query.isReadingTaskViewInOrder + var trialReadingCriterionId = this.$router.currentRoute.query.TrialReadingCriterionId var path = '' if (readingTool === 0) { - path = `/readingDicoms?trialId=${this.globalInfo.trialId}&subjectCode=${this.globalInfo.subjectCode}&subjectId=${this.globalInfo.subjectId}&visitTaskId=${visitTaskId}&isReadingTaskViewInOrder=${isReadingTaskViewInOrder}&criterionType=${criterionType}&readingTool=${readingTool}&TokenKey=${token}` + path = `/readingDicoms?TrialReadingCriterionId=${trialReadingCriterionId}&trialId=${this.globalInfo.trialId}&subjectCode=${this.globalInfo.subjectCode}&subjectId=${this.globalInfo.subjectId}&visitTaskId=${visitTaskId}&isReadingTaskViewInOrder=${isReadingTaskViewInOrder}&criterionType=${criterionType}&readingTool=${readingTool}&TokenKey=${token}` } else { - path = `/noneDicomReading?trialId=${this.globalInfo.trialId}&subjectCode=${this.globalInfo.subjectCode}&subjectId=${this.globalInfo.subjectId}&visitTaskId=${visitTaskId}&isReadingTaskViewInOrder=${isReadingTaskViewInOrder}&criterionType=${criterionType}&readingTool=${readingTool}&TokenKey=${token}` + path = `/noneDicomReading?TrialReadingCriterionId=${trialReadingCriterionId}&trialId=${this.globalInfo.trialId}&subjectCode=${this.globalInfo.subjectCode}&subjectId=${this.globalInfo.subjectId}&visitTaskId=${visitTaskId}&isReadingTaskViewInOrder=${isReadingTaskViewInOrder}&criterionType=${criterionType}&readingTool=${readingTool}&TokenKey=${token}` } const routeData = this.$router.resolve({ path }) var newWindow = window.open(routeData.href, '_blank') diff --git a/src/views/trials/trials-panel/reading/global-review/index.vue b/src/views/trials/trials-panel/reading/global-review/index.vue index 979acdde..745baa1c 100644 --- a/src/views/trials/trials-panel/reading/global-review/index.vue +++ b/src/views/trials/trials-panel/reading/global-review/index.vue @@ -460,15 +460,16 @@ export default { try { var token = getToken() var visitTaskId = row.VisitTaskId + var trialReadingCriterionId = this.$router.currentRoute.query.TrialReadingCriterionId var criterionType = this.$router.currentRoute.query.criterionType var readingTool = this.$router.currentRoute.query.readingTool readingTool = isNaN(parseInt(readingTool)) ? null : parseInt(readingTool) var isReadingTaskViewInOrder = this.$router.currentRoute.query.isReadingTaskViewInOrder var path = '' if (readingTool === 0) { - path = `/readingDicoms?trialId=${this.trialId}&subjectCode=${this.subjectCode}&subjectId=${this.subjectId}&visitTaskId=${visitTaskId}&isReadingTaskViewInOrder=${isReadingTaskViewInOrder}&criterionType=${criterionType}&readingTool=${readingTool}&TokenKey=${token}` + path = `/readingDicoms?TrialReadingCriterionId=${trialReadingCriterionId}&trialId=${this.trialId}&subjectCode=${this.subjectCode}&subjectId=${this.subjectId}&visitTaskId=${visitTaskId}&isReadingTaskViewInOrder=${isReadingTaskViewInOrder}&criterionType=${criterionType}&readingTool=${readingTool}&TokenKey=${token}` } else { - path = `/noneDicomReading?trialId=${this.trialId}&subjectCode=${this.subjectCode}&subjectId=${this.subjectId}&visitTaskId=${visitTaskId}&isReadingTaskViewInOrder=${isReadingTaskViewInOrder}&criterionType=${criterionType}&readingTool=${readingTool}&TokenKey=${token}` + path = `/noneDicomReading?TrialReadingCriterionId=${trialReadingCriterionId}&trialId=${this.trialId}&subjectCode=${this.subjectCode}&subjectId=${this.subjectId}&visitTaskId=${visitTaskId}&isReadingTaskViewInOrder=${isReadingTaskViewInOrder}&criterionType=${criterionType}&readingTool=${readingTool}&TokenKey=${token}` } const routeData = this.$router.resolve({ path }) this.openWindow = window.open(routeData.href, '_blank')