From 15adb3611abc59d8faf5c456e40c08892bad4b3c Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Wed, 20 Aug 2025 16:39:11 +0800
Subject: [PATCH] =?UTF-8?q?mRecist=E5=8A=9F=E8=83=BD=E6=B7=BB=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/MRecist/QuestionForm.vue       | 425 +++++++++---------
 .../components/MRecist/QuestionList.vue       | 189 ++++----
 .../reading/dicoms/components/ReportPage.vue  |   6 +-
 3 files changed, 331 insertions(+), 289 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/dicoms/components/MRecist/QuestionForm.vue b/src/views/trials/trials-panel/reading/dicoms/components/MRecist/QuestionForm.vue
index 10e112b..d3ddbfe 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/MRecist/QuestionForm.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/MRecist/QuestionForm.vue
@@ -1,12 +1,6 @@
 <template>
-  <el-form
-    v-if="isRender"
-    ref="measurementForm"
-    v-loading="loading"
-    :model="questionForm"
-    size="mini"
-    class="measurement-form"
-  >
+  <el-form v-if="isRender" ref="measurementForm" v-loading="loading" :model="questionForm" size="mini"
+    class="measurement-form">
     <div class="base-dialog-body">
       <div style="display: flex;justify-content: space-between;">
         <h3 v-if="questionName" style="color: #ddd;padding: 5px 0px;margin: 0;">
@@ -19,169 +13,104 @@
         </div>
       </div>
 
-      <el-form-item
-        :label="$t('trials:reading:title:lesionType')"
-        prop="LesionType"
-        :rules="[
-          { required:true,message: $t('common:ruleMessage:select'), trigger: ['blur']},
-        ]"
-      >
+      <el-form-item :label="$t('trials:reading:title:lesionType')" prop="LesionType" :rules="[
+        { required: true, message: $t('common:ruleMessage:select'), trigger: ['blur'] },
+      ]">
         <!-- 下拉框 -->
-        <el-select
-          v-model="questionForm.LesionType"
-          filterable
-          :disabled="!isCurrentTask || readingTaskState>=2 || !isBaseLineTask"
-          @change="((val)=>{lesionTypeChange(val)})"
-        >
+        <el-select v-model="questionForm.LesionType" filterable
+          :disabled="!isCurrentTask || readingTaskState >= 2 || !isBaseLineTask"
+          @change="((val) => { lesionTypeChange(val) })">
 
-          <el-option
-            v-for="item of $d.LesionType"
-            v-show="!(isBaseLineTask && item.value === 2)"
-            :key="item.id"
-            :value="item.value"
-            :label="item.label"
-          />
+          <el-option v-for="item of $d.LesionType" v-show="!(isBaseLineTask && item.value === 2)" :key="item.id"
+            :value="item.value" :label="item.label" />
 
         </el-select>
       </el-form-item>
-      <!-- :rules="[
-          { required: (qs.IsRequired === 0 || (qs.IsRequired ===1 && qs.RelevanceId && (questionForm[qs.RelevanceId] === qs.RelevanceValue))) && qs.Type!=='group' && qs.Type!=='summary' && qs.QuestionMark !== 4 && qs.QuestionMark !== 6 && qs.QuestionMark !== 2,
-            message: '请注明', trigger: ['blur']},
-        ]" -->
-      <el-form-item
-        v-for="qs in questions"
-        v-show="qs.ShowQuestion!==2"
-        :key="qs.Id"
-        :label="`${qs.QuestionName}`"
-        :prop="qs.Id"
-        :rules="[
-          { required: (qs.IsRequired === 0 || (qs.IsRequired ===1 && qs.RelevanceId && (questionForm[qs.RelevanceId] === qs.RelevanceValue)) || (qs.QuestionMark === 6 && questionForm.IsCanEditPosition === true) || (questionForm.IsCanEditPosition && qs.QuestionMark === 10)) && qs.Type!=='group' && qs.Type!=='summary',
-            message:['radio', 'select', 'checkbox'].includes(qs.Type) ? $t('common:ruleMessage:select') : $t('common:ruleMessage:specify'), trigger: ['blur','change']},
-        ]"
-      >
-        <!-- {{ isCurrentTaskAdd }}
-        {{ questionForm.IsCanEditPosition }} -->
-
+      <el-form-item v-for="qs in questions" v-show="qs.ShowQuestion !== 2" :key="qs.Id" :label="`${qs.QuestionName}`"
+        :prop="qs.Id" :rules="[
+          {
+            required: (qs.IsRequired === 0 || (qs.IsRequired === 1 && qs.RelevanceId && (questionForm[qs.RelevanceId] === qs.RelevanceValue)) || (qs.QuestionMark === 6 && questionForm.IsCanEditPosition === true) || (questionForm.IsCanEditPosition && qs.QuestionMark === 10) || (questionForm.IsCanEditPosition && qs.QuestionMark === 10) || (qs.QuestionMark === 21 && (questionForm.LesionOrgan === '肝脏' || questionForm.LesionOrgan === 'Liver') && (lesionType === 0 || lesionType === 1 || lesionType === 2))) && qs.Type !== 'group' && qs.Type !== 'summary',
+            message: ['radio', 'select', 'checkbox'].includes(qs.Type) ? $t('common:ruleMessage:select') : $t('common:ruleMessage:specify'), trigger: ['blur', 'change']
+          },
+        ]">
+        <span slot="label" style="display:inline-block;">
+          <el-tooltip
+            v-if="qs.QuestionMark === 0 && (questionForm.LesionOrgan === '肝脏' || questionForm.LesionOrgan === 'Liver') && (lesionType === 0 || lesionType === 1 || lesionType === 2) && questionForm.IntrahepaticLesion"
+            effect="dark" :content="$t('trials:mRecist:warnning:msg1')" placement="bottom">
+            <i class='el-icon-warning' />
+          </el-tooltip>
+          {{ qs.QuestionName }}
+        </span>
         <!-- 输入框 -->
-        <template v-if="qs.Type==='input' || qs.Type==='number'">
-          <!-- {{ ((qs.QuestionMark === 6 && isCurrentTaskAdd === 'False') || (qs.QuestionMark === 6 && isCurrentTaskAdd === 'True' && !questionForm.IsCanEditPosition)) }} -->
-          <el-input
-            v-if="qs.Type==='input' || qs.Type==='number'"
-            v-model="questionForm[qs.Id]"
-            :disabled="!isCurrentTask || readingTaskState>=2 || qs.QuestionMark === 0 || qs.QuestionMark === 1 || qs.QuestionMark === 2 || qs.QuestionMark === 5 || (qs.QuestionMark === 6 && (isCurrentTaskAdd === 'False' || (isCurrentTaskAdd === 'True' && !questionForm.IsCanEditPosition) || !!answers.SplitOrMergeLesionName))|| (qs.QuestionMark === 8 && (isCurrentTaskAdd === 'False' || !!answers.SplitOrMergeLesionName) && lesionType !== 2) || (qs.QuestionMark === 10 && (isCurrentTaskAdd === 'False' || !!answers.SplitOrMergeLesionName))"
-            @change="((val)=>{formItemChange(val, qs)})"
-          >
-            <template v-if="(qs.QuestionMark===0 || qs.QuestionMark===1) && qs.Unit" slot="append">
+        <template v-if="qs.Type === 'input' || qs.Type === 'number'">
+          <el-input v-if="qs.Type === 'input' || qs.Type === 'number'" v-model="questionForm[qs.Id]"
+            :disabled="!isCurrentTask || readingTaskState >= 2 || qs.QuestionMark === 0 || qs.QuestionMark === 1 || qs.QuestionMark === 2 || qs.QuestionMark === 5 || (qs.QuestionMark === 6 && (isCurrentTaskAdd === 'False' || (isCurrentTaskAdd === 'True' && !questionForm.IsCanEditPosition) || !!answers.SplitOrMergeLesionName)) || (qs.QuestionMark === 8 && (isCurrentTaskAdd === 'False' || !!answers.SplitOrMergeLesionName) && lesionType !== 2) || (qs.QuestionMark === 10 && (isCurrentTaskAdd === 'False' || !!answers.SplitOrMergeLesionName))"
+            @change="((val) => { formItemChange(val, qs) })">
+            <template v-if="(qs.QuestionMark === 0 || qs.QuestionMark === 1) && qs.Unit" slot="append">
               {{ $fd('ValueUnit', parseInt(qs.Unit)) }}
             </template>
           </el-input>
         </template>
         <!-- 多行文本输入框 -->
-        <el-input
-          v-if="qs.Type==='textarea'"
-          v-model="questionForm[qs.Id]"
-          type="textarea"
-          :autosize="{ minRows: 2, maxRows: 4}"
-          :disabled="!isCurrentTask || readingTaskState>=2"
-          @change="((val)=>{formItemChange(val, qs)})"
-        />
+        <el-input v-if="qs.Type === 'textarea'" v-model="questionForm[qs.Id]" type="textarea"
+          :autosize="{ minRows: 2, maxRows: 4 }" :disabled="!isCurrentTask || readingTaskState >= 2"
+          @change="((val) => { formItemChange(val, qs) })" />
         <!-- 下拉框 -->
-        <!-- :disabled="!isCurrentTask || readingTaskState>=2 || (!isBaseLineTask && qs.QuestionMark === 5 && isCurrentTaskAdd === 'False') || qs.QuestionMark === 2 || (qs.QuestionMark === 8 && !isBaseLineTask && isCurrentTaskAdd === 'False')" -->
-
-        <el-select
-          v-if="qs.Type==='select'"
-          v-model="questionForm[qs.Id]"
-          filterable
+        <el-select v-if="qs.Type === 'select'" v-model="questionForm[qs.Id]" filterable
           :placeholder="qs.QuestionMark === 8 ? $t('common:placeholder:selectorsearch') : $t('common:placeholder:select')"
-          :disabled="!isCurrentTask || readingTaskState>=2 || qs.QuestionMark === 0 || qs.QuestionMark === 1 || qs.QuestionMark === 2 || qs.QuestionMark === 5 || (qs.QuestionMark === 6 && (isCurrentTaskAdd === 'False' || (isCurrentTaskAdd === 'True' && !questionForm.IsCanEditPosition) || !!answers.SplitOrMergeLesionName))|| (qs.QuestionMark === 8 && (isCurrentTaskAdd === 'False'|| !!answers.SplitOrMergeLesionName)) || (qs.QuestionMark === 10 && (isCurrentTaskAdd === 'False' || (isCurrentTaskAdd === 'True' && !questionForm.IsCanEditPosition) || !!answers.SplitOrMergeLesionName))"
-          @change="((val)=>{formItemChange(val, qs)})"
-        >
+          :disabled="!isCurrentTask || readingTaskState >= 2 || qs.QuestionMark === 0 || qs.QuestionMark === 1 || qs.QuestionMark === 2 || qs.QuestionMark === 5 ||
+            (qs.QuestionMark === 6 && (isCurrentTaskAdd === 'False' || (isCurrentTaskAdd === 'True' && !questionForm.IsCanEditPosition) || !!answers.SplitOrMergeLesionName))
+            || (qs.QuestionMark === 8 && (isCurrentTaskAdd === 'False' || !!answers.SplitOrMergeLesionName))
+            || (qs.QuestionMark === 10 && (isCurrentTaskAdd === 'False' || (isCurrentTaskAdd === 'True' && !questionForm.IsCanEditPosition) || !!answers.SplitOrMergeLesionName))
+            || (qs.QuestionMark === 21 && (isCurrentTaskAdd === 'False' || !!answers.SplitOrMergeLesionName))
+            || (answers.LesionOrgan && answers.LesionOrgan !== '肝脏' && answers.LesionOrgan !== 'Liver' && qs.QuestionMark === 21)"
+          @change="((val) => { formItemChange(val, qs) })">
           <template v-if="qs.QuestionMark === 8" #prefix>
             <span style="padding-left: 5px;">
               <i class="el-icon-search" />
             </span>
           </template>
           <template v-if="qs.TableQuestionType === 1">
-            <el-option
-              v-for="item in organList"
-              :key="item.Id"
-              :label="item[qs.DataTableColumn]"
-              :value="item[qs.DataTableColumn]"
-            />
+            <el-option v-for="item in organList" :key="item.Id" :label="item[qs.DataTableColumn]"
+              :value="item[qs.DataTableColumn]" />
           </template>
           <template v-else-if="qs.DictionaryCode && qs.QuestionMark === 7 && isBaseLineTask">
-            <el-option
-              v-for="item of $d[qs.DictionaryCode]"
-              v-show="(lesionType === 0 && item.value ===0) || (lesionType === 1 && (item.value ===0))"
-              :key="item.id"
-              :value="item.value"
-              :label="item.label"
-            />
+            <el-option v-for="item of $d[qs.DictionaryCode]"
+              v-show="(lesionType === 0 && item.value === 0) || (lesionType === 1 && (item.value === 0))" :key="item.id"
+              :value="item.value" :label="item.label" />
           </template>
           <template v-else-if="qs.DictionaryCode && qs.QuestionMark === 7 && !isBaseLineTask">
             <el-option-group
-              :label="!isNaN(parseFloat(answers.LastTaskState)) ? `${$t('trials:dicomReading:tip:lastVisitStatus')} ${$fd(qs.DictionaryCode,parseFloat(answers.LastTaskState))}` : ''"
-            >
+              :label="!isNaN(parseFloat(answers.LastTaskState)) ? `${$t('trials:dicomReading:tip:lastVisitStatus')} ${$fd(qs.DictionaryCode, parseFloat(answers.LastTaskState))}` : ''">
               <!-- 首次分裂的病灶只能选择存在 -->
-              <template v-if="answers.IsFristAdd=== 'True' && answers.SplitOrMergeType === '0'">
+              <template v-if="answers.IsFristAdd === 'True' && answers.SplitOrMergeType === '0'">
 
-                <el-option
-                  v-for="item of $d[qs.DictionaryCode]"
-                  v-show="item.value === 0"
-                  :key="item.id"
-                  :value="item.value"
-                  :label="item.label"
-                />
+                <el-option v-for="item of $d[qs.DictionaryCode]" v-show="item.value === 0" :key="item.id"
+                  :value="item.value" :label="item.label" />
               </template>
               <!-- 首次添加的新病灶不能为无法评估和消失 -->
-              <template v-else-if="isCurrentTaskAdd=== 'True' && lesionType === 2">
-                <el-option
-                  v-for="item of $d[qs.DictionaryCode]"
-                  v-show="item.value === 0 || item.value === 1"
-                  :key="item.id"
-                  :value="item.value"
-                  :label="item.label"
-                />
+              <template v-else-if="isCurrentTaskAdd === 'True' && lesionType === 2">
+                <el-option v-for="item of $d[qs.DictionaryCode]" v-show="item.value === 0 || item.value === 1"
+                  :key="item.id" :value="item.value" :label="item.label" />
               </template>
               <template v-else>
-                <el-option
-                  v-for="item of filterState($d[qs.DictionaryCode])"
-                  :key="item.id"
-                  :value="item.value"
-                  :label="item.label"
-                />
+                <el-option v-for="item of filterState($d[qs.DictionaryCode])" :key="item.id" :value="item.value"
+                  :label="item.label" />
               </template>
             </el-option-group>
           </template>
           <template v-else-if="qs.DictionaryCode && qs.QuestionMark !== 7">
-            <el-option
-              v-for="item of $d[qs.DictionaryCode]"
-              :key="item.id"
-              :value="item.value"
-              :label="item.label"
-            />
+            <el-option v-for="item of $d[qs.DictionaryCode]" :key="item.id" :value="item.value" :label="item.label" />
           </template>
           <template v-else>
-            <el-option
-              v-for="val in qs.TypeValue.split('|')"
-              :key="val"
-              :label="val"
-              :value="val"
-            />
+            <el-option v-for="val in qs.TypeValue.split('|')" :key="val" :label="val" :value="val" />
           </template>
 
         </el-select>
         <!-- 单选 -->
-        <el-radio-group
-          v-if="qs.Type==='radio'"
-          v-model="questionForm[qs.id]"
-          :disabled="!isCurrentTask || readingTaskState>=2"
-        >
-          <el-radio
-            v-for="val in qs.options.split('|')"
-            :key="val"
-            :label="val"
-          >
+        <el-radio-group v-if="qs.Type === 'radio'" v-model="questionForm[qs.id]"
+          :disabled="!isCurrentTask || readingTaskState >= 2">
+          <el-radio v-for="val in qs.options.split('|')" :key="val" :label="val">
             {{ val }}
           </el-radio>
         </el-radio-group>
@@ -189,33 +118,19 @@
 
     </div>
 
-    <div
-      v-if="isCurrentTask && readingTaskState<2"
-      class="base-dialog-footer"
-      style="text-align:right;margin-top:10px;"
-    >
+    <div v-if="isCurrentTask && readingTaskState < 2" class="base-dialog-footer"
+      style="text-align:right;margin-top:10px;">
 
       <!-- 清除标记 -->
-      <el-button
-        v-if="questionForm.MeasureData"
-        size="mini"
-        @click="handleDeleteMeasureData"
-      >
+      <el-button v-if="questionForm.MeasureData" size="mini" @click="handleDeleteMeasureData">
         {{ $t('trials:reading:button:removeMark') }}
       </el-button>
       <!-- 删除 -->
-      <el-button
-        v-if="isCurrentTaskAdd !== 'False'"
-        size="mini"
-        @click="handleDelete"
-      >
+      <el-button v-if="isCurrentTaskAdd !== 'False'" size="mini" @click="handleDelete">
         {{ $t('common:button:delete') }}
       </el-button>
       <!-- 保存 -->
-      <el-button
-        size="mini"
-        @click="handleSave"
-      >
+      <el-button size="mini" @click="handleSave">
         {{ $t('common:button:save') }}
       </el-button>
     </div>
@@ -327,7 +242,8 @@ 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, 'LesionOrgan', this.answers.LesionOrgan ? this.answers.LesionOrgan : '')
+      this.$set(this.questionForm, 'IntrahepaticLesion', this.answers.IntrahepaticLesion ? this.answers.IntrahepaticLesion : 0)
       // saveTypeEnum 0：未保存过（新建病灶）；1：已保存，信息不完整（随访初始化病灶/分裂病灶，通过状态判断）；2：已保存，信息完整
       var lesionState = this.getQuestionVal(7)
       if (this.questionForm.RowId) {
@@ -352,12 +268,12 @@ export default {
         await this.setMeasureData(this.answers.measureObj, true)
       } else {
         if (this.questionForm.MeasureData) {
-        // 十字线工具 且是靶病灶  器官只能是淋巴结类型
+          // 十字线工具 且是靶病灶  器官只能是淋巴结类型
           if (this.questionForm.MeasureData.type === 'Bidirectional') {
             this.organList = []
             await this.getOrganInfoList(1)
           } else if (this.questionForm.MeasureData.type === 'Length') {
-          // 直径测量工具 且是靶病灶  器官只能是非淋巴结类型
+            // 直径测量工具 且是靶病灶  器官只能是非淋巴结类型
             this.organList = []
             await this.getOrganInfoList(0)
           } else {
@@ -469,8 +385,8 @@ export default {
               type: 'warning',
               distinguishCancelAndClose: true
             })
-              .then(() => {})
-              .catch(() => {})
+              .then(() => { })
+              .catch(() => { })
             this.$set(this.questionForm, 'LesionType', this.originalQuestionForm.LesionType)
             return
           }
@@ -483,7 +399,7 @@ export default {
             this.$confirm(msg, {
               type: 'warning',
               showCancelButton: false,
-              callback: action => {}
+              callback: action => { }
             })
             this.$set(this.questionForm, 'LesionType', this.originalQuestionForm.LesionType)
             return
@@ -543,16 +459,29 @@ export default {
           var selected = this.organList[index]
           question.RelationQuestions.map(qs => {
             var val = selected[qs.DataTableColumn]
+            if (qs.DataTableColumn === 'TULOC' || qs.DataTableColumn === 'TULOCEN') {
+              this.$set(this.questionForm, 'LesionOrgan', val)
+            }
             this.$set(this.questionForm, qs.Id, val)
           })
           this.$set(this.questionForm, 'OrganInfoId', selected.OrganInfoId)
           this.$set(this.questionForm, 'IsCanEditPosition', selected['IsCanEditPosition'])
+          let qs = this.questions.find(item => item.QuestionMark === 21)
+          this.$set(this.questionForm, qs.Id, 0)
+
+          // if (this.questionForm.LesionOrgan === '肝脏' || this.questionForm.LesionOrgan === 'Liver') {
+          //   this.$set(this.questionForm, qs.Id, 0)
+          // }
+
         } else {
           question.RelationQuestions.map(qs => {
             this.$set(this.questionForm, qs.Id, '')
           })
         }
       }
+      if (question.QuestionMark === 21) {
+        this.$set(this.questionForm, 'IntrahepaticLesion', this.questionForm[question.Id])
+      }
       // saveTypeEnum 0：未保存过（新建病灶）；1：已保存，信息不完整（随访初始化病灶/分裂病灶，通过状态判断）；2：已保存，信息完整
       if (this.questionForm.RowId) {
         this.$set(this.questionForm, 'saveTypeEnum', 1)
@@ -655,9 +584,24 @@ export default {
             var isLymphLesion = this.getQuestionVal(2)
             var lesionLength = this.getQuestionVal(0)
             var lesionShort = this.getQuestionVal(1)
+            var lesionOrgan = this.getQuestionVal(5)
+            var IntrahepaticLesion = this.getQuestionVal(21)
+            // 新病灶的器官为肝脏时,如果是典型肝内病灶，当直径≥1cm时自动设置病灶状态为“明确”（0），当直径<1cm时，自动设置病灶状态为“疑似”（1）；
+            if (this.isCurrentTaskAdd === 'True') {
+              if ((lesionOrgan === '肝脏' || lesionOrgan === 'Liver') && IntrahepaticLesion) {
+                if (!this.isBaseLineTask && (measureData.type === 'Length' && lesionLength >= 10)) {
+                  const stateId = this.getQuestionId(7)
+                  this.$set(this.questionForm, stateId, 0)
+                }
+                if (!this.isBaseLineTask && (measureData.type === 'Length' && lesionLength < 10)) {
+                  const stateId = this.getQuestionId(7)
+                  this.$set(this.questionForm, stateId, 1)
+                }
+              }
+            }
             // 当前添加的新病灶不做处理
             if (!(this.isCurrentTaskAdd === 'True')) {
-            // 非基线时，非淋巴结病灶长径>=10mm，自动给“存在”状态，如果淋巴结病灶短径>=10mm，自动给“存在”状态。
+              // 非基线时，非淋巴结病灶长径>=10mm，自动给“存在”状态，如果淋巴结病灶短径>=10mm，自动给“存在”状态。
               if (!this.isBaseLineTask && ((measureData.type === 'Length' && lesionLength >= 10) || (measureData.type === 'Bidirectional' && lesionShort >= 10))) {
                 const stateId = this.getQuestionId(7)
                 this.$set(this.questionForm, stateId, 0)
@@ -721,7 +665,7 @@ export default {
         this.$set(this.questionForm, 'MeasureData', measureData)
         const isLymph = this.getQuestionVal(2)
         const lesionPart = this.getQuestionVal(8)
-        const lesionOrgan = this.getQuestionVal(6)
+        // const lesionOrgan = this.getQuestionVal(6)
         const lesionL = this.getQuestionVal(0)
         const lesionS = this.getQuestionVal(1)
         var lesionState = this.getQuestionVal(7)
@@ -844,6 +788,26 @@ export default {
       var lesionLength = this.getQuestionVal(0)
       var lesionShort = this.getQuestionVal(1)
       var lymphNodes = this.getQuestionVal(2)
+      var IntrahepaticLesion = this.getQuestionVal(21)
+      // 添加为典型肝内病灶的非靶病灶时，判断靶病灶中典型肝内病灶数量，<2 时提示
+      if (this.lesionType !== 0 && IntrahepaticLesion === 1) {
+        let questions = this.tableQuestions.find(item => item.QuestionEnName === 'Target Lesion' && item.QuestionName === '靶病灶')
+        let num = 0
+        if (questions.TableQuestions && Array.isArray(questions.TableQuestions.Answers)) {
+          questions.TableQuestions.Answers.forEach(item => {
+            if (item.IntrahepaticLesion && item.IntrahepaticLesion > 0) num++
+          })
+        }
+        if (num < 2) {
+          this.$confirm(this.$t('trials:reading:warnning:msg199'), {
+            type: 'warning',
+            showCancelButton: false,
+            callback: action => { }
+          })
+          loading.close()
+          return
+        }
+      }
       if (this.isBaseLineTask) {
         // 基线
         // 靶病灶且状态为存在（0）
@@ -855,7 +819,17 @@ export default {
               this.$confirm(this.$t('trials:reading:warnning:msg19'), {
                 type: 'warning',
                 showCancelButton: false,
-                callback: action => {}
+                callback: action => { }
+              })
+              loading.close()
+              return
+            }
+            if (!(measureData && measureData.markTool === 'Bidirectional' && lesionShort >= 20)) {
+              // 靶病灶部位为肝门淋巴结时，选择要求时短轴≥2cm
+              this.$confirm(this.$t('trials:mRecist:warnning:msg2'), {
+                type: 'warning',
+                showCancelButton: false,
+                callback: action => { }
               })
               loading.close()
               return
@@ -867,7 +841,7 @@ export default {
               this.$confirm(this.$t('trials:reading:warnning:msg20'), {
                 type: 'warning',
                 showCancelButton: false,
-                callback: action => {}
+                callback: action => { }
               })
               loading.close()
               return
@@ -884,7 +858,7 @@ export default {
               this.$confirm(this.$t('trials:reading:warnning:msg21'), {
                 type: 'warning',
                 showCancelButton: false,
-                callback: action => {}
+                callback: action => { }
               })
               loading.close()
               return
@@ -896,7 +870,7 @@ export default {
               this.$confirm(this.$t('trials:reading:warnning:msg22'), {
                 type: 'warning',
                 showCancelButton: false,
-                callback: action => {}
+                callback: action => { }
               })
               loading.close()
               return
@@ -914,7 +888,7 @@ export default {
               this.$confirm(this.$t('trials:reading:warnning:msg23'), {
                 type: 'warning',
                 showCancelButton: false,
-                callback: action => {}
+                callback: action => { }
               })
               loading.close()
               return
@@ -926,7 +900,7 @@ export default {
               this.$confirm(this.$t('trials:reading:warnning:msg24'), {
                 type: 'warning',
                 showCancelButton: false,
-                callback: action => {}
+                callback: action => { }
               })
               loading.close()
               return
@@ -942,7 +916,7 @@ export default {
               this.$confirm(this.$t('trials:reading:warnning:msg25'), {
                 type: 'warning',
                 showCancelButton: false,
-                callback: action => {}
+                callback: action => { }
               })
               loading.close()
               return
@@ -958,7 +932,7 @@ export default {
               this.$confirm(this.$t('trials:reading:warnning:msg26'), {
                 type: 'warning',
                 showCancelButton: false,
-                callback: action => {}
+                callback: action => { }
               })
               loading.close()
               return
@@ -979,7 +953,7 @@ export default {
               this.$confirm(this.$t('trials:reading:warnning:msg27'), {
                 type: 'warning',
                 showCancelButton: false,
-                callback: action => {}
+                callback: action => { }
               })
               loading.close()
               return
@@ -991,7 +965,7 @@ export default {
               this.$confirm(this.$t('trials:reading:warnning:msg28'), {
                 type: 'warning',
                 showCancelButton: false,
-                callback: action => {}
+                callback: action => { }
               })
               loading.close()
               return
@@ -1026,7 +1000,7 @@ export default {
               this.$confirm(this.$t('trials:reading:warnning:msg29'), {
                 type: 'warning',
                 showCancelButton: false,
-                callback: action => {}
+                callback: action => { }
               })
               loading.close()
               return
@@ -1038,7 +1012,7 @@ export default {
               this.$confirm(this.$t('trials:reading:warnning:msg30'), {
                 type: 'warning',
                 showCancelButton: false,
-                callback: action => {}
+                callback: action => { }
               })
               loading.close()
               return
@@ -1059,7 +1033,7 @@ export default {
               this.$confirm(this.$t('trials:reading:warnning:msg31'), {
                 type: 'warning',
                 showCancelButton: false,
-                callback: action => {}
+                callback: action => { }
               })
               loading.close()
               return
@@ -1071,7 +1045,7 @@ export default {
               this.$confirm(this.$t('trials:reading:warnning:msg32'), {
                 type: 'warning',
                 showCancelButton: false,
-                callback: action => {}
+                callback: action => { }
               })
               loading.close()
               return
@@ -1088,7 +1062,7 @@ export default {
               this.$confirm(this.$t('trials:reading:warnning:msg33'), {
                 type: 'warning',
                 showCancelButton: false,
-                callback: action => {}
+                callback: action => { }
               })
               loading.close()
               return
@@ -1100,7 +1074,7 @@ export default {
               this.$confirm(this.$t('trials:reading:warnning:msg34'), {
                 type: 'warning',
                 showCancelButton: false,
-                callback: action => {}
+                callback: action => { }
               })
               loading.close()
               return
@@ -1117,7 +1091,7 @@ export default {
               this.$confirm(this.$t('trials:reading:warnning:msg35'), {
                 type: 'warning',
                 showCancelButton: false,
-                callback: action => {}
+                callback: action => { }
               })
               loading.close()
               return
@@ -1129,7 +1103,7 @@ export default {
               this.$confirm(this.$t('trials:reading:warnning:msg36'), {
                 type: 'warning',
                 showCancelButton: false,
-                callback: action => {}
+                callback: action => { }
               })
               loading.close()
               return
@@ -1146,7 +1120,7 @@ export default {
               this.$confirm(this.$t('trials:reading:warnning:msg37'), {
                 type: 'warning',
                 showCancelButton: false,
-                callback: action => {}
+                callback: action => { }
               })
               loading.close()
               return
@@ -1158,7 +1132,7 @@ export default {
               this.$confirm(this.$t('trials:reading:warnning:msg38'), {
                 type: 'warning',
                 showCancelButton: false,
-                callback: action => {}
+                callback: action => { }
               })
               loading.close()
               return
@@ -1175,7 +1149,7 @@ export default {
               this.$confirm(this.$t('trials:reading:warnning:msg39'), {
                 type: 'warning',
                 showCancelButton: false,
-                callback: action => {}
+                callback: action => { }
               })
               loading.close()
               return
@@ -1187,7 +1161,27 @@ export default {
               this.$confirm(this.$t('trials:reading:warnning:msg40'), {
                 type: 'warning',
                 showCancelButton: false,
-                callback: action => {}
+                callback: action => { }
+              })
+              loading.close()
+              return
+            }
+            if (!(measureData && (measureData.type === 'Length' || measureData.type === 'ArrowAnnotate'))) {
+              // 评估状态为存在的非淋巴结新病灶需使用直径测量工具或箭头工具添加标记！
+              this.$confirm(this.$t('trials:reading:warnning:msg40'), {
+                type: 'warning',
+                showCancelButton: false,
+                callback: action => { }
+              })
+              loading.close()
+              return
+            }
+            if (measureData && measureData.type === 'Length' && this.questionForm.IntrahepaticLesion && lesionLength < 10) {
+              // 病灶状态为“明确”的典型肝内病灶，长径应不小于10mm。
+              this.$confirm(this.$t('trials:mRecist:warnning:msg3'), {
+                type: 'warning',
+                showCancelButton: false,
+                callback: action => { }
               })
               loading.close()
               return
@@ -1204,7 +1198,7 @@ export default {
               this.$confirm(this.$t('trials:reading:warnning:msg41'), {
                 type: 'warning',
                 showCancelButton: false,
-                callback: action => {}
+                callback: action => { }
               })
               loading.close()
               return
@@ -1216,7 +1210,28 @@ export default {
               this.$confirm(this.$t('trials:reading:warnning:msg42'), {
                 type: 'warning',
                 showCancelButton: false,
-                callback: action => {}
+                callback: action => { }
+              })
+              loading.close()
+              return
+            }
+            // 非淋巴结非靶病灶 直径测量工具、箭头工具
+            if (!(measureData && (measureData.type === 'Length' || measureData.type === 'ArrowAnnotate'))) {
+              // `评估状态为疑似的非淋巴结新病灶需使用直径测量工具或箭头工具添加标记！`
+              this.$confirm(this.$t('trials:reading:warnning:msg42'), {
+                type: 'warning',
+                showCancelButton: false,
+                callback: action => { }
+              })
+              loading.close()
+              return
+            }
+            if (measureData && measureData.type === 'Length' && this.questionForm.IntrahepaticLesion && lesionLength >= 10) {
+              // 病灶状态为“疑似”的典型肝内病灶，长径应小于10mm。
+              this.$confirm(this.$t('trials:mRecist:warnning:msg4'), {
+                type: 'warning',
+                showCancelButton: false,
+                callback: action => { }
               })
               loading.close()
               return
@@ -1233,7 +1248,7 @@ export default {
               this.$confirm(this.$t('trials:reading:warnning:msg43'), {
                 type: 'warning',
                 showCancelButton: false,
-                callback: action => {}
+                callback: action => { }
               })
               loading.close()
               return
@@ -1245,7 +1260,7 @@ export default {
               this.$confirm(this.$t('trials:reading:warnning:msg44'), {
                 type: 'warning',
                 showCancelButton: false,
-                callback: action => {}
+                callback: action => { }
               })
               loading.close()
               return
@@ -1262,7 +1277,7 @@ export default {
               this.$confirm(this.$t('trials:reading:warnning:msg45'), {
                 type: 'warning',
                 showCancelButton: false,
-                callback: action => {}
+                callback: action => { }
               })
               loading.close()
               return
@@ -1274,7 +1289,7 @@ export default {
               this.$confirm(this.$t('trials:reading:warnning:msg46'), {
                 type: 'warning',
                 showCancelButton: false,
-                callback: action => {}
+                callback: action => { }
               })
               loading.close()
               return
@@ -1330,7 +1345,7 @@ export default {
           }
           const res = await submitTableQuestion(params)
           if (res.IsSuccess) {
-          // 保存成功！
+            // 保存成功！
             this.$message.success(this.$t('common:message:savedSuccessfully'))
             this.currentMarkTool = measureData ? measureData.type : ''
             // saveTypeEnum 0：未保存过（新建病灶）；1：已保存，信息不完整（随访初始化病灶/分裂病灶，通过状态判断）；2：已保存，信息完整
@@ -1500,42 +1515,50 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
-.measurement-form{
-  /deep/ .el-form-item__label{
+.measurement-form {
+  /deep/ .el-form-item__label {
     color: #c3c3c3;
   }
-  /deep/ .el-input .el-input__inner{
+
+  /deep/ .el-input .el-input__inner {
     background-color: transparent;
     color: #ddd;
     border: 1px solid #5e5e5e;
   }
-  /deep/ .el-form-item{
+
+  /deep/ .el-form-item {
     display: flex;
     flex-direction: row;
     justify-content: flex-start;
   }
-  /deep/ .el-form-item__content{
+
+  /deep/ .el-form-item__content {
     flex: 1;
   }
-  /deep/ .el-input.is-disabled .el-input__inner{
+
+  /deep/ .el-input.is-disabled .el-input__inner {
     background-color: #646464a1;
   }
-  /deep/ .el-select.is-disabled .el-input__inner{
+
+  /deep/ .el-select.is-disabled .el-input__inner {
     background-color: #646464a1;
   }
-  /deep/ .el-button--mini, .el-button--mini.is-round {
+
+  /deep/ .el-button--mini,
+  .el-button--mini.is-round {
     padding: 7px 10px;
   }
-  .el-form-item__content
-  .el-select{
+
+  .el-form-item__content .el-select {
     width: 100%;
   }
-  .input-width1{
-    width: calc(100% -60px)!important;
+
+  .input-width1 {
+    width: calc(100% -60px) !important;
   }
-  .input-width2{
+
+  .input-width2 {
     width: 100% !important;
   }
 }
-
 </style>
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/MRecist/QuestionList.vue b/src/views/trials/trials-panel/reading/dicoms/components/MRecist/QuestionList.vue
index fc95fa5..9454d63 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/MRecist/QuestionList.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/MRecist/QuestionList.vue
@@ -8,119 +8,117 @@
           <span style="margin-left:5px;">{{ taskBlindName }}</span>
         </h3>
         <div v-if="readingTaskState < 2">
-          <el-tooltip class="item" effect="dark" :content="$t('trials:dicomReading:message:confirmReset')" placement="bottom">
-            <i
-              class="el-icon-refresh-left"
-              @click="resetMeasuredData"
-            />
+          <el-tooltip class="item" effect="dark" :content="$t('trials:dicomReading:message:confirmReset')"
+            placement="bottom">
+            <i class="el-icon-refresh-left" @click="resetMeasuredData" />
           </el-tooltip>
         </div>
       </div>
 
       <!-- 非测量问题 -->
       <div class="lesions">
-        <Questions ref="ecrf" :question-form-change-state="questionFormChangeState" :question-form-change-num="questionFormChangeNum" />
+        <Questions ref="ecrf" :question-form-change-state="questionFormChangeState"
+          :question-form-change-num="questionFormChangeNum" />
       </div>
       <!-- 测量问题 -->
       <template v-if="questions.length > 0 && CriterionType !== 10">
-        <div v-for="(qs,index) in questions" :key="index" v-loading="loading" class="lesions lesions_wrapper">
+        <div v-for="(qs, index) in questions" :key="index" v-loading="loading" class="lesions lesions_wrapper">
           <h4 v-if="qs.Type === 'group'" style="color: #ddd;padding: 5px 0px;margin: 0;">
-            {{ language==='en'?qs.GroupEnName:qs.GroupName }}
+            {{ language === 'en' ? qs.GroupEnName : qs.GroupName }}
           </h4>
           <div class="lesion_list">
             <div v-for="item in qs.Childrens" v-show="!(isBaseLineTask && item.LesionType === 2)" :key="item.Id">
               <div v-if="item.Type === 'table'" class="flex-row" style="margin:3px 0;">
                 <div class="title">{{ item.QuestionName }}</div>
-                <div v-if="readingTaskState<2 && (isBaseLineTask || item.LesionType === 2)" class="add-icon" @click.prevent="handleAdd(item)">
+                <div v-if="readingTaskState < 2 && (isBaseLineTask || item.LesionType === 2)" class="add-icon"
+                  @click.prevent="handleAdd(item)">
                   <i class="el-icon-plus" />
                 </div>
               </div>
               <!-- @change="handleCollapseChange(qs.Childrens,item)" -->
-              <el-collapse
-                v-if="item.Type === 'table' && item.TableQuestions"
-                v-model="activeName"
-                accordion
-                @change="handleCollapseChange"
-              >
-                <el-collapse-item
-                  v-for="(q,i) in item.TableQuestions.Answers"
-                  :key="`${item.Id}_${q.RowIndex}`"
+              <el-collapse v-if="item.Type === 'table' && item.TableQuestions" v-model="activeName" accordion
+                @change="handleCollapseChange">
+                <el-collapse-item v-for="(q, i) in item.TableQuestions.Answers" :key="`${item.Id}_${q.RowIndex}`"
                   :name="`${item.Id}_${q.RowIndex}`"
-                  @contextmenu.prevent.native="collapseRightClick($event,q,item.Id,q.RowIndex)"
-                >
+                  @contextmenu.prevent.native="collapseRightClick($event, q, item.Id, q.RowIndex)">
                   <template slot="title">
-                    <div style="width:300px;position: relative;" :style="{color:(activeName===item.Id+q.RowIndex?'#ffeb3b':'#fff')}">
+                    <div style="width:300px;position: relative;"
+                      :style="{ color: (activeName === item.Id + q.RowIndex ? '#ffeb3b' : item.TableQuestions.Answers[i].IntrahepaticLesion && item.TableQuestions.Answers[i].IntrahepaticLesion > 0 ? '#5fb4ff' : '#fff') }"
+                      :title="item.TableQuestions.Answers[i].IntrahepaticLesion && item.TableQuestions.Answers[i].IntrahepaticLesion > 0 ? $t('trials:mRecist:text:text1') : ''">
 
-                      {{ getLesionName(item.OrderMark,q.RowIndex) }}
+                      {{ getLesionName(item.OrderMark, q.RowIndex) }}
                       <!-- 未保存 -->
-                      <el-tooltip v-if="readingTaskState<2 && parseInt(item.TableQuestions.Answers[i].saveTypeEnum) === 0" class="item" effect="dark" :content="$t('trials:reading:button:unsaved')" placement="bottom">
+                      <el-tooltip
+                        v-if="readingTaskState < 2 && parseInt(item.TableQuestions.Answers[i].saveTypeEnum) === 0"
+                        class="item" effect="dark" :content="$t('trials:reading:button:unsaved')" placement="bottom">
                         <i class="el-icon-warning" style="color:red" />
                       </el-tooltip>
                       <!-- 信息不完整 -->
-                      <el-tooltip v-if="readingTaskState<2 && parseInt(item.TableQuestions.Answers[i].saveTypeEnum) ===1" class="item" effect="dark" :content="$t('trials:reading:button:incompleteInfor')" placement="bottom">
+                      <el-tooltip
+                        v-if="readingTaskState < 2 && parseInt(item.TableQuestions.Answers[i].saveTypeEnum) === 1"
+                        class="item" effect="dark" :content="$t('trials:reading:button:incompleteInfor')"
+                        placement="bottom">
                         <i class="el-icon-warning" style="color:#ff9800" />
                       </el-tooltip>
-                      <div style="position: absolute;left: 50px;top: 2px;">
+                      <div style="position: absolute;left: 50px;top: 2px;"
+                        :style="{ position: 'absolute', left: '50px', top: '2px', color: item.TableQuestions.Answers[i].IntrahepaticLesion && item.TableQuestions.Answers[i].IntrahepaticLesion > 0 ? '#5fb4ff' : '#fff' }">
                         <!-- white-space: nowrap;overflow: hidden;text-overflow: ellipsis; -->
                         <div style="font-size: 11px;width:220px;height: 30px;">
-                          <div
-                            v-if="item.TableQuestions.Answers[i].lesionPart"
-                            style="margin-left:10px;display: inline-block; white-space: nowrap;overflow: hidden;text-overflow: ellipsis;max-width:90px"
-                          >
-                            <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="margin-left:10px;display: inline-block; white-space: nowrap;overflow: hidden;text-overflow: ellipsis;max-width:90px">
+                            <el-tooltip v-if="!!item.TableQuestions.Answers[i].lesionPart" class="item" effect="dark"
+                              :content="item.TableQuestions.Answers[i].lesionPart" placement="bottom">
                               <span>{{ item.TableQuestions.Answers[i].lesionPart }}</span>
                             </el-tooltip>
                           </div>
-                          <div style="display: inline-block;margin-left:5px;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;max-width:50px">
+                          <div
+                            style="display: inline-block;margin-left:5px;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;max-width:50px">
                             <span v-if="item.LesionType === 0">
-                              {{ $fd('TargetState',parseInt(item.TableQuestions.Answers[i].lesionState)) }}
+                              {{ $fd('TargetState', parseInt(item.TableQuestions.Answers[i].lesionState)) }}
                             </span>
                             <span v-else-if="item.LesionType === 1">
-                              {{ $fd('NoTargetState',parseInt(item.TableQuestions.Answers[i].lesionState)) }}
+                              {{ $fd('NoTargetState', parseInt(item.TableQuestions.Answers[i].lesionState)) }}
                             </span>
                             <span v-else>
-                              {{ $fd('NewLesionState',parseInt(item.TableQuestions.Answers[i].lesionState)) }}
+                              {{ $fd('NewLesionState', parseInt(item.TableQuestions.Answers[i].lesionState)) }}
                             </span>
                           </div>
-                          <div style="display: inline-block;margin-left:5px;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;max-width:60px">
-                            <template v-if="item.TableQuestions.Answers[i].isLymphLesion && !isNaN(parseInt(item.TableQuestions.Answers[i].lesionShort))">
+                          <div
+                            style="display: inline-block;margin-left:5px;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;max-width:60px">
+                            <template
+                              v-if="item.TableQuestions.Answers[i].isLymphLesion && !isNaN(parseInt(item.TableQuestions.Answers[i].lesionShort))">
                               {{ item.TableQuestions.Answers[i].lesionShort }}mm
                             </template>
-                            <template v-else-if="!item.TableQuestions.Answers[i].isLymphLesion && !isNaN(parseInt(item.TableQuestions.Answers[i].lesionLength))">
+                            <template
+                              v-else-if="!item.TableQuestions.Answers[i].isLymphLesion && !isNaN(parseInt(item.TableQuestions.Answers[i].lesionLength))">
                               {{ item.TableQuestions.Answers[i].lesionLength }}mm
                             </template>
                           </div>
                         </div>
                       </div>
-                      <div v-if="((item.LesionType === 0 && parseInt(item.TableQuestions.Answers[i].lesionState) === 0) || (item.LesionType === 1 && [0,1].includes(parseInt(item.TableQuestions.Answers[i].lesionState))) || (item.LesionType === 2 && parseInt(item.TableQuestions.Answers[i].lesionState) === 0)) && item.TableQuestions.Answers[i].IsCurrentTaskAdd === 'False'" style="position: absolute;right: 5px;top: 2px;transform: rotateY(180deg);">
+                      <div
+                        v-if="((item.LesionType === 0 && parseInt(item.TableQuestions.Answers[i].lesionState) === 0) || (item.LesionType === 1 && [0, 1].includes(parseInt(item.TableQuestions.Answers[i].lesionState))) || (item.LesionType === 2 && parseInt(item.TableQuestions.Answers[i].lesionState) === 0)) && item.TableQuestions.Answers[i].IsCurrentTaskAdd === 'False'"
+                        style="position: absolute;right: 5px;top: 2px;transform: rotateY(180deg);">
                         <!-- 分裂 -->
-                        <el-tooltip v-show="readingTaskState<2 && !!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)" />
+                        <el-tooltip
+                          v-show="readingTaskState < 2 && !!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)" />
                         </el-tooltip>
                       </div>
 
                     </div>
 
                   </template>
-                  <QuestionForm
-                    :ref="`${item.Id}_${q.RowIndex}`"
-                    :questions="item.TableQuestions.Questions"
-                    :answers="item.TableQuestions.Answers[i]"
-                    :lesion-type="item.LesionType"
-                    :order-mark="item.OrderMark"
-                    :table-questions="tableQuestions"
-                    :row-index="String(q.RowIndex)"
-                    :question-name="item.QuestionName"
-                    :parent-qs-id="item.Id"
-                    :visit-task-id="visitTaskId"
-                    :is-current-task="isCurrentTask"
-                    :reading-task-state="readingTaskState"
-                    :is-base-line-task="isBaseLineTask"
-                    @getReadingQuestionAndAnswer="getReadingQuestionAndAnswer"
-                    @determineExistsUnsavedLession="determineExistsUnsavedLession"
-                    @resetQuestions="resetQuestions"
-                    @close="close"
-                  />
+                  <QuestionForm :ref="`${item.Id}_${q.RowIndex}`" :questions="item.TableQuestions.Questions"
+                    :answers="item.TableQuestions.Answers[i]" :lesion-type="item.LesionType"
+                    :order-mark="item.OrderMark" :table-questions="tableQuestions" :row-index="String(q.RowIndex)"
+                    :question-name="item.QuestionName" :parent-qs-id="item.Id" :visit-task-id="visitTaskId"
+                    :is-current-task="isCurrentTask" :reading-task-state="readingTaskState"
+                    :is-base-line-task="isBaseLineTask" @getReadingQuestionAndAnswer="getReadingQuestionAndAnswer"
+                    @determineExistsUnsavedLession="determineExistsUnsavedLession" @resetQuestions="resetQuestions"
+                    @close="close" />
                 </el-collapse-item>
 
               </el-collapse>
@@ -274,6 +272,7 @@ export default {
         this.$nextTick(() => {
           this.$refs['ecrf'].getQuestions(this.visitTaskId)
           this.getTableQuestions()
+          this.getQuestions(this.tableQuestions)
           this.tableQuestions.forEach(item => {
             item.TableQuestions.Answers.forEach(i => {
               var refName = `${item.Id}_${i.RowIndex}`
@@ -288,6 +287,7 @@ export default {
       await store.dispatch('reading/setReadingQuestionAndAnswer', { questions: this.questions, visitTaskId: this.visitTaskId })
 
       this.getTableQuestions()
+      this.getQuestions(this.tableQuestions)
     },
     setQuestions(questions, obj) {
       questions.forEach(item => {
@@ -324,6 +324,8 @@ export default {
             this.$set(answerObj, 'loctation', this.getQuestionAnswer(item.TableQuestions.Questions, 6, answerObj))
             this.$set(answerObj, 'lesionLength', this.getQuestionAnswer(item.TableQuestions.Questions, 0, answerObj))
             this.$set(answerObj, 'lesionShort', this.getQuestionAnswer(item.TableQuestions.Questions, 1, answerObj))
+            this.$set(answerObj, 'LesionOrgan', this.getQuestionAnswer(item.TableQuestions.Questions, 5, answerObj))
+            this.$set(answerObj, 'IntrahepaticLesion', this.getQuestionAnswer(item.TableQuestions.Questions, 21, answerObj))
             var isLymphLesion = this.getQuestionAnswer(item.TableQuestions.Questions, 2, answerObj)
             isLymphLesion = isLymphLesion ? parseInt(isLymphLesion) : null
             this.$set(answerObj, 'isLymphLesion', isLymphLesion)
@@ -397,6 +399,7 @@ export default {
               this.isCurrentTask = this.visitTaskList[idx].IsCurrentTask
             }
             this.getTableQuestions()
+            this.getQuestions(this.tableQuestions)
             this.$nextTick(() => {
               this.tableQuestions.forEach(item => {
                 item.TableQuestions.Answers.forEach(i => {
@@ -495,7 +498,7 @@ export default {
               .then(() => {
                 this.split(rowId, questionId)
               })
-              .catch(() => {})
+              .catch(() => { })
           } else {
             // 是否确认分裂
             this.$confirm(this.$t('trials:reading:warnning:msg4'), {
@@ -505,7 +508,7 @@ export default {
               .then(() => {
                 this.split(rowId, questionId)
               })
-              .catch(() => {})
+              .catch(() => { })
           }
         }
       }
@@ -631,7 +634,7 @@ export default {
         this.$confirm(msg, {
           type: 'warning',
           showCancelButton: false,
-          callback: action => {}
+          callback: action => { }
         })
         return
       }
@@ -642,7 +645,7 @@ export default {
         this.$confirm(msg, {
           type: 'warning',
           showCancelButton: false,
-          callback: action => {}
+          callback: action => { }
         })
       } else {
         // saveTypeEnum: 0
@@ -781,7 +784,7 @@ export default {
     async changeLesionType(questionsObj) {
       await store.dispatch('reading/removeReadingQuestionAndAnswer', { lesionType: questionsObj.oldLesionType, rowIndex: questionsObj.rowIndex, visitTaskId: this.visitTaskId })
       // saveTypeEnum: 0
-      var lesionObj = { }
+      var lesionObj = {}
       var questionObj = questionsObj.questionForm
       // 切换到新的病灶集合
       var targetObj = this.tableQuestions.find(item => item.LesionType === questionsObj.newLesionType)
@@ -1058,23 +1061,26 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
-.measurement-wrapper{
+.measurement-wrapper {
   height: 100%;
   overflow-y: auto;
   // overflow: hidden;
 
-  .container{
+  .container {
     padding: 10px;
-    .basic-info{
+
+    .basic-info {
       display: flex;
       justify-content: space-between;
       align-items: center;
-      h3{
+
+      h3 {
         color: #ddd;
         padding: 5px 0px;
         margin: 0;
       }
-      i{
+
+      i {
         color: #fff;
         font-size: 22px;
         font-weight: bold;
@@ -1082,14 +1088,16 @@ export default {
       }
     }
   }
-  .title{
+
+  .title {
     padding: 5px;
     font-weight: bold;
     color: #ddd;
     font-size: 15px;
 
   }
-  .add-icon{
+
+  .add-icon {
     padding: 5px;
     font-weight: bold;
     color: #ddd;
@@ -1098,42 +1106,49 @@ export default {
     margin-bottom: 2px;
     cursor: pointer;
   }
-  .add-icon:hover{
+
+  .add-icon:hover {
     background-color: #607d8b;
   }
 
-  .flex-row{
+  .flex-row {
     display: flex;
     flex-direction: row;
     justify-content: space-between;
     background-color: #424242;
 
   }
-  .lesion_list{
+
+  .lesion_list {
     position: relative;
   }
-  .el-collapse{
-    border-bottom:none;
-    border-top:none;
-    /deep/ .el-collapse-item{
-      background-color: #000!important;
+
+  .el-collapse {
+    border-bottom: none;
+    border-top: none;
+
+    /deep/ .el-collapse-item {
+      background-color: #000 !important;
       color: #ddd;
 
     }
-    /deep/ .el-collapse-item__header{
-      background-color: #000!important;
+
+    /deep/ .el-collapse-item__header {
+      background-color: #000 !important;
       color: #ddd;
-      border-bottom-color:#5a5a5a;
+      border-bottom-color: #5a5a5a;
       padding-left: 5px;
       height: 35px;
       line-height: 35px;
     }
-    /deep/ .el-collapse-item__wrap{
-      background-color: #000!important;
+
+    /deep/ .el-collapse-item__wrap {
+      background-color: #000 !important;
       color: #ddd;
     }
-    /deep/ .el-collapse-item__content{
-      width:260px;
+
+    /deep/ .el-collapse-item__content {
+      width: 260px;
       position: absolute;
       top: 0px;
       right: 0px;
@@ -1142,7 +1157,7 @@ export default {
       z-index: 1;
       color: #ddd;
       padding: 5px;
-      background-color:#1e1e1e;
+      background-color: #1e1e1e;
     }
 
   }
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/ReportPage.vue b/src/views/trials/trials-panel/reading/dicoms/components/ReportPage.vue
index 42780b4..6d53e64 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/ReportPage.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/ReportPage.vue
@@ -261,7 +261,8 @@ export default {
       ntLesionCount: null,
       openWindow: null,
       reportBtnLoading: false,
-      previewFileVisible: false
+      previewFileVisible: false,
+      fileData: {}
     }
   },
   computed: {
@@ -795,6 +796,9 @@ export default {
         sysRes = this.$fd('OverallAssessment', this.tumorEvaluate)
         curRes = this.$fd('OverallAssessment', this.currentEvaluateResult)
       }
+      if (!curRes) {
+        return ''
+      }
       const msg = this.$t('trials:readingReport:message:msg9').replace('xxx', '<font color="red">' + sysRes + '</font>').replace('yyy', '<font color="red">' + curRes + '</font>')
       return msg
     },