From 6e95127522852718e8fd5cab3c0878fe22903ec5 Mon Sep 17 00:00:00 2001 From: caiyiling <1321909229@qq.com> Date: Tue, 20 Feb 2024 15:54:22 +0800 Subject: [PATCH] =?UTF-8?q?lugano=E7=97=85=E7=81=B6=E8=9E=8D=E5=90=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/trials.js | 15 ++ .../reading/dicoms/components/DicomCanvas.vue | 21 ++- .../dicoms/components/Lugano/QuestionForm.vue | 12 +- .../dicoms/components/Lugano/QuestionList.vue | 154 +++++++++++++++++- 4 files changed, 184 insertions(+), 18 deletions(-) diff --git a/src/api/trials.js b/src/api/trials.js index 7808c3f3..c0d188d7 100644 --- a/src/api/trials.js +++ b/src/api/trials.js @@ -3519,3 +3519,18 @@ export function getTrialSiteSurveySelectList(param) { data: param }) } +export function getCanMergeLesion(param) { + return request({ + url: `/ReadingImageTask/getCanMergeLesion`, + method: 'post', + data: param + }) +} + +export function mergeLesion(param) { + return request({ + url: `/ReadingImageTask/mergeLesion`, + method: 'post', + data: param + }) +} diff --git a/src/views/trials/trials-panel/reading/dicoms/components/DicomCanvas.vue b/src/views/trials/trials-panel/reading/dicoms/components/DicomCanvas.vue index 8e1a48f3..4e14aaff 100644 --- a/src/views/trials/trials-panel/reading/dicoms/components/DicomCanvas.vue +++ b/src/views/trials/trials-panel/reading/dicoms/components/DicomCanvas.vue @@ -14,7 +14,7 @@
- +
@@ -223,7 +223,7 @@ export default { taskBlindName: '', frame: null, imageRendered: false, - isExistsClinicalData:false + isExistsClinicalData: false // preventCache: true }, dicomInfo: { @@ -539,7 +539,7 @@ export default { this.mousePosition.y = currentPoints.image.y + 1 this.mousePosition.mo = stats.mo this.mousePosition.suv = stats.suv - if (this.isFirstChangeTask && this.pointNearTool(e)) { + if ((this.isFirstChangeTask || this.disabledMarks.length > 0) && this.pointNearTool(e)) { e.stopImmediatePropagation() e.stopPropagation() e.preventDefault() @@ -555,7 +555,7 @@ export default { mouseDown(e) { this.image = e.detail.image var pointNearTool = this.pointNearTool(e) - if (this.isFirstChangeTask && pointNearTool) { + if ((this.isFirstChangeTask || this.disabledMarks.length > 0) && pointNearTool) { e.stopImmediatePropagation() e.stopPropagation() e.preventDefault() @@ -604,6 +604,15 @@ export default { }) return arr }, + getMergeMarks(measureDatas) { + var arr = [] + measureDatas.map(i => { + if ((i.LesionType === 0) && i.SplitOrMergeType === 1) { + arr.push(i.OrderMarkName) + } + }) + return arr + }, getRGBPixels(element, x, y, width, height) { if (!element) { return @@ -1064,11 +1073,15 @@ export default { var idx = this.visitTaskList.findIndex(i => i.VisitTaskId === dicomSeries.visitTaskId) this.stack.visitTaskNum = this.visitTaskList[idx].VisitTaskNum this.isFirstChangeTask = this.visitTaskList[idx].IsFirstChangeTask + var criterionType = parseInt(localStorage.getItem('CriterionType')) if (this.isFirstChangeTask) { this.disabledMarks = this.getDisabledMarks(this.visitTaskList[idx].MeasureData) + } else if (criterionType === 2) { + this.disabledMarks = this.getMergeMarks(this.visitTaskList[idx].MeasureData) } else { this.disabledMarks = [] } + this.maxVistNum = this.visitTaskList[this.visitTaskList.length - 1].VisitTaskNum this.minVistNum = this.visitTaskList[0].VisitTaskNum this.measureData = this.visitTaskList[idx].MeasureData diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionForm.vue b/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionForm.vue index 5928f3e0..8ee76602 100644 --- a/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionForm.vue +++ b/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionForm.vue @@ -30,7 +30,7 @@ @@ -63,7 +63,7 @@