XCKJ
/
irc_web
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

已融合的消失的病灶不允许画标记
continuous-integration/drone/push Build is passing Details

main
wangxiaoshuang 2025-12-26 13:10:47 +08:00
parent 6f3ca769a6
commit cce6122e9e
8 changed files with 27 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/views/trials/trials-panel/reading/dicoms/components/IRecist/QuestionList.vue
View File

@ -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 }

2
src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionList.vue
View File

@ -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 })

2
src/views/trials/trials-panel/reading/dicoms/components/LuganoWithoutPET/QuestionList.vue
View File

@ -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 })

5
src/views/trials/trials-panel/reading/dicoms/components/Recist/QuestionList.vue
View File

@ -128,7 +128,7 @@
style="position: absolute;right: 5px;top: 2px;">
<!-- 分裂 -->
<el-tooltip
v-show="readingTaskState < 2&& item.TableQuestions.Answers[i].SplitOrMergeType !== '4' && !!item.TableQuestions.Answers[i].RowId && !isBaseLineTask && item.TableQuestions.Answers[i].isDicomReading !== false"
v-show="readingTaskState < 2 && item.TableQuestions.Answers[i].SplitOrMergeType !== '4' && !!item.TableQuestions.Answers[i].RowId && !isBaseLineTask && item.TableQuestions.Answers[i].isDicomReading !== false"
class="item" :content="$t('trials:reading:button:split')" placement="left">
<i class="iconfont icon-24gl-split" style="color:#fff;font-size: 16px;"
@click.stop="handleSplit(item.TableQuestions.Answers[i].RowId, item.Id)" />
@ -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 })

3
src/views/trials/trials-panel/reading/dicoms/components/RecistBM/QuestionList.vue
View File

@ -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 })

4
src/views/trials/trials-panel/reading/dicoms3D/components/ReadPage.vue
View File

@ -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)
}

8
src/views/trials/trials-panel/reading/dicoms3D/components/Recist/QuestionList.vue
View File

@ -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') {

8
src/views/trials/trials-panel/reading/dicoms3D/components/mRecist/QuestionList.vue
View File

@ -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') {