From 88f2c34db93cc30997d1e772925ff441479cc72c Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Wed, 24 Apr 2024 17:03:27 +0800
Subject: [PATCH] =?UTF-8?q?=E8=82=9D=E8=84=8F=E5=8F=8Apet5ps=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dicoms/components/Fusion/Questions.vue    | 11 +++++++--
 .../reading/dicoms/components/Questions.vue   | 24 ++++++++++++++-----
 2 files changed, 27 insertions(+), 8 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 3a8dbca5..9d55267f 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
@@ -664,9 +664,16 @@ export default {
           // this.calculatePet5PS = pet5PS
           // this.setPet5PSCommentDisplay()
           // this.setUptakeFormBaseline()
-          this.questionFormChangeState = true
         })
-
+        for (let i = 0; i < this.questions[0].Childrens[0].Childrens.length; i++) {
+          if (this.questions[0].Childrens[0].Childrens[i].QuestionType === 59) {
+            this.questions[0].Childrens[0].Childrens[i].ShowQuestion = 2
+            this.questions[0].Childrens[0].Childrens[i].IsRequired = 3
+            this.questionForm[this.pet5PSCommentsId] = ''
+            break
+          }
+        }
+        this.questionFormChangeState = true
         this.loading = false
       }).catch(() => { this.loading = false })
     },
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 0a7251fc..e8ba4bbc 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Questions.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Questions.vue
@@ -283,7 +283,6 @@ export default {
           currentSpleenStatus = isNaN(parseInt(currentSpleenStatus)) ? null : parseInt(currentSpleenStatus)
           var stIdx = this.measurements.findIndex(i => i.QuestionType === 60)
           var slIdx = this.measurements.findIndex(i => i.QuestionType === 61)
-          var chenckVaild = this.checkAnnotationValid(stIdx, slIdx)
 
           if (currentSpleenLength && currentSpleenStatus === 5) {
             // '脾脏状态为不可评估，不需要添加标记!'
@@ -299,11 +298,6 @@ export default {
             this.$alert(this.$t('trials:lugano:message:validSpleen2'), this.$t('trials:lugano:fusionDialog:warning'), {
               callback: _ => {}
             })
-          } else if (!chenckVaild) {
-            // 校验标记是否在同一序列的不同图像上
-            this.$alert(this.$t('trials:lugano:message:validSpleen3'), this.$t('trials:lugano:fusionDialog:warning'), {
-              callback: _ => {}
-            })
           } else {
             this.saveQuestionsList()
           }
@@ -533,6 +527,16 @@ export default {
       }
     },
     saveAnnotation(question) {
+      var stIdx = this.measurements.findIndex(i => i.QuestionType === 60)
+      var slIdx = this.measurements.findIndex(i => i.QuestionType === 61)
+      var chenckVaild = this.checkAnnotationValid(stIdx, slIdx)
+      if (!chenckVaild) {
+        // 校验标记是否在同一序列的不同图像上
+        this.$alert(this.$t('trials:lugano:message:validSpleen3'), this.$t('trials:lugano:fusionDialog:warning'), {
+          callback: _ => {}
+        })
+        return
+      }
       this.loading = true
       // 获取截图
       var annotationObj = this.measurements.find(i => i.QuestionType === question.QuestionType)
@@ -578,6 +582,14 @@ export default {
         await saveTaskQuestion(qsType, params)
         this.$message.success(this.$t('common:message:savedSuccessfully'))
         await this.setQuestions()
+        for (let i = 0; i < this.questions[0].Childrens.length; i++) {
+          if (this.questions[0].Childrens[i].QuestionType === 58) {
+            this.questions[0].Childrens[i].ShowQuestion = 2
+            this.questions[0].Childrens[i].IsRequired = 3
+            this.questionForm[this.spleenCommentsId] = ''
+            break
+          }
+        }
         this.loading = false
         this.$set(question, 'SaveEnum', 0)
         DicomEvent.$emit('getReportInfo', true)