From c5f86d05578f839d9f2c8dfe6f37ff58df4c3d29 Mon Sep 17 00:00:00 2001 From: caiyiling <1321909229@qq.com> Date: Wed, 21 Feb 2024 13:28:38 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A2=AB=E8=9E=8D=E5=90=88=E7=9A=84=E7=97=85?= =?UTF-8?q?=E7=81=B6=E5=9C=A8=E4=B8=8B=E6=AC=A1=E9=9A=8F=E8=AE=BF=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E7=8A=B6=E6=80=81=E4=B8=BA=E6=B6=88=E5=A4=B1=E4=B8=94?= =?UTF-8?q?=E4=B8=8D=E8=83=BD=E5=86=8D=E6=93=8D=E4=BD=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../reading/dicoms/components/Lugano/QuestionForm.vue | 11 ++++++----- .../reading/dicoms/components/Lugano/QuestionList.vue | 9 +++++++-- 2 files changed, 13 insertions(+), 7 deletions(-) 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 4b3b76b3..0ca86fd8 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 @@ -88,7 +88,7 @@ v-model="questionForm[qs.Id]" filterable :placeholder="qs.QuestionMark === 8 ? $t('common:placeholder:selectorsearch') : $t('common:placeholder:select')" - :disabled="!isCurrentTask || readingTaskState>=2 || qs.QuestionMark === 0 || qs.QuestionMark === 1 || qs.QuestionMark === 2 || qs.QuestionMark === 5 || (qs.QuestionMark === 6 && (isCurrentTaskAdd === 'False' || (isCurrentTaskAdd === 'True' && !questionForm.IsCanEditPosition) || !!answers.SplitOrMergeLesionName))|| (qs.QuestionMark === 8 && (isCurrentTaskAdd === 'False'|| !!answers.SplitOrMergeLesionName)) || (qs.QuestionMark === 10 && (isCurrentTaskAdd === 'False' || (isCurrentTaskAdd === 'True' && !questionForm.IsCanEditPosition) || !!answers.SplitOrMergeLesionName)) || (qs.QuestionMark === 7 && stateDisabled) || answers.SplitOrMergeType === '1'" + :disabled="!isCurrentTask || readingTaskState>=2 || qs.QuestionMark === 0 || qs.QuestionMark === 1 || qs.QuestionMark === 2 || qs.QuestionMark === 5 || (qs.QuestionMark === 6 && (isCurrentTaskAdd === 'False' || (isCurrentTaskAdd === 'True' && !questionForm.IsCanEditPosition) || !!answers.SplitOrMergeLesionName))|| (qs.QuestionMark === 8 && (isCurrentTaskAdd === 'False'|| !!answers.SplitOrMergeLesionName)) || (qs.QuestionMark === 10 && (isCurrentTaskAdd === 'False' || (isCurrentTaskAdd === 'True' && !questionForm.IsCanEditPosition) || !!answers.SplitOrMergeLesionName)) || (qs.QuestionMark === 7 && stateDisabled) || answers.SplitOrMergeType === '1' || (qs.QuestionMark === 7 && answers.SplitOrMergeType === '3')" :popper-append-to-body="lesionType === 0 ? false :true" @change="((val)=>{formItemChange(val, qs)})" > @@ -234,7 +234,7 @@
@@ -1706,7 +1706,6 @@ export default { this.$set(this.questionForm, lengId, '') var shortId = this.getQuestionId(1) this.$set(this.questionForm, shortId, '') - var stateId = this.getQuestionId(7) this.$set(this.questionForm, stateId, '') // saveTypeEnum 0：未保存过（新建病灶）；1：已保存，信息不完整（随访初始化病灶/分裂病灶，通过状态判断） @@ -1841,8 +1840,10 @@ export default { if (this.isCurrentTask && this.readingTaskState < 2) { var lesionState = this.getQuestionVal(7) if (isNaN(parseInt(lesionState)) && this.answers.IsFristAdd === 'False') { - const stateId = this.getQuestionId(7) - this.$set(this.questionForm, stateId, 2) + if (this.answers.SplitOrMergeType !== '3') { + const stateId = this.getQuestionId(7) + this.$set(this.questionForm, stateId, 2) + } var isLymphLesion = this.getQuestionVal(2) isLymphLesion = !isNaN(parseInt(isLymphLesion)) ? parseInt(isLymphLesion) : null const lesionPart = this.getQuestionVal(8) 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 8f52d19b..df68e89e 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 @@ -968,7 +968,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' ? 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 }) @@ -1137,7 +1138,11 @@ export default { this.$nextTick(() => { const refName = `${this.activeItem.activeCollapseId}_${this.activeItem.activeRowIndex}` if (!this.$refs[refName][0].questionForm.MeasureData || (this.$refs[refName][0].questionForm && this.$refs[refName][0].questionForm.MeasureData && measureData.data.uuid === this.$refs[refName][0].questionForm.MeasureData.data.uuid)) { - this.$refs[refName][0].setMeasureData(measureData) + if (!this.$refs[refName][0].questionForm.MeasureData && this.$refs[refName][0].answers.SplitOrMergeType === '3') { + this.createNLTarget(measureData) + } else { + this.$refs[refName][0].setMeasureData(measureData) + } } else { if (this.isBaseLineTask) { var idx = this.tableQuestions.findIndex(item => item.LesionType === 0)