diff --git a/src/views/trials/trials-panel/reading/dicoms/components/DicomViewer.vue b/src/views/trials/trials-panel/reading/dicoms/components/DicomViewer.vue
index e95eeb3..65b2d88 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/DicomViewer.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/DicomViewer.vue
@@ -419,6 +419,14 @@
               :is-show="isShow"
               :is-reading-show-subject-info="isReadingShowSubjectInfo"
             />
+            <MRecistQuestionList
+              v-else-if="CriterionType === 7"
+              ref="measurementList"
+              :question-form-change-state="questionFormChangeState"
+              :question-form-change-num="questionFormChangeNum"
+              :is-show="isShow"
+              :is-reading-show-subject-info="isReadingShowSubjectInfo"
+            />
             <h2 v-else style="color:#ddd">
               Developing...
             </h2>
@@ -541,6 +549,7 @@ import { getToken } from '@/utils/auth'
 // import PetCt from './Fusion/PetCt'
 import DicomCanvas from '@/views/trials/trials-panel/reading/dicoms/components/DicomCanvas.vue'
 import RecistQuestionList from './Recist/QuestionList'
+import MRecistQuestionList from './MRecist/QuestionList'
 import RecistBMQuestionList from './RecistBM/QuestionList'
 import IRecistQuestionList from './IRecist/QuestionList'
 import PCWGQuestionList from './PCWG/QuestionList'
@@ -568,6 +577,7 @@ export default {
     WL,
     Others,
     RecistQuestionList,
+    MRecistQuestionList,
     PCWGQuestionList,
     RecistBMQuestionList,
     IRecistQuestionList,
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
new file mode 100644
index 0000000..10e112b
--- /dev/null
+++ b/src/views/trials/trials-panel/reading/dicoms/components/MRecist/QuestionForm.vue
@@ -0,0 +1,1541 @@
+<template>
+  <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;">
+          <!-- {{ `${questionName} (${orderMark}${String(rowIndex).padStart(2, '0')})` }} -->
+          {{ lesionName }}
+        </h3>
+        <!-- 关闭 -->
+        <div>
+          <i class="el-icon-circle-close" style="font-size: 25px;cursor: pointer;" @click="handleClose" />
+        </div>
+      </div>
+
+      <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-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 }} -->
+
+        <!-- 输入框 -->
+        <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">
+              {{ $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)})"
+        />
+        <!-- 下拉框 -->
+        <!-- :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
+          :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)})"
+        >
+          <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]"
+            />
+          </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"
+            />
+          </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))}` : ''"
+            >
+              <!-- 首次分裂的病灶只能选择存在 -->
+              <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"
+                />
+              </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>
+              <template v-else>
+                <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"
+            />
+          </template>
+          <template v-else>
+            <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"
+          >
+            {{ val }}
+          </el-radio>
+        </el-radio-group>
+      </el-form-item>
+
+    </div>
+
+    <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"
+      >
+        {{ $t('trials:reading:button:removeMark') }}
+      </el-button>
+      <!-- 删除 -->
+      <el-button
+        v-if="isCurrentTaskAdd !== 'False'"
+        size="mini"
+        @click="handleDelete"
+      >
+        {{ $t('common:button:delete') }}
+      </el-button>
+      <!-- 保存 -->
+      <el-button
+        size="mini"
+        @click="handleSave"
+      >
+        {{ $t('common:button:save') }}
+      </el-button>
+    </div>
+  </el-form>
+</template>
+<script>
+import { submitTableQuestion, deleteReadingRowAnswer } from '@/api/trials'
+// import { uploadPrintscreen } from '@/api/reading'
+import DicomEvent from './../DicomEvent'
+import store from '@/store'
+export default {
+  name: 'MeasurementForm',
+  props: {
+    questions: {
+      type: Array,
+      default() { return [] }
+    },
+    answers: {
+      type: Object,
+      default() { return {} }
+    },
+    lesionType: {
+      type: Number,
+      required: true
+    },
+    visitTaskId: {
+      type: String,
+      required: true
+    },
+    parentQsId: {
+      type: String,
+      required: true
+    },
+    isCurrentTask: {
+      type: Boolean,
+      required: true
+    },
+    readingTaskState: {
+      type: Number,
+      required: true
+    },
+    isBaseLineTask: {
+      type: Boolean,
+      required: true
+    },
+    orderMark: {
+      type: String,
+      default: ''
+    },
+    questionName: {
+      type: String,
+      required: true
+    },
+    rowIndex: {
+      type: String,
+      required: true
+    },
+    tableQuestions: {
+      type: Array,
+      default() { return [] }
+    }
+  },
+  data() {
+    return {
+      questionForm: {},
+      loading: false,
+      trialId: '',
+      organList: [],
+      originalQuestionForm: {},
+      isRender: false,
+      toolType: '',
+      lesionName: '',
+      isCurrentTaskAdd: 'False',
+      splitOrMergeLesionName: '',
+      lesionMark: '',
+      deleteInfo: null,
+      pictureBaseStr: '',
+      currentMarkTool: ''
+    }
+  },
+  mounted() {
+    this.trialId = this.$route.query.trialId
+    this.initForm()
+    DicomEvent.$on('handleImageQualityAbnormal', () => {
+      this.setState()
+    })
+  },
+  beforeDestroy() {
+    DicomEvent.$off('handleImageQualityAbnormal')
+  },
+  methods: {
+    async initForm() {
+      const loading = this.$loading({ fullscreen: true })
+      this.questions.forEach(item => {
+        var val = this.answers[item.Id]
+        if (item.DictionaryCode) {
+          val = isNaN(parseInt(this.answers[item.Id])) ? this.answers[item.Id] : parseInt(this.answers[item.Id])
+        }
+        if (this.isBaseLineTask && item.QuestionMark === 7 && this.lesionType === 0) {
+          val = 0
+        }
+        if (this.isBaseLineTask && item.QuestionMark === 7 && this.lesionType === 1) {
+          val = 0
+        }
+
+        this.$set(this.questionForm, item.Id, val)
+      })
+      this.$set(this.questionForm, 'MeasureData', this.answers.MeasureData ? JSON.parse(this.answers.MeasureData) : '')
+      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 : '')
+
+      // saveTypeEnum 0：未保存过（新建病灶）；1：已保存，信息不完整（随访初始化病灶/分裂病灶，通过状态判断）；2：已保存，信息完整
+      var lesionState = this.getQuestionVal(7)
+      if (this.questionForm.RowId) {
+        this.$set(this.questionForm, 'saveTypeEnum', lesionState === '' ? 1 : 2)
+      } else {
+        this.$set(this.questionForm, 'saveTypeEnum', 0)
+      }
+      this.$set(this.questionForm, 'IsCanEditPosition', this.answers.IsCanEditPosition === 'True')
+      this.$set(this.questionForm, 'IsDicomReading', this.answers.IsDicomReading !== 'False')
+
+      this.toolType = this.questionForm.MeasureData ? this.questionForm.MeasureData.type : ''
+      this.currentMarkTool = this.questionForm.MeasureData ? this.questionForm.MeasureData.type : this.answers.MarkTool
+      if (!this.questionForm.LesionType) {
+        this.$set(this.questionForm, 'LesionType', this.lesionType)
+      }
+      this.lesionName = this.getLesionInfo(this.orderMark, this.rowIndex)
+      this.isCurrentTaskAdd = this.answers.IsCurrentTaskAdd ? this.answers.IsCurrentTaskAdd : 'True'
+      this.lesionMark = this.getLesionName(this.orderMark, this.questionForm.RowIndex)
+      this.originalQuestionForm = { ...this.questionForm }
+      // this.lesionType === 0 && this.questionForm.MeasureData
+      if (this.answers.measureObj) {
+        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 {
+            this.organList = []
+            await this.getOrganInfoList()
+          }
+        } else {
+          this.organList = []
+          await this.getOrganInfoList()
+        }
+      }
+
+      // 首次分裂的病灶默认状态为空时，设置默认值为存在
+      if (this.answers.IsFristAdd === 'True' && this.answers.SplitOrMergeType === '0' && lesionState === '') {
+        const stateId = this.getQuestionId(7)
+        this.$set(this.questionForm, stateId, 0)
+        const isLymphLesion = this.getQuestionVal(2)
+        const lesionPart = this.getQuestionVal(8)
+        const lesionOrgan = this.getQuestionVal(6)
+        const lesionLength = this.getQuestionVal(0)
+        const lesionShort = this.getQuestionVal(1)
+        const lesionState = this.getQuestionVal(7)
+        this.$emit('resetQuestions', { isLymphLesion, lesionPart, lesionOrgan, lesionShort, lesionState, saveTypeEnum: this.questionForm.saveTypeEnum, lesionLength, rowIndex: this.rowIndex, questionId: this.parentQsId, anwsers: this.questionForm })
+      }
+      this.isRender = true
+      loading.close()
+    },
+    getLesionName(orderMark, rowIndex) {
+      var lessionName = ''
+      var rowIndexArr = rowIndex.split('.')
+      var x = parseInt(rowIndexArr[0])
+      var y = parseInt(rowIndexArr[1])
+      if (y > 0) {
+        y = String.fromCharCode(parseInt(rowIndexArr[1]) - 1 + 65 + 32)
+        lessionName = `${orderMark}${String(x).padStart(2, '0')}${y}`
+      } else {
+        lessionName = `${orderMark}${String(x).padStart(2, '0')}`
+      }
+
+      return lessionName
+    },
+    getLesionInfo(orderMark, rowIndex) {
+      var arr = []
+      var lessionName = ''
+      var rowIndexArr = rowIndex.split('.')
+      var x = parseInt(rowIndexArr[0])
+      var y = parseInt(rowIndexArr[1])
+      if (y > 0) {
+        y = String.fromCharCode(parseInt(rowIndexArr[1]) - 1 + 65 + 32)
+        lessionName = `${orderMark}${String(x).padStart(2, '0')}${y}`
+        arr.push(lessionName)
+      } else {
+        lessionName = `${orderMark}${String(x).padStart(2, '0')}`
+        arr.push(lessionName)
+      }
+      if (this.answers.SplitOrMergeLesionName && parseInt(this.answers.SplitOrMergeType) === 0) {
+        arr.push(`(Split from ${this.answers.SplitOrMergeLesionName})`)
+      }
+      return arr.join(' ')
+    },
+    getQuestionId(questionMark) {
+      var idx = this.questions.findIndex(i => i.QuestionMark === questionMark)
+      if (idx > -1) {
+        return this.questions[idx].Id
+      } else {
+        return ''
+      }
+    },
+    getOrganInfoList(isLymphNodes = null) {
+      return new Promise(async resolve => {
+        // var param = {
+        //   trialId: this.trialId,
+        //   visitTaskId: this.visitTaskId,
+        //   lesionType: this.lesionType,
+        //   isEnable: true
+        // }
+        // if (isLymphNodes !== undefined && isLymphNodes !== null) {
+        //   param.isLymphNodes = isLymphNodes
+        // }
+        // getTrialOrganList(param).then(res => {
+        //   this.organList = res.Result
+        //   resolve()
+        // })
+        if (!sessionStorage.getItem('organList')) {
+          await store.dispatch('reading/getOrganInfo', this.visitTaskId)
+        }
+        var organList = sessionStorage.getItem('organList') ? JSON.parse(sessionStorage.getItem('organList')) : []
+        var idx = organList.findIndex(i => i.LesionType === this.lesionType)
+        if (idx > -1) {
+          organList = organList[idx].OrganList
+
+          if (!isNaN(parseInt(isLymphNodes))) {
+            this.organList = organList.filter((item) => item.IsLymphNodes === parseInt(isLymphNodes))
+          } else {
+            this.organList = organList
+          }
+        }
+        resolve()
+      })
+    },
+    async lesionTypeChange(v) {
+      this.$emit('determineExistsUnsavedLession', async val => {
+        if (val) {
+          // 基线时，靶病灶只能用直径和长短径标注，非dicom文件的标注不能作为靶病灶
+          //
+          if ((this.isBaseLineTask || this.questionForm.IsDicomReading === false) && this.questionForm.MeasureData && this.questionForm.MeasureData.type === 'ArrowAnnotate' && v === 0) {
+            // 当前病灶不允许设置为靶病灶
+            this.$confirm(this.$t(' trials:reading:warnning:msg15'), {
+              type: 'warning',
+              distinguishCancelAndClose: true
+            })
+              .then(() => {})
+              .catch(() => {})
+            this.$set(this.questionForm, 'LesionType', this.originalQuestionForm.LesionType)
+            return
+          }
+          // 判断是否超过该病灶类型个数的最大值
+          var idx = this.tableQuestions.findIndex(item => item.LesionType === v)
+          if (idx > -1 && !!this.tableQuestions[idx].MaxQuestionCount && this.tableQuestions[idx].MaxQuestionCount <= this.tableQuestions[idx].TableQuestions.Answers.length) {
+            let msg = this.$t('trials:reading:warnning:msg14')
+            // msg = msg.replace('xxx', this.tableQuestions[idx].QuestionName)
+            msg = msg.replace('xxx', this.tableQuestions[idx].MaxQuestionCount)
+            this.$confirm(msg, {
+              type: 'warning',
+              showCancelButton: false,
+              callback: action => {}
+            })
+            this.$set(this.questionForm, 'LesionType', this.originalQuestionForm.LesionType)
+            return
+          }
+
+          var arr = []
+          this.questionForm[this.getQuestionId(8)] = ''
+          this.questionForm[this.getQuestionId(5)] = ''
+          this.questionForm[this.getQuestionId(10)] = ''// 部位描述
+          this.questionForm[this.getQuestionId(4)] = ''
+          this.questionForm[this.getQuestionId(6)] = ''
+          this.questionForm[this.getQuestionId(2)] = ''
+          this.questions.forEach(item => {
+            item.Answer = this.questionForm[item.Id] ? this.questionForm[item.Id] : ''
+            arr.push(item)
+          })
+          var obj = { questionId: this.parentQsId, rowIndex: this.questionForm.RowIndex, visitTaskId: this.visitTaskId, lesionName: this.lesionMark, lesionType: this.lesionType }
+          DicomEvent.$emit('imageLocation', obj)
+          var type = null
+          if (this.questionForm.RowId) {
+            type = 1
+          } else {
+            type = 0
+          }
+          DicomEvent.$emit('changeLesionType', { questionForm: arr, oldLesionType: this.lesionType, newLesionType: v, rowIndex: this.questionForm.RowIndex, questionId: this.parentQsId, measureData: this.questionForm.MeasureData, type, rowId: this.questionForm.RowId })
+        } else {
+          this.$set(this.questionForm, 'LesionType', this.originalQuestionForm.LesionType)
+        }
+      })
+    },
+    deleteLesionInfo() {
+      return new Promise((resolve, reject) => {
+        const loading = this.$loading({ fullscreen: true })
+        var param = {
+          visitTaskId: this.visitTaskId,
+          questionId: this.parentQsId,
+          rowId: this.questionForm.RowId
+        }
+        deleteReadingRowAnswer(param)
+          .then(async res => {
+            if (res.IsSuccess) {
+              DicomEvent.$emit('getReportInfo', true)
+            }
+            loading.close()
+            resolve()
+          }).catch(() => {
+            loading.close()
+            reject()
+          })
+      })
+    },
+    async formItemChange(v, question) {
+      if (question.QuestionMark === 8 && question.RelationQuestions.length > 0) {
+        // 当选择部位时，联动器官、位置、是否淋巴结问题答案
+        var index = this.organList.findIndex(item => item[question.DataTableColumn] === v)
+        if (index > -1) {
+          var selected = this.organList[index]
+          question.RelationQuestions.map(qs => {
+            var val = selected[qs.DataTableColumn]
+            this.$set(this.questionForm, qs.Id, val)
+          })
+          this.$set(this.questionForm, 'OrganInfoId', selected.OrganInfoId)
+          this.$set(this.questionForm, 'IsCanEditPosition', selected['IsCanEditPosition'])
+        } else {
+          question.RelationQuestions.map(qs => {
+            this.$set(this.questionForm, qs.Id, '')
+          })
+        }
+      }
+      // saveTypeEnum 0：未保存过（新建病灶）；1：已保存，信息不完整（随访初始化病灶/分裂病灶，通过状态判断）；2：已保存，信息完整
+      if (this.questionForm.RowId) {
+        this.$set(this.questionForm, 'saveTypeEnum', 1)
+      } else {
+        this.$set(this.questionForm, 'saveTypeEnum', 0)
+      }
+      const isLymphLesion = this.getQuestionVal(2)
+      const lesionPart = this.getQuestionVal(8)
+      const lesionOrgan = this.getQuestionVal(6)
+      const lesionLength = this.getQuestionVal(0)
+      const lesionShort = this.getQuestionVal(1)
+      const lesionState = this.getQuestionVal(7)
+      this.$emit('resetQuestions', { isLymphLesion, lesionPart, lesionOrgan, lesionShort, lesionState, saveTypeEnum: this.questionForm.saveTypeEnum, lesionLength, rowIndex: this.rowIndex, questionId: this.parentQsId, anwsers: this.questionForm })
+
+      if (question.QuestionMark === 7) {
+        var status = ''
+        if (this.lesionType === 0 && lesionState === 1) {
+          status = 'T'
+        }
+        if ((this.lesionType === 0 && lesionState === 3) || (this.lesionType === 1 && lesionState === 3) || (this.lesionType === 2 && lesionState === 3)) {
+          status = 'D'
+        }
+        if (this.questionForm.MeasureData) {
+          this.questionForm.MeasureData.status = status
+        }
+        await store.dispatch('reading/updateMeasureDataStatus', { visitTaskId: this.visitTaskId, rowIndex: this.rowIndex, questionId: this.parentQsId, status })
+        DicomEvent.$emit('getMeasureData')
+      }
+    },
+    setMeasureData(measureData, isInit = false) {
+      return new Promise(resolve => {
+        if (measureData) {
+          if (measureData.pictureBaseStr) {
+            this.pictureBaseStr = measureData.pictureBaseStr
+            measureData.pictureBaseStr = ''
+          }
+          // 获取长径(0)
+          var lengthObj = this.questions.find(i => i.QuestionMark === 0)
+          var shortObj = this.questions.find(i => i.QuestionMark === 1)
+
+          if (measureData.type === 'Length' || measureData.type === 'Bidirectional') {
+            var length = ''
+            if (measureData.type === 'Length') {
+              length = measureData.data.length
+            } else if (measureData.type === 'Bidirectional') {
+              length = measureData.data.longestDiameter
+            }
+            this.$set(this.questionForm, lengthObj.Id, length)
+            // 获取短径(1)
+
+            var short = ''
+            if (measureData.type === 'Bidirectional') {
+              short = measureData.data.shortestDiameter
+            }
+            this.$set(this.questionForm, shortObj.Id, short)
+          } else if (measureData.type === 'ArrowAnnotate') {
+            this.$set(this.questionForm, lengthObj.Id, '')
+            this.$set(this.questionForm, shortObj.Id, '')
+          }
+
+          // 十字线工具 器官只能是淋巴结类型
+
+          if (measureData.type === 'Bidirectional') {
+            this.organList = []
+            this.getOrganInfoList(1)
+          } else if (measureData.type === 'Length') {
+            // 直径测量工具 且是靶病灶  器官只能是非淋巴结类型
+            this.organList = []
+            this.getOrganInfoList(0)
+          } else {
+            this.organList = []
+            this.getOrganInfoList()
+          }
+
+          var data = {}
+          if (measureData.isDicomReading === false) {
+            this.$set(this.questionForm, 'IsDicomReading', false)
+            data = {
+              Id: '',
+              IsDicomReading: false,
+              StudyId: measureData.studyId,
+              InstanceId: measureData.instanceId,
+              SeriesId: measureData.seriesId,
+              MeasureData: measureData,
+              QuestionId: this.parentQsId,
+              RowIndex: this.questionForm.RowIndex,
+              RowId: this.questionForm.RowId,
+              VisitTaskId: this.visitTaskId
+            }
+            measureData.data.uuid = `${measureData.instanceId}-${measureData.data.remark}`
+          } else {
+            this.$set(this.questionForm, 'IsDicomReading', true)
+
+            // 基线时，默认状态都为存在
+            if (this.isBaseLineTask && !lesionState) {
+              const stateId = this.getQuestionId(7)
+              this.$set(this.questionForm, stateId, 0)
+            }
+
+            var isLymphLesion = this.getQuestionVal(2)
+            var lesionLength = this.getQuestionVal(0)
+            var lesionShort = this.getQuestionVal(1)
+            // 当前添加的新病灶不做处理
+            if (!(this.isCurrentTaskAdd === 'True')) {
+            // 非基线时，非淋巴结病灶长径>=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)
+              }
+              // 非基线时，非淋巴结病灶长径<10mm，自动给“存在”状态，如果淋巴结病灶短径<10mm，自动给“消失”状态。
+              if (!this.isBaseLineTask && ((measureData.type === 'Length' && lesionLength < 10) || (measureData.type === 'Bidirectional' && lesionShort < 10))) {
+                const stateId = this.getQuestionId(7)
+                if (isLymphLesion) {
+                  this.$set(this.questionForm, stateId, 3)
+                } else if (isLymphLesion === 0) {
+                  this.$set(this.questionForm, stateId, 0)
+                }
+              }
+            }
+
+            const lesionState = this.getQuestionVal(7)
+            var status = ''
+            if (lesionState) {
+              if (this.lesionType === 0 && lesionState === 1) {
+                status = 'T'
+              }
+              if ((this.lesionType === 0 && lesionState === 3) || (this.lesionType === 1 && lesionState === 3) || (this.lesionType === 2 && lesionState === 3)) {
+                status = 'D'
+              }
+            }
+            measureData.data.status = status
+
+            measureData.data.remark = this.getLesionName(this.orderMark, this.questionForm.RowIndex)
+            data = {
+              Id: '',
+              IsDicomReading: true,
+              StudyId: measureData.studyId,
+              InstanceId: measureData.instanceId,
+              SeriesId: measureData.seriesId,
+              MeasureData: measureData,
+              QuestionId: this.parentQsId,
+              RowIndex: this.questionForm.RowIndex,
+              RowId: this.questionForm.RowId,
+              VisitTaskId: this.visitTaskId,
+              OrderMarkName: measureData.data.remark,
+              frame: isNaN(parseInt(measureData.frame)) ? 0 : measureData.frame
+            }
+          }
+          // Store.$emit('addTemporaryMeasuredData', data)
+          store.dispatch('reading/addMeasuredData', { visitTaskId: this.visitTaskId, data: data })
+          if (!this.questionForm.IsDicomReading) {
+            DicomEvent.$emit('addNoneDicomMeasureData', measureData)
+          }
+          DicomEvent.$emit('getMeasureData', val => {
+            this.pictureBaseStr = val
+          })
+        }
+        if (!isInit) {
+          // saveTypeEnum 0：未保存过（新建病灶）；1：已保存，信息不完整（随访初始化病灶/分裂病灶，通过状态判断）
+          if (this.questionForm.RowId) {
+            this.$set(this.questionForm, 'saveTypeEnum', 1)
+          } else {
+            this.$set(this.questionForm, 'saveTypeEnum', 0)
+          }
+        }
+        this.$set(this.questionForm, 'MeasureData', measureData)
+        const isLymph = this.getQuestionVal(2)
+        const lesionPart = this.getQuestionVal(8)
+        const lesionOrgan = this.getQuestionVal(6)
+        const lesionL = this.getQuestionVal(0)
+        const lesionS = this.getQuestionVal(1)
+        var lesionState = this.getQuestionVal(7)
+        this.$emit('resetQuestions', { isLymphLesion: isLymph, lesionPart, lesionOrgan, lesionShort: lesionS, lesionLength: lesionL, lesionState, saveTypeEnum: this.questionForm.saveTypeEnum, rowIndex: this.rowIndex, questionId: this.parentQsId, anwsers: this.questionForm })
+        this.toolType = measureData.type
+        DicomEvent.$emit('refreshStudyListMeasureData')
+        resolve()
+      })
+    },
+    returnFloat(num) {
+      if (num) return
+      var value = Math.round(parseFloat(num) * 100) / 100
+      var s = value.toString().split('.')
+      if (s.length === 1) {
+        value = value.toString() + '.00'
+        return value
+      }
+      if (s.length > 1) {
+        if (s[1].length < 2) {
+          value = value.toString() + '0'
+        }
+        return value
+      }
+    },
+    getQuestionVal(questionMark) {
+      const idx = this.questions.findIndex(i => i.QuestionMark === questionMark)
+      if (idx > -1) {
+        const questionId = this.questions[idx].Id
+        const answer = this.questionForm[questionId]
+        if (isNaN(parseFloat(answer))) {
+          return answer
+        } else {
+          return parseFloat(answer)
+        }
+      } else {
+        return ''
+      }
+    },
+    filterState(arr) {
+      if (!this.isBaseLineTask) {
+        const isLymphLesion = this.getQuestionVal(2)
+        const lesionLength = this.getQuestionVal(0)
+        const lesionShort = this.getQuestionVal(1)
+        const bLesionL = !isNaN(parseFloat(this.answers.BaseLineMajorAxis)) ? parseFloat(this.answers.BaseLineMajorAxis) : 0
+        const bLesionS = !isNaN(parseFloat(this.answers.BaseLineShortAxis)) ? parseFloat(this.answers.BaseLineShortAxis) : 0
+        if (this.lesionType === 1 && isLymphLesion === 1 && this.questionForm.MeasureData && this.questionForm.MeasureData.type === 'Bidirectional' && lesionShort < bLesionS) {
+          arr = arr.filter(i => i.value !== 1)
+        } else if (this.lesionType === 1 && isLymphLesion === 1 && this.questionForm.MeasureData && this.questionForm.MeasureData.type === 'Bidirectional' && lesionShort >= 10 && lesionShort > bLesionS) {
+          arr = arr.filter(i => i.value === 0 || i.value === 1)
+        } else if (this.lesionType === 1 && isLymphLesion === 0 && this.questionForm.MeasureData && (this.questionForm.MeasureData.type === 'Length' || this.questionForm.MeasureData.type === 'Bidirectional') && lesionLength < bLesionL) {
+          arr = arr.filter(i => i.value !== 1)
+        }
+        return arr
+      } else {
+        return arr
+      }
+    },
+    setDeleteInfo(deleteInfo) {
+      this.deleteInfo = deleteInfo
+    },
+    deleteOldLesion(questionId, rowId) {
+      return new Promise((resolve, reject) => {
+        var param = {
+          visitTaskId: this.visitTaskId,
+          questionId: questionId,
+          rowId: rowId
+        }
+        deleteReadingRowAnswer(param)
+          .then(async res => {
+            resolve()
+          }).catch(() => {
+          })
+      })
+    },
+    async uploadScreenshots(fileName, file) {
+      try {
+        file = this.convertBase64ToBlob(file)
+        var trialId = this.$route.query.trialId
+        var subjectId = this.$route.query.trialId
+        const result = await this.OSSclient.put(`/${trialId}/Read/${subjectId}/Visit/${fileName}.png`, file)
+        return { isSuccess: true, result: result }
+      } catch (e) {
+        console.log(e)
+        return { isSuccess: false, result: e }
+      }
+    },
+    convertBase64ToBlob(imageEditorBase64) {
+      var base64Arr = imageEditorBase64.split(',')
+      var imgtype = ''
+      var base64String = ''
+      if (base64Arr.length > 1) {
+        // 如果是图片base64，去掉头信息
+        base64String = base64Arr[1]
+        imgtype = base64Arr[0].substring(
+          base64Arr[0].indexOf(':') + 1,
+          base64Arr[0].indexOf(';')
+        )
+      }
+      // 将base64解码
+      var bytes = atob(base64String)
+      // var bytes = base64;
+      var bytesCode = new ArrayBuffer(bytes.length)
+      // 转换为类型化数组
+      var byteArray = new Uint8Array(bytesCode)
+
+      // 将base64转换为ascii码
+      for (var i = 0; i < bytes.length; i++) {
+        byteArray[i] = bytes.charCodeAt(i)
+      }
+
+      // 生成Blob对象（文件对象）
+      return new Blob([bytesCode], { type: imgtype })
+    },
+    async handleSave() {
+      const valid = await this.$refs.measurementForm.validate()
+      if (!valid) return
+      const loading = this.$loading({ fullscreen: true })
+      var measureData = this.questionForm.MeasureData
+      var lesionState = this.getQuestionVal(7)
+      var lesionLength = this.getQuestionVal(0)
+      var lesionShort = this.getQuestionVal(1)
+      var lymphNodes = this.getQuestionVal(2)
+      if (this.isBaseLineTask) {
+        // 基线
+        // 靶病灶且状态为存在（0）
+        if (this.lesionType === 0 && lesionState === 0) {
+          if (lymphNodes === 1) {
+            //  淋巴结靶病灶 必须使用长短径测量工具,短径大于等于15mm
+            if (!(measureData && measureData.type === 'Bidirectional' && lesionShort >= 15)) {
+              // 评估状态为存在的淋巴结靶病灶需使用长短径测量工具添加标记，且短径须大于15mm！
+              this.$confirm(this.$t('trials:reading:warnning:msg19'), {
+                type: 'warning',
+                showCancelButton: false,
+                callback: action => {}
+              })
+              loading.close()
+              return
+            }
+          } else {
+            // 非淋巴结靶病灶 直径测量工具 长径须大于等于10mm且不小于2倍层厚
+            if (!(measureData && measureData.type === 'Length' && lesionLength >= 10 && (measureData.thick && lesionLength >= 2 * measureData.thick || !measureData.thick))) {
+              // 评估状态为存在的非淋巴结靶病灶需使用直径测量工具添加标记，长径须大于10mm且不小于2倍层厚！
+              this.$confirm(this.$t('trials:reading:warnning:msg20'), {
+                type: 'warning',
+                showCancelButton: false,
+                callback: action => {}
+              })
+              loading.close()
+              return
+            }
+          }
+        }
+
+        // 非靶病灶且状态为存在（0）
+        if (this.lesionType === 1 && lesionState === 0) {
+          if (lymphNodes === 1) {
+            // 淋巴结非靶病灶 必须使用长短径测量工具或箭头工具
+            if (!(measureData && (measureData.type === 'Bidirectional' || measureData.type === 'RectangleRoi'))) {
+              // 评估状态为存在的淋巴结非靶病灶需使用长短径测量工具或矩形工具添加标记
+              this.$confirm(this.$t('trials:reading:warnning:msg21'), {
+                type: 'warning',
+                showCancelButton: false,
+                callback: action => {}
+              })
+              loading.close()
+              return
+            }
+          } else {
+            // 非淋巴结非靶病灶 直径测量工具或箭头工具
+            if (!(measureData && (measureData.type === 'Length' || measureData.type === 'RectangleRoi'))) {
+              // 评估状态为存在的非淋巴结非靶病灶需使用直径测量工具或矩形工具添加标记！
+              this.$confirm(this.$t('trials:reading:warnning:msg22'), {
+                type: 'warning',
+                showCancelButton: false,
+                callback: action => {}
+              })
+              loading.close()
+              return
+            }
+          }
+        }
+      } else {
+        // 非基线
+        // 靶病灶且状态为存在（0）
+        if (this.lesionType === 0 && lesionState === 0) {
+          if (lymphNodes === 1) {
+            // 淋巴结靶病灶 必须使用长短径测量工具
+            if (!(measureData && measureData.type === 'Bidirectional' && lesionShort >= 10)) {
+              // 评估状态为存在的淋巴结靶病灶需使用长短径测量工具添加标记！
+              this.$confirm(this.$t('trials:reading:warnning:msg23'), {
+                type: 'warning',
+                showCancelButton: false,
+                callback: action => {}
+              })
+              loading.close()
+              return
+            }
+          } else {
+            // 非淋巴结靶病灶 直径测量工具
+            if (!(measureData && measureData.type === 'Length')) {
+              // `评估状态为存在的非淋巴结靶病灶需使用直径测量工具添加标记！`
+              this.$confirm(this.$t('trials:reading:warnning:msg24'), {
+                type: 'warning',
+                showCancelButton: false,
+                callback: action => {}
+              })
+              loading.close()
+              return
+            }
+          }
+        }
+        // 靶病灶且状态为太小（1）
+        if (this.lesionType === 0 && lesionState === 1) {
+          if (lymphNodes === 1) {
+            // 淋巴结靶病灶 必须使用箭头工具，短径记录为5mm
+            if (!(measureData && (measureData.type === 'ArrowAnnotate'))) {
+              // 评估状态为太小的淋巴结靶病灶需使用箭头工具添加标记！
+              this.$confirm(this.$t('trials:reading:warnning:msg25'), {
+                type: 'warning',
+                showCancelButton: false,
+                callback: action => {}
+              })
+              loading.close()
+              return
+            } else if (measureData && measureData.type === 'ArrowAnnotate') {
+              const shortId = this.getQuestionId(1)
+              this.$set(this.questionForm, shortId, 5)
+              lesionShort = 5
+            }
+          } else {
+            // 非淋巴结靶病灶 箭头工具，长径记录为5mm
+            if (!(measureData && (measureData.type === 'ArrowAnnotate'))) {
+              // 评估状态为太小的非淋巴结靶病灶需使用箭头工具添加标记！
+              this.$confirm(this.$t('trials:reading:warnning:msg26'), {
+                type: 'warning',
+                showCancelButton: false,
+                callback: action => {}
+              })
+              loading.close()
+              return
+            } else if (measureData && measureData.type === 'ArrowAnnotate') {
+              const lengthId = this.getQuestionId(0)
+              this.$set(this.questionForm, lengthId, 5)
+              lesionLength = 5
+            }
+          }
+        }
+
+        // 靶病灶且状态为无法评估（2）
+        if (this.lesionType === 0 && lesionState === 2) {
+          if (lymphNodes === 1) {
+            // 淋巴结靶病灶 不需要添加标记
+            if (measureData) {
+              // 评估状态为无法评估的淋巴结靶病灶不需要添加标记！
+              this.$confirm(this.$t('trials:reading:warnning:msg27'), {
+                type: 'warning',
+                showCancelButton: false,
+                callback: action => {}
+              })
+              loading.close()
+              return
+            }
+          } else {
+            // 非淋巴结靶病灶 不需要添加标记
+            if (measureData) {
+              // 状态为无法评估的非淋巴结靶病灶不需要添加标记！
+              this.$confirm(this.$t('trials:reading:warnning:msg28'), {
+                type: 'warning',
+                showCancelButton: false,
+                callback: action => {}
+              })
+              loading.close()
+              return
+            }
+          }
+        }
+
+        // 靶病灶且状态为消失（3）
+        if (this.lesionType === 0 && lesionState === 3) {
+          if (lymphNodes === 1) {
+            // 淋巴结靶病灶 使用箭头工具
+            // if (!(measureData && (measureData.type === 'ArrowAnnotate' || measureData.type === 'Bidirectional'))) {
+            //   this.$confirm(`评估状态为消失的淋巴结靶病灶需使用箭头工具或长短径工具添加标记！`, {
+            //     type: 'warning',
+            //     showCancelButton: false,
+            //     callback: action => {}
+            //   })
+            //   loading.close()
+            //   return
+            // }
+            // else if (measureData && measureData.type === 'Bidirectional' && lesionShort >= 10) {
+            //   this.$confirm(`评估状态为消失的淋巴结靶病灶,短径需小于10mm！`, {
+            //     type: 'warning',
+            //     showCancelButton: false,
+            //     callback: action => {}
+            //   })
+            //   loading.close()
+            //   return
+            // }
+            if (!(measureData && (measureData.type === 'Bidirectional' && lesionShort < 10))) {
+              // `评估状态为消失的淋巴结靶病灶需使用长短径工具添加标记,且短径需小于10mm！`
+              this.$confirm(this.$t('trials:reading:warnning:msg29'), {
+                type: 'warning',
+                showCancelButton: false,
+                callback: action => {}
+              })
+              loading.close()
+              return
+            }
+          } else {
+            // 非淋巴结靶病灶 箭头工具
+            if (!(measureData && measureData.type === 'ArrowAnnotate')) {
+              // 评估状态为消失的非淋巴结靶病灶只能使用箭头工具添加标记！
+              this.$confirm(this.$t('trials:reading:warnning:msg30'), {
+                type: 'warning',
+                showCancelButton: false,
+                callback: action => {}
+              })
+              loading.close()
+              return
+            } else if (measureData && measureData.type === 'ArrowAnnotate') {
+              const lId = this.getQuestionId(0)
+              this.$set(this.questionForm, lId, 0)
+              lesionLength = 0
+            }
+          }
+        }
+
+        // 非靶病灶且状态为存在（0）
+        if (this.lesionType === 1 && lesionState === 0) {
+          if (lymphNodes === 1) {
+            // 淋巴结非靶病灶 必须使用长短径测量工具、箭头工具
+            if (!(measureData && (measureData.type === 'Bidirectional' || measureData.type === 'RectangleRoi'))) {
+              // 评估状态为存在的淋巴结非靶病灶需使用长短径测量工具或箭头工具添加标记！
+              this.$confirm(this.$t('trials:reading:warnning:msg31'), {
+                type: 'warning',
+                showCancelButton: false,
+                callback: action => {}
+              })
+              loading.close()
+              return
+            }
+          } else {
+            // 非淋巴结非靶病灶 直径测量工具、箭头工具
+            if (!(measureData && (measureData.type === 'Length' || measureData.type === 'RectangleRoi'))) {
+              // 评估状态为存在的非淋巴结非靶病灶需使用直径测量工具或箭头工具添加标记！
+              this.$confirm(this.$t('trials:reading:warnning:msg32'), {
+                type: 'warning',
+                showCancelButton: false,
+                callback: action => {}
+              })
+              loading.close()
+              return
+            }
+          }
+        }
+
+        // 非靶病灶且状态为显著增大（1）
+        if (this.lesionType === 1 && lesionState === 1) {
+          if (lymphNodes === 1) {
+            // 淋巴结靶病灶 必须使用长短径测量工具、箭头工具
+            if (!(measureData && (measureData.type === 'Bidirectional' || measureData.type === 'RectangleRoi'))) {
+              // `评估状态为显著增大的淋巴结非靶病灶需使用长短径测量工具或矩形工具添加标记！`
+              this.$confirm(this.$t('trials:reading:warnning:msg33'), {
+                type: 'warning',
+                showCancelButton: false,
+                callback: action => {}
+              })
+              loading.close()
+              return
+            }
+          } else {
+            // 非淋巴结非靶病灶 直径测量工具、箭头工具
+            if (!(measureData && (measureData.type === 'Length' || measureData.type === 'RectangleRoi'))) {
+              // 评估状态为显著增大的非淋巴结非靶病灶需使用直径测量工具或矩形工具添加标记！
+              this.$confirm(this.$t('trials:reading:warnning:msg34'), {
+                type: 'warning',
+                showCancelButton: false,
+                callback: action => {}
+              })
+              loading.close()
+              return
+            }
+          }
+        }
+
+        // 非靶病灶且状态为无法评估（2）
+        if (this.lesionType === 1 && lesionState === 2) {
+          if (lymphNodes === 1) {
+            // 淋巴结靶病灶 无标记
+            if (measureData) {
+              // 评估状态为无法评估的淋巴结非靶病灶不需要添加标记！
+              this.$confirm(this.$t('trials:reading:warnning:msg35'), {
+                type: 'warning',
+                showCancelButton: false,
+                callback: action => {}
+              })
+              loading.close()
+              return
+            }
+          } else {
+            // 非淋巴结非靶病灶 无标记
+            if (measureData) {
+              // 评估状态为无法评估的非淋巴结非靶病灶不需要添加标记！
+              this.$confirm(this.$t('trials:reading:warnning:msg36'), {
+                type: 'warning',
+                showCancelButton: false,
+                callback: action => {}
+              })
+              loading.close()
+              return
+            }
+          }
+        }
+
+        // 非靶病灶且状态为消失（3）
+        if (this.lesionType === 1 && lesionState === 3) {
+          if (lymphNodes === 1) {
+            // 淋巴结靶病灶 必须使用长短径测量工具、箭头工具
+            if (!(measureData && (measureData.type === 'ArrowAnnotate'))) {
+              // 评估状态为消失的淋巴结非靶病灶需使用箭头工具添加标记！
+              this.$confirm(this.$t('trials:reading:warnning:msg37'), {
+                type: 'warning',
+                showCancelButton: false,
+                callback: action => {}
+              })
+              loading.close()
+              return
+            }
+          } else {
+            // 非淋巴结非靶病灶 箭头工具
+            if (!(measureData && (measureData.type === 'ArrowAnnotate'))) {
+              // 评估状态为消失的非淋巴结非靶病灶需使用箭头工具添加标记！
+              this.$confirm(this.$t('trials:reading:warnning:msg38'), {
+                type: 'warning',
+                showCancelButton: false,
+                callback: action => {}
+              })
+              loading.close()
+              return
+            }
+          }
+        }
+
+        // 新病灶且状态为存在（0）
+        if (this.lesionType === 2 && lesionState === 0) {
+          if (lymphNodes === 1) {
+            // 淋巴结靶病灶 必须使用长短径测量工具、箭头工具
+            if (!(measureData && (measureData.type === 'Bidirectional' || measureData.type === 'ArrowAnnotate'))) {
+              // 评估状态为存在的淋巴结新病灶需使用长短径测量工具或箭头工具添加标记！
+              this.$confirm(this.$t('trials:reading:warnning:msg39'), {
+                type: 'warning',
+                showCancelButton: false,
+                callback: action => {}
+              })
+              loading.close()
+              return
+            }
+          } else {
+            // 非淋巴结非靶病灶 直径测量工具、箭头工具
+            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
+            }
+          }
+        }
+
+        // 新病灶且状态为疑似（1）
+        if (this.lesionType === 2 && lesionState === 1) {
+          if (lymphNodes === 1) {
+            // 淋巴结靶病灶 必须使用长短径测量工具、箭头工具
+            if (!(measureData && (measureData.type === 'Bidirectional' || measureData.type === 'ArrowAnnotate'))) {
+              // 评估状态为疑似的淋巴结新病灶需使用长短径测量工具或箭头工具添加标记！
+              this.$confirm(this.$t('trials:reading:warnning:msg41'), {
+                type: 'warning',
+                showCancelButton: false,
+                callback: action => {}
+              })
+              loading.close()
+              return
+            }
+          } else {
+            // 非淋巴结非靶病灶 直径测量工具、箭头工具
+            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
+            }
+          }
+        }
+
+        // 新病灶且状态为无法评估（2）
+        if (this.lesionType === 2 && lesionState === 2) {
+          if (lymphNodes === 1) {
+            // 淋巴结靶病灶 必须使用长短径测量工具、箭头工具
+            if (measureData) {
+              // `评估状态为无法评估的淋巴结新病灶不需要添加标记！`
+              this.$confirm(this.$t('trials:reading:warnning:msg43'), {
+                type: 'warning',
+                showCancelButton: false,
+                callback: action => {}
+              })
+              loading.close()
+              return
+            }
+          } else {
+            // 非淋巴结非靶病灶 直径测量工具、箭头工具
+            if (measureData) {
+              // 评估状态为无法评估的非淋巴结新病灶不需要添加标记！
+              this.$confirm(this.$t('trials:reading:warnning:msg44'), {
+                type: 'warning',
+                showCancelButton: false,
+                callback: action => {}
+              })
+              loading.close()
+              return
+            }
+          }
+        }
+
+        // 新病灶且状态为消失（3）
+        if (this.lesionType === 2 && lesionState === 3) {
+          if (lymphNodes === 1) {
+            // 淋巴结靶病灶 必须使用长短径测量工具、箭头工具
+            if (!(measureData && (measureData.type === 'ArrowAnnotate'))) {
+              // 评估状态为消失的淋巴结新病灶需使用箭头工具添加标记！
+              this.$confirm(this.$t('trials:reading:warnning:msg45'), {
+                type: 'warning',
+                showCancelButton: false,
+                callback: action => {}
+              })
+              loading.close()
+              return
+            }
+          } else {
+            // 箭头工具
+            if (!(measureData && (measureData.type === 'ArrowAnnotate'))) {
+              // 评估状态为消失的非淋巴结新病灶需使用箭头工具添加标记！
+              this.$confirm(this.$t('trials:reading:warnning:msg46'), {
+                type: 'warning',
+                showCancelButton: false,
+                callback: action => {}
+              })
+              loading.close()
+              return
+            }
+          }
+        }
+      }
+      DicomEvent.$emit('getScreenshots', { questionId: this.parentQsId, rowIndex: this.questionForm.RowIndex, visitTaskId: this.visitTaskId, lesionName: this.lesionMark, lesionType: this.lesionType, isMarked: !!measureData }, async val => {
+        // 靶病灶状态为0（存在）时，一定存在长径或者长短径（长径、十字线 ）
+        // 普通靶病灶：长径大于10mm且不小于2倍层厚（基线校验）
+        // 淋巴结靶病灶：短径大于15mm且不小于2倍层厚（基线校验）
+        try {
+          var picturePath = ''
+          if (val && measureData && this.questionForm.IsDicomReading) {
+            var pictureObj = await this.uploadScreenshots(`${new Date().getTime()}`, val)
+
+            picturePath = pictureObj.isSuccess ? this.$getObjectName(pictureObj.result.url) : ''
+          }
+          var answers = []
+          var reg = new RegExp(/^[0-9a-zA-Z]{8}-[0-9a-zA-Z]{4}-[0-9a-zA-Z]{4}-[0-9a-zA-Z]{4}-[0-9a-zA-Z]{12}$/)
+          for (const k in this.questionForm) {
+            if (reg.test(k)) {
+              if (answers.findIndex(i => i.tableQuestionId === k) === -1) {
+                answers.push({ tableQuestionId: k, answer: this.questionForm[k] })
+              }
+            }
+          }
+
+          var params = {
+            questionId: this.parentQsId,
+            rowId: this.questionForm.RowId,
+            rowIndex: this.answers.RowIndex,
+            visitTaskId: this.visitTaskId,
+            trialId: this.trialId,
+            measureData: measureData ? JSON.stringify(measureData) : '',
+            answerList: answers,
+            isCanEditPosition: this.questionForm.IsCanEditPosition,
+            studyId: measureData ? this.questionForm.MeasureData.studyId : '',
+            seriesId: measureData ? this.questionForm.MeasureData.seriesId : '',
+            instanceId: measureData ? this.questionForm.MeasureData.instanceId : '',
+            numberOfFrames: measureData && !isNaN(parseInt(this.questionForm.MeasureData.frame)) ? parseInt(this.questionForm.MeasureData.frame) : 0,
+            picturePath: picturePath,
+            organInfoId: this.questionForm.OrganInfoId,
+            markTool: measureData ? measureData.type : ''
+          }
+          if (this.questionForm.IsDicomReading === false) {
+            params.isDicomReading = false
+          }
+          if (this.deleteInfo) {
+            await this.deleteOldLesion(this.deleteInfo.questionId, this.deleteInfo.rowId)
+            this.deleteInfo = null
+            params.rowId = ''
+          }
+          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：已保存，信息完整
+
+            this.$set(this.questionForm, 'saveTypeEnum', 2)
+            this.originalQuestionForm = { ...this.questionForm }
+            var isLymphLesion = this.getQuestionVal(2)
+            var lesionOrgan = this.getQuestionVal(6)
+            this.$set(this.questionForm, 'RowId', res.Result.RowId)
+            const lesionPart = this.getQuestionVal(8)
+            const lesionState = this.getQuestionVal(7)
+            this.$emit('resetQuestions', { isLymphLesion, lesionPart, lesionOrgan, lesionShort, saveTypeEnum: this.questionForm.saveTypeEnum, lesionLength, lesionState, rowIndex: this.rowIndex, questionId: this.parentQsId, anwsers: this.questionForm })
+            // await store.dispatch('reading/refreshMeasuredData', this.visitTaskId)
+            // DicomEvent.$emit('getMeasureData')
+            this.$emit('close')
+            DicomEvent.$emit('getReportInfo', true)
+            DicomEvent.$emit('setMeasuredToolsPassive')
+          }
+          loading.close()
+        } catch (e) {
+          console.log(e)
+          loading.close()
+        }
+      })
+    },
+    async handleDeleteMeasureData() {
+      // 是否确认清除标记？
+      const confirm = await this.$confirm(
+        this.$t('trials:reading:warnning:msg47'),
+        {
+          type: 'warning',
+          distinguishCancelAndClose: true
+        }
+      )
+      if (confirm !== 'confirm') return
+      this.organList = []
+      await this.getOrganInfoList()
+      // 重置长短径 和 状态
+      var lengId = this.getQuestionId(0)
+      this.$set(this.questionForm, lengId, '')
+      var shortId = this.getQuestionId(1)
+      this.$set(this.questionForm, shortId, '')
+
+      var stateId = this.getQuestionId(7)
+      this.$set(this.questionForm, stateId, '')
+      if (this.questionForm.RowId) {
+        this.$set(this.questionForm, 'saveTypeEnum', 1)
+      } else {
+        this.$set(this.questionForm, 'saveTypeEnum', 0)
+      }
+      await store.dispatch('reading/removeMeasuredData', { visitTaskId: this.visitTaskId, measureData: this.questionForm.MeasureData, questionId: this.parentQsId, rowIndex: this.questionForm.RowIndex })
+      DicomEvent.$emit('getMeasureData')
+      // Store.$emit('updateImage', this.questionForm.MeasureData.instanceId)
+      const isLymphLesion = this.getQuestionVal(2)
+      const lesionPart = this.getQuestionVal(8)
+      const lesionOrgan = this.getQuestionVal(6)
+      const lesionLength = ''
+      const lesionShort = ''
+      const lesionState = this.getQuestionVal(7)
+      if (!this.questionForm.IsDicomReading) {
+        DicomEvent.$emit('removeNoneDicomMeasureData', this.questionForm.MeasureData)
+      }
+      this.$set(this.questionForm, 'IsDicomReading', true)
+
+      this.$set(this.questionForm, 'MeasureData', '')
+      let anwsers = null
+      if (this.answers.measureObj) {
+        anwsers = Object.assign({ measureObj: '' }, this.questionForm)
+      } else {
+        anwsers = Object.assign({}, this.questionForm)
+      }
+      this.$emit('resetQuestions', { isLymphLesion, lesionPart, lesionOrgan, lesionShort, lesionState, saveTypeEnum: this.questionForm.saveTypeEnum, lesionLength, rowIndex: this.rowIndex, questionId: this.parentQsId, anwsers: anwsers })
+      DicomEvent.$emit('refreshStudyListMeasureData')
+    },
+    async handleDelete() {
+      const loading = this.$loading({ fullscreen: true })
+      try {
+        const confirm = await this.$confirm(
+          this.$t('trials:reading:warnning:msg48'),
+          {
+            type: 'warning',
+            distinguishCancelAndClose: true
+          }
+        )
+        if (confirm !== 'confirm') return
+        if (this.questionForm.RowId) {
+          var param = {
+            visitTaskId: this.visitTaskId,
+            questionId: this.parentQsId,
+            rowId: this.questionForm.RowId
+          }
+          const res = await deleteReadingRowAnswer(param)
+          if (res.IsSuccess) {
+            if (this.questionForm.IsDicomReading && this.questionForm.MeasureData) {
+              await store.dispatch('reading/removeMeasuredData', { visitTaskId: this.visitTaskId, measureData: this.questionForm.MeasureData, questionId: this.parentQsId, rowIndex: this.questionForm.RowIndex })
+            }
+            if (!this.questionForm.IsDicomReading && this.questionForm.MeasureData) {
+              DicomEvent.$emit('removeNoneDicomMeasureData', this.questionForm.MeasureData)
+            }
+            this.$emit('close', { lesionType: this.lesionType, rowIndex: this.rowIndex, visitTaskId: this.visitTaskId })
+            DicomEvent.$emit('getReportInfo', true)
+            // '删除成功！'
+            this.$message.success(this.$t('common:message:deletedSuccessfully'))
+          }
+        } else {
+          // 移除新建病灶并关闭窗口
+          if (this.questionForm.MeasureData && this.questionForm.IsDicomReading) {
+            await store.dispatch('reading/removeMeasuredData', { visitTaskId: this.visitTaskId, measureData: this.questionForm.MeasureData, questionId: this.parentQsId, rowIndex: this.questionForm.RowIndex })
+          }
+          if (!this.questionForm.IsDicomReading && this.questionForm.MeasureData) {
+            DicomEvent.$emit('removeNoneDicomMeasureData', this.questionForm.MeasureData)
+          }
+          this.$emit('close', { lesionType: this.lesionType, rowIndex: this.rowIndex, visitTaskId: this.visitTaskId })
+        }
+        DicomEvent.$emit('refreshStudyListMeasureData')
+        loading.close()
+      } catch (e) {
+        loading.close()
+        console.log(e)
+      }
+    },
+    async handleClose() {
+      if (!this.questionForm.RowId) {
+        // '当前病灶为新建病灶，未保存。如果关闭窗口，将会删除病灶信息，是否继续？'
+        const confirm = await this.$confirm(
+          this.$t('trials:reading:warnning:msg49'),
+          {
+            type: 'warning',
+            distinguishCancelAndClose: true
+          }
+        )
+        if (confirm !== 'confirm') return
+        // 移除新建病灶并关闭窗口
+        if (this.questionForm.MeasureData) {
+          await store.dispatch('reading/removeMeasuredData', { visitTaskId: this.visitTaskId, measureData: this.questionForm.MeasureData, questionId: this.parentQsId, rowIndex: this.questionForm.RowIndex })
+        }
+        DicomEvent.$emit('getMeasureData')
+        this.$emit('close', { lesionType: this.lesionType, rowIndex: this.rowIndex, visitTaskId: this.visitTaskId })
+      } else {
+        // saveTypeEnum 0：未保存过（新建病灶）；1：已保存，信息不完整（随访初始化病灶/分裂病灶，通过状态判断）
+        if (this.questionForm.saveTypeEnum === 1) {
+          this.$emit('close')
+        } else {
+          this.$emit('close')
+        }
+      }
+    },
+    setState() {
+      this.$nextTick(() => {
+        if (this.isCurrentTask && this.readingTaskState < 2) {
+          var lesionState = this.getQuestionVal(7)
+          if (isNaN(parseInt(lesionState)) && this.answers.IsFristAdd === 'False') {
+            const stateId = this.getQuestionId(7)
+            this.$set(this.questionForm, stateId, 2)
+            const isLymphLesion = this.getQuestionVal(2)
+            const lesionPart = this.getQuestionVal(8)
+            const lesionOrgan = this.getQuestionVal(6)
+            const lesionLength = this.getQuestionVal(0)
+            const lesionShort = this.getQuestionVal(1)
+            const lesionState = this.getQuestionVal(7)
+            this.$emit('resetQuestions', { isLymphLesion, lesionPart, lesionOrgan, lesionShort, lesionState, saveTypeEnum: this.questionForm.saveTypeEnum, lesionLength, rowIndex: this.rowIndex, questionId: this.parentQsId, anwsers: this.questionForm })
+          }
+        }
+      })
+    }
+  }
+}
+</script>
+<style lang="scss" scoped>
+.measurement-form{
+  /deep/ .el-form-item__label{
+    color: #c3c3c3;
+  }
+  /deep/ .el-input .el-input__inner{
+    background-color: transparent;
+    color: #ddd;
+    border: 1px solid #5e5e5e;
+  }
+  /deep/ .el-form-item{
+    display: flex;
+    flex-direction: row;
+    justify-content: flex-start;
+  }
+  /deep/ .el-form-item__content{
+    flex: 1;
+  }
+  /deep/ .el-input.is-disabled .el-input__inner{
+    background-color: #646464a1;
+  }
+  /deep/ .el-select.is-disabled .el-input__inner{
+    background-color: #646464a1;
+  }
+  /deep/ .el-button--mini, .el-button--mini.is-round {
+    padding: 7px 10px;
+  }
+  .el-form-item__content
+  .el-select{
+    width: 100%;
+  }
+  .input-width1{
+    width: calc(100% -60px)!important;
+  }
+  .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
new file mode 100644
index 0000000..fc95fa5
--- /dev/null
+++ b/src/views/trials/trials-panel/reading/dicoms/components/MRecist/QuestionList.vue
@@ -0,0 +1,1150 @@
+<template>
+  <div class="measurement-wrapper">
+
+    <div class="container">
+      <div class="basic-info">
+        <h3 v-if="isReadingShowSubjectInfo">
+          <span v-if="subjectCode">{{ subjectCode }} </span>
+          <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>
+        </div>
+      </div>
+
+      <!-- 非测量问题 -->
+      <div class="lesions">
+        <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">
+          <h4 v-if="qs.Type === 'group'" style="color: #ddd;padding: 5px 0px;margin: 0;">
+            {{ 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)">
+                  <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}`"
+                  :name="`${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')}">
+
+                      {{ 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">
+                        <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">
+                        <i class="el-icon-warning" style="color:#ff9800" />
+                      </el-tooltip>
+                      <div style="position: absolute;left: 50px;top: 2px;">
+                        <!-- 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">
+                              <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">
+                            <span v-if="item.LesionType === 0">
+                              {{ $fd('TargetState',parseInt(item.TableQuestions.Answers[i].lesionState)) }}
+                            </span>
+                            <span v-else-if="item.LesionType === 1">
+                              {{ $fd('NoTargetState',parseInt(item.TableQuestions.Answers[i].lesionState)) }}
+                            </span>
+                            <span v-else>
+                              {{ $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))">
+                              {{ item.TableQuestions.Answers[i].lesionShort }}mm
+                            </template>
+                            <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);">
+                        <!-- 分裂 -->
+                        <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"
+                  />
+                </el-collapse-item>
+
+              </el-collapse>
+            </div>
+          </div>
+        </div>
+      </template>
+    </div>
+  </div>
+</template>
+<script>
+import { splitLesion } from '@/api/trials'
+import { resetReadingTask } from '@/api/reading'
+import DicomEvent from './../DicomEvent'
+import store from '@/store'
+import { mapGetters } from 'vuex'
+import Questions from './../Questions'
+import QuestionForm from './QuestionForm'
+export default {
+  name: 'MeasurementList',
+  components: {
+    Questions,
+    QuestionForm
+  },
+  props: {
+    isShow: {
+      type: Boolean,
+      required: true
+    },
+    isReadingShowSubjectInfo: {
+      type: Boolean,
+      required: true
+    },
+    questionFormChangeState: {
+      type: Boolean,
+      default() {
+        return false
+      }
+    },
+    questionFormChangeNum: {
+      type: Number,
+      default() {
+        return 0
+      }
+    }
+  },
+  data() {
+    return {
+      questions: [],
+      activeName: '',
+      activeItem: {
+        activeRowIndex: null,
+        activeCollapseId: null
+      },
+      visitTaskId: '',
+      isCurrentTask: false,
+      loading: false,
+      unSaveTargets: [],
+      temporaryLesions: [],
+      readingTaskState: 2,
+      isBaseLineTask: false,
+      taskBlindName: '',
+      tableQuestions: [],
+      isFirstRender: false,
+      CriterionType: null,
+      subjectCode: ''
+    }
+  },
+  computed: {
+    ...mapGetters(['visitTaskList', 'language', 'lastCanvasTaskId', 'currentReadingTaskState'])
+  },
+  watch: {
+    lastCanvasTaskId: {
+      immediate: true,
+      handler(val) {
+        if (val) {
+          this.initList()
+        }
+        console.log('lastCanvasTaskId', val)
+      }
+    },
+    currentReadingTaskState: {
+      immediate: true,
+      handler(val) {
+        if (val) {
+          this.readingTaskState = val
+        }
+      }
+    }
+  },
+  mounted() {
+    // this.subjectCode = this.$router.currentRoute.query.subjectCode
+    this.subjectCode = localStorage.getItem('subjectCode')
+    window.addEventListener('message', this.receiveMsg)
+    this.CriterionType = parseInt(localStorage.getItem('CriterionType'))
+    DicomEvent.$on('setCollapseActive', measureData => {
+      this.setCollapseActive(measureData)
+      console.log('setCollapseActive')
+    })
+    DicomEvent.$on('changeLesionType', (questionsObj) => {
+      this.changeLesionType(questionsObj)
+      console.log('changeLesionType')
+    })
+    DicomEvent.$on('getAllUnSaveLesions', (callback) => {
+      var list = this.getAllUnSaveLesions()
+      callback(list)
+      console.log('getAllUnSaveLesions')
+    })
+
+    DicomEvent.$on('split', measureData => {
+      this.handleSplit(measureData.RowId, measureData.QuestionId)
+    })
+  },
+  beforeDestroy() {
+    DicomEvent.$off('setCollapseActive')
+    DicomEvent.$off('changeLesionType')
+    DicomEvent.$off('getUnSaveTarget')
+  },
+  methods: {
+    async initList() {
+      var i = this.visitTaskList.findIndex(i => i.VisitTaskId === this.lastCanvasTaskId)
+      if (i > -1) {
+        this.visitTaskId = this.visitTaskList[i].VisitTaskId
+        this.taskBlindName = this.visitTaskList[i].TaskBlindName
+        this.readingTaskState = this.visitTaskList[i].ReadingTaskState
+        this.isBaseLineTask = this.visitTaskList[i].IsBaseLineTask
+        this.isCurrentTask = this.visitTaskList[i].IsCurrentTask
+        this.activeName = ''
+        this.activeItem.activeRowIndex = null
+        this.activeItem.activeCollapseId = null
+        if (!this.visitTaskList[i].IsInit) {
+          var loading = this.$loading({ fullscreen: true })
+          var triald = this.trialId = this.$router.currentRoute.query.trialId
+          if (!this.visitTaskList[i].measureDataInit) {
+            await store.dispatch('reading/getMeasuredData', this.visitTaskList[i].VisitTaskId)
+          }
+          if (!this.visitTaskList[i].studyListInit) {
+            await store.dispatch('reading/getStudyInfo', { trialId: triald, subjectVisitId: this.visitTaskList[i].VisitId, visitTaskId: this.visitTaskList[i].VisitTaskId, taskBlindName: this.visitTaskList[i].TaskBlindName })
+          }
+          if (!this.visitTaskList[i].readingQuestionsInit) {
+            await store.dispatch('reading/getReadingQuestionAndAnswer', { trialId: triald, visitTaskId: this.visitTaskList[i].VisitTaskId })
+          }
+          if (!this.visitTaskList[i].questionsInit) {
+            await store.dispatch('reading/getDicomReadingQuestionAnswer', { trialId: triald, visitTaskId: this.visitTaskList[i].VisitTaskId })
+          }
+
+          await store.dispatch('reading/setStatus', { visitTaskId: this.visitTaskList[i].VisitTaskId })
+          loading.close()
+        }
+        this.questions = this.visitTaskList[i].ReadingQuestions
+        this.$nextTick(() => {
+          this.$refs['ecrf'].getQuestions(this.visitTaskId)
+          this.getTableQuestions()
+          this.tableQuestions.forEach(item => {
+            item.TableQuestions.Answers.forEach(i => {
+              var refName = `${item.Id}_${i.RowIndex}`
+              this.$refs[refName] && this.$refs[refName][0].initForm()
+            })
+          })
+        })
+      }
+    },
+    async resetQuestions(obj) {
+      this.setQuestions(this.questions, obj)
+      await store.dispatch('reading/setReadingQuestionAndAnswer', { questions: this.questions, visitTaskId: this.visitTaskId })
+
+      this.getTableQuestions()
+    },
+    setQuestions(questions, obj) {
+      questions.forEach(item => {
+        if (item.Type === 'table' && item.Id === obj.questionId) {
+          var idx = item.TableQuestions.Answers.findIndex(i => i.RowIndex === obj.rowIndex)
+          item.TableQuestions.Answers[idx].isLymphLesion = obj.isLymphLesion
+          item.TableQuestions.Answers[idx].loctation = obj.lesionOrgan
+          item.TableQuestions.Answers[idx].lesionPart = obj.lesionPart
+          item.TableQuestions.Answers[idx].lesionLength = obj.lesionLength
+          item.TableQuestions.Answers[idx].lesionShort = obj.lesionShort
+          item.TableQuestions.Answers[idx].lesionState = obj.lesionState
+          item.TableQuestions.Answers[idx].saveTypeEnum = obj.saveTypeEnum
+
+          for (const i in obj.anwsers) {
+            if (i === 'MeasureData' && obj.anwsers[i]) {
+              item.TableQuestions.Answers[idx].InstanceId = obj.anwsers[i].instanceId
+              item.TableQuestions.Answers[idx].SeriesId = obj.anwsers[i].seriesId
+              item.TableQuestions.Answers[idx][i] = JSON.stringify(obj.anwsers[i])
+              item.TableQuestions.Answers[idx].isDicomReading = !(obj.anwsers[i].IsDicomReading === false || obj.anwsers[i].IsDicomReading === 'False')
+            } else {
+              item.TableQuestions.Answers[idx][i] = String(obj.anwsers[i])
+            }
+          }
+        }
+        if (item.Childrens.length > 0) {
+          this.setQuestions(item.Childrens, obj)
+        }
+      })
+    },
+    getQuestions(questions) {
+      questions.forEach(item => {
+        if (item.Type === 'table' && item.TableQuestions && item.TableQuestions.Answers.length > 0) {
+          item.TableQuestions.Answers.forEach(answerObj => {
+            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))
+            var isLymphLesion = this.getQuestionAnswer(item.TableQuestions.Questions, 2, answerObj)
+            isLymphLesion = isLymphLesion ? parseInt(isLymphLesion) : null
+            this.$set(answerObj, 'isLymphLesion', isLymphLesion)
+
+            var lesionState = this.getQuestionAnswer(item.TableQuestions.Questions, 7, answerObj)
+            lesionState = !isNaN(parseInt(lesionState)) ? parseInt(lesionState) : ''
+            this.$set(answerObj, 'lesionState', lesionState)
+            if (answerObj.RowId) {
+              var idx = item.TableQuestions.Questions.findIndex(i => i.QuestionMark === 11)
+              if (idx > -1) {
+                var lesionNum = this.getQuestionAnswer(item.TableQuestions.Questions, 11, answerObj)
+                lesionNum = !isNaN(parseInt(lesionNum)) ? parseInt(lesionNum) : ''
+                this.$set(answerObj, 'saveTypeEnum', isNaN(parseInt(lesionNum)) ? 1 : 2)
+              } else {
+                this.$set(answerObj, 'saveTypeEnum', isNaN(parseInt(lesionState)) ? 1 : 2)
+              }
+            } else {
+              this.$set(answerObj, 'saveTypeEnum', 0)
+            }
+          })
+        }
+        if (item.Childrens.length > 0) {
+          this.getQuestions(item.Childrens)
+        }
+      })
+      return questions
+    },
+    getTableQuestions() {
+      this.tableQuestions = []
+      this.questions.map(item => {
+        if (item.Type === 'table') {
+          this.tableQuestions.push(item)
+        }
+        if (item.Childrens.length > 0) {
+          this.getTableQuestionsChild(item.Childrens)
+        }
+      })
+    },
+    getTableQuestionsChild(obj) {
+      obj.map(item => {
+        if (item.Type === 'table') {
+          this.tableQuestions.push(item)
+        }
+        if (item.Childrens.length > 0) {
+          this.getTableQuestionsChild(item.Childrens)
+        }
+      })
+    },
+    refreshReadingQuestionAndAnswer(type) {
+      if (type === 0) {
+        // 删除
+        this.activeName = ''
+        this.activeItem.activeRowIndex = null
+        this.activeItem.activeCollapseId = null
+      }
+
+      this.getReadingQuestionAndAnswer(this.visitTaskId)
+    },
+    getReadingQuestionAndAnswer() {
+      return new Promise(async resolve => {
+        try {
+          const loading = this.$loading({ fullscreen: true })
+          await store.dispatch('reading/refreshReadingQuestionAndAnswer', { trialId: this.$router.currentRoute.query.trialId, visitTaskId: this.visitTaskId }).then(() => {
+            var idx = this.visitTaskList.findIndex(i => i.VisitTaskId === this.visitTaskId)
+            if (idx > -1) {
+              if (this.visitTaskList[idx].ReadingQuestions.length > 0) {
+                this.questions = this.visitTaskList[idx].ReadingQuestions
+              }
+              this.readingTaskState = this.visitTaskList[idx].ReadingTaskState
+              this.isBaseLineTask = this.visitTaskList[idx].IsBaseLineTask
+              this.isCurrentTask = this.visitTaskList[idx].IsCurrentTask
+            }
+            this.getTableQuestions()
+            this.$nextTick(() => {
+              this.tableQuestions.forEach(item => {
+                item.TableQuestions.Answers.forEach(i => {
+                  var refName = `${item.Id}_${i.RowIndex}`
+                  this.$refs[refName] && this.$refs[refName][0].initForm()
+                })
+              })
+            })
+          })
+          await store.dispatch('reading/refreshMeasuredData', this.visitTaskId)
+          DicomEvent.$emit('getMeasureData')
+          loading.close()
+          resolve()
+        } catch (e) { console.log(e) }
+      })
+    },
+    getQuestionAnswer(questions, questionMark, answers) {
+      var idx = questions.findIndex(i => i.QuestionMark === questionMark)
+      if (idx > -1) {
+        var questionId = questions[idx].Id
+        return answers[questionId]
+      } else {
+        return ''
+      }
+    },
+    // 分裂
+    handleSplit(rowId, questionId) {
+      // 消失，无法评估，疑似，太小等状态病灶不支持分裂
+      // 获取病灶状态
+      var idx = this.tableQuestions.findIndex(i => i.Id === questionId)
+      if (idx > -1) {
+        var i = this.tableQuestions[idx].TableQuestions.Answers.findIndex(i => i.RowId === rowId)
+        if (i > -1) {
+          // var refName = `${questionId}_${this.tableQuestions[idx].TableQuestions.Answers[i].RowIndex}`
+          // var lesionState = this.$refs[refName][0].getQuestionVal(7)
+          // var lesionType = this.$refs[refName][0].lesionType
+          // var isCurrentTaskAdd = this.tableQuestions[idx].TableQuestions.Answers[i].IsCurrentTaskAdd
+          // if (isNaN(parseInt(lesionState))) {
+          //   this.$confirm(`请先为病灶设置状态`, {
+          //     type: 'warning',
+          //     distinguishCancelAndClose: true
+          //   })
+          //     .then(() => {})
+          //     .catch(() => {})
+          // } else if (lesionType === 0 && lesionState !== 0) {
+          //   // 靶病灶
+          //   this.$confirm(`病灶状态为消失或无法评估或太小，不支持分裂`, {
+          //     type: 'warning',
+          //     distinguishCancelAndClose: true
+          //   })
+          //     .then(() => {})
+          //     .catch(() => {})
+          // } else if (lesionType === 1 && lesionState === 2 || lesionState === 3) {
+          //   // 非靶病灶
+          //   this.$confirm(`病灶状态为消失或无法评估，不支持分裂`, {
+          //     type: 'warning',
+          //     distinguishCancelAndClose: true
+          //   })
+          //     .then(() => {})
+          //     .catch(() => {})
+          // } else if (lesionType === 2 && (lesionState === 1 || lesionState === 2 || lesionState === 3)) {
+          //   // 新病灶
+          //   this.$confirm(`病灶状态为疑似或消失或无法评估，不支持分裂`, {
+          //     type: 'warning',
+          //     distinguishCancelAndClose: true
+          //   })
+          //     .then(() => {})
+          //     .catch(() => {})
+          // } else if (isCurrentTaskAdd !== 'False') {
+          //   this.$confirm(`首次添加的病灶不支持分裂`, {
+          //     type: 'warning',
+          //     distinguishCancelAndClose: true
+          //   })
+          //     .then(() => {})
+          //     .catch(() => {})
+          // } else {}
+          var arr = []
+          this.getUnSaveTarget()
+          if (this.unSaveTargets.length > 0) {
+            this.unSaveTargets.forEach(item => {
+              arr.push(item.lessionName)
+            })
+          }
+          var unSavedList = this.getAllUnSaveLesions()
+          unSavedList.forEach(item => {
+            arr.push(item.lessionName)
+          })
+          if (arr.length > 0) {
+            // 病灶${message}，未保存。如果分裂，信息将被还原，是否继续？
+            var msg = this.$t('trials:reading:warnning:msg3')
+            msg = msg.replaceAll('xxx', arr.join('、'))
+            this.$confirm(msg, {
+              type: 'warning',
+              distinguishCancelAndClose: true
+            })
+              .then(() => {
+                this.split(rowId, questionId)
+              })
+              .catch(() => {})
+          } else {
+            // 是否确认分裂
+            this.$confirm(this.$t('trials:reading:warnning:msg4'), {
+              type: 'warning',
+              distinguishCancelAndClose: true
+            })
+              .then(() => {
+                this.split(rowId, questionId)
+              })
+              .catch(() => {})
+          }
+        }
+      }
+    },
+    async split(rowId, questionId) {
+      const loading = this.$loading({ fullscreen: true })
+      try {
+        var params = {
+          visitTaskId: this.visitTaskId,
+          questionId: questionId,
+          rowId: rowId
+        }
+        await splitLesion(params)
+        await this.getReadingQuestionAndAnswer()
+        this.$nextTick(() => {
+          this.tableQuestions.forEach(item => {
+            item.TableQuestions.Answers.forEach(i => {
+              var refName = `${item.Id}_${i.RowIndex}`
+              this.$refs[refName] && this.$refs[refName][0].initForm()
+            })
+          })
+        })
+        loading.close()
+      } catch (e) {
+        loading.close()
+        console.log(e)
+      }
+    },
+    isCanActiveTool(toolName) {
+      this.getUnSaveTarget()
+      if (this.unSaveTargets.length > 0) {
+        var rowIndex = String(this.unSaveTargets[0].rowIndex)
+        var questionId = this.unSaveTargets[0].questionId
+        const refName = `${this.activeItem.activeCollapseId}_${this.activeItem.activeRowIndex}`
+        if (rowIndex === this.activeItem.activeRowIndex && questionId === this.activeItem.activeCollapseId && !this.$refs[refName][0].questionForm.MeasureData) {
+          return this.checkToolCanActive(toolName)
+        } else {
+          var msg = this.$t('trials:reading:warnning:msg5')
+          msg = msg.replace('xxx', this.unSaveTargets[0].lessionName)
+          // `病灶${this.unSaveTargets[0].lessionName}信息未保存，不允许继续添加！`
+          return { isCanActiveTool: false, reason: msg }
+        }
+      } else {
+        if (this.activeItem.activeCollapseId) {
+          return this.checkToolCanActive(toolName)
+        } else {
+          if (this.isBaseLineTask && (toolName === 'Bidirectional' || toolName === 'Length' || toolName === 'RectangleRoi')) {
+            return { isCanActiveTool: true, reason: '' }
+          } else if (!this.isBaseLineTask && (toolName === 'ArrowAnnotate' || toolName === 'Bidirectional' || toolName === 'Length' || toolName === 'RectangleRoi')) {
+            return { isCanActiveTool: true, reason: '' }
+          } else if (this.isBaseLineTask && toolName === 'ArrowAnnotate') {
+            return { isCanActiveTool: false, reason: this.$t('trials:reading:warnning:msg54') }
+          } else {
+            return { isCanActiveTool: false, reason: '' }
+          }
+        }
+      }
+    },
+
+    checkToolCanActive(toolName) {
+      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.MeasureData) {
+        if (this.isBaseLineTask) {
+          if (this.$refs[refName][0].lesionType === 0 && isLymphNodes === 1 && toolName !== 'Bidirectional') {
+            // '淋巴结靶病灶需使用长短径测量工具'
+            return { isCanActiveTool: false, reason: this.$t('trials:reading:warnning:msg6') }
+          } else if (this.$refs[refName][0].lesionType === 0 && isLymphNodes === 0 && toolName !== 'Length') {
+            // '非淋巴结靶病灶需使用直径测量工具'
+            return { isCanActiveTool: false, reason: this.$t('trials:reading:warnning:msg7') }
+          } else if (this.$refs[refName][0].lesionType === 1 && isLymphNodes === 1 && toolName !== 'Bidirectional' && toolName !== 'RectangleRoi') {
+            // '淋巴结非靶病灶需使用长短径测量工具或矩形工具'
+            return { isCanActiveTool: false, reason: this.$t('trials:reading:warnning:msg8') }
+          } else if (this.$refs[refName][0].lesionType === 1 && isLymphNodes === 0 && toolName !== 'Length' && toolName !== 'RectangleRoi') {
+            // '非淋巴结非靶病灶需使用直径测量工具或矩形工具'
+            return { isCanActiveTool: false, reason: this.$t('trials:reading:warnning:msg9') }
+          } else if (toolName === 'ArrowAnnotate') {
+            return { isCanActiveTool: false, reason: this.$t('trials:reading:warnning:msg54') }
+          } else {
+            return { isCanActiveTool: true, reason: '' }
+          }
+        } else {
+          if (this.$refs[refName][0].lesionType === 0 && isLymphNodes === 1 && toolName !== 'Bidirectional' && toolName !== 'ArrowAnnotate') {
+            // 淋巴结靶病灶需使用长短径测量工具或箭头工具
+            return { isCanActiveTool: false, reason: this.$t('trials:reading:warnning:msg10') }
+          } else if (this.$refs[refName][0].lesionType === 0 && isLymphNodes === 0 && toolName !== 'Length' && toolName !== 'ArrowAnnotate') {
+            // 非淋巴结靶病灶需使用直径测量工具或箭头工具
+            return { isCanActiveTool: false, reason: this.$t('trials:reading:warnning:msg11') }
+          } else if (this.$refs[refName][0].lesionType === 1 && isLymphNodes === 1 && toolName !== 'Bidirectional' && toolName !== 'ArrowAnnotate' && toolName !== 'RectangleRoi') {
+            // 淋巴结非靶病灶需使用长短径测量工具或矩形工具或矩形工具或箭头工具
+            return { isCanActiveTool: false, reason: this.$t('trials:reading:warnning:msg52') }
+          } else if (this.$refs[refName][0].lesionType === 1 && isLymphNodes === 0 && toolName !== 'Length' && toolName !== 'ArrowAnnotate' && toolName !== 'RectangleRoi') {
+            // 非淋巴结非靶病灶需使用直径测量工具或矩形工具或矩形工具或箭头工具
+            return { isCanActiveTool: false, reason: this.$t('trials:reading:warnning:msg53') }
+          } else if (this.$refs[refName][0].lesionType === 2 && isLymphNodes === 1 && toolName !== 'Bidirectional' && toolName !== 'ArrowAnnotate') {
+            // 淋巴结新病灶需使用长短径测量工具或箭头工具
+            return { isCanActiveTool: false, reason: this.$t('trials:reading:warnning:msg12') }
+          } else if (this.$refs[refName][0].lesionType === 2 && isLymphNodes === 0 && toolName !== 'Length' && toolName !== 'ArrowAnnotate') {
+            // 非淋巴结新病灶需使用直径测量工具或箭头工具
+            return { isCanActiveTool: false, reason: this.$t('trials:reading:warnning:msg13') }
+          } else if (this.$refs[refName][0].lesionType === 2 && toolName !== 'Length' && toolName !== 'Bidirectional' && toolName !== 'ArrowAnnotate') {
+            // 新病灶需使用直径测量工具或箭头工具
+            return { isCanActiveTool: false, reason: this.$t('trials:reading:warnning:msg51') }
+          } else {
+            return { isCanActiveTool: true, reason: '' }
+          }
+        }
+      } else {
+        return { isCanActiveTool: true, reason: '' }
+      }
+    },
+
+    async handleAdd(qs) {
+      this.$emit('setToolPassive')
+      // 判断是否有未保存的病灶
+      this.getUnSaveTarget()
+      if (this.unSaveTargets.length > 0) {
+        // 病灶${this.unSaveTargets[0].lessionName}信息未保存，不允许继续添加！
+        let msg = this.$t('trials:reading:warnning:msg5')
+        msg = msg.replace('xxx', this.unSaveTargets[0].lessionName)
+
+        this.$confirm(msg, {
+          type: 'warning',
+          showCancelButton: false,
+          callback: action => {}
+        })
+        return
+      }
+      if (!!qs.MaxQuestionCount && qs.MaxQuestionCount <= qs.TableQuestions.Answers.length) {
+        let msg = this.$t('trials:reading:warnning:msg14')
+        // msg = msg.replace('xxx', qs.QuestionName)
+        msg = msg.replace('xxx', qs.MaxQuestionCount)
+        this.$confirm(msg, {
+          type: 'warning',
+          showCancelButton: false,
+          callback: action => {}
+        })
+      } else {
+        // saveTypeEnum: 0
+        var obj = { saveTypeEnum: 0 }
+        // var questions = qs.TableQuestions.Questions.find(item => item.QuestionMark === 3)
+        // if (questions) {
+        //   console.log(questions)
+        //   var maxIndex = this.getMaxRowIndex(qs.TableQuestions.Answers)
+        //   obj.RowIndex = `${maxIndex + 1}.00`
+        //   obj[questions.Id] = `${qs.OrderMark}${String(maxIndex + 1).padStart(2, '0')}`
+        // }
+        var maxIndex = this.getMaxRowIndex(qs.TableQuestions.Answers)
+        obj.RowIndex = `${maxIndex + 1}.00`
+        obj.IsDicomReading = true
+        await store.dispatch('reading/addReadingQuestionAndAnswer', { lesionType: qs.LesionType, visitTaskId: this.visitTaskId, lesionObj: obj })
+
+        this.activeItem.activeRowIndex = String(obj.RowIndex)
+        this.activeItem.activeCollapseId = qs.Id
+        this.activeName = `${this.activeItem.activeCollapseId}_${this.activeItem.activeRowIndex}`
+      }
+    },
+    getMaxRowIndex(answerList) {
+      if (answerList.length > 0) {
+        var arr = []
+        answerList.forEach(item => {
+          var rowIndex = item.RowIndex
+          arr.push(parseInt(rowIndex))
+        })
+        var max = Math.max.apply(null, arr)
+        return max
+      } else {
+        return 0
+      }
+    },
+    determineExistsUnsavedLession(callback) {
+      // const loading = this.$loading({ fullscreen: true })
+      this.getUnSaveTarget()
+      if (this.unSaveTargets.length > 0) {
+        var rowIndex = String(this.unSaveTargets[0].rowIndex)
+        var questionId = this.unSaveTargets[0].questionId
+        if (rowIndex === String(this.activeItem.activeRowIndex) && questionId === this.activeItem.activeCollapseId) {
+          callback(true)
+          // loading.close()
+          return
+        } else {
+          // 病灶${this.unSaveTargets[0].lessionName}信息未保存，不允许执行此操作！
+          let msg = this.$t('trials:reading:warnning:msg17')
+          msg = msg.replace('xxx', this.unSaveTargets[0].lessionName)
+          this.$confirm(msg, {
+            type: 'warning',
+            showCancelButton: false,
+            callback: action => { }
+          })
+          callback(false)
+          // loading.close()
+          return
+        }
+      }
+      callback(true)
+      // loading.close()
+      return
+    },
+    getUnSaveTarget() {
+      this.unSaveTargets = []
+      this.tableQuestions.map(item => {
+        if (item.TableQuestions && item.TableQuestions.Answers) {
+          item.TableQuestions.Answers.map(t => {
+            if (!t.RowId) {
+              var lessionName = this.getLesionName(item.OrderMark, t.RowIndex)
+              this.unSaveTargets.push({ lessionName: lessionName, rowIndex: t.RowIndex, questionId: item.Id })
+            }
+          })
+        }
+      })
+      // console.log(this.unSaveTargets)
+      return this.unSaveTargets
+    },
+    getAllUnSaveLesions() {
+      var arr = []
+      this.tableQuestions.map(item => {
+        if (item.TableQuestions && item.TableQuestions.Answers) {
+          item.TableQuestions.Answers.map(t => {
+            const refName = `${item.Id}_${t.RowIndex}`
+            if (this.$refs[refName] && this.$refs[refName][0] && this.$refs[refName][0].questionForm.saveTypeEnum !== 2) {
+              var lessionName = this.getLesionName(item.OrderMark, t.RowIndex)
+              arr.push({ lessionName: lessionName, rowIndex: t.RowIndex, questionId: item.Id })
+            }
+          })
+        }
+      })
+      return arr
+    },
+    getLesionName(orderMark, rowIndex) {
+      var lessionName = ''
+      var rowIndexArr = rowIndex.split('.')
+      var x = parseInt(rowIndexArr[0])
+      var y = parseInt(rowIndexArr[1])
+      if (y > 0) {
+        y = String.fromCharCode(parseInt(rowIndexArr[1]) - 1 + 65 + 32)
+        lessionName = `${orderMark}${String(x).padStart(2, '0')}${y}`
+      } else {
+        lessionName = `${orderMark}${String(x).padStart(2, '0')}`
+      }
+
+      return lessionName
+    },
+    handleCollapseChange(val) {
+      if (this.activeName) {
+        var arr = this.activeName.split('_')
+        this.activeItem.activeRowIndex = arr[1]
+        this.activeItem.activeCollapseId = arr[0]
+        this.$nextTick(() => {
+          const refName = `${this.activeItem.activeCollapseId}_${this.activeItem.activeRowIndex}`
+          if (this.$refs[refName][0].questionForm.IsDicomReading !== false) {
+            var markTool = this.$refs[refName][0].currentMarkTool
+            var readingTaskState = this.readingTaskState
+            var isMarked = !!this.$refs[refName][0].questionForm.MeasureData
+            DicomEvent.$emit('imageLocation', { questionId: this.activeItem.activeCollapseId, rowIndex: this.activeItem.activeRowIndex, visitTaskId: this.visitTaskId, lesionName: this.$refs[refName][0].lesionMark, lesionType: this.$refs[refName][0].lesionType, markTool, readingTaskState, isMarked })
+          }
+        })
+      } else {
+        this.activeItem.activeRowIndex = null
+        this.activeItem.activeCollapseId = null
+      }
+    },
+    collapseRightClick(e, obj, activeCollapseId, activeRowIndex) {
+      if (obj.IsDicomReading !== false) {
+        const refName = `${activeCollapseId}_${activeRowIndex}`
+        DicomEvent.$emit('imageLocation', { questionId: activeCollapseId, rowIndex: activeRowIndex, visitTaskId: this.visitTaskId, lesionName: this.$refs[refName][0].lesionMark, lesionType: this.$refs[refName][0].lesionType })
+      }
+      e.stopImmediatePropagation()
+      e.stopPropagation()
+      e.preventDefault()
+    },
+    // 更改病灶类型
+    async changeLesionType(questionsObj) {
+      await store.dispatch('reading/removeReadingQuestionAndAnswer', { lesionType: questionsObj.oldLesionType, rowIndex: questionsObj.rowIndex, visitTaskId: this.visitTaskId })
+      // saveTypeEnum: 0
+      var lesionObj = { }
+      var questionObj = questionsObj.questionForm
+      // 切换到新的病灶集合
+      var targetObj = this.tableQuestions.find(item => item.LesionType === questionsObj.newLesionType)
+      var lesionMark = ''
+      var maxIndex = this.getMaxRowIndex(targetObj.TableQuestions.Answers)
+      lesionObj.RowIndex = `${maxIndex + 1}.00`
+      lesionMark = `${targetObj.OrderMark}${String(maxIndex + 1).padStart(2, '0')}`
+      targetObj.TableQuestions.Questions.forEach(i => {
+        // if (i.QuestionMark === 3) {
+        //   var maxIndex = this.getMaxRowIndex(targetObj.TableQuestions.Answers)
+        //   lesionObj.RowIndex = `${maxIndex + 1}.00`
+        //   lesionObj[i.Id] = `${targetObj.OrderMark}${String(maxIndex + 1).padStart(2, '0')}`
+        //   lesionMark = lesionObj[i.Id]
+        // } else {
+        //   var obj = questionObj.find(v => v.QuestionMark === i.QuestionMark)
+        //   if (obj) {
+        //     lesionObj[i.Id] = obj.Answer
+        //   }
+        // }
+        var obj = questionObj.find(v => v.QuestionMark === i.QuestionMark)
+        if (obj) {
+          lesionObj[i.Id] = obj.Answer
+        }
+      })
+
+      if (questionsObj.measureData) {
+        await store.dispatch('reading/removeMeasuredData', { visitTaskId: this.visitTaskId, measureData: questionsObj.measureData, questionId: questionsObj.questionId, rowIndex: questionsObj.rowIndex })
+
+        questionsObj.measureData.data.remark = lesionMark
+        lesionObj.MeasureData = JSON.stringify(questionsObj.measureData)
+      }
+
+      var deleteInfo = null
+      if (questionsObj.rowId) {
+        deleteInfo = { rowId: questionsObj.rowId, questionId: questionsObj.questionId }
+        lesionObj.RowId = questionsObj.rowId
+      }
+      await store.dispatch('reading/addReadingQuestionAndAnswer', { lesionType: questionsObj.newLesionType, visitTaskId: this.visitTaskId, lesionObj: lesionObj })
+
+      this.activeItem.activeRowIndex = String(lesionObj.RowIndex)
+      this.activeItem.activeCollapseId = targetObj.Id
+      this.activeName = `${this.activeItem.activeCollapseId}_${this.activeItem.activeRowIndex}`
+      const refName = `${this.activeItem.activeCollapseId}_${this.activeItem.activeRowIndex}`
+      this.$nextTick(() => {
+        if (deleteInfo) {
+          this.$refs[refName][0].setDeleteInfo(deleteInfo)
+        }
+        this.$refs[refName][0].setMeasureData(questionsObj.measureData, deleteInfo)
+      })
+    },
+    removeQuestionAnswer(questionsObj) {
+      // 移除当前病灶
+      var currentObj = this.tableQuestions.find(item => item.LesionType === questionsObj.oldLesionType)
+      if (currentObj) {
+        var i = currentObj.TableQuestions.Answers.findIndex(i => String(i.RowIndex) === String(questionsObj.rowIndex))
+        if (i === -1) return
+        currentObj.TableQuestions.Answers.splice(i, 1)
+      }
+    },
+    // 创建新病灶
+    createNLTarget(measureData) {
+      var idx = this.tableQuestions.findIndex(item => item.LesionType === 2)
+      if (idx > -1) {
+        this.addTarget(this.tableQuestions[idx], measureData)
+      }
+    },
+    // 创建靶病灶
+    createTTarget(measureData) {
+      var idx = this.tableQuestions.findIndex(item => item.LesionType === 0)
+      if (idx > -1) {
+        this.addTarget(this.tableQuestions[idx], measureData)
+      }
+    },
+
+    async addTarget(target, measureData) {
+      // saveTypeEnum: 0
+      var obj = {}
+      var maxIndex = this.getMaxRowIndex(target.TableQuestions.Answers)
+      obj.RowIndex = `${maxIndex + 1}.00`
+      // obj.RowIndex = target.TableQuestions.Answers.length + 1
+      // var questions = target.TableQuestions.Questions.find(item => item.QuestionMark === 3)
+      // if (questions) {
+      //   var maxIndex = this.getMaxRowIndex(target.TableQuestions.Answers)
+      //   obj.RowIndex = `${maxIndex + 1}.00`
+      //   obj[questions.Id] = `${target.OrderMark}${String(maxIndex + 1).padStart(2, '0')}`
+      //   // obj[questions.Id] = `${target.OrderMark}${String(obj.RowIndex).padStart(2, '0')}`
+      // }
+      // target.TableQuestions.Answers.push(obj)
+      obj.IsDicomReading = !(measureData.isDicomReading === false || measureData.isDicomReading === 'False')
+      obj.measureObj = measureData
+      await store.dispatch('reading/addReadingQuestionAndAnswer', { lesionType: target.LesionType, visitTaskId: this.visitTaskId, lesionObj: obj })
+
+      this.activeItem.activeRowIndex = String(obj.RowIndex)
+      this.activeItem.activeCollapseId = target.Id
+      this.activeName = `${this.activeItem.activeCollapseId}_${this.activeItem.activeRowIndex}`
+      // const refName = `${this.activeItem.activeCollapseId}_${this.activeItem.activeRowIndex}`
+      // this.$nextTick(() => {
+      //   this.$refs[refName][0].setMeasureData(measureData)
+      // })
+    },
+    createNTTarget(measureData) {
+      var idx = this.tableQuestions.findIndex(item => item.LesionType === 1)
+      if (idx > -1) {
+        this.addTarget(this.tableQuestions[idx], measureData)
+      }
+    },
+    setCollapseActive(measureData) {
+      if (measureData) {
+        if (this.activeItem.activeRowIndex === measureData.RowIndex && this.activeItem.activeCollapseId === measureData.QuestionId) {
+          return
+        } else {
+          this.activeItem.activeCollapseId = measureData.QuestionId
+          this.activeItem.activeRowIndex = measureData.RowIndex
+          this.activeName = `${this.activeItem.activeCollapseId}_${this.activeItem.activeRowIndex}`
+        }
+      }
+    },
+    modifyMeasuredData(measureObj) {
+      if (measureObj.questionInfo) {
+        this.activeItem.activeCollapseId = measureObj.questionInfo.QuestionId
+        this.activeItem.activeRowIndex = String(measureObj.questionInfo.RowIndex)
+        this.activeName = `${this.activeItem.activeCollapseId}_${this.activeItem.activeRowIndex}`
+        const refName = `${this.activeItem.activeCollapseId}_${this.activeItem.activeRowIndex}`
+        this.$refs[refName][0].setMeasureData(measureObj.measureData)
+      }
+    },
+    // 设置测量数据
+    setMeasuredData(measureData) {
+      if (this.activeItem.activeCollapseId) {
+        // 判断是否存在测量数据
+        this.$nextTick(() => {
+          const refName = `${this.activeItem.activeCollapseId}_${this.activeItem.activeRowIndex}`
+          if (!this.$refs[refName][0].questionForm.MeasureData || (this.$refs[refName][0].questionForm && this.$refs[refName][0].questionForm.MeasureData && measureData.data.uuid === this.$refs[refName][0].questionForm.MeasureData.data.uuid)) {
+            this.$refs[refName][0].setMeasureData(measureData)
+          } else {
+            if (this.isBaseLineTask) {
+              var idx = this.tableQuestions.findIndex(item => item.LesionType === 0)
+              if (this.tableQuestions[idx].TableQuestions.Answers.length < this.tableQuestions[idx].MaxQuestionCount && (measureData.type === 'Length' || measureData.type === 'Bidirectional')) {
+                this.createTTarget(measureData)
+              } else {
+                this.createNTTarget(measureData)
+              }
+            } else {
+              this.createNLTarget(measureData)
+            }
+          }
+        })
+      } else {
+        if (this.isBaseLineTask) {
+          var idx = this.tableQuestions.findIndex(item => item.LesionType === 0)
+          if (this.tableQuestions[idx].TableQuestions.Answers.length < this.tableQuestions[idx].MaxQuestionCount && (measureData.type === 'Length' || measureData.type === 'Bidirectional')) {
+            this.createTTarget(measureData)
+          } else {
+            this.createNTTarget(measureData)
+          }
+        } else {
+          this.createNLTarget(measureData)
+        }
+      }
+    },
+    async close(questionsObj) {
+      if (questionsObj) {
+        this.getReadingQuestionAndAnswer(questionsObj.visitTaskId)
+      }
+      this.activeItem.activeRowIndex = null
+      this.activeItem.activeCollapseId = null
+      this.activeName = ''
+    },
+    getECRFQuestions(obj) {
+      this.$refs['ecrf'].getQuestions(obj.visitTaskId)
+    },
+    async resetMeasuredData() {
+      const confirm = await this.$confirm(
+        this.$t('trials:dicomReading:message:confirmReset1'),
+        this.$t('trials:dicomReading:message:confirmReset2'),
+        {
+          type: 'warning',
+          distinguishCancelAndClose: true
+        }
+      )
+      if (confirm !== 'confirm') return
+      const loading = this.$loading({ fullscreen: true })
+      try {
+        const res = await resetReadingTask({ visitTaskId: this.visitTaskId })
+        this.loading = false
+        if (res.IsSuccess) {
+          // 刷新标注、表单、报告页信息
+          this.activeName = ''
+          this.activeItem.activeRowIndex = null
+          this.activeItem.activeCollapseId = null
+          await this.getReadingQuestionAndAnswer(this.visitTaskId)
+          const triald = this.$router.currentRoute.query.trialId
+          await store.dispatch('reading/refreshDicomReadingQuestionAnswer', { trialId: triald, visitTaskId: this.visitTaskId })
+          this.$refs['ecrf'].getQuestions(this.visitTaskId, true)
+          DicomEvent.$emit('getMeasureData')
+          DicomEvent.$emit('getReportInfo', true)
+          DicomEvent.$emit('refreshStudyListMeasureData')
+        }
+        loading.close()
+      } catch (e) {
+        loading.close()
+        console.log(e)
+      }
+    },
+    receiveMsg(event) {
+      if (event.data.type === 'isCanActiveNoneDicomTool') {
+        this.getUnSaveTarget()
+        var obj = {}
+        if (this.unSaveTargets.length > 0) {
+          var rowIndex = String(this.unSaveTargets[0].rowIndex)
+          var questionId = this.unSaveTargets[0].questionId
+          const refName = `${this.activeItem.activeCollapseId}_${this.activeItem.activeRowIndex}`
+          if (rowIndex === this.activeItem.activeRowIndex && questionId === this.activeItem.activeCollapseId && !this.$refs[refName][0].questionForm.MeasureData) {
+            // 判断是否是靶病灶
+            //  questions.findIndex(i => i.QuestionMark === questionMark)
+            var lesionType = this.$refs[refName][0].questionForm.LesionType
+            if (lesionType === 0) {
+              // '当前病灶为靶病灶，不允许添加标记！'
+              obj = { isCanActiveTool: false, lesionName: '', reason: this.$t('trials:reading:warnning:msg18') }
+            } else {
+              obj = { isCanActiveTool: true, lesionName: this.$refs[refName][0].lesionMark, reason: '', toolName: event.data.toolName }
+            }
+          } else {
+            let msg = this.$t('trials:reading:warnning:msg5')
+            msg = msg.replace('xxx', this.unSaveTargets[0].lessionName)
+            obj = { isCanActiveTool: false, lesionName: '', reason: msg }
+          }
+        } else {
+          if (this.activeItem.activeCollapseId) {
+            // 判断是否是靶病灶
+            const refName = `${this.activeItem.activeCollapseId}_${this.activeItem.activeRowIndex}`
+            // obj = { isCanActiveTool: true, lesionName: this.$refs[refName][0].lesionMark, reason: '' }
+            const lesionType = this.$refs[refName][0].questionForm.LesionType
+            if (lesionType === 0) {
+              // 当前病灶为靶病灶，不允许添加标记！
+              obj = { isCanActiveTool: false, lesionName: '', reason: this.$t('trials:reading:warnning:msg18') }
+            } else {
+              obj = { isCanActiveTool: true, lesionName: this.$refs[refName][0].lesionMark, reason: '', toolName: event.data.toolName }
+            }
+          } else {
+            // 获取非靶病灶/新病灶的长度及标识
+            var qsObj = null
+            var lesionName = ''
+            if (this.isBaseLineTask) {
+              const idx = this.tableQuestions.findIndex(item => item.LesionType === 1)
+              if (idx > -1) {
+                qsObj = this.tableQuestions[idx]
+              }
+            } else {
+              const idx = this.tableQuestions.findIndex(item => item.LesionType === 2)
+              if (idx > -1) {
+                qsObj = this.tableQuestions[idx]
+              }
+            }
+
+            // var questions = qsObj.TableQuestions.Questions.find(item => item.QuestionMark === 3)
+            // if (questions) {
+            //   var maxIndex = this.getMaxRowIndex(qsObj.TableQuestions.Answers)
+            //   lesionName = `${qsObj.OrderMark}${String(maxIndex + 1).padStart(2, '0')}`
+            // }
+            var maxIndex = this.getMaxRowIndex(qsObj.TableQuestions.Answers)
+            lesionName = `${qsObj.OrderMark}${String(maxIndex + 1).padStart(2, '0')}`
+            obj = { isCanActiveTool: true, lesionName: lesionName, reason: '', toolName: event.data.toolName }
+          }
+        }
+
+        DicomEvent.$emit('isCanActiveNoneDicomTool', obj)
+      } else if (event.data.type === 'setMeasurement') {
+        this.setMeasuredData(event.data.data)
+      }
+    }
+
+  }
+}
+</script>
+<style lang="scss" scoped>
+.measurement-wrapper{
+  height: 100%;
+  overflow-y: auto;
+  // overflow: hidden;
+
+  .container{
+    padding: 10px;
+    .basic-info{
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      h3{
+        color: #ddd;
+        padding: 5px 0px;
+        margin: 0;
+      }
+      i{
+        color: #fff;
+        font-size: 22px;
+        font-weight: bold;
+        cursor: pointer;
+      }
+    }
+  }
+  .title{
+    padding: 5px;
+    font-weight: bold;
+    color: #ddd;
+    font-size: 15px;
+
+  }
+  .add-icon{
+    padding: 5px;
+    font-weight: bold;
+    color: #ddd;
+    font-size: 15px;
+    border: 1px solid #938b8b;
+    margin-bottom: 2px;
+    cursor: pointer;
+  }
+  .add-icon:hover{
+    background-color: #607d8b;
+  }
+
+  .flex-row{
+    display: flex;
+    flex-direction: row;
+    justify-content: space-between;
+    background-color: #424242;
+
+  }
+  .lesion_list{
+    position: relative;
+  }
+  .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;
+      color: #ddd;
+      border-bottom-color:#5a5a5a;
+      padding-left: 5px;
+      height: 35px;
+      line-height: 35px;
+    }
+    /deep/ .el-collapse-item__wrap{
+      background-color: #000!important;
+      color: #ddd;
+    }
+    /deep/ .el-collapse-item__content{
+      width:260px;
+      position: absolute;
+      top: 0px;
+      right: 0px;
+      // border: 1px solid #ffeb3b;
+      border: 1px solid #fff;
+      z-index: 1;
+      color: #ddd;
+      padding: 5px;
+      background-color:#1e1e1e;
+    }
+
+  }
+}
+</style>