From 138ea2cfb80a1c1b1afabe818c23c4889ca667f7 Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Thu, 18 Apr 2024 14:25:40 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E7=A4=BA=E4=BC=98=E5=8C=96=E5=8F=8A?=
 =?UTF-8?q?=E5=BD=B1=E5=83=8F=E8=AF=84=E4=BC=B0=E8=AE=BE=E7=BD=AEpet=205PS?=
 =?UTF-8?q?=E8=AF=84=E5=88=86=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../reading/dicoms/components/Fusion/Questions.vue          | 4 ++--
 .../trials-panel/reading/dicoms/components/Questions.vue    | 6 +++++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/Questions.vue b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/Questions.vue
index e9aa831d..d9e9a5e6 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/Questions.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/Questions.vue
@@ -456,11 +456,11 @@ export default {
           const suvMax = measurement.suvMax
           
           if(this.questionForm[obj.QuestionId] !== suvMax){
+            this.setPet5PSCommentDisplay()
+            this.$set(this.questionForm, obj.QuestionId, suvMax || null)
             var pet5PS = this.setpet5PS()
             this.questionForm[this.pet5PSId] = pet5PS
             this.calculatePet5PS = pet5PS
-            this.setPet5PSCommentDisplay()
-            this.$set(this.questionForm, obj.QuestionId, suvMax || null)
           }
         }
         FusionEvent.$emit('addOrUpdateAnnotations', { data })
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Questions.vue b/src/views/trials/trials-panel/reading/dicoms/components/Questions.vue
index 520cf1d5..59cef3ee 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Questions.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Questions.vue
@@ -311,7 +311,11 @@ export default {
           // 保存影响质量问题分组，如果质量问题为PET-CT影像无法融合则验证是否可以保存
           const res = await getCanChooseNotMerge({ visitTaskId: this.visitTaskId })
           if (res.IsSuccess && !res.Result.IsCanChooseNotMerge) {
-            this.$alert(this.$t('trials:lugano:saveQuestions:warning1'))
+            // this.$alert(this.$t('trials:lugano:saveQuestions:warning1'), this.$t('trials:lugano:fusionDialog:warning'), {showCancelButton: false})
+            this.$alert(this.$t('trials:lugano:saveQuestions:warning1'), this.$t('trials:lugano:fusionDialog:warning'), {
+              showCancelButton: false,
+              callback: action => {}
+            })
             return
           } else {
             // 如果设置为PET-CT影像无法融合，则FDG-PET评估会被设置为NE。