From f21d8871b5b513bb4016d231e74d716ed2aa89dd Mon Sep 17 00:00:00 2001 From: caiyiling <1321909229@qq.com> Date: Thu, 29 Feb 2024 14:24:45 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E9=98=85=E7=89=87=E5=AE=8C=E6=88=90?= =?UTF-8?q?=E9=9A=90=E8=97=8F=E5=88=86=E8=A3=82=E8=9E=8D=E5=90=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../reading/dicoms/components/Lugano/QuestionList.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 0cc9bd27..7e7802bf 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 @@ -96,7 +96,7 @@ -
+
From 9c4fc174d0376268f288da006dbff7cd81c2425d Mon Sep 17 00:00:00 2001 From: caiyiling <1321909229@qq.com> Date: Thu, 29 Feb 2024 15:22:04 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E8=82=BF=E7=98=A4=E5=AD=A6=E9=98=85?= =?UTF-8?q?=E7=89=87bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/Conclusions.vue | 54 ++---------- .../mim-medical-audit/components/Issues.vue | 12 +-- .../reading/oncology-review/index.vue | 87 ++++++++++--------- 3 files changed, 55 insertions(+), 98 deletions(-) diff --git a/src/views/trials/trials-panel/reading/mim-medical-audit/components/Conclusions.vue b/src/views/trials/trials-panel/reading/mim-medical-audit/components/Conclusions.vue index ac9e0ebf..b204102b 100644 --- a/src/views/trials/trials-panel/reading/mim-medical-audit/components/Conclusions.vue +++ b/src/views/trials/trials-panel/reading/mim-medical-audit/components/Conclusions.vue @@ -5,56 +5,9 @@ ref="conclusionsForm" v-loading="loading" :model="form" - label-width="100px" - style="width:500px" + label-position="left" + label-width="800px" > - - - - - - - - - @@ -106,6 +61,7 @@ - - - - !item.EvaluationResult && !item.IsBaseLine) - var isDiffer = this.checkDifferResult() - if (isDiffer) { - this.loading = false - // '肿瘤学阅片结论不能为空！' this.$t('trials:oncologyReview:message:msg1' - // '肿瘤学阅片结果与影像学整体肿瘤评估不一致，请填写原因！' - this.$confirm(this.$t('trials:oncologyReview:message:msg2'), { - type: 'warning', - distinguishCancelAndClose: true - }) - .then(() => { - return Promise.reject(false) - }) - .catch(action => { - return Promise.reject(false) - }) - } else { + return new Promise((resolve, reject) => { this.loading = true - var oncologyQuestionList = [] - this.oncologyInfo.OncologyVisits.map(item => { - if (item.EvaluationResult && !item.IsBaseLine) { - oncologyQuestionList.push( - { - visitTaskId: item.VisitTaskId, - evaluationResult: item.EvaluationResult, - evaluationReason: item.EvaluationReason - } - ) + // var index = this.oncologyInfo.OncologyVisits.findIndex(item => !item.EvaluationResult && !item.IsBaseLine) + var isDiffer = this.checkDifferResult() + if (isDiffer) { + this.loading = false + // '肿瘤学阅片结论不能为空！' this.$t('trials:oncologyReview:message:msg1' + // '肿瘤学阅片结果与影像学整体肿瘤评估不一致，请填写原因！' + // this.$confirm(this.$t('trials:oncologyReview:message:msg2'), { + // type: 'warning', + // distinguishCancelAndClose: true, + // showCancelButton: false + // }).then(_ => {}) + // .catch(_ => { + // }) + this.$confirm(this.$t('trials:oncologyReview:message:msg2'), { + type: 'warning', + showCancelButton: false + }) + .then(() => { + reject(false) + }) + } else { + this.loading = true + var oncologyQuestionList = [] + this.oncologyInfo.OncologyVisits.map(item => { + if (item.EvaluationResult && !item.IsBaseLine) { + oncologyQuestionList.push( + { + visitTaskId: item.VisitTaskId, + evaluationResult: item.EvaluationResult, + evaluationReason: item.EvaluationReason + } + ) + } + }) + var params = { + oncologyTaskId: this.visitTaskId, + oncologyQuestionList: oncologyQuestionList, + globalTaskId: this.oncologyInfo.GlobalTaskId, + relatedTaskId: this.oncologyInfo.RelatedTaskId } - }) - var params = { - oncologyTaskId: this.visitTaskId, - oncologyQuestionList: oncologyQuestionList, - globalTaskId: this.oncologyInfo.GlobalTaskId, - relatedTaskId: this.oncologyInfo.RelatedTaskId - } - return new Promise((resolve, reject) => { + setOncologyReadingInfo(params).then(res => { this.loading = false this.getList() @@ -411,8 +416,8 @@ export default { this.loading = false reject(false) }) - }) - } + } + }) }, checkDifferResult() { var isDiffer = false @@ -424,7 +429,11 @@ export default { var idx = this.oncologyInfo.OncologyVisits[i].QuestionList.findIndex(v => v.DictionaryCode === 'ImagingOverallAssessment_Lugano') if (idx > -1) { tumorAssessment = this.oncologyInfo.OncologyVisits[i].QuestionList[idx].Answer - if (tumorAssessment !== this.oncologyInfo.OncologyVisits[i].EvaluationResult) { + console.log(tumorAssessment === this.oncologyInfo.OncologyVisits[i].EvaluationResult) + if (tumorAssessment === this.oncologyInfo.OncologyVisits[i].EvaluationResult || (tumorAssessment !== this.oncologyInfo.OncologyVisits[i].EvaluationResult && this.oncologyInfo.OncologyVisits[i].EvaluationReason)) { + isDiffer = false + break + } else { isDiffer = true break }