From 3dc99d096d8070d20686b6ea076a9aa8b1d5cbe0 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Fri, 26 Dec 2025 13:46:21 +0800
Subject: [PATCH] =?UTF-8?q?=E9=83=A8=E5=88=86=E9=97=AE=E9=A2=98=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../reading/dicoms/components/IRecist/QuestionList.vue      | 2 +-
 .../trials-panel/reading/dicoms3D/components/ReadPage.vue   | 6 ++----
 .../setting/reading-unit/components/QuestionsList.vue       | 4 ++--
 3 files changed, 5 insertions(+), 7 deletions(-)

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 cf14ecec..b8676390 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
@@ -165,7 +165,7 @@
                         </el-tooltip>
                         <!-- 融合 -->
                         <el-tooltip
-                          v-show="!isConvertedTask && !!item.TableQuestions.Answers[i].RowId && item.TableQuestions.Answers[i].SplitOrMergeType !== '2' && ((item.LesionType === 0 && [0, 1, 4].includes(parseInt(item.TableQuestions.Answers[i].lesionState))))"
+                          v-show="!isFirstChangeTask && !!item.TableQuestions.Answers[i].RowId && item.TableQuestions.Answers[i].SplitOrMergeType !== '2' && ((item.LesionType === 0 && [0, 1, 4].includes(parseInt(item.TableQuestions.Answers[i].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(item.TableQuestions.Answers[i], item.Id, item.OrderMark)" />
diff --git a/src/views/trials/trials-panel/reading/dicoms3D/components/ReadPage.vue b/src/views/trials/trials-panel/reading/dicoms3D/components/ReadPage.vue
index 63f926ed..ca1dedf5 100644
--- a/src/views/trials/trials-panel/reading/dicoms3D/components/ReadPage.vue
+++ b/src/views/trials/trials-panel/reading/dicoms3D/components/ReadPage.vue
@@ -2533,15 +2533,13 @@ export default {
       if (this.isFusion || this.isMPR) {
         const confirm = await this.$confirm(this.$t('trials:reading:confirm:changeStack'))
         if (!confirm) return false
-        if (this.isMPR) {
-          this.rows = 1
-          this.cols = 1
-        }
         this.isFusion = false
         this.isMPR = false
         this.fullScreenIndex = null
         this.setToolsPassive()
       }
+      this.rows = 1
+      this.cols = 1
       if (taskIndex === this.activeTaskIndex) return
       if (!this.selectArr.includes(taskInfo.VisitTaskId)) {
         this.selectArr.push(taskInfo.VisitTaskId)
diff --git a/src/views/trials/trials-panel/setting/reading-unit/components/QuestionsList.vue b/src/views/trials/trials-panel/setting/reading-unit/components/QuestionsList.vue
index b6f6aab2..761a293b 100644
--- a/src/views/trials/trials-panel/setting/reading-unit/components/QuestionsList.vue
+++ b/src/views/trials/trials-panel/setting/reading-unit/components/QuestionsList.vue
@@ -36,14 +36,14 @@
       />
       <!-- 分组 -->
       <el-table-column
-        prop="GroupName"
+        prop="QuestionGroupName"
         v-if="$i18n.locale === 'zh'"
         :label="$t('trials:readingUnit:qsList:title:groupNameEn')"
         show-overflow-tooltip
       />
       <!-- 分组(EN) -->
       <el-table-column
-        prop="GroupEnName"
+        prop="QuestionGroupEnName"
         v-if="$i18n.locale === 'en'"
         :label="$t('trials:readingUnit:qsList:title:groupNameEn')"
         show-overflow-tooltip