From bd0f07aaede17349e821f810f2b0356595e28688 Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Thu, 7 Mar 2024 10:08:38 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E5=85=A8=E5=B1=80=E9=98=85=E7=89=87?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=88=AA=E6=AD=A2=E8=AE=BF=E8=A7=86=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../trials/trials-panel/reading/global-review/index.vue     | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/views/trials/trials-panel/reading/global-review/index.vue b/src/views/trials/trials-panel/reading/global-review/index.vue
index fd7bf318..a8d509f2 100644
--- a/src/views/trials/trials-panel/reading/global-review/index.vue
+++ b/src/views/trials/trials-panel/reading/global-review/index.vue
@@ -100,6 +100,12 @@
           show-overflow-tooltip
           width="200"
         />
+        <el-table-column
+          prop="VisitName"
+          :label="$t('trials:globalReview:table:cutOffVisitName')"
+          show-overflow-tooltip
+          width="200"
+        />
         <el-table-column
           :label="$t('common:action:action')"
           width="200"

From 265f8771f5c158bf517c298d5e35dd635f997cd2 Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Thu, 7 Mar 2024 11:25:54 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E5=9B=BD=E9=99=85=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/trials.js                                     |  8 ++++++++
 .../reading/dicoms/components/Fusion/Questions.vue    |  9 +++++++--
 .../dicoms/components/Fusion/TableQuestionItem.vue    | 11 ++++++-----
 3 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/src/api/trials.js b/src/api/trials.js
index 53546b1c..b6b4fa94 100644
--- a/src/api/trials.js
+++ b/src/api/trials.js
@@ -3583,4 +3583,12 @@ export function getUpdateVirtualSiteCodeList(param) {
 }
 
 
+export function getReadingCalculationData(param) {
+  return request({
+    url: `/ReadingImageTask/getReadingCalculationData`,
+    method: 'post',
+    data: param
+  })
+}
+
 
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 1b6eabbc..8df03bba 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 } from '@/api/trials'
+import { saveImageQuality, getDicomReadingQuestionAnswer,getReadingCalculationData } from '@/api/trials'
 import QuestionItem from './QuestionItem'
 import { mapGetters } from 'vuex'
 import FusionEvent from './FusionEvent'
@@ -63,7 +63,8 @@ export default {
       questionFormChangeState: false,
       questionFormChangeNum: 0,
       lungIsInsideVolume: true,
-      liverIsInsideVolume: true
+      liverIsInsideVolume: true,
+      uptakeFromBaselineId:''
     }
   },
   computed: {
@@ -190,6 +191,10 @@ export default {
             // 修改PET 5PS评分备注
             this.pet5PSCommentsId = i.Id
           }
+          if (i.QuestionType === 56) {
+            // 与基线相比摄取值变化
+            this.uptakeFromBaselineId = i.Id
+          }
           if (i.Childrens && i.Childrens.length > 0) {
             this.setChild(i.Childrens)
           }
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/TableQuestionItem.vue b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/TableQuestionItem.vue
index 78032cc5..58a7c963 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/TableQuestionItem.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/TableQuestionItem.vue
@@ -724,7 +724,6 @@ export default {
       return new Blob([bytesCode], { type: imgtype })
     },
     handleSave() {
-      console.log('handleSave')
       this.$refs.measurementForm.validate(async valid => {
         if (!valid) return
         const loading = this.$loading({ fullscreen: true })
@@ -733,7 +732,8 @@ export default {
           //   callback: action => {}
           // })
           loading.close()
-          this.$confirm(this.$t('当前标记在图像外，不允许保存！'), {
+          // 当前标记在图像外，不允许保存！
+          this.$confirm(this.$t('trials:reading:lugano:warnning:outsideVolume'), {
             type: 'warning',
             showCancelButton: false,
             callback: action => {}
@@ -743,11 +743,11 @@ export default {
         }
         // 消失、无法评估状态的病灶限制不能测量SUV值
         var lesionState = this.getQuestionVal(7)
-        console.log(lesionState)
         lesionState = parseInt(lesionState)
         if ((lesionState === 2 || lesionState === 3) && this.questionForm.OtherMeasureData) {
           loading.close()
-          this.$confirm(this.$t('评估状态为无法评估或消失的病灶不能测量SUV值！'), {
+          // 评估状态为无法评估或消失的病灶不能测量SUV值！
+          this.$confirm(this.$t('trials:reading:lugano:warnning:cannotMeasuredSUV'), {
             type: 'warning',
             showCancelButton: false,
             callback: action => {}
@@ -759,7 +759,8 @@ export default {
           var suvmax = this.getQuestionVal(20)
           if (suvmax === 0) {
             loading.close()
-            this.$confirm(this.$t('当前病灶suv测量值为0，不允许保存！'), {
+            // 当前病灶suv测量值为0，不允许保存！
+            this.$confirm(this.$t('trials:reading:lugano:warnning:suvis0'), {
               type: 'warning',
               showCancelButton: false,
               callback: action => {}

From ef4fab35b4b43b072f295e37cce3ba019471e83c Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Thu, 7 Mar 2024 13:34:00 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E5=8C=BB=E5=AD=A6=E5=AE=A1=E6=A0=B8?=
 =?UTF-8?q?=E8=B7=B3=E8=BF=87=E4=BB=BB=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/MedicalAudit.vue                  | 16 ++--------------
 1 file changed, 2 insertions(+), 14 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/mim-medical-audit/components/MedicalAudit.vue b/src/views/trials/trials-panel/reading/mim-medical-audit/components/MedicalAudit.vue
index a02eecfc..6b705504 100644
--- a/src/views/trials/trials-panel/reading/mim-medical-audit/components/MedicalAudit.vue
+++ b/src/views/trials/trials-panel/reading/mim-medical-audit/components/MedicalAudit.vue
@@ -220,20 +220,8 @@ export default {
     },
     // 获取下一任务
     getNextTask() {
-      this.loading = true
-      this.$refs['auditIssues'].save().then(auditIssuesRes => {
-        if (!auditIssuesRes) {
-          this.disPatchNextTask(false)
-        } else {
-          this.$refs['auditConclusions'].save().then(auditConclusionsRes => {
-            this.disPatchNextTask(!!(auditIssuesRes && auditConclusionsRes))
-          }).catch(_ => {
-            this.loading = false
-          })
-        }
-      }).catch(_ => {
-        this.loading = false
-      })
+      this.disPatchNextTask(this.auditInfo.AuditState >= 2)
+
     },
     disPatchNextTask(isComplete) {
       // '是否确认进入下一个医学审核任务？' : '当前医学审核任务未完成，是否确认进入下一个医学审核任务？'

From c34146ae7609ab031f5255754b15fed122462b96 Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Thu, 7 Mar 2024 13:37:29 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E5=8C=BB=E5=AD=A6=E5=AE=A1=E6=A0=B8?=
 =?UTF-8?q?=E7=AD=BE=E5=90=8D=E4=BF=9D=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../trials/trials-panel/reading/mim-medical-audit/index.vue  | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/views/trials/trials-panel/reading/mim-medical-audit/index.vue b/src/views/trials/trials-panel/reading/mim-medical-audit/index.vue
index a3c1fc10..c1cd0576 100644
--- a/src/views/trials/trials-panel/reading/mim-medical-audit/index.vue
+++ b/src/views/trials/trials-panel/reading/mim-medical-audit/index.vue
@@ -661,7 +661,10 @@ export default {
           this.$message.success(this.$t('common:message:savedSuccessfully'))
           this.$refs['signForm'].btnLoading = false
           this.signVisible = false
-          this.chatForm.visible = false
+          this.$nextTick(()=>{
+            this.chatForm.visible = false
+          })
+          
         }
         this.loading = false
         this.getList()