From 2aef040a345decbab1106a6bf6bb73308dcb77c2 Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Thu, 7 Mar 2024 17:33:39 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E8=87=AA=E5=8A=A8=E8=AE=A1=E7=AE=97?=
 =?UTF-8?q?=E4=B8=8E=E5=9F=BA=E7=BA=BF=E7=9B=B8=E6=AF=94=E6=91=84=E5=8F=96?=
 =?UTF-8?q?=E5=80=BC=E5=8F=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .eslintignore                                 |  2 +-
 .../dicoms/components/Fusion/Questions.vue    | 25 ++++++++++++++++---
 2 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/.eslintignore b/.eslintignore
index 3ff12bc3..f8cee48b 100644
--- a/.eslintignore
+++ b/.eslintignore
@@ -4,7 +4,7 @@ src/utils/*
 public
 dist
 
-src/*
+# src/*
 src/views/trials/trials-panel/visit/*
 src/App.vue
 src/views/trials/trials-panel/reading/global-review/*
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 8df03bba..05af5533 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
@@ -35,7 +35,7 @@
 
 <script>
 
-import { saveImageQuality, getDicomReadingQuestionAnswer,getReadingCalculationData } from '@/api/trials'
+import { saveImageQuality, getDicomReadingQuestionAnswer, getReadingCalculationData } from '@/api/trials'
 import QuestionItem from './QuestionItem'
 import { mapGetters } from 'vuex'
 import FusionEvent from './FusionEvent'
@@ -64,7 +64,8 @@ export default {
       questionFormChangeNum: 0,
       lungIsInsideVolume: true,
       liverIsInsideVolume: true,
-      uptakeFromBaselineId:''
+      uptakeFromBaselineId: '',
+      baseLinePET5PS: null
     }
   },
   computed: {
@@ -96,7 +97,7 @@ export default {
     this.visitTaskId = this.$route.query.visitTaskId
     this.readingTaskState = parseInt(this.$route.query.readingTaskState)
     this.isBaseLineTask = this.$route.query.isBaseLineTask === 'true'
-    this.initList()
+    this.initPage()
     FusionEvent.$on('refreshQuestions', () => {
       this.initList()
     })
@@ -131,6 +132,15 @@ export default {
         this.questions = questions
       }
     },
+    async initPage() {
+      if (!this.isBaseLineTask) {
+        this.loading = true
+        var res = await getReadingCalculationData({ visitTaskId: this.visitTaskId })
+        this.baseLinePET5PS = res.Result.BaseLinePET5PS
+        this.loading = false
+      }
+      this.initList()
+    },
     initList() {
       this.loading = true
       var params = {
@@ -205,7 +215,8 @@ export default {
       this.$refs['questions'].validate((valid) => {
         if (!valid) return
         if (!this.lungIsInsideVolume || !this.liverIsInsideVolume) {
-          this.$alert('当前标记在图像外，不允许保存！', '提示', {
+          // 当前标记在图像外
+          this.$alert(this.$t('trials:reading:lugano:warnning:outsideVolume'), this.$t('trials:lugano:fusionDialog:warning'), {
             callback: action => {
               this.$message({
                 type: 'info',
@@ -435,6 +446,12 @@ export default {
           }
         }
       }
+      // 自动计算与基线相比摄取值变化
+      if (!this.isBaseLineTask && this.questionForm[this.pet5PSId] > 0) {
+        // 当前访视的PET 5ps评分大于基线的PET 5ps评分   增大
+        // 当前访视的PET 5ps评分小于基线的PET 5ps评分   减小
+        this.questionForm[this.uptakeFromBaselineId] = this.questionForm[this.pet5PSId] > this.baseLinePET5PS ? '1' : '2'
+      }
     },
     setpet5PS() {
       console.log('setpet5PS')

From aea1bf16bf0d31c1cbe0cefb224e6ac72f74c7e4 Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Thu, 7 Mar 2024 17:41:20 +0800
Subject: [PATCH 2/2] =?UTF-8?q?lugano=E5=85=A8=E5=B1=80=E9=98=85=E7=89=87?=
 =?UTF-8?q?=E5=88=97=E5=AE=BD=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../reading/global-review/components/LuganoTable.vue          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/global-review/components/LuganoTable.vue b/src/views/trials/trials-panel/reading/global-review/components/LuganoTable.vue
index f0e0c245..e35ea11a 100644
--- a/src/views/trials/trials-panel/reading/global-review/components/LuganoTable.vue
+++ b/src/views/trials/trials-panel/reading/global-review/components/LuganoTable.vue
@@ -93,7 +93,7 @@
             prop=""
             :label="qs.questionName"
             show-overflow-tooltip
-            :min-width="index === 3 ? '200' : '200'"
+            width="150"
           >
             <template slot-scope="scope">
               <div v-if="readingTaskState<2 && (scope.row.AfterQuestionList[index].GlobalReadingShowType === 0 || (scope.row.IsBaseLine && scope.row.AfterQuestionList[index].GlobalReadingShowType === 1) || (!scope.row.IsBaseLine && scope.row.AfterQuestionList[index].GlobalReadingShowType === 2))">
@@ -284,7 +284,7 @@
       </el-table-column>
       <el-table-column
         :label="$t('common:action:action')"
-        width="100"
+        min-width="150"
       >
         <template slot-scope="scope">
           <el-button