From 9929045d4bd2b8a972d4bdc1c9bff4ab91dee7f5 Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Tue, 20 Feb 2024 16:37:11 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=9E=8D=E5=90=88=E6=A0=87?=
 =?UTF-8?q?=E8=AF=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dicoms/components/Lugano/QuestionForm.vue     |  2 ++
 .../dicoms/components/Lugano/QuestionList.vue     | 15 +++++++++++++++
 2 files changed, 17 insertions(+)

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 8ee76602..4b3b76b3 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
@@ -528,6 +528,8 @@ export default {
       }
       if (this.answers.SplitOrMergeLesionName && parseInt(this.answers.SplitOrMergeType) === 0) {
         arr.push(`(Split from ${this.answers.SplitOrMergeLesionName})`)
+      } else if (this.answers.MeltingInToLesionMarks && parseInt(this.answers.SplitOrMergeType) === 1) {
+        arr.push(`(Merge to ${this.answers.MeltingInToLesionMarks})`)
       }
       return arr.join(' ')
     },
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionList.vue b/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionList.vue
index 7ac36f4b..e909fdbf 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionList.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionList.vue
@@ -64,7 +64,13 @@
                       </el-tooltip>
                       <div style="position: absolute;left: 50px;top: 2px;">
                         <!-- white-space: nowrap;overflow: hidden;text-overflow: ellipsis; -->
+
                         <div style="font-size: 11px;width:210px;height: 30px;display: flex;justify-content: flex-start;flex-wrap: nowrap;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;">
+                          <el-tooltip v-if="item.TableQuestions.Answers[i].SplitOrMergeType === '1'" class="item" effect="dark" :content="`融向${item.TableQuestions.Answers[i].MeltingInToLesionMarks}`" placement="bottom">
+                            <div v-if="item.TableQuestions.Answers[i].SplitOrMergeType === '1'">
+                              <span class="login-cycle" />
+                            </div>
+                          </el-tooltip>
                           <el-tooltip v-if="!!item.TableQuestions.Answers[i].lesionPart" class="item" effect="dark" :content="item.TableQuestions.Answers[i].lesionPart" placement="bottom">
                             <div v-if="item.TableQuestions.Answers[i].lesionPart" style="max-width: 100px;overflow: hidden;">
                               {{ item.TableQuestions.Answers[i].lesionPart }}
@@ -1301,6 +1307,15 @@ export default {
   .lesion_list{
     position: relative;
   }
+  .login-cycle{
+    width: 5px;
+    height: 5px;
+    display: inline-block;
+    background-color: #428bca;
+    border-radius: 50%;
+    margin-right: 2px;
+    margin-bottom: 2px;
+  }
   .el-collapse{
     border-bottom:none;
     border-top:none;