From 8618b188aed96b6d51e426bde69e062bdacec3a7 Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Thu, 18 Apr 2024 16:45:45 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8E=E5=9F=BA=E7=BA=BF=E6=91=84=E5=8F=96?=
 =?UTF-8?q?=E5=80=BC=E5=8F=98=E5=8C=96=E8=87=AA=E5=8A=A8=E8=AE=A1=E7=AE=97?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dicoms/components/Fusion/Questions.vue    | 33 +++++++++++--------
 .../dicoms/components/Lugano/QuestionForm.vue | 12 +++----
 2 files changed, 26 insertions(+), 19 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 d9e9a5e6..25dd73e2 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
@@ -348,6 +348,7 @@ export default {
       this.questionForm[this.pet5PSId] = pet5PS
       this.calculatePet5PS = pet5PS
       this.setPet5PSCommentDisplay()
+      this.setUptakeFormBaseline()
       FusionEvent.$emit('removeAnnotation', { otherMeasureData: this.measurements[idx].OtherMeasureData, type: 'clear' })
       var remark = this.measurements[idx].OtherMeasureData.data.remark
       remark === 'Liver' ? this.liverIsInsideVolume = true : remark === 'Mediastinum' ? this.lungIsInsideVolume = true : ''
@@ -454,13 +455,14 @@ export default {
         }
         if (measurement.type === 'CircleROI') {
           const suvMax = measurement.suvMax
-          
-          if(this.questionForm[obj.QuestionId] !== 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.setUptakeFormBaseline()
           }
         }
         FusionEvent.$emit('addOrUpdateAnnotations', { data })
@@ -517,11 +519,12 @@ export default {
         OrderMarkName: remark
       }
       if (measurement.type === 'CircleROI') {
+        this.setPet5PSCommentDisplay()
         this.$set(this.questionForm, obj.QuestionId, null)
         var pet5PS = this.setpet5PS()
         this.questionForm[this.pet5PSId] = pet5PS
         this.calculatePet5PS = pet5PS
-        this.setPet5PSCommentDisplay()
+        this.setUptakeFormBaseline()
       }
       FusionEvent.$emit('addOrUpdateAnnotations', { data })
       this.questionFormChangeState = true
@@ -535,6 +538,7 @@ export default {
       this.questionForm[this.pet5PSId] = pet5PS
       this.calculatePet5PS = pet5PS
       this.setPet5PSCommentDisplay()
+      this.setUptakeFormBaseline()
       this.measurements[idx].OtherMeasureData = ''
       this.currentQsId = this.measurements[idx].QuestionId
       // const { QuestionId, QuestionType } = this.measurements[idx]
@@ -548,16 +552,7 @@ export default {
       this.questionForm[obj.key] = obj.val
       if (obj.key === this.pet5PSId) {
         this.setPet5PSCommentDisplay()
-        // 自动计算与基线相比摄取值变化
-        if (!this.isBaseLineTask && this.questionForm[this.pet5PSId] > 0) {
-          // 当前访视的PET 5ps评分大于基线的PET 5ps评分   增大
-          // 当前访视的PET 5ps评分小于基线的PET 5ps评分   减小
-          if (this.questionForm[this.pet5PSId] > this.baseLinePET5PS) {
-            this.questionForm[this.uptakeFromBaselineId] = '1'
-          } else if (this.questionForm[this.pet5PSId] < this.baseLinePET5PS) {
-            this.questionForm[this.uptakeFromBaselineId] = '2'
-          }
-        }
+        this.setUptakeFormBaseline()
       }
     },
     setPet5PSCommentDisplay() {
@@ -577,6 +572,18 @@ export default {
         }
       }
     },
+    setUptakeFormBaseline() {
+      // 自动计算与基线相比摄取值变化
+      if (!this.isBaseLineTask && this.questionForm[this.pet5PSId] > 0) {
+        // 当前访视的PET 5ps评分大于基线的PET 5ps评分   增大
+        // 当前访视的PET 5ps评分小于基线的PET 5ps评分   减小
+        if (this.questionForm[this.pet5PSId] > this.baseLinePET5PS) {
+          this.questionForm[this.uptakeFromBaselineId] = '1'
+        } else if (this.questionForm[this.pet5PSId] < this.baseLinePET5PS) {
+          this.questionForm[this.uptakeFromBaselineId] = '2'
+        }
+      }
+    },
     setpet5PS() {
       console.log('setpet5PS')
       // 无需标记，自主选择   1分
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 66eb3c82..407c2ec6 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
@@ -28,11 +28,11 @@
         >
           <!-- 下拉框 -->
           <el-select
+            :ref="`select_LesionType`"
             v-model="questionForm.LesionType"
             filterable
             :disabled="!isCurrentTask || readingTaskState>=2 || !isBaseLineTask || answers.SplitOrMergeType === '1'"
             @change="((val)=>{lesionTypeChange(val)})"
-            :ref="`select_LesionType`"
           >
 
             <el-option
@@ -85,12 +85,12 @@
 
           <el-select
             v-if="qs.Type==='select'"
+            :ref="`select_${qs.Id}`"
             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' || (qs.QuestionMark === 7 && answers.SplitOrMergeType === '3')"
             @change="((val)=>{formItemChange(val, qs)})"
-            :ref="`select_${qs.Id}`"
           >
             <template v-if="qs.QuestionMark === 8" #prefix>
               <span style="padding-left: 5px;">
@@ -366,11 +366,11 @@ export default {
   },
   methods: {
     scrollHandle() {
-      for(let k in this.$refs) {
-        if(k.indexOf('select_') === -1) continue
-        if(this.$refs[k] instanceof Array){
+      for (const k in this.$refs) {
+        if (k.indexOf('select_') === -1) continue
+        if (this.$refs[k] instanceof Array) {
           this.$refs[k][0].blur()
-        }else{
+        } else {
           this.$refs[k].blur()
         }
       }