diff --git a/src/views/trials/trials-panel/reading/dicoms/components/IRecist/QuestionList.vue b/src/views/trials/trials-panel/reading/dicoms/components/IRecist/QuestionList.vue index 09d877a4..91ee976d 100644 --- a/src/views/trials/trials-panel/reading/dicoms/components/IRecist/QuestionList.vue +++ b/src/views/trials/trials-panel/reading/dicoms/components/IRecist/QuestionList.vue @@ -985,7 +985,8 @@ export default { this.$nextTick(() => { const refName = `${this.activeItem.activeCollapseId}_${this.activeItem.activeRowIndex}` if (this.$refs[refName][0].questionForm.IsDicomReading !== false) { - var markTool = this.$refs[refName][0].currentMarkTool + var splitOrMergeType = this.$refs[refName][0].answers.SplitOrMergeType + var markTool = splitOrMergeType !== '3' && splitOrMergeType !== '1' ? this.$refs[refName][0].currentMarkTool : '' var readingTaskState = this.readingTaskState var isMarked = !!this.$refs[refName][0].questionForm.MeasureData var obj = { questionId: this.activeItem.activeCollapseId, rowIndex: this.activeItem.activeRowIndex, visitTaskId: this.visitTaskId, lesionName: this.$refs[refName][0].lesionMark, lesionType: this.$refs[refName][0].lesionType, markTool, readingTaskState, isMarked } diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionList.vue b/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionList.vue index fb7f527a..1e8876ba 100644 --- a/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionList.vue +++ b/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionList.vue @@ -976,7 +976,7 @@ export default { const refName = `${this.activeItem.activeCollapseId}_${this.activeItem.activeRowIndex}` if (this.$refs[refName][0].questionForm.IsDicomReading !== false) { var splitOrMergeType = this.$refs[refName][0].answers.SplitOrMergeType - var markTool = splitOrMergeType !== '3' ? this.$refs[refName][0].currentMarkTool : '' + var markTool = splitOrMergeType !== '3' && splitOrMergeType !== '1' ? this.$refs[refName][0].currentMarkTool : '' var readingTaskState = this.readingTaskState var isMarked = !!this.$refs[refName][0].questionForm.MeasureData DicomEvent.$emit('imageLocation', { questionId: this.activeItem.activeCollapseId, rowIndex: this.activeItem.activeRowIndex, visitTaskId: this.visitTaskId, lesionName: this.$refs[refName][0].lesionMark, lesionType: this.$refs[refName][0].lesionType, markTool, readingTaskState, isMarked }) diff --git a/src/views/trials/trials-panel/reading/dicoms/components/LuganoWithoutPET/QuestionList.vue b/src/views/trials/trials-panel/reading/dicoms/components/LuganoWithoutPET/QuestionList.vue index 15b65e75..b62cdbc2 100644 --- a/src/views/trials/trials-panel/reading/dicoms/components/LuganoWithoutPET/QuestionList.vue +++ b/src/views/trials/trials-panel/reading/dicoms/components/LuganoWithoutPET/QuestionList.vue @@ -974,7 +974,7 @@ export default { const refName = `${this.activeItem.activeCollapseId}_${this.activeItem.activeRowIndex}` if (this.$refs[refName][0].questionForm.IsDicomReading !== false) { var splitOrMergeType = this.$refs[refName][0].answers.SplitOrMergeType - var markTool = splitOrMergeType !== '3' ? this.$refs[refName][0].currentMarkTool : '' + var markTool = splitOrMergeType !== '3' && splitOrMergeType !== '1' ? this.$refs[refName][0].currentMarkTool : '' var readingTaskState = this.readingTaskState var isMarked = !!this.$refs[refName][0].questionForm.MeasureData DicomEvent.$emit('imageLocation', { questionId: this.activeItem.activeCollapseId, rowIndex: this.activeItem.activeRowIndex, visitTaskId: this.visitTaskId, lesionName: this.$refs[refName][0].lesionMark, lesionType: this.$refs[refName][0].lesionType, markTool, readingTaskState, isMarked }) diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Recist/QuestionList.vue b/src/views/trials/trials-panel/reading/dicoms/components/Recist/QuestionList.vue index f5d1f6ac..b73324de 100644 --- a/src/views/trials/trials-panel/reading/dicoms/components/Recist/QuestionList.vue +++ b/src/views/trials/trials-panel/reading/dicoms/components/Recist/QuestionList.vue @@ -128,7 +128,7 @@ style="position: absolute;right: 5px;top: 2px;"> @@ -882,7 +882,8 @@ export default { this.$nextTick(() => { const refName = `${this.activeItem.activeCollapseId}_${this.activeItem.activeRowIndex}` if (this.$refs[refName][0].questionForm.IsDicomReading !== false) { - var markTool = this.$refs[refName][0].currentMarkTool + var splitOrMergeType = this.$refs[refName][0].answers.SplitOrMergeType + var markTool = splitOrMergeType !== '3' && splitOrMergeType !== '1' ? this.$refs[refName][0].currentMarkTool : '' var readingTaskState = this.readingTaskState var isMarked = !!this.$refs[refName][0].questionForm.MeasureData DicomEvent.$emit('imageLocation', { questionId: this.activeItem.activeCollapseId, rowIndex: this.activeItem.activeRowIndex, visitTaskId: this.visitTaskId, lesionName: this.$refs[refName][0].lesionMark, lesionType: this.$refs[refName][0].lesionType, markTool, readingTaskState, isMarked }) diff --git a/src/views/trials/trials-panel/reading/dicoms/components/RecistBM/QuestionList.vue b/src/views/trials/trials-panel/reading/dicoms/components/RecistBM/QuestionList.vue index 5ca55c5a..c73f9f29 100644 --- a/src/views/trials/trials-panel/reading/dicoms/components/RecistBM/QuestionList.vue +++ b/src/views/trials/trials-panel/reading/dicoms/components/RecistBM/QuestionList.vue @@ -841,7 +841,8 @@ export default { this.$nextTick(() => { const refName = `${this.activeItem.activeCollapseId}_${this.activeItem.activeRowIndex}` if (this.$refs[refName][0].questionForm.IsDicomReading !== false) { - var markTool = this.$refs[refName][0].currentMarkTool + var splitOrMergeType = this.$refs[refName][0].answers.SplitOrMergeType + var markTool = splitOrMergeType !== '3' && splitOrMergeType !== '1' ? this.$refs[refName][0].currentMarkTool : '' var readingTaskState = this.readingTaskState var isMarked = !!this.$refs[refName][0].questionForm.MeasureData DicomEvent.$emit('imageLocation', { questionId: this.activeItem.activeCollapseId, rowIndex: this.activeItem.activeRowIndex, visitTaskId: this.visitTaskId, lesionName: this.$refs[refName][0].lesionMark, lesionType: this.$refs[refName][0].lesionType, markTool, readingTaskState, isMarked }) diff --git a/src/views/trials/trials-panel/reading/dicoms3D/components/ReadPage.vue b/src/views/trials/trials-panel/reading/dicoms3D/components/ReadPage.vue index e4ecaaa3..63f926ed 100644 --- a/src/views/trials/trials-panel/reading/dicoms3D/components/ReadPage.vue +++ b/src/views/trials/trials-panel/reading/dicoms3D/components/ReadPage.vue @@ -2969,7 +2969,7 @@ export default { firstAddSeries = currentAddSeries } else if (Object.keys(firstAddSeries).length === 0 && Object.keys(currentAddSeries).length === 0) { this.setToolsPassive() - if (obj.isActiveTarget) { + if (obj.isActiveTarget && obj.SplitOrMergeType !== '1' && obj.SplitOrMergeType !== '3') { this.setToolToTarget(obj) } resolve() @@ -3005,7 +3005,7 @@ export default { } } this.setToolsPassive() - if (obj.isActiveTarget) { + if (obj.isActiveTarget && obj.SplitOrMergeType !== '1' && obj.SplitOrMergeType !== '3') { this.setToolToTarget(obj) } diff --git a/src/views/trials/trials-panel/reading/dicoms3D/components/Recist/QuestionList.vue b/src/views/trials/trials-panel/reading/dicoms3D/components/Recist/QuestionList.vue index 64fa95e7..146a68e1 100644 --- a/src/views/trials/trials-panel/reading/dicoms3D/components/Recist/QuestionList.vue +++ b/src/views/trials/trials-panel/reading/dicoms3D/components/Recist/QuestionList.vue @@ -1540,6 +1540,7 @@ export default { obj.lesionName = innerForm.LesionName obj.markTool = innerForm.MarkTool ? innerForm.MarkTool : '' obj.isMarked = !!innerForm.MeasureData + obj.SplitOrMergeType = innerForm.SplitOrMergeType if (this.visitTaskId === this.taskInfo.VisitTaskId) { obj.isActiveTarget = true } @@ -1550,6 +1551,7 @@ export default { if (!innerForm.MeasureData) return const obj = Object.assign({ visitTaskId: this.visitTaskId }, innerForm.MeasureData) obj.lesionName = innerForm.LesionName + obj.SplitOrMergeType = innerForm.SplitOrMergeType this.$emit('imageLocation', obj) e.stopImmediatePropagation() e.stopPropagation() @@ -1862,6 +1864,9 @@ export default { const tableId = this.activeName.split('_')[0] const rowIndex = this.activeName.split('_')[1] const innerForm = this.innerFormData[`${tableId}_${rowIndex}`] + if (innerForm.SplitOrMergeType === '1' || innerForm.SplitOrMergeType === '3') { + return { isCanActiveTool: false, reason: '' } + } if (!innerForm.MeasureData) { return this.checkToolCanActive(toolName) } else { @@ -1897,6 +1902,9 @@ export default { const rowIndex = this.activeName.split('_')[1] const innerForm = this.innerFormData[`${tableId}_${rowIndex}`] const isLymphNodes = innerForm.IsLymphNodes + if (innerForm.SplitOrMergeType === '1' || innerForm.SplitOrMergeType === '3') { + return { isCanActiveTool: false, reason: '' } + } if (!innerForm.MeasureData) { if (this.isBaseLineTask) { if (innerForm.LesionType === 0 && isLymphNodes === 1 && toolName !== 'Bidirectional') { diff --git a/src/views/trials/trials-panel/reading/dicoms3D/components/mRecist/QuestionList.vue b/src/views/trials/trials-panel/reading/dicoms3D/components/mRecist/QuestionList.vue index 8fe5179d..dc9a8aff 100644 --- a/src/views/trials/trials-panel/reading/dicoms3D/components/mRecist/QuestionList.vue +++ b/src/views/trials/trials-panel/reading/dicoms3D/components/mRecist/QuestionList.vue @@ -1636,6 +1636,7 @@ export default { obj.lesionName = innerForm.LesionName obj.markTool = innerForm.MarkTool ? innerForm.MarkTool : '' obj.isMarked = !!innerForm.MeasureData + obj.SplitOrMergeType = innerForm.SplitOrMergeType if (this.visitTaskId === this.taskInfo.VisitTaskId) { obj.isActiveTarget = true } @@ -1646,6 +1647,7 @@ export default { if (!innerForm.MeasureData) return const obj = Object.assign({ visitTaskId: this.visitTaskId }, innerForm.MeasureData) obj.lesionName = innerForm.LesionName + obj.SplitOrMergeType = innerForm.SplitOrMergeType this.$emit('imageLocation', obj) e.stopImmediatePropagation() e.stopPropagation() @@ -1953,6 +1955,9 @@ export default { const tableId = this.activeName.split('_')[0] const rowIndex = this.activeName.split('_')[1] const innerForm = this.innerFormData[`${tableId}_${rowIndex}`] + if (innerForm.SplitOrMergeType === '1' || innerForm.SplitOrMergeType === '3') { + return { isCanActiveTool: false, reason: '' } + } if (!innerForm.MeasureData) { return this.checkToolCanActive(toolName) } else { @@ -1989,6 +1994,9 @@ export default { const innerForm = this.innerFormData[`${tableId}_${rowIndex}`] const isLymphNodes = innerForm.IsLymphNodes const intrahepaticLesion = innerForm.IntrahepaticLesion + if (innerForm.SplitOrMergeType === '1' || innerForm.SplitOrMergeType === '3') { + return { isCanActiveTool: false, reason: '' } + } if (!innerForm.MeasureData) { if (this.isBaseLineTask) { if (innerForm.LesionType === 0 && isLymphNodes === 1 && toolName !== 'Bidirectional') {