From 4ee7906dcdca8cf36e6ba26669ba96eadf8ce4d2 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Fri, 26 Dec 2025 14:14:55 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A2=AB=E8=9E=8D=E5=90=88=E7=97=85=E7=81=B6?=
 =?UTF-8?q?=E4=B8=8D=E5=85=81=E8=AE=B8=E7=94=BB=E6=A0=87=E8=AE=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/IRecist/QuestionForm.vue       |  7 ++++---
 .../components/IRecist/QuestionList.vue       |  6 ++++++
 .../dicoms/components/Lugano/QuestionForm.vue |  2 +-
 .../dicoms/components/Lugano/QuestionList.vue |  6 ++++++
 .../LuganoWithoutPET/QuestionForm.vue         |  4 ++--
 .../LuganoWithoutPET/QuestionList.vue         | 20 +++++++++++++------
 .../dicoms/components/Recist/QuestionForm.vue |  7 ++++---
 .../dicoms/components/Recist/QuestionList.vue |  6 ++++++
 .../components/RecistBM/QuestionForm.vue      |  7 ++++---
 .../components/RecistBM/QuestionList.vue      |  8 +++++++-
 .../components/Recist/QuestionList.vue        |  6 ++++--
 .../components/mRecist/QuestionList.vue       |  6 ++++--
 12 files changed, 62 insertions(+), 23 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/dicoms/components/IRecist/QuestionForm.vue b/src/views/trials/trials-panel/reading/dicoms/components/IRecist/QuestionForm.vue
index 02db661e..213f3399 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/IRecist/QuestionForm.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/IRecist/QuestionForm.vue
@@ -133,8 +133,9 @@
 
     </div>
 
-    <div v-if="isCurrentTask && readingTaskState < 2" class="base-dialog-footer"
-      style="text-align:right;margin-top:10px;">
+    <div
+      v-if="isCurrentTask && readingTaskState < 2 && (answers.SplitOrMergeType !== '1' && answers.SplitOrMergeType !== '3')"
+      class="base-dialog-footer" style="text-align:right;margin-top:10px;">
       <!-- 清除标记 -->
       <el-button
         v-if="questionForm.MeasureData && (!isFirstChangeTask || (isFirstChangeTask && (lesionType === 5 || lesionType === 6)))"
@@ -275,7 +276,7 @@ export default {
       this.$set(this.questionForm, 'RowIndex', this.answers.RowIndex ? this.answers.RowIndex : '')
       this.$set(this.questionForm, 'RowId', this.answers.RowId ? this.answers.RowId : '')
       this.$set(this.questionForm, 'OrganInfoId', this.answers.OrganInfoId ? this.answers.OrganInfoId : '')
-
+      this.$set(this.questionForm, 'SplitOrMergeType', this.answers.SplitOrMergeType ? this.answers.SplitOrMergeType : '')
       // saveTypeEnum 0：未保存过（新建病灶）；1：已保存，信息不完整（随访初始化病灶/分裂病灶，通过状态判断）；2：已保存，信息完整
       var lesionState = this.getQuestionVal(7)
       if (this.questionForm.RowId) {
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/IRecist/QuestionList.vue b/src/views/trials/trials-panel/reading/dicoms/components/IRecist/QuestionList.vue
index b8676390..28972399 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/IRecist/QuestionList.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/IRecist/QuestionList.vue
@@ -737,6 +737,9 @@ export default {
         var rowIndex = String(this.unSaveTargets[0].rowIndex)
         var questionId = this.unSaveTargets[0].questionId
         const refName = `${this.activeItem.activeCollapseId}_${this.activeItem.activeRowIndex}`
+        if (this.$refs[refName][0].questionForm.SplitOrMergeType === '1' || this.$refs[refName][0].questionForm.SplitOrMergeType === '3') {
+          return { isCanActiveTool: false, reason: '' }
+        }
         if (rowIndex === this.activeItem.activeRowIndex && questionId === this.activeItem.activeCollapseId && !this.$refs[refName][0].questionForm.MeasureData) {
           return this.checkToolCanActive(toolName)
         } else {
@@ -770,6 +773,9 @@ export default {
       const refName = `${this.activeItem.activeCollapseId}_${this.activeItem.activeRowIndex}`
       var isLymphNodes = this.$refs[refName][0].getQuestionVal(2)
       isLymphNodes = !isNaN(parseInt(isLymphNodes)) ? parseInt(isLymphNodes) : null
+      if (this.$refs[refName][0].questionForm.SplitOrMergeType === '1' || this.$refs[refName][0].questionForm.SplitOrMergeType === '3') {
+        return { isCanActiveTool: false, reason: '' }
+      }
       if (!this.$refs[refName][0].questionForm.MeasureData) {
         if (this.isBaseLineTask) {
           if (this.$refs[refName][0].lesionType === 0 && isLymphNodes === 1 && toolName !== 'Bidirectional') {
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 f263ae25..67a7b3ae 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
@@ -340,7 +340,7 @@ export default {
       this.$set(this.questionForm, 'RowIndex', this.answers.RowIndex ? this.answers.RowIndex : '')
       this.$set(this.questionForm, 'RowId', this.answers.RowId ? this.answers.RowId : '')
       this.$set(this.questionForm, 'OrganInfoId', this.answers.OrganInfoId ? this.answers.OrganInfoId : '')
-
+      this.$set(this.questionForm, 'SplitOrMergeType', this.answers.SplitOrMergeType ? this.answers.SplitOrMergeType : '')
       // saveTypeEnum 0：未保存过（新建病灶）；1：已保存，信息不完整（随访初始化病灶/分裂病灶，通过状态判断）；2：已保存，信息完整
       var lesionState = this.getQuestionVal(7)
       if (this.questionForm.RowId) {
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 1e8876ba..1d6e324d 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
@@ -735,6 +735,9 @@ export default {
         var rowIndex = String(this.unSaveTargets[0].rowIndex)
         var questionId = this.unSaveTargets[0].questionId
         const refName = `${this.activeItem.activeCollapseId}_${this.activeItem.activeRowIndex}`
+        if (this.$refs[refName][0].questionForm.SplitOrMergeType === '1' || this.$refs[refName][0].questionForm.SplitOrMergeType === '3') {
+          return { isCanActiveTool: false, reason: '' }
+        }
         if (rowIndex === this.activeItem.activeRowIndex && questionId === this.activeItem.activeCollapseId && !this.$refs[refName][0].questionForm.MeasureData) {
           return this.checkToolCanActive(toolName)
         } else {
@@ -765,6 +768,9 @@ export default {
       const refName = `${this.activeItem.activeCollapseId}_${this.activeItem.activeRowIndex}`
       var isLymphNodes = this.$refs[refName][0].getQuestionVal(2)
       isLymphNodes = !isNaN(parseInt(isLymphNodes)) ? parseInt(isLymphNodes) : null
+      if (this.$refs[refName][0].questionForm.SplitOrMergeType === '1' || this.$refs[refName][0].questionForm.SplitOrMergeType === '3') {
+        return { isCanActiveTool: false, reason: '' }
+      }
       if (!this.$refs[refName][0].questionForm.MeasureData) {
         if (this.isBaseLineTask) {
           if (this.$refs[refName][0].lesionType === 0 && isLymphNodes === 1 && toolName !== 'Bidirectional') {
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/LuganoWithoutPET/QuestionForm.vue b/src/views/trials/trials-panel/reading/dicoms/components/LuganoWithoutPET/QuestionForm.vue
index 0d990f34..67a7b3ae 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/LuganoWithoutPET/QuestionForm.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/LuganoWithoutPET/QuestionForm.vue
@@ -340,7 +340,7 @@ export default {
       this.$set(this.questionForm, 'RowIndex', this.answers.RowIndex ? this.answers.RowIndex : '')
       this.$set(this.questionForm, 'RowId', this.answers.RowId ? this.answers.RowId : '')
       this.$set(this.questionForm, 'OrganInfoId', this.answers.OrganInfoId ? this.answers.OrganInfoId : '')
-
+      this.$set(this.questionForm, 'SplitOrMergeType', this.answers.SplitOrMergeType ? this.answers.SplitOrMergeType : '')
       // saveTypeEnum 0：未保存过（新建病灶）；1：已保存，信息不完整（随访初始化病灶/分裂病灶，通过状态判断）；2：已保存，信息完整
       var lesionState = this.getQuestionVal(7)
       if (this.questionForm.RowId) {
@@ -1244,7 +1244,7 @@ export default {
             // }
           } else {
             // 非淋巴结靶病灶 箭头工具
-            if (!(measureData && (measureData.type === 'ArrowAnnotate' || measureData.type === 'Bidirectional'))) {
+            if (!(measureData && (measureData.type === 'ArrowAnnotate'))) {
               // 评估状态为消失的非淋巴结靶病灶只能使用箭头工具添加标记！
               this.$confirm(this.$t('trials:lugano:warnning:validState7'), {
                 type: 'warning',
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/LuganoWithoutPET/QuestionList.vue b/src/views/trials/trials-panel/reading/dicoms/components/LuganoWithoutPET/QuestionList.vue
index b62cdbc2..1beda61f 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/LuganoWithoutPET/QuestionList.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/LuganoWithoutPET/QuestionList.vue
@@ -87,11 +87,13 @@
                             placement="bottom">
                             <div
                               v-if="item.TableQuestions.Answers[i].SplitOrMergeType === '1' || item.TableQuestions.Answers[i].SplitOrMergeType === '3'">
-                              <span class="login-cycle" />
+                              <span class="login-cycle"
+                                :style="`background-color:${$GuidToColor(item.TableQuestions.Answers[i].MergeRowId)}`" />
                             </div>
                           </el-tooltip>
                           <div v-if="item.TableQuestions.Answers[i].SplitOrMergeType === '4'">
-                            <span class="login-cycle" />
+                            <span class="login-cycle"
+                              :style="`background-color:${$GuidToColor(item.TableQuestions.Answers[i].RowId)}`" />
                           </div>
                           <el-tooltip v-if="!!item.TableQuestions.Answers[i].lesionPart" class="item" effect="dark"
                             :content="item.TableQuestions.Answers[i].lesionPart" placement="bottom">
@@ -194,7 +196,7 @@
   </div>
 </template>
 <script>
-import { splitLesion, getSplitPPdSumNoPet, getCanMergeLesion, mergeLesion } from '@/api/trials'
+import { splitLesion, getSplitPPdSum, getCanMergeLesion, mergeLesion } from '@/api/trials'
 import { resetReadingTask } from '@/api/reading'
 import DicomEvent from './../DicomEvent'
 import store from '@/store'
@@ -312,7 +314,7 @@ export default {
       })
     })
     DicomEvent.$on('refreshSplitTargetLesionPDD', async (callback) => {
-      const res = await getSplitPPdSumNoPet({ visitTaskId: this.visitTaskId })
+      const res = await getSplitPPdSum({ visitTaskId: this.visitTaskId })
       this.splitTargetLesions = res.Result
       if (this.splitTargetLesions && this.splitTargetLesions.length > 0) {
         this.splitTargetLesions.map(i => {
@@ -369,7 +371,7 @@ export default {
           loading.close()
         }
         if (!this.isBaseLineTask) {
-          const res = await getSplitPPdSumNoPet({ visitTaskId: this.visitTaskId })
+          const res = await getSplitPPdSum({ visitTaskId: this.visitTaskId })
           this.splitTargetLesions = res.Result
         }
         this.questions = this.visitTaskList[i].ReadingQuestions
@@ -512,7 +514,7 @@ export default {
               this.isCurrentTask = this.visitTaskList[idx].IsCurrentTask
             }
             if (!this.isBaseLineTask) {
-              const res = await getSplitPPdSumNoPet({ visitTaskId: this.visitTaskId })
+              const res = await getSplitPPdSum({ visitTaskId: this.visitTaskId })
               this.splitTargetLesions = res.Result
             }
             this.getTableQuestions()
@@ -733,6 +735,9 @@ export default {
         var rowIndex = String(this.unSaveTargets[0].rowIndex)
         var questionId = this.unSaveTargets[0].questionId
         const refName = `${this.activeItem.activeCollapseId}_${this.activeItem.activeRowIndex}`
+        if (this.$refs[refName][0].questionForm.SplitOrMergeType === '1' || this.$refs[refName][0].questionForm.SplitOrMergeType === '3') {
+          return { isCanActiveTool: false, reason: '' }
+        }
         if (rowIndex === this.activeItem.activeRowIndex && questionId === this.activeItem.activeCollapseId && !this.$refs[refName][0].questionForm.MeasureData) {
           return this.checkToolCanActive(toolName)
         } else {
@@ -763,6 +768,9 @@ export default {
       const refName = `${this.activeItem.activeCollapseId}_${this.activeItem.activeRowIndex}`
       var isLymphNodes = this.$refs[refName][0].getQuestionVal(2)
       isLymphNodes = !isNaN(parseInt(isLymphNodes)) ? parseInt(isLymphNodes) : null
+      if (this.$refs[refName][0].questionForm.SplitOrMergeType === '1' || this.$refs[refName][0].questionForm.SplitOrMergeType === '3') {
+        return { isCanActiveTool: false, reason: '' }
+      }
       if (!this.$refs[refName][0].questionForm.MeasureData) {
         if (this.isBaseLineTask) {
           if (this.$refs[refName][0].lesionType === 0 && isLymphNodes === 1 && toolName !== 'Bidirectional') {
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Recist/QuestionForm.vue b/src/views/trials/trials-panel/reading/dicoms/components/Recist/QuestionForm.vue
index c72b70c9..0b49ae12 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Recist/QuestionForm.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Recist/QuestionForm.vue
@@ -127,8 +127,9 @@
 
     </div>
 
-    <div v-if="isCurrentTask && readingTaskState < 2" class="base-dialog-footer"
-      style="text-align:right;margin-top:10px;">
+    <div
+      v-if="isCurrentTask && readingTaskState < 2 && (answers.SplitOrMergeType !== '1' && answers.SplitOrMergeType !== '3')"
+      class="base-dialog-footer" style="text-align:right;margin-top:10px;">
 
       <!-- 清除标记 -->
       <el-button v-if="questionForm.MeasureData" size="mini" @click="handleDeleteMeasureData">
@@ -254,7 +255,7 @@ export default {
       this.$set(this.questionForm, 'RowIndex', this.answers.RowIndex ? this.answers.RowIndex : '')
       this.$set(this.questionForm, 'RowId', this.answers.RowId ? this.answers.RowId : '')
       this.$set(this.questionForm, 'OrganInfoId', this.answers.OrganInfoId ? this.answers.OrganInfoId : '')
-
+      this.$set(this.questionForm, 'SplitOrMergeType', this.answers.SplitOrMergeType ? this.answers.SplitOrMergeType : '')
       // saveTypeEnum 0：未保存过（新建病灶）；1：已保存，信息不完整（随访初始化病灶/分裂病灶，通过状态判断）；2：已保存，信息完整
       var lesionState = this.getQuestionVal(7)
       if (this.questionForm.RowId) {
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Recist/QuestionList.vue b/src/views/trials/trials-panel/reading/dicoms/components/Recist/QuestionList.vue
index b73324de..92b5d6a7 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Recist/QuestionList.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Recist/QuestionList.vue
@@ -665,6 +665,9 @@ export default {
         var rowIndex = String(this.unSaveTargets[0].rowIndex)
         var questionId = this.unSaveTargets[0].questionId
         const refName = `${this.activeItem.activeCollapseId}_${this.activeItem.activeRowIndex}`
+        if (this.$refs[refName][0].questionForm.SplitOrMergeType === '1' || this.$refs[refName][0].questionForm.SplitOrMergeType === '3') {
+          return { isCanActiveTool: false, reason: '' }
+        }
         if (rowIndex === this.activeItem.activeRowIndex && questionId === this.activeItem.activeCollapseId && !this.$refs[refName][0].questionForm.MeasureData) {
           return this.checkToolCanActive(toolName)
         } else {
@@ -694,6 +697,9 @@ export default {
       const refName = `${this.activeItem.activeCollapseId}_${this.activeItem.activeRowIndex}`
       var isLymphNodes = this.$refs[refName][0].getQuestionVal(2)
       isLymphNodes = !isNaN(parseInt(isLymphNodes)) ? parseInt(isLymphNodes) : null
+      if (this.$refs[refName][0].questionForm.SplitOrMergeType === '1' || this.$refs[refName][0].questionForm.SplitOrMergeType === '3') {
+        return { isCanActiveTool: false, reason: '' }
+      }
       if (!this.$refs[refName][0].questionForm.MeasureData) {
         if (this.isBaseLineTask) {
           if (this.$refs[refName][0].lesionType === 0 && isLymphNodes === 1 && toolName !== 'Bidirectional') {
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/RecistBM/QuestionForm.vue b/src/views/trials/trials-panel/reading/dicoms/components/RecistBM/QuestionForm.vue
index ac3df227..cd448991 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/RecistBM/QuestionForm.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/RecistBM/QuestionForm.vue
@@ -117,8 +117,9 @@
 
     </div>
 
-    <div v-if="isCurrentTask && readingTaskState < 2" class="base-dialog-footer"
-      style="text-align:right;margin-top:10px;">
+    <div
+      v-if="isCurrentTask && readingTaskState < 2 && (answers.SplitOrMergeType !== '1' && answers.SplitOrMergeType !== '3')"
+      class="base-dialog-footer" style="text-align:right;margin-top:10px;">
 
       <!-- 清除标记 -->
       <el-button v-if="questionForm.MeasureData" size="mini" @click="handleDeleteMeasureData">
@@ -243,7 +244,7 @@ export default {
       this.$set(this.questionForm, 'RowIndex', this.answers.RowIndex ? this.answers.RowIndex : '')
       this.$set(this.questionForm, 'RowId', this.answers.RowId ? this.answers.RowId : '')
       this.$set(this.questionForm, 'OrganInfoId', this.answers.OrganInfoId ? this.answers.OrganInfoId : '')
-
+      this.$set(this.questionForm, 'SplitOrMergeType', this.answers.SplitOrMergeType ? this.answers.SplitOrMergeType : '')
       // saveTypeEnum 0：未保存过（新建病灶）；1：已保存，信息不完整（随访初始化病灶/分裂病灶，通过状态判断）；2：已保存，信息完整
       var lesionState = this.getQuestionVal(7)
       if (this.questionForm.RowId) {
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/RecistBM/QuestionList.vue b/src/views/trials/trials-panel/reading/dicoms/components/RecistBM/QuestionList.vue
index c73f9f29..ba9127c5 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/RecistBM/QuestionList.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/RecistBM/QuestionList.vue
@@ -121,7 +121,7 @@
                         style="position: absolute;right: 5px;top: 2px;">
                         <!-- 分裂 -->
                         <el-tooltip
-                          v-show="readingTaskState < 2&& item.TableQuestions.Answers[i].SplitOrMergeType !== '4' && !!item.TableQuestions.Answers[i].RowId && !isBaseLineTask && item.TableQuestions.Answers[i].isDicomReading !== false"
+                          v-show="readingTaskState < 2 && item.TableQuestions.Answers[i].SplitOrMergeType !== '4' && !!item.TableQuestions.Answers[i].RowId && !isBaseLineTask && item.TableQuestions.Answers[i].isDicomReading !== false"
                           class="item" :content="$t('trials:reading:button:split')" placement="left">
                           <i class="iconfont icon-24gl-split" style="color:#fff;font-size: 16px;"
                             @click.stop="handleSplit(item.TableQuestions.Answers[i].RowId, item.Id)" />
@@ -656,6 +656,9 @@ export default {
         var rowIndex = String(this.unSaveTargets[0].rowIndex)
         var questionId = this.unSaveTargets[0].questionId
         const refName = `${this.activeItem.activeCollapseId}_${this.activeItem.activeRowIndex}`
+        if (this.$refs[refName][0].questionForm.SplitOrMergeType === '1' || this.$refs[refName][0].questionForm.SplitOrMergeType === '3') {
+          return { isCanActiveTool: false, reason: '' }
+        }
         if (rowIndex === this.activeItem.activeRowIndex && questionId === this.activeItem.activeCollapseId && !this.$refs[refName][0].questionForm.MeasureData) {
           return this.checkToolCanActive(toolName)
         } else {
@@ -683,6 +686,9 @@ export default {
 
     checkToolCanActive(toolName) {
       const refName = `${this.activeItem.activeCollapseId}_${this.activeItem.activeRowIndex}`
+      if (this.$refs[refName][0].questionForm.SplitOrMergeType === '1' || this.$refs[refName][0].questionForm.SplitOrMergeType === '3') {
+        return { isCanActiveTool: false, reason: '' }
+      }
       if (!this.$refs[refName][0].questionForm.MeasureData) {
         if (this.isBaseLineTask) {
           if (this.$refs[refName][0].lesionType === 0 && toolName !== 'Length') {
diff --git a/src/views/trials/trials-panel/reading/dicoms3D/components/Recist/QuestionList.vue b/src/views/trials/trials-panel/reading/dicoms3D/components/Recist/QuestionList.vue
index 146a68e1..d6f2a3bd 100644
--- a/src/views/trials/trials-panel/reading/dicoms3D/components/Recist/QuestionList.vue
+++ b/src/views/trials/trials-panel/reading/dicoms3D/components/Recist/QuestionList.vue
@@ -151,7 +151,7 @@
                         </el-tooltip>
                         <!-- 融合 -->
                         <el-tooltip
-                          v-show="readingTaskState < 2 && !!innerFormData[`${table.Id}_${answer.RowIndex}`].RowId && innerFormData[`${table.Id}_${answer.RowIndex}`].SplitOrMergeType !== '2' && table.LesionType === 0 && [0, 1, 4].includes(parseInt(innerFormData[`${table.Id}_${answer.RowIndex}`].LesionState))"
+                          v-show="readingTaskState < 2 && !isBaseLineTask && !!innerFormData[`${table.Id}_${answer.RowIndex}`].RowId && innerFormData[`${table.Id}_${answer.RowIndex}`].SplitOrMergeType !== '2' && table.LesionType === 0 && [0, 1, 4].includes(parseInt(innerFormData[`${table.Id}_${answer.RowIndex}`].LesionState))"
                           class="item" :content="$t('trials:reading:button:merge')" placement="bottom">
                           <i class="iconfont icon-24gl-merge" style="color:#fff;font-size: 16px;"
                             @click.stop="handleMerge(innerFormData[`${table.Id}_${answer.RowIndex}`], table.Id, table.OrderMark)" />
@@ -168,7 +168,9 @@
                       :reading-task-state="readingTaskState" :organs="organs" :is-base-line-task="isBaseLineTask"
                       :is-current-task="isCurrentTask" @update="innerFormDataUpdate" @close="closeInnerForm"
                       @lesionTypeChange="lesionTypeChange" @handleReadingChart="handleReadingChart" />
-                    <div v-if="readingTaskState < 2" style="text-align:right;margin-top:10px;">
+                    <div
+                      v-if="readingTaskState < 2 && innerFormData[`${table.Id}_${answer.RowIndex}`].SplitOrMergeType !== '1' && innerFormData[`${table.Id}_${answer.RowIndex}`].SplitOrMergeType !== '3'"
+                      style="text-align:right;margin-top:10px;">
                       <!-- 清除标记 -->
                       <el-button v-if="innerFormData[`${table.Id}_${answer.RowIndex}`].MeasureData" size="mini"
                         @click="clearMeasureData(table, answer.RowIndex)">
diff --git a/src/views/trials/trials-panel/reading/dicoms3D/components/mRecist/QuestionList.vue b/src/views/trials/trials-panel/reading/dicoms3D/components/mRecist/QuestionList.vue
index dc9a8aff..198ae925 100644
--- a/src/views/trials/trials-panel/reading/dicoms3D/components/mRecist/QuestionList.vue
+++ b/src/views/trials/trials-panel/reading/dicoms3D/components/mRecist/QuestionList.vue
@@ -149,7 +149,7 @@
                         </el-tooltip>
                         <!-- 融合 -->
                         <el-tooltip
-                          v-show="readingTaskState < 2 && !!innerFormData[`${table.Id}_${answer.RowIndex}`].RowId && innerFormData[`${table.Id}_${answer.RowIndex}`].SplitOrMergeType !== '2' && table.LesionType === 0 && [0, 1, 4].includes(parseInt(innerFormData[`${table.Id}_${answer.RowIndex}`].LesionState))"
+                          v-show="readingTaskState < 2 && !isBaseLineTask && !!innerFormData[`${table.Id}_${answer.RowIndex}`].RowId && innerFormData[`${table.Id}_${answer.RowIndex}`].SplitOrMergeType !== '2' && table.LesionType === 0 && [0, 1, 4].includes(parseInt(innerFormData[`${table.Id}_${answer.RowIndex}`].LesionState))"
                           class="item" :content="$t('trials:reading:button:merge')" placement="bottom">
                           <i class="iconfont icon-24gl-merge" style="color:#fff;font-size: 16px;"
                             @click.stop="handleMerge(innerFormData[`${table.Id}_${answer.RowIndex}`], table.Id, table.OrderMark)" />
@@ -166,7 +166,9 @@
                       :reading-task-state="readingTaskState" :organs="organs" :is-base-line-task="isBaseLineTask"
                       :is-current-task="isCurrentTask" @update="innerFormDataUpdate" @close="closeInnerForm"
                       @lesionTypeChange="lesionTypeChange" @handleReadingChart="handleReadingChart" />
-                    <div v-if="readingTaskState < 2" style="text-align:right;margin-top:10px;">
+                    <div
+                      v-if="readingTaskState < 2 && innerFormData[`${table.Id}_${answer.RowIndex}`].SplitOrMergeType !== '1' && innerFormData[`${table.Id}_${answer.RowIndex}`].SplitOrMergeType !== '3'"
+                      style="text-align:right;margin-top:10px;">
                       <!-- 清除标记 -->
                       <el-button v-if="innerFormData[`${table.Id}_${answer.RowIndex}`].MeasureData" size="mini"
                         @click="clearMeasureData(table, answer.RowIndex)">