肝脏及pet5ps逻辑优化

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 })
     },

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)