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 7fa1137d..8273b0fd 100644 --- a/src/views/trials/trials-panel/reading/dicoms/components/DicomCanvas.vue +++ b/src/views/trials/trials-panel/reading/dicoms/components/DicomCanvas.vue @@ -680,6 +680,14 @@ export default { const imageId = this.stack.imageIds[this.stack.currentImageIdIndex] ToolStateManager.clearImageIdToolState(imageId) cornerstone.updateImage(this.canvas, true) + 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 = [] + } return true }, onContextmenu(event) { 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 1e52c47a..26f50181 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 @@ -470,27 +470,39 @@ export default { sdiIncrease = isNaN(parseFloat(sdiIncrease)) ? 0 : parseFloat(sdiIncrease) if (!this.isBaseLineTask && state === 4 && this.lesionType === 0 && ldi && pddIncrease && ldiIncrease && sdiIncrease) { - if (this.splitLesionTargetPDD) { - var minPPD = this.getQuestionVal(13) - minPPD = parseFloat(minPPD) - pddIncrease = ((((this.splitLesionTargetPDD - minPPD) / minPPD)) * 100).toFixed(this.digitPlaces) - } - /** 疾病进展 + /** 融合主病灶疾病进展 + * 当前融合靶病灶LDi>15 + * 相比最低点PPD增加百分比 ≥50% + **/ + if (this.answers.SplitOrMergeType === '4' || this.answers.SplitOrMergeType === '5') { + if (ldi > 15 && pddIncrease >= 50) { + this.stateDisabled = true + } else { + this.stateDisabled = false + } + } else { + if (this.splitLesionTargetPDD) { + var minPPD = this.getQuestionVal(13) + minPPD = parseFloat(minPPD) + pddIncrease = ((((this.splitLesionTargetPDD - minPPD) / minPPD)) * 100).toFixed(this.digitPlaces) + } + /** 疾病进展 * 15mm<当前靶病灶LDi≤20mm * 相比最低点PPD增加百分比 ≥50% * 相比PPD最低点LDi增加值 ≥5 mm 或者 相比PPD最低点SDi增加值≥5 mm **/ - if ((ldi > 15 && ldi <= 20) && (pddIncrease >= 50) && (ldiIncrease >= 5 || sdiIncrease >= 5)) { - this.stateDisabled = true - } else if ((ldi > 20) && (pddIncrease >= 50) && (ldiIncrease >= 10 || sdiIncrease >= 10)) { + if ((ldi > 15 && ldi <= 20) && (pddIncrease >= 50) && (ldiIncrease >= 5 || sdiIncrease >= 5)) { + this.stateDisabled = true + } else if ((ldi > 20) && (pddIncrease >= 50) && (ldiIncrease >= 10 || sdiIncrease >= 10)) { /** 疾病进展 * 当前靶病灶LDi>20 mm * 相比最低点PPD增加百分比 ≥50% * 相比PPD最低点LDi增加值 ≥10 mm 或者 相比PPD最低点SDi增加值Sdi ≥10 mm **/ - this.stateDisabled = true - } else { - this.stateDisabled = false + this.stateDisabled = true + } else { + this.stateDisabled = false + } } } else { this.stateDisabled = false @@ -968,32 +980,47 @@ export default { } /** 疾病进展* **/ if (!this.isBaseLineTask && ldi && pddIncreaseNum && ldiIncrease && sdiIncrease && this.lesionType === 0 && this.isCurrentTaskAdd === 'False') { + if (this.answers.SplitOrMergeType === '4' || this.answers.SplitOrMergeType === '5') { + /** 融合主病灶疾病进展 + * 当前融合靶病灶LDi>15 + * 相比最低点PPD增加百分比 ≥50% + **/ + if (ldi > 15 && pddIncreaseNum >= 50) { + const stateId = this.getQuestionId(7) + this.$set(this.questionForm, stateId, 4) + this.stateDisabled = true + } else { + // 不符合疾病进展是否需要清空修改前疾病进展的状态 + this.stateDisabled = false + } + } else { /** 疾病进展 * 15mm<当前靶病灶LDi≤20mm * 相比最低点PPD增加百分比 ≥50% * 相比PPD最低点LDi增加值 ≥5 mm 或者 相比PPD最低点SDi增加值≥5 mm **/ - if ((ldi > 15 && ldi <= 20) && (pddIncreaseNum >= 50) && (ldiIncrease >= 5 || sdiIncrease >= 5)) { - const stateId = this.getQuestionId(7) - this.$set(this.questionForm, stateId, 4) - this.stateDisabled = true - } else if ((ldi > 20) && (pddIncreaseNum >= 50) && (ldiIncrease >= 10 || sdiIncrease >= 10)) { + if ((ldi > 15 && ldi <= 20) && (pddIncreaseNum >= 50) && (ldiIncrease >= 5 || sdiIncrease >= 5)) { + const stateId = this.getQuestionId(7) + this.$set(this.questionForm, stateId, 4) + this.stateDisabled = true + } else if ((ldi > 20) && (pddIncreaseNum >= 50) && (ldiIncrease >= 10 || sdiIncrease >= 10)) { /** 疾病进展 * 当前靶病灶LDi>20 mm * 相比最低点PPD增加百分比 ≥50% * 相比PPD最低点LDi增加值 ≥10 mm 或者 相比PPD最低点SDi增加值Sdi ≥10 mm **/ - const stateId = this.getQuestionId(7) - this.$set(this.questionForm, stateId, 4) - this.stateDisabled = true - } else { + const stateId = this.getQuestionId(7) + this.$set(this.questionForm, stateId, 4) + this.stateDisabled = true + } else { // 不符合疾病进展是否需要清空修改前疾病进展的状态 // const lesionState = !isNaN(parseInt(this.getQuestionVal(7))) ? parseInt(this.getQuestionVal(7)) : '' // if (lesionState === 4) { // const stateId = this.getQuestionId(7) // this.$set(this.questionForm, stateId, null) // } - this.stateDisabled = false + this.stateDisabled = false + } } } else { // 不符合疾病进展是否需要清空修改前疾病进展的状态 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 df68e89e..f92dff6c 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 @@ -66,11 +66,14 @@
- +
+
+
{{ item.TableQuestions.Answers[i].lesionPart }} @@ -95,7 +98,7 @@
- + @@ -708,8 +711,8 @@ export default { var params = { visitTaskId: this.visitTaskId, questionId: this.mergeInfo.questionId, - mergeRowId: this.mergeInfo.mergeRowId, - meltingInToLesionList: this.mergeList + mergeMainRowId: this.mergeInfo.mergeRowId, + mergeRowIdList: this.mergeList } mergeLesion(params).then(res => { this.merge.loading = false