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 0e7571f7..25ec4043 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/DicomViewer.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/DicomViewer.vue
@@ -467,7 +467,14 @@
               :is-show="isShow"
               :is-reading-show-subject-info="isReadingShowSubjectInfo"
             />
-
+            <LuganoWithoutPETQuestionList
+              v-else-if="CriterionType === 18"
+              ref="measurementList"
+              :question-form-change-state="questionFormChangeState"
+              :question-form-change-num="questionFormChangeNum"
+              :is-show="isShow"
+              :is-reading-show-subject-info="isReadingShowSubjectInfo"
+            />
             <RecistQuestionList
               v-else-if="CriterionType === 1"
               ref="measurementList"
@@ -792,6 +799,7 @@ import RecistBMQuestionList from './RecistBM/QuestionList'
 import IRecistQuestionList from './IRecist/QuestionList'
 import PCWGQuestionList from './PCWG/QuestionList'
 import LuganoQuestionList from './Lugano/QuestionList'
+import LuganoWithoutPETQuestionList from './LuganoWithoutPET/QuestionList'
 import IVUSList from './IVUS/QuestionList'
 import OCTList from './OCT/QuestionList'
 import MRIPDFF from './MRIPDFF/QuestionList'
@@ -825,6 +833,7 @@ export default {
     RecistBMQuestionList,
     IRecistQuestionList,
     LuganoQuestionList,
+    LuganoWithoutPETQuestionList,
     IVUSList,
     OCTList,
     MRIPDFF,
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/LuganoWithoutPET/QuestionForm.vue b/src/views/trials/trials-panel/reading/dicoms/components/LuganoWithoutPET/QuestionForm.vue
new file mode 100644
index 00000000..5b13de71
--- /dev/null
+++ b/src/views/trials/trials-panel/reading/dicoms/components/LuganoWithoutPET/QuestionForm.vue
@@ -0,0 +1,1887 @@
+<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="lesionName" 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>
+      <div ref="scrollPanel" style="height: 420px;overflow-y: auto;overflow-x: hidden;" @scroll.stop="scrollHandle">
+        <el-form-item
+          :label="$t('trials:reading:title:lesionType')"
+          prop="LesionType"
+          :rules="[
+            { required:true,message: $t('common:ruleMessage:select'), trigger: ['blur']},
+          ]"
+        >
+          <!-- 下拉框 -->
+          <el-select
+            :ref="`select_LesionType`"
+            v-model="questionForm.LesionType"
+            filterable
+            :disabled="!isCurrentTask || readingTaskState>=2 || !isBaseLineTask || answers.SplitOrMergeType === '1'"
+            @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>
+        <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 && (qs.RelevanceValue.includes(questionForm[qs.RelevanceId]))) || (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']},
+          ]"
+        >
+
+          <!-- 输入框 -->
+          <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)) || answers.SplitOrMergeType === '1'"
+              @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}"
+            maxlength="500"
+            :disabled="!isCurrentTask || readingTaskState>=2 || answers.SplitOrMergeType === '1'"
+            @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'"
+            :ref="`select_${qs.Id}`"
+            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)) || (qs.QuestionMark === 7 && stateDisabled) || answers.SplitOrMergeType === '1' || (qs.QuestionMark === 7 && answers.SplitOrMergeType === '3')"
+            @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 || answers.SplitOrMergeType === '1'"
+          >
+            <el-radio
+              v-for="val in qs.options.split('|')"
+              :key="val"
+              :label="val"
+              @change="((val)=>{formItemChange(val, qs)})"
+            >
+              {{ val }}
+            </el-radio>
+          </el-radio-group>
+          <template v-if="qs.QuestionMark === 20">
+            <div style="display: flex;flex-direction: row;justify-content: flex-start;">
+
+              <el-input
+                v-if="qs.Type==='calculation'"
+                v-model="questionForm[qs.Id]"
+                disabled
+                style="width:120px;"
+                @change="((val)=>{formItemChange(val, qs)})"
+              >
+                <template v-if="qs.Unit" slot="append">
+                  {{ $fd('ValueUnit', parseInt(qs.Unit)) }}
+                </template>
+              </el-input>
+              <viewer
+                v-if="answers.OtherPicturePath"
+                ref="viewer"
+                style="margin:0 10px;"
+                :images="[`${OSSclientConfig.basePath}${answers.OtherPicturePath}`]"
+              >
+                <span style="color:#409eff;cursor: pointer" @click="previewImage()">
+                  {{ $t('trials:lugano:button:suvscreenshot1') }}
+                </span>
+                <img
+                  v-show="false"
+                  crossorigin="anonymous"
+                  :src="`${OSSclientConfig.basePath}${answers.OtherPicturePath}`"
+                  alt="Image"
+                >
+              </viewer>
+              <!-- <img
+                v-if="answers.OtherPicturePath"
+                v-viewer
+                :options="{ toolbar: false }"
+                style="width: 25px; height: 25px; cursor: pointer;margin-left:10px;"
+                crossorigin="anonymous"
+                :src="answers.OtherPicturePath"
+                alt="Image"
+                class="suv_viewer"
+              > -->
+              <!-- <el-link v-if="answers.OtherPicturePath" type="primary" style="margin-left:10px;" @click="previewImage(answers.OtherPicturePath)">截图</el-link> -->
+            </div>
+          </template>
+          <template v-else>
+            <el-input
+              v-if="qs.Type==='calculation'"
+              v-model="questionForm[qs.Id]"
+              disabled
+              @change="((val)=>{formItemChange(val, qs)})"
+            >
+              <template v-if="qs.Unit" slot="append">
+                {{ $fd('ValueUnit', parseInt(qs.Unit)) }}
+              </template>
+            </el-input>
+          </template>
+        </el-form-item>
+      </div>
+      <div
+        v-if="isCurrentTask && readingTaskState<2 && (answers.SplitOrMergeType !== '1' && answers.SplitOrMergeType !== '3')"
+        class="base-dialog-footer"
+        style="text-align:right;margin-top:10px;"
+      >
+        <!-- 清除标记 -->
+        <el-button
+          v-if="questionForm.MeasureData"
+          size="mini"
+          @click="handleDeleteMeasureData"
+        >
+          {{ $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>
+    </div>
+  </el-form>
+</template>
+<script>
+import { submitTableQuestion, deleteReadingRowAnswer, getIsSuvMaxLesion } 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: '',
+      digitPlaces: 2,
+      stateDisabled: false,
+      splitLesionTargetPPD: null,
+      splitLesionTargetLDi: null,
+      splitLesionTargetSDi: null
+    }
+  },
+  mounted() {
+    this.trialId = this.$route.query.trialId
+    this.initForm()
+    DicomEvent.$on('handleImageQualityAbnormal', () => {
+      this.setState()
+    })
+    var digitPlaces = Number(localStorage.getItem('digitPlaces'))
+    this.digitPlaces = digitPlaces === -1 ? this.digitPlaces : digitPlaces
+    // var container = document.getElementById('qs_container')
+    // container.addEventListener('scroll', this.scrollHandle , true)
+  },
+  beforeDestroy() {
+    DicomEvent.$off('handleImageQualityAbnormal')
+    // var container = document.getElementById('qs_container')
+    // container.removeEventListener('scroll', this.scrollHandle , true)
+  },
+  methods: {
+    scrollHandle() {
+      for (const k in this.$refs) {
+        if (k.indexOf('select_') === -1) continue
+        if (this.$refs[k] instanceof Array) {
+          this.$refs[k][0].blur()
+        } else {
+          this.$refs[k].blur()
+        }
+      }
+    },
+    previewImage() {
+      this.$refs.viewer[0].$viewer.show()
+    },
+    async initForm(params) {
+      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
+        }
+        // 最低点PPD（13）、PPD最低点所在访视（14）、PPD最低点LDi（15）、PPD最低点SDi（16）
+        if (this.isBaseLineTask && (item.QuestionMark === 13 || item.QuestionMark === 14 || item.QuestionMark === 15 || item.QuestionMark === 16)) {
+          val = 'NA'
+        }
+        // PPD（12）、相比最低点PPD增加百分比（17）、相比PPD最低点LDi增加值（18）、相比PPD最低点SDi增加值（19）为空是，默认值为NA
+        if (!val && (item.QuestionMark === 12 || item.QuestionMark === 17 || item.QuestionMark === 18 || item.QuestionMark === 19)) {
+          val = 'NA'
+        }
+
+        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', isNaN(parseInt(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 {
+        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)
+        var 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 (this.lesionType === 0 && params) {
+        // ppd
+
+        var ppd = this.getQuestionVal(12)
+        ppd = isNaN(parseFloat(ppd)) ? 0 : parseFloat(ppd)
+
+        this.splitLesionTargetPPD = ppd + params.splitLesionTargetPPD
+        this.splitLesionTargetLDi = params.splitLesionTargetLDi
+        this.splitLesionTargetSDi = params.splitLesionTargetSDi
+      }
+
+      // 如果当前病灶状态为“疾病进展”，且满足疾病进展的条件，则状态不允许更改
+      var state = this.getQuestionVal(7)// 长径
+      var ldi = this.getQuestionVal(0)// 长径
+      ldi = isNaN(parseFloat(ldi)) ? 0 : ldi
+      var pddIncrease = this.getQuestionVal(17) // 相比最低点PPD增加百分比
+      pddIncrease = isNaN(parseFloat(pddIncrease)) ? 0 : parseFloat(pddIncrease)
+      var ldiIncrease = this.getQuestionVal(18)// 相比PPD最低点LDi增加值
+      ldiIncrease = isNaN(parseFloat(ldiIncrease)) ? 0 : parseFloat(ldiIncrease)
+      var sdiIncrease = this.getQuestionVal(19)// 相比PPD最低点SDi增加值
+      sdiIncrease = isNaN(parseFloat(sdiIncrease)) ? 0 : parseFloat(sdiIncrease)
+
+      if (!this.isBaseLineTask && state === 4 && this.lesionType === 0 && ldi && pddIncrease && ldiIncrease && sdiIncrease) {
+        /** 融合主病灶疾病进展
+         * 当前融合靶病灶LDi>15
+         * 相比最低点PPD增加百分比 ≥50％
+        **/
+        if (this.answers.SplitOrMergeType === '4' || this.answers.SplitOrMergeType === '5') {
+          if (ldi > 15 && pddIncrease >= 50) {
+            this.stateDisabled = true
+          } else {
+            this.stateDisabled = false
+          }
+        } else {
+          if (this.lesionType === 0 && this.answers.SplitOrMergeType === '2' && this.splitLesionTargetPPD) {
+            var minPPD = this.getQuestionVal(13)
+            minPPD = parseFloat(minPPD)
+            pddIncrease = ((((this.splitLesionTargetPPD - minPPD) / minPPD)) * 100).toFixed(this.digitPlaces)
+            ldi = this.splitLesionTargetLDi + ldi
+            var minLDi = this.getQuestionVal(15)
+            ldiIncrease = ldi - minLDi
+            var sdi = this.getQuestionVal(1)// 短径
+            sdi = isNaN(parseFloat(sdi)) ? 0 : sdi
+            sdi = this.splitLesionTargetSDi + sdi
+            var minSDi = this.getQuestionVal(16)
+            sdiIncrease = sdi - minSDi
+          }
+
+          /** 疾病进展
+         * 15mm<当前靶病灶LDi≤20mm
+         * 相比最低点PPD增加百分比 ≥50％
+         * 相比PPD最低点LDi增加值 ≥5 mm 或者 相比PPD最低点SDi增加值≥5 mm
+        **/
+          if ((ldi > 15 && ldi <= 20) && (pddIncrease >= 50) && (ldiIncrease >= 5 || sdiIncrease >= 5)) {
+            this.stateDisabled = true
+          } else if ((ldi > 20) && (pddIncrease >= 50) && (ldiIncrease >= 10 || sdiIncrease >= 10)) {
+          /** 疾病进展
+           * 当前靶病灶LDi>20 mm
+           * 相比最低点PPD增加百分比 ≥50％
+           * 相比PPD最低点LDi增加值 ≥10 mm 或者 相比PPD最低点SDi增加值Sdi ≥10 mm
+          **/
+            this.stateDisabled = true
+          } else {
+            this.stateDisabled = false
+          }
+        }
+      } else {
+        this.stateDisabled = false
+      }
+      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})`)
+      } else if (this.answers.SplitOrMergeLesionName && parseInt(this.answers.SplitOrMergeType) === 1) {
+        arr.push(`(Merge to ${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(async(resolve, reject) => {
+        const loading = this.$loading({ fullscreen: true })
+        var param = {
+          visitTaskId: this.visitTaskId,
+          questionId: this.parentQsId,
+          rowId: this.questionForm.RowId
+        }
+        try {
+          const res = await deleteReadingRowAnswer(param)
+          if (res.IsSuccess) {
+            DicomEvent.$emit('getReportInfo', true)
+          }
+          loading.close()
+          resolve()
+        } catch (e) {
+          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)
+      }
+      var 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) {
+      console.log('setMeasureData')
+      return new Promise(resolve => {
+        if (measureData) {
+          if (measureData.pictureBaseStr) {
+            this.pictureBaseStr = measureData.pictureBaseStr
+            measureData.pictureBaseStr = ''
+          }
+          // 获取长径(0)
+          // const loading = this.$loading({ fullscreen: true })
+          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, '')
+          }
+          var isLymphLesion = this.getQuestionVal(2)
+          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)
+            const lesionState = this.getQuestionVal(7)
+            // 基线时，默认状态都为存在
+            if (this.isBaseLineTask && !lesionState) {
+              const stateId = this.getQuestionId(7)
+              this.$set(this.questionForm, stateId, 0)
+            }
+            var lesionLength = this.getQuestionVal(0)
+            // 当前添加的新病灶不做处理
+            if (!(this.isCurrentTaskAdd === 'True') && this.lesionType === 0 && !this.isBaseLineTask && measureData.type === 'Bidirectional') {
+              if (isLymphLesion) {
+                // 淋巴结靶病灶
+                if (lesionLength > 15) {
+                  // 长径大于15mm,自动给“存在”状态
+                  const stateId = this.getQuestionId(7)
+                  this.$set(this.questionForm, stateId, 0)
+                } else {
+                  // 长径小于或等于15mm,自动给“消失”状态
+                  const stateId = this.getQuestionId(7)
+                  this.$set(this.questionForm, stateId, 3)
+                }
+              } else {
+                // 非淋巴结靶病灶
+                if (lesionLength > 0) {
+                  // 长径大于0,自动给“存在”状态
+                  const stateId = this.getQuestionId(7)
+                  this.$set(this.questionForm, stateId, 0)
+                }
+              }
+            } else if (this.isCurrentTaskAdd === 'True' && !lesionState && measureData.type === 'Bidirectional') {
+              const stateId = this.getQuestionId(7)
+              this.$set(this.questionForm, stateId, 0)
+            }
+            if (this.lesionType === 0) {
+              this.calculatePPD()
+            }
+            
+            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')
+        }
+        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)
+        var 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)
+        // // 状态为空时，非淋巴结靶病灶长径>0mm，自动给“存在”状态，如果淋巴结靶病灶短径>=10mm，自动给“存在”状态。淋巴结靶病灶在短径小于10mm时，用十字线标记测量时标记为消失
+        // if (!this.isBaseLineTask && this.lesionType === 0 && ((isLymphLesion === 0 && lesionLength > 0) || (isLymphLesion === 1 && lesionShort >= 10))) {
+        //   const stateId = this.getQuestionId(7)
+        //   this.$set(this.questionForm, stateId, 0)
+        //   lesionState = 0
+        // }
+
+        // if (!this.isBaseLineTask && this.lesionType === 0 && (isLymphLesion === 1 && measureData.type === 'Bidirectional' && lesionShort < 10)) {
+        //   const stateId = this.getQuestionId(7)
+        //   this.$set(this.questionForm, stateId, 3)
+        //   lesionState = 3
+        // }
+        // // 基线时，默认状态都为存在
+        // if (this.isBaseLineTask && !lesionState) {
+        //   const stateId = this.getQuestionId(7)
+        //   this.$set(this.questionForm, stateId, 0)
+        //   lesionState = 0
+        // }
+
+        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()
+      })
+
+      // loading.close()
+      // this.handleSave()
+    },
+    calculatePPD() {
+      // 最低点PPD（13）、PPD最低点LDi（15）、	PPD最低点SDi（16）
+      // 长径(0)/短径(1)发生改变，计算PPD（12）、相比最低点PPD增加百分比（17）、相比PPD最低点LDi增加值（18）、相比PPD最低点SDi增加值（19）
+      var ldi = this.getQuestionVal(0)
+      var sdi = this.getQuestionVal(1)
+      var ppd = null
+      if (!isNaN(parseFloat(ldi)) && !isNaN(parseFloat(sdi))) {
+        ldi = parseFloat(ldi)
+        sdi = parseFloat(sdi)
+        ppd = (ldi * sdi).toFixed(this.digitPlaces)
+      } else {
+        ppd = 'NA'
+      }
+      var ppdObj = this.questions.find(i => i.QuestionMark === 12)
+      this.$set(this.questionForm, ppdObj.Id, ppd)
+      // if(isNaN(parseFloat(ppd))){
+
+      // }
+      var minPPD = this.getQuestionVal(13)
+      var pddIncrease = null
+      // 相比最低点PPD增加百分比
+      var ppdIncreaseObj = this.questions.find(i => i.QuestionMark === 17)
+      if (!isNaN(parseFloat(minPPD)) && !isNaN(parseFloat(ppd))) {
+        minPPD = parseFloat(minPPD)
+        pddIncrease = ((((ppd - minPPD) / minPPD)) * 100).toFixed(this.digitPlaces)
+        this.$set(this.questionForm, ppdIncreaseObj.Id, pddIncrease)
+      } else {
+        this.$set(this.questionForm, ppdIncreaseObj.Id, 'NA')
+      }
+      var minLDi = this.getQuestionVal(15)
+      var ldiIncrease = null
+      // 相比PPD最低点LDi增加值
+      var ldiIncreaseObj = this.questions.find(i => i.QuestionMark === 18)
+      if (!isNaN(parseFloat(minLDi)) && !isNaN(parseFloat(ldi))) {
+        minLDi = parseFloat(minLDi)
+        ldiIncrease = ldi - minLDi
+        this.$set(this.questionForm, ldiIncreaseObj.Id, ldiIncrease.toFixed(this.digitPlaces))
+      } else {
+        this.$set(this.questionForm, ldiIncreaseObj.Id, 'NA')
+      }
+      var minSDi = this.getQuestionVal(16)
+      var sdiIncrease = null
+      // 相比PPD最低点SDi增加值
+      var sdiIncreaseObj = this.questions.find(i => i.QuestionMark === 19)
+      if (!isNaN(parseFloat(minSDi)) && !isNaN(parseFloat(sdi))) {
+        minSDi = parseFloat(minSDi)
+        sdiIncrease = sdi - minSDi
+        this.$set(this.questionForm, sdiIncreaseObj.Id, sdiIncrease.toFixed(this.digitPlaces))
+      } else {
+        this.$set(this.questionForm, sdiIncreaseObj.Id, 'NA')
+      }
+      var pddIncreaseNum = null
+      if (this.lesionType === 0 && this.answers.SplitOrMergeType === '2' && this.splitLesionTargetPPD) {
+        pddIncreaseNum = ((((this.splitLesionTargetPPD - minPPD) / minPPD)) * 100).toFixed(this.digitPlaces)
+        ldi = this.splitLesionTargetLDi + ldi
+        ldiIncrease = ldi - minLDi
+        sdi = this.splitLesionTargetSDi + sdi
+        sdiIncrease = sdi - minSDi
+      } else {
+        pddIncreaseNum = ((((ppd - minPPD) / minPPD)) * 100).toFixed(this.digitPlaces)
+      }
+      /** 疾病进展* **/
+      if (!this.isBaseLineTask && ldi && pddIncreaseNum && ldiIncrease && sdiIncrease && this.lesionType === 0 && this.isCurrentTaskAdd === 'False') {
+        if (this.answers.SplitOrMergeType === '4' || this.answers.SplitOrMergeType === '5') {
+          /** 融合主病灶疾病进展
+           * 当前融合靶病灶LDi>15
+           * 相比最低点PPD增加百分比 ≥50％
+          **/
+          if (ldi > 15 && pddIncreaseNum >= 50) {
+            const stateId = this.getQuestionId(7)
+            this.$set(this.questionForm, stateId, 4)
+            this.stateDisabled = true
+          } else {
+            // 不符合疾病进展是否需要清空修改前疾病进展的状态
+            this.stateDisabled = false
+          }
+        } else {
+        /** 疾病进展
+         * 15mm<当前靶病灶LDi≤20mm
+         * 相比最低点PPD增加百分比 ≥50％
+         * 相比PPD最低点LDi增加值 ≥5 mm 或者 相比PPD最低点SDi增加值≥5 mm
+        **/
+          if ((ldi > 15 && ldi <= 20) && (pddIncreaseNum >= 50) && (ldiIncrease >= 5 || sdiIncrease >= 5)) {
+            const stateId = this.getQuestionId(7)
+            this.$set(this.questionForm, stateId, 4)
+            this.stateDisabled = true
+          } else if ((ldi > 20) && (pddIncreaseNum >= 50) && (ldiIncrease >= 10 || sdiIncrease >= 10)) {
+          /** 疾病进展
+           * 当前靶病灶LDi>20 mm
+           * 相比最低点PPD增加百分比 ≥50％
+           * 相比PPD最低点LDi增加值 ≥10 mm 或者 相比PPD最低点SDi增加值Sdi ≥10 mm
+          **/
+            const stateId = this.getQuestionId(7)
+            this.$set(this.questionForm, stateId, 4)
+            this.stateDisabled = true
+          } else {
+          // 不符合疾病进展是否需要清空修改前疾病进展的状态
+          // const lesionState = !isNaN(parseInt(this.getQuestionVal(7))) ? parseInt(this.getQuestionVal(7)) : ''
+          // if (lesionState === 4) {
+          //   const stateId = this.getQuestionId(7)
+          //   this.$set(this.questionForm, stateId, null)
+          // }
+            this.stateDisabled = false
+          }
+        }
+      } else {
+        // 不符合疾病进展是否需要清空修改前疾病进展的状态
+        // const lesionState = !isNaN(parseInt(this.getQuestionVal(7))) ? parseInt(this.getQuestionVal(7)) : ''
+        // if (lesionState === 4) {
+        //   const stateId = this.getQuestionId(7)
+        //   this.$set(this.questionForm, stateId, null)
+        // }
+        this.stateDisabled = false
+      }
+    },
+    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(parseInt(this.answers.LastTaskMajorAxis)) ? parseInt(this.answers.LastTaskMajorAxis) : 0
+        const bLesionS = !isNaN(parseInt(this.answers.LastTaskShortAxis)) ? parseInt(this.answers.LastTaskShortAxis) : 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
+    },
+    // async uploadScreenshots(fileName, file) {
+    //   try {
+    //     file = this.convertBase64ToBlob(file)
+    //     const formData = new FormData()
+    //     formData.append('file', file)
+    //     const result = await uploadPrintscreen(formData, this.$route.query.subjectId)
+    //     result.url = result.Result.Path
+    //     // const result = await this.OSSclient.put(`${fileName}.png`, file)
+    //     return { isSuccess: true, result: result }
+    //   } catch (e) {
+    //     console.log(e)
+    //     return { isSuccess: false, result: e }
+    //   }
+    // },
+    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}/${this.visitTaskId}/${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) {
+        if (this.lesionType === 0) {
+          this.$refs['scrollPanel'].scrollTo({ top: 0, behavior: 'smooth' })
+        }
+        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)
+      lymphNodes = (lymphNodes !== null && lymphNodes !== undefined) ? parseInt(lymphNodes) : null
+      if (this.isBaseLineTask) {
+        // 基线
+        // 靶病灶且状态为存在（0）
+        if (this.lesionType === 0 && lesionState === 0) {
+          if (lymphNodes === 1) {
+            //  评估状态为“存在”的淋巴结靶病灶，长径应大于15 mm，请使用长短径测量工具添加标记。
+            if (!(measureData && measureData.type === 'Bidirectional' && lesionLength > 15 && lesionLength >= 2 * measureData.thick)) {
+              this.$confirm(this.$t('trials:lugano:message:validState1'), {
+                type: 'warning',
+                showCancelButton: false,
+                callback: action => {}
+              })
+              loading.close()
+              return
+            }
+          } else {
+            // 评估状态为“存在”的非淋巴结靶病灶，长径应大于10 mm，请使用长短径测量工具添加标记。
+            if (!(measureData && measureData.type === 'Bidirectional' && lesionLength > 10 && lesionLength >= 2 * measureData.thick)) {
+              this.$confirm(this.$t('trials:lugano:message:validState2'), {
+                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 === 'Bidirectional' || measureData.type === 'RectangleRoi'))) {
+              // 评估状态为存在的非淋巴结非靶病灶需使用长短径测量工具或矩形工具添加标记
+              this.$confirm(this.$t('trials:lugano:message:validState12'), {
+                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' && lesionLength > 15)) {
+              // 状态为“存在”的淋巴结靶病灶，长径应大于15 mm，请使用长短径测量工具添加标记。
+              this.$confirm(this.$t('trials:lugano:message:validState3'), {
+                type: 'warning',
+                showCancelButton: false,
+                callback: action => {}
+              })
+              loading.close()
+              return
+            }
+          } else {
+            // 非淋巴结靶病灶 长短径测量工具
+            if (!(measureData && measureData.type === 'Bidirectional')) {
+              // 状态为“存在”的非淋巴结靶病灶，长径应大于10 mm，请使用长短径测量工具添加标记。
+              this.$confirm(this.$t('trials:lugano:message:validState4'), {
+                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
+              const lengthId = this.getQuestionId(0)
+              this.$set(this.questionForm, lengthId, 5)
+              lesionLength = 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 shortId = this.getQuestionId(1)
+              this.$set(this.questionForm, shortId, 5)
+              lesionShort = 5
+              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(this.$t('trials:lugano:message:validState5'), {
+                type: 'warning',
+                showCancelButton: false,
+                callback: action => {}
+              })
+              loading.close()
+              return
+            } else if (measureData && measureData.type === 'Bidirectional' && lesionLength > 15) {
+              // 评估状态为消失的淋巴结靶病灶,短径应不大于15mm！
+              this.$confirm(this.$t('trials:lugano:message:validState6'), {
+                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
+            // }
+          }
+          if (measureData && measureData.type === 'ArrowAnnotate') {
+            const shortId = this.getQuestionId(1)
+            this.$set(this.questionForm, shortId, null)
+            lesionShort = null
+            const lengthId = this.getQuestionId(0)
+            this.$set(this.questionForm, lengthId, null)
+            lesionLength = null
+          }
+        }
+
+        // 靶病灶且状态为疾病进展 （4）
+        if (this.lesionType === 0 && lesionState === 4) {
+          if (lymphNodes === 1) {
+            if (!(measureData && measureData.type === 'Bidirectional' && lesionLength > 15)) {
+              // 状态为“疾病进展”的淋巴结靶病灶，长径应大于15 mm，请使用长短径测量工具添加标记。
+              this.$confirm(this.$t('trials:lugano:message:validState7'), {
+                type: 'warning',
+                showCancelButton: false,
+                callback: action => {}
+              })
+              loading.close()
+              return
+            }
+          } else {
+            // 非淋巴结靶病灶 直径测量工具
+            if (!(measureData && measureData.type === 'Bidirectional' && lesionLength > 10)) {
+              // 状态为“疾病进展”的非淋巴结靶病灶，长径应大于10 mm，请使用长短径测量工具添加标记。
+              this.$confirm(this.$t('trials:lugano:message:validState8'), {
+                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:msg31'), {
+                type: 'warning',
+                showCancelButton: false,
+                callback: action => {}
+              })
+              loading.close()
+              return
+            }
+          } else {
+            // 非淋巴结非靶病灶 直径测量工具、箭头工具
+            if (!(measureData && (measureData.type === 'Bidirectional' || measureData.type === 'RectangleRoi'))) {
+              // 评估状态为存在的非淋巴结非靶病灶需使用长短径测量工具或箭头工具添加标记！
+              this.$confirm(this.$t('trials:lugano:message:validState9'), {
+                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 === 'Bidirectional' || measureData.type === 'RectangleRoi'))) {
+              // 评估状态为显著增大的非淋巴结非靶病灶需使用矩形工具添加标记！
+              this.$confirm(this.$t('trials:lugano:message:validState10'), {
+                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 === 'Bidirectional' || measureData.type === 'ArrowAnnotate'))) {
+              // 评估状态为存在的非淋巴结新病灶需使用长短径测量工具或箭头工具添加标记！
+              this.$confirm(this.$t('trials:lugano:message:validState11'), {
+                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倍层厚（基线校验）
+        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 = {
+          computationTrigger: -2,
+          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) {
+          var param = {
+            visitTaskId: this.visitTaskId,
+            questionId: this.deleteInfo.questionId,
+            rowId: this.deleteInfo.rowId
+          }
+          await deleteReadingRowAnswer(param)
+          this.deleteInfo = null
+          params.rowId = ''
+        }
+        try {
+          const res = await submitTableQuestion(params)
+          if (res.IsSuccess) {
+            // 保存成功！
+            this.$message.success(this.$t('common:message:savedSuccessfully'))
+
+            this.currentMarkTool = measureData ? measureData.type : ''
+            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 })
+            this.$emit('close')
+            DicomEvent.$emit('readingPageUpdate', {})
+            DicomEvent.$emit('getReportInfo', true)
+            DicomEvent.$emit('setMeasuredToolsPassive')
+            if (parseInt(this.answers.SplitOrMergeType) === 0) {
+              this.$emit('getReadingQuestionAndAnswer')
+            }
+          }
+          loading.close()
+        } catch (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.stateDisabled = false
+      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, '')
+      // saveTypeEnum 0：未保存过（新建病灶）；1：已保存，信息不完整（随访初始化病灶/分裂病灶，通过状态判断）
+      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 })
+      if (this.lesionType === 0) {
+        this.calculatePPD()
+      }
+      DicomEvent.$emit('refreshStudyListMeasureData')
+    },
+    async handleDelete() {
+      let message = this.$t('trials:reading:warnning:msg48')
+      // 判断该病灶的suvmax是否是最大的
+      const suvMax = this.getQuestionVal(20)
+      if (this.questionForm.RowId && !!suvMax) {
+        const res = await getIsSuvMaxLesion({ visitTaskId: this.visitTaskId, rowId: this.questionForm.RowId })
+        if (res.IsSuccess && res.Result.IsSuvMaxLesion) {
+          message = this.$t('trials:reading:warnning:msg58')
+        }
+      }
+      const confirm = await this.$confirm(
+        message,
+        {
+          type: 'warning',
+          distinguishCancelAndClose: true
+        }
+      )
+      if (confirm !== 'confirm') return
+      if (this.questionForm.RowId) {
+        const loading = this.$loading({ fullscreen: true })
+        var param = {
+          visitTaskId: this.visitTaskId,
+          questionId: this.parentQsId,
+          rowId: this.questionForm.RowId
+        }
+        try {
+          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)
+            DicomEvent.$emit('readingPageUpdate', {})
+            // '删除成功！'
+            this.$message.success(this.$t('common:message:deletedSuccessfully'))
+          }
+          loading.close()
+        } catch (e) {
+          console.log(e)
+          loading.close()
+        }
+      } 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')
+    },
+    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 {
+        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') {
+            if (this.answers.SplitOrMergeType !== '3') {
+              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{
+  ::v-deep .el-form-item__label{
+    color: #c3c3c3;
+  }
+  ::v-deep .el-input .el-input__inner{
+    background-color: transparent;
+    color: #ddd;
+    border: 1px solid #5e5e5e;
+  }
+  ::v-deep .el-form-item{
+    display: flex;
+    flex-direction: row;
+    justify-content: flex-start;
+    flex-wrap: wrap;
+  }
+  ::v-deep .el-form-item__content{
+    flex: 1;
+  }
+  ::v-deep .el-input.is-disabled .el-input__inner{
+    background-color: #646464a1;
+  }
+  ::v-deep .el-input-group__append, .el-input-group__prepend{
+    padding: 0 10px;
+  }
+  ::v-deep .el-select.is-disabled .el-input__inner{
+    background-color: #646464a1;
+  }
+  ::v-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;
+  }
+  .suv_viewer{
+    ::v-deep .viewer-play {
+      display: none;
+    }
+  }
+}
+
+</style>
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/LuganoWithoutPET/QuestionList.vue b/src/views/trials/trials-panel/reading/dicoms/components/LuganoWithoutPET/QuestionList.vue
new file mode 100644
index 00000000..97eeacd3
--- /dev/null
+++ b/src/views/trials/trials-panel/reading/dicoms/components/LuganoWithoutPET/QuestionList.vue
@@ -0,0 +1,1483 @@
+<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"
+          :group-classify="1"
+        /> -->
+        <Questions
+          ref="ecrf"
+          :question-form-change-state="true"
+          :question-form-change-num="0"
+          :is-qulity-issues="false"
+          :group-classify="1"
+        />
+      </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: item.LesionType === 1 && readingTaskState < 2?'58px':'50px',top: '2px'}">
+                        <!-- white-space: nowrap;overflow: hidden;text-overflow: ellipsis; -->
+
+                        <div style="font-size: 11px;width:210px;height: 30px;display: flex;justify-content: flex-start;flex-wrap: nowrap;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;">
+                          <el-tooltip v-if="item.TableQuestions.Answers[i].SplitOrMergeType === '1' || item.TableQuestions.Answers[i].SplitOrMergeType === '3'" class="item" effect="dark" :content="`${$t('trials:reading:message:fused')}${item.TableQuestions.Answers[i].SplitOrMergeLesionName}`" placement="bottom">
+                            <div v-if="item.TableQuestions.Answers[i].SplitOrMergeType === '1' || item.TableQuestions.Answers[i].SplitOrMergeType === '3'">
+                              <span class="login-cycle" />
+                            </div>
+                          </el-tooltip>
+                          <div v-if="item.TableQuestions.Answers[i].SplitOrMergeType === '4'">
+                            <span class="login-cycle" />
+                          </div>
+                          <el-tooltip v-if="!!item.TableQuestions.Answers[i].lesionPart" class="item" effect="dark" :content="item.TableQuestions.Answers[i].lesionPart" placement="bottom">
+                            <div v-if="item.TableQuestions.Answers[i].lesionPart" style="max-width: 100px;overflow: hidden;">
+                              {{ item.TableQuestions.Answers[i].lesionPart }}
+                            </div>
+                          </el-tooltip>
+                          <div v-if="item.LesionType === 0" style="margin:0 5px;">
+                            {{ $fd('TargetState',parseInt(item.TableQuestions.Answers[i].lesionState)) }}
+                          </div>
+                          <div v-else-if="item.LesionType === 1" style="margin:0 5px;">
+                            {{ $fd('NoTargetState',parseInt(item.TableQuestions.Answers[i].lesionState)) }}
+                          </div>
+                          <div v-else style="margin:0 5px;">
+                            {{ $fd('NewLesionState',parseInt(item.TableQuestions.Answers[i].lesionState)) }}
+                          </div>
+                          <div v-if="!isNaN(parseInt(item.TableQuestions.Answers[i].lesionLength))">
+                            <el-tooltip class="item" effect="dark" :content="`${item.TableQuestions.Answers[i].lesionLength}*${item.TableQuestions.Answers[i].lesionShort}m㎡`" placement="bottom">
+                              <span>{{ item.TableQuestions.Answers[i].lesionLength }}*{{ item.TableQuestions.Answers[i].lesionShort }}m㎡</span>
+                            </el-tooltip>
+                          </div>
+
+                        </div>
+                      </div>
+                      <div v-if="item.TableQuestions.Answers[i].IsCurrentTaskAdd === 'False' && readingTaskState < 2" style="position: absolute;right: 5px;top: 2px;">
+                        <!-- 分裂 -->
+                        <el-tooltip v-show="!!item.TableQuestions.Answers[i].RowId && item.TableQuestions.Answers[i].SplitOrMergeType !== '4' && ((item.LesionType === 0 && [0,4].includes(parseInt(item.TableQuestions.Answers[i].lesionState))) || (item.LesionType === 1 && [0,1].includes(parseInt(item.TableQuestions.Answers[i].lesionState))) || (item.LesionType === 2 && parseInt(item.TableQuestions.Answers[i].lesionState) === 0))" class="item" :content="$t('trials:reading:button:split')" placement="bottom">
+                          <i class="iconfont icon-24gl-split" style="color:#fff;font-size: 16px;" @click.stop="handleSplit(item.TableQuestions.Answers[i].RowId,item.Id)" />
+                        </el-tooltip>
+
+                        <!-- 融合 -->
+                        <el-tooltip v-show="!!item.TableQuestions.Answers[i].RowId && item.TableQuestions.Answers[i].SplitOrMergeType !== '2' && ((item.LesionType === 0 && [0,1,4].includes(parseInt(item.TableQuestions.Answers[i].lesionState))))" class="item" :content="$t('trials:reading:button:merge')" placement="bottom">
+                          <i class="iconfont icon-24gl-merge" style="color:#fff;font-size: 16px;" @click.stop="handleMerge(item.TableQuestions.Answers[i],item.Id,item.OrderMark)" />
+                        </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>
+      <!-- <el-divider /> -->
+      <!-- 肝脏评估 -->
+      <Questions
+        ref="ecrf2"
+        :question-form-change-state="true"
+        :question-form-change-num="0"
+        :group-classify="2"
+        :is-qulity-issues="false"
+        style="margin-top:20px"
+        :question-type="6"
+        @setNonTargetMeasurementStatus="setNonTargetMeasurementStatus"
+      />
+      <!-- 脾脏评估 -->
+      <Questions
+        ref="ecrf3"
+        :question-form-change-state="true"
+        :question-form-change-num="0"
+        :group-classify="3"
+        :is-qulity-issues="false"
+        :question-type="7"
+        @setNonTargetMeasurementStatus="setNonTargetMeasurementStatus"
+      />
+    </div>
+    <el-dialog
+      v-if="merge.visible"
+      v-loading="merge.loading"
+      :visible.sync="merge.visible"
+      :close-on-click-modal="false"
+      :title="$t('trials:reading:lugano:message:merge')"
+      width="500px"
+    >
+      <div class="merge-table">
+        <div class="merge-label">
+          <label>{{ $t('trials:reading:lugano:label:currentLesion') }}</label>
+          <span>{{ mergeInfo.lesionName }}</span>
+          <span style="margin-left:10px">{{ mergeInfo.lesionPart }}</span>
+        </div>
+        <div class="merge-label"><label>{{ $t('trials:reading:lugano:label:selectLesion') }}</label></div>
+        <el-table
+          :data="lesionData"
+          style="width: 450px"
+          size="small"
+          height="200"
+          @selection-change="handleSelectionChange"
+        >
+          <el-table-column
+            type="selection"
+            width="45"
+          />
+          <el-table-column
+            prop="OrderMarkName"
+            :label="$t('trials:reading:lugano:label:lesionNumber')"
+            width="100"
+          />
+          <el-table-column
+            prop="Part"
+            :label="$t('trials:reading:lugano:label:lesionLocation')"
+            min-width="120"
+            show-overflow-tooltip
+          />
+        </el-table>
+      </div>
+      <div slot="footer" style="text-align:right;">
+        <!-- 取消 -->
+        <el-button size="mini" @click="merge.visible = false">{{ $t('common:button:cancel') }}</el-button>
+        <!-- 确认 -->
+        <el-button
+          type="primary"
+          size="mini"
+          :disabled="mergeList.length === 0"
+          @click="confirmMerge"
+        >
+          {{ $t('common:button:confirm') }}</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+<script>
+import { splitLesion, getSplitPPdSum, getCanMergeLesion, mergeLesion } 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: '',
+      isNonTargetMeasurement: false,
+      splitTargetLesions: [],
+      lesionTypeQuestionId: '',
+      merge: { visible: false, loading: false },
+      lesionData: [],
+      mergeInfo: {},
+      mergeList: []
+    }
+  },
+  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)
+    })
+    DicomEvent.$on('refreshQuestions', async(obj) => {
+      var triald = this.$router.currentRoute.query.trialId
+      await store.dispatch('reading/refreshDicomReadingQuestionAnswer', { trialId: triald, visitTaskId: this.visitTaskId })
+      this.$nextTick(() => {
+        this.$refs['ecrf'].getQuestions(this.visitTaskId)
+        this.$refs['ecrf2'].getQuestions(this.visitTaskId)
+        this.$refs['ecrf3'].getQuestions(this.visitTaskId)
+      })
+    })
+    DicomEvent.$on('refreshSplitTargetLesionPDD', async(callback) => {
+      const res = await getSplitPPdSum({ visitTaskId: this.visitTaskId })
+      this.splitTargetLesions = res.Result
+      if (this.splitTargetLesions && this.splitTargetLesions.length > 0) {
+        this.splitTargetLesions.map(i => {
+          var refName = `${this.lesionTypeQuestionId}_${i.RowIndex}`
+          console.log(refName)
+          var params = {}
+          params.splitLesionTargetPPD = i.AllPPD
+          params.splitLesionTargetLDi = i.AllLDi
+          params.splitLesionTargetSDi = i.AllSDi
+          this.$refs[refName] && this.$refs[refName][0].initForm(params)
+        })
+      }
+      callback(true)
+    })
+  },
+  beforeDestroy() {
+    DicomEvent.$off('setCollapseActive')
+    DicomEvent.$off('changeLesionType')
+    DicomEvent.$off('getUnSaveTarget')
+    DicomEvent.$off('refreshQuestions')
+  },
+  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.$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()
+        }
+        if (!this.isBaseLineTask) {
+          const res = await getSplitPPdSum({ visitTaskId: this.visitTaskId })
+          this.splitTargetLesions = res.Result
+        }
+        this.questions = this.visitTaskList[i].ReadingQuestions
+        this.$nextTick(() => {
+          this.$refs['ecrf'].getQuestions(this.visitTaskId)
+          this.$refs['ecrf2'].getQuestions(this.visitTaskId)
+          this.$refs['ecrf3'].getQuestions(this.visitTaskId)
+          this.getTableQuestions()
+          this.tableQuestions.forEach(item => {
+            item.TableQuestions.Answers.forEach(i => {
+              var refName = `${item.Id}_${i.RowIndex}`
+              var params = {}
+              if (parseInt(i.LesionType) === 0) {
+                this.lesionTypeQuestionId = item.Id
+                var idx = this.splitTargetLesions.findIndex(v => v.RowId === i.RowId)
+                if (idx > -1) {
+                  params.splitLesionTargetPPD = this.splitTargetLesions[idx].AllPPD
+                  params.splitLesionTargetLDi = this.splitTargetLesions[idx].AllLDi
+                  params.splitLesionTargetSDi = this.splitTargetLesions[idx].AllSDi
+                }
+              }
+              this.$refs[refName] && this.$refs[refName][0].initForm(params)
+            })
+          })
+        })
+      }
+    },
+    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(async() => {
+            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
+            }
+            if (!this.isBaseLineTask) {
+              const res = await getSplitPPdSum({ visitTaskId: this.visitTaskId })
+              this.splitTargetLesions = res.Result
+            }
+            this.getTableQuestions()
+            this.$nextTick(() => {
+              this.tableQuestions.forEach(item => {
+                item.TableQuestions.Answers.forEach(i => {
+                  var refName = `${item.Id}_${i.RowIndex}`
+                  var params = {}
+                  if (parseInt(i.LesionType) === 0) {
+                    var idx = this.splitTargetLesions.findIndex(v => v.RowId === i.RowId)
+                    if (idx > -1) {
+                      params.splitLesionTargetPPD = this.splitTargetLesions[idx].AllPPD
+                      params.splitLesionTargetLDi = this.splitTargetLesions[idx].AllLDi
+                      params.splitLesionTargetSDi = this.splitTargetLesions[idx].AllSDi
+                    }
+                  }
+                  this.$refs[refName] && this.$refs[refName][0].initForm(params)
+                })
+              })
+            })
+          }) 
+          await store.dispatch('reading/refreshMeasuredData', this.visitTaskId)
+          DicomEvent.$emit('getMeasureData')
+          await store.dispatch('reading/refreshDicomReadingQuestionAnswer', { trialId: this.$route.query.trialId, visitTaskId: this.visitTaskId })
+          this.$refs['ecrf'].getQuestions(this.visitTaskId, true)
+          this.$refs['ecrf2'].getQuestions(this.visitTaskId, true)
+          this.$refs['ecrf3'].getQuestions(this.visitTaskId, true)
+          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)
+      }
+    },
+    // 融合
+    async handleMerge(answers, questionId, orderMark) {
+      this.lesionData = []
+      this.mergeList = []
+      this.merge.visible = true
+      this.mergeInfo.questionId = questionId
+      this.mergeInfo.mergeRowId = answers.RowId
+      this.mergeInfo.lesionName = this.getLesionName(orderMark, answers.RowIndex)
+      this.mergeInfo.lesionPart = answers.lesionPart
+      this.merge.loading = true
+      try {
+        const res = await getCanMergeLesion({ rowId: answers.RowId })
+        if (res.IsSuccess) {
+          this.lesionData = res.Result
+        }
+        this.merge.loading = false
+      } catch (e) {
+        console.log(e)
+        this.merge.loading = false
+      }
+    },
+    handleSelectionChange(val) {
+      this.mergeList = []
+      val.map(i => {
+        this.mergeList.push(i.RowId)
+      })
+    },
+    confirmMerge() {
+    // '融合后将无法撤销, 是否继续?'
+      this.$confirm(this.$t('trials:reading:lugano:warnning:fuse'), {
+        type: 'warning'
+      }).then(() => {
+        this.lesionMerge()
+      }).catch(() => {
+
+      })
+    },
+    async lesionMerge() {
+      this.merge.loading = true
+      try {
+        var params = {
+          visitTaskId: this.visitTaskId,
+          questionId: this.mergeInfo.questionId,
+          mergeMainRowId: this.mergeInfo.mergeRowId,
+          mergeRowIdList: this.mergeList
+        }
+        const res = await mergeLesion(params)
+        if (res.IsSuccess) {
+          this.merge.visible = false
+          DicomEvent.$emit('readingPageUpdate', {})
+          DicomEvent.$emit('getReportInfo', true)
+          DicomEvent.$emit('setMeasuredToolsPassive')
+          this.getReadingQuestionAndAnswer()
+        }
+        this.merge.loading = false
+      } catch (e) {
+        this.merge.loading = false
+        console.log(e)
+      }
+    },
+    isCanActiveTool(toolName) {
+      this.isNonTargetMeasurement = false
+      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 === 'RectangleRoi' || toolName === 'CircleROI')) {
+            return { isCanActiveTool: true, reason: '' }
+          } else if (!this.isBaseLineTask && (toolName === 'ArrowAnnotate' || toolName === 'Bidirectional' || toolName === 'RectangleRoi' || toolName === 'CircleROI')) {
+            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) {
+      console.log('checkToolCanActive')
+      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 !== 'Bidirectional') {
+            // ' 请使用长短径测量工具'
+            return { isCanActiveTool: false, reason: this.$t('trials:lugano:message:validTools9') }
+          } else if (this.$refs[refName][0].lesionType === 0 && toolName !== 'Bidirectional') {
+            // '请使用长短径测量工具'
+            return { isCanActiveTool: false, reason: this.$t('trials:lugano:message:validTools9') }
+          } 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 !== 'Bidirectional' && toolName !== 'RectangleRoi') {
+            // '请使用长短径测量工具或矩形工具'
+            return { isCanActiveTool: false, reason: this.$t('trials:lugano:message:validTools8') }
+          } else if (this.$refs[refName][0].lesionType === 1 && toolName !== 'Bidirectional' && toolName !== 'RectangleRoi') {
+            // '请使用长短径测量工具或矩形工具'
+            return { isCanActiveTool: false, reason: this.$t('trials:lugano:message:validTools8') }
+          } else if (toolName === 'ArrowAnnotate') {
+            return { isCanActiveTool: false, reason: this.$t('trials:reading:warnning:msg54') }
+          } else if (toolName === 'Length' && !isNaN(parseInt(this.$refs[refName][0].lesionType))) {
+            // '请使用长短径测量工具或矩形工具'
+            return { isCanActiveTool: false, reason: this.$t('trials:lugano:message:validTools8') }
+          } 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:lugano:message:validTools1') }
+          } else if (this.$refs[refName][0].lesionType === 0 && isLymphNodes === 0 && toolName !== 'Bidirectional' && toolName !== 'ArrowAnnotate') {
+            // 请使用长短径测量工具或箭头工具
+            return { isCanActiveTool: false, reason: this.$t('trials:lugano:message:validTools1') }
+          } else if (this.$refs[refName][0].lesionType === 0 && toolName !== 'Bidirectional' && toolName !== 'ArrowAnnotate') {
+            // 请使用长短径测量工具或箭头工具
+            return { isCanActiveTool: false, reason: this.$t('trials:lugano:message:validTools1') }
+          } 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 !== 'Bidirectional' && toolName !== 'ArrowAnnotate' && toolName !== 'RectangleRoi') {
+            // '请使用长短径测量工具或矩形工具或箭头工具进行淋巴结非靶病灶的标记。'
+            return { isCanActiveTool: false, reason: this.$t('trials:lugano:message:validTools2') }
+          } else if (this.$refs[refName][0].lesionType === 1 && toolName !== 'Bidirectional' && toolName !== 'ArrowAnnotate' && toolName !== 'RectangleRoi') {
+            // 请使用长短径测量工具或矩形工具或箭头工具进行非靶病灶的标记。
+            return { isCanActiveTool: false, reason: this.$t('trials:lugano:message:validTools3') }
+          } 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 !== 'Bidirectional' && toolName !== 'ArrowAnnotate') {
+            // '请使用长短径测量工具或箭头工具进行淋巴结非靶病灶的标记。'
+            return { isCanActiveTool: false, reason: this.$t('trials:lugano:message:validTools4') }
+          } else if (this.$refs[refName][0].lesionType === 2 && toolName !== 'Bidirectional' && toolName !== 'ArrowAnnotate') {
+            // '请使用长短径测量工具或箭头工具进行新病灶的标记。'
+            return { isCanActiveTool: false, reason: this.$t('trials:lugano:message:validTools5') }
+          } else if (toolName === 'Length' && !isNaN(parseInt(this.$refs[refName][0].lesionType))) {
+            // '请使用长短径测量工具或矩形工具或箭头工具。'
+            return { isCanActiveTool: false, reason: this.$t('trials:lugano:message:validTools6') }
+          } else {
+            return { isCanActiveTool: true, reason: '' }
+          }
+        }
+      } else {
+        if (toolName === 'Bidirectional' || toolName === 'RectangleRoi' || toolName === 'ArrowAnnotate') {
+          return { isCanActiveTool: true, reason: '' }
+        } else {
+          return { isCanActiveTool: false, 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 splitOrMergeType = this.$refs[refName][0].answers.SplitOrMergeType
+            var markTool = splitOrMergeType !== '3' ? 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
+        }
+      })
+
+      // 需要处理2D 和 3D的标记
+      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.measureData.data.remark === 'Spleen Top' || measureObj.measureData.data.remark === 'Spleen Bottom') {
+        this.$refs['ecrf3'].setMeasuredData(measureObj.measureData)
+        this.isNonTargetMeasurement = false
+      } else {
+        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.isNonTargetMeasurement || measureData.data.remark === 'Spleen Top' || measureData.data.remark === 'Spleen Bottom') {
+        this.$refs['ecrf3'].setMeasuredData(measureData)
+        this.isNonTargetMeasurement = false
+        return
+      }
+      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)) {
+            if (!this.$refs[refName][0].questionForm.MeasureData && this.$refs[refName][0].answers.SplitOrMergeType === '3') {
+              this.createNLTarget(measureData)
+            } else {
+              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 === '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 === 'Bidirectional')) {
+            this.createTTarget(measureData)
+          } else {
+            this.createNTTarget(measureData)
+          }
+        } else {
+          this.createNLTarget(measureData)
+        }
+      }
+    },
+    setNonTargetMeasurementStatus(obj) {
+      this.isNonTargetMeasurement = obj.status
+    },
+    async close(questionsObj) {
+      if (questionsObj) {
+        this.getReadingQuestionAndAnswer(questionsObj.visitTaskId)
+      }
+      this.activeItem.activeRowIndex = null
+      this.activeItem.activeCollapseId = null
+      this.activeName = ''
+    },
+    getECRFQuestions(obj) {
+      this.$nextTick(() => {
+        this.$refs['ecrf'].getQuestions(obj.visitTaskId)
+        this.$refs['ecrf2'].getQuestions(obj.visitTaskId)
+        this.$refs['ecrf3'].getQuestions(obj.visitTaskId)
+      })
+    },
+    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)
+      } else if (event.data.type === 'petctLesionUpdate') {
+        this.refreshQuestions()
+      }
+    },
+    async refreshQuestions() {
+      const loading = this.$loading({ fullscreen: true })
+      await store.dispatch('reading/refreshMeasuredData', this.visitTaskId)
+      await this.getReadingQuestionAndAnswer()
+      var triald = this.$router.currentRoute.query.trialId
+      await store.dispatch('reading/refreshDicomReadingQuestionAnswer', { trialId: triald, visitTaskId: this.visitTaskId })
+      this.$nextTick(() => {
+        this.$refs['ecrf'].getQuestions(this.visitTaskId)
+        this.$refs['ecrf2'].getQuestions(this.visitTaskId)
+        this.$refs['ecrf3'].getQuestions(this.visitTaskId)
+      })
+      DicomEvent.$emit('getReportInfo', true)
+      loading.close()
+    },
+    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 })
+        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)
+          this.$refs['ecrf2'].getQuestions(this.visitTaskId, true)
+          this.$refs['ecrf3'].getQuestions(this.visitTaskId, true)
+          DicomEvent.$emit('getMeasureData')
+          DicomEvent.$emit('getReportInfo', true)
+          DicomEvent.$emit('refreshStudyListMeasureData')
+          DicomEvent.$emit('resetPage', {})
+        }
+        loading.close()
+      } catch (e) {
+        loading.close()
+        console.log(e)
+      }
+    }
+
+  }
+}
+</script>
+<style lang="scss" scoped>
+.measurement-wrapper{
+  height: 100%;
+  overflow-y: auto;
+  .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;
+  }
+  .login-cycle{
+    width: 5px;
+    height: 5px;
+    display: inline-block;
+    background-color: #428bca;
+    border-radius: 50%;
+    margin-right: 2px;
+    margin-bottom: 2px;
+  }
+  .el-collapse{
+    border-bottom:none;
+    border-top:none;
+    ::v-deep .el-collapse-item{
+      background-color: #000!important;
+      color: #ddd;
+
+    }
+    ::v-deep .el-collapse-item__header{
+      background-color: #000!important;
+      color: #ddd;
+      border-bottom-color:#5a5a5a;
+      padding-left: 5px;
+      height: 35px;
+      line-height: 35px;
+    }
+    ::v-deep .el-collapse-item__wrap{
+      background-color: #000!important;
+      color: #ddd;
+    }
+    ::v-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;
+    }
+
+  }
+  .merge-table{
+    padding:0 10px;
+    ::v-deep.el-table{
+      background-color:  #1e1e1e !important;
+      color: #383838;
+    }
+    ::v-deep.el-table td.el-table__cell, .el-table th.el-table__cell.is-leaf{
+      border-bottom: 1px solid #383838;
+    }
+    .el-table--border::after, .el-table--group::after, .el-table::before{
+      background-color: #1e1e1e;
+    }
+    ::v-deep.el-table__header-wrapper{
+        th{
+          background-color:  #1e1e1e !important;
+          color: #dfdfdf;
+          border-bottom: 1px solid #383838;
+        }
+      }
+    ::v-deep.el-table__body-wrapper{
+      tr{
+        background-color:  #1e1e1e !important;
+        color: #dfdfdf;
+      }
+      tr:hover > td{
+        background-color:  #1e1e1e !important;
+      }
+    }
+    ::v-deep.el-table__empty-block{
+      background-color:  #1e1e1e !important;
+    }
+    .merge-label{
+      color:#ddd;
+      font-size: 13px;
+      margin-bottom: 10px;
+      span{
+        font-size: 15px;
+        color: red;
+      }
+    }
+  }
+}
+</style>
diff --git a/src/views/trials/trials-panel/reading/global-review/components/LuganoTable.vue b/src/views/trials/trials-panel/reading/global-review/components/LuganoTable.vue
index d72d689c..d34d241b 100644
--- a/src/views/trials/trials-panel/reading/global-review/components/LuganoTable.vue
+++ b/src/views/trials/trials-panel/reading/global-review/components/LuganoTable.vue
@@ -1,253 +1,173 @@
 <template>
   <el-form v-if="globalForm.taskList.length > 0" ref="globalRuleForm" :model="globalForm" class="global-form">
-    <el-table
-      v-loading="loading"
-      :data="globalForm.taskList"
-    >
+    <el-table v-loading="loading" :data="globalForm.taskList">
       <!-- 访视名称 -->
-      <el-table-column
-        prop="BlindName"
-        :label="$t('trials:globalReview:table:visitName')"
-        show-overflow-tooltip
-        width="150"
-      />
+      <el-table-column prop="BlindName" :label="$t('trials:globalReview:table:visitName')" show-overflow-tooltip
+        width="150" />
       <!-- 评估结果 -->
-      <el-table-column
-        :label="$t('trials:globalReview:table:evaluationRes')"
-        align="center"
-        prop=""
-      >
+      <el-table-column :label="$t('trials:globalReview:table:evaluationRes')" align="center" prop="">
         <template>
-          <el-table-column
-            v-for="(qs,index) in globalInfo.evaluationQsList"
-            :key="index"
-            prop=""
-            :label="qs"
-            show-overflow-tooltip
-            width="150"
-          >
+          <el-table-column v-for="(qs, index) in globalInfo.evaluationQsList" :key="index" prop="" :label="qs"
+            show-overflow-tooltip width="150">
             <template slot-scope="scope">
-              <template v-if="(scope.row.IsBaseLine && (scope.row.BeforeQuestionList[index].GlobalReadingShowType ===1 || scope.row.BeforeQuestionList[index].GlobalReadingShowType ===5)) || (!scope.row.IsBaseLine && (scope.row.BeforeQuestionList[index].GlobalReadingShowType ===2 || scope.row.BeforeQuestionList[index].GlobalReadingShowType ===6)) || (scope.row.BeforeQuestionList[index].GlobalReadingShowType ===0 || scope.row.BeforeQuestionList[index].GlobalReadingShowType ===4)">
-                <div v-if="scope.row.BeforeQuestionList.length>index && scope.row.BeforeQuestionList[index].Answer" :style="{color: scope.row.BeforeQuestionList[index].IsGlobalAnswer ? '#f66' : null}">
-                <span v-if="scope.row.BeforeQuestionList[index].DictionaryCode">
-                  {{ $fd(scope.row.BeforeQuestionList[index].DictionaryCode,parseInt(scope.row.BeforeQuestionList[index].Answer)) }}
-                </span>
-                <span v-else>{{ scope.row.BeforeQuestionList[index].Answer }}</span>
-              </div>
+              <template
+                v-if="(scope.row.IsBaseLine && (scope.row.BeforeQuestionList[index].GlobalReadingShowType === 1 || scope.row.BeforeQuestionList[index].GlobalReadingShowType === 5)) || (!scope.row.IsBaseLine && (scope.row.BeforeQuestionList[index].GlobalReadingShowType === 2 || scope.row.BeforeQuestionList[index].GlobalReadingShowType === 6)) || (scope.row.BeforeQuestionList[index].GlobalReadingShowType === 0 || scope.row.BeforeQuestionList[index].GlobalReadingShowType === 4)">
+                <div v-if="scope.row.BeforeQuestionList.length > index && scope.row.BeforeQuestionList[index].Answer"
+                  :style="{ color: scope.row.BeforeQuestionList[index].IsGlobalAnswer ? '#f66' : null }">
+                  <span v-if="scope.row.BeforeQuestionList[index].DictionaryCode">
+                    {{
+                      $fd(scope.row.BeforeQuestionList[index].DictionaryCode, parseInt(scope.row.BeforeQuestionList[index].Answer))
+                    }}
+                  </span>
+                  <span v-else>{{ scope.row.BeforeQuestionList[index].Answer }}</span>
+                </div>
               </template>
-              
+
             </template>
           </el-table-column>
         </template>
       </el-table-column>
       <!-- 是否同意访视结果 -->
-      <el-table-column
-        prop=""
-        :label="$t('trials:globalReview:table:isAgreeEvaluationRes')"
-        show-overflow-tooltip
-        width="170"
-      >
+      <el-table-column prop="" :label="$t('trials:globalReview:table:isAgreeEvaluationRes')" show-overflow-tooltip
+        width="170">
         <template slot-scope="scope">
-          <el-form-item
-            v-if="readingTaskState<2"
-            :prop="`${scope.$index}${scope.row.AgreeOrNot[0].GlobalAnswerType}`"
-            label=""
-            :rules="[
-              { required: true,message: $t('common:ruleMessage:select'), trigger: ['change','blur']},
-            ]"
-            class="form-item"
-          >
-            <el-radio-group
-              v-model="globalForm[`${scope.$index}${scope.row.AgreeOrNot[0].GlobalAnswerType}`]"
-              @change="handleAgreeOrNotChange(scope.$index,scope.row.AgreeOrNot[0].GlobalAnswerType)"
-            >
-              <el-radio
-                v-for="item of $d.ReadingYesOrNo"
-                :key="'AgreeOrNot' + item.value"
-                :label="String(item.value)"
-              >
+          <el-form-item v-if="readingTaskState < 2" :prop="`${scope.$index}${scope.row.AgreeOrNot[0].GlobalAnswerType}`"
+            label="" :rules="[
+              { required: true, message: $t('common:ruleMessage:select'), trigger: ['change', 'blur'] },
+            ]" class="form-item">
+            <el-radio-group v-model="globalForm[`${scope.$index}${scope.row.AgreeOrNot[0].GlobalAnswerType}`]"
+              @change="handleAgreeOrNotChange(scope.$index, scope.row.AgreeOrNot[0].GlobalAnswerType)">
+              <el-radio v-for="item of $d.ReadingYesOrNo" :key="'AgreeOrNot' + item.value" :label="String(item.value)">
                 {{ item.label }}
               </el-radio>
             </el-radio-group>
           </el-form-item>
 
-          <el-tag v-else-if="scope.row.AgreeOrNot.length > 0 && parseInt(scope.row.AgreeOrNot[0].Answer) === 1" type="primary">
-            {{ $fd('ReadingYesOrNo',parseInt(scope.row.AgreeOrNot[0].Answer)) }}
+          <el-tag v-else-if="scope.row.AgreeOrNot.length > 0 && parseInt(scope.row.AgreeOrNot[0].Answer) === 1"
+            type="primary">
+            {{ $fd('ReadingYesOrNo', parseInt(scope.row.AgreeOrNot[0].Answer)) }}
           </el-tag>
-          <el-tag v-else-if="scope.row.AgreeOrNot.length > 0 && parseInt(scope.row.AgreeOrNot[0].Answer) === 0" type="danger"> {{ $fd('ReadingYesOrNo',parseInt(scope.row.AgreeOrNot[0].Answer)) }}</el-tag>
+          <el-tag v-else-if="scope.row.AgreeOrNot.length > 0 && parseInt(scope.row.AgreeOrNot[0].Answer) === 0"
+            type="danger"> {{ $fd('ReadingYesOrNo', parseInt(scope.row.AgreeOrNot[0].Answer)) }}</el-tag>
           <span v-else />
         </template>
       </el-table-column>
 
       <!-- 调整后结果 -->
-      <el-table-column
-        :label="$t('trials:globalReview:table:adjustedRes')"
-        align="center"
-        prop=""
-      >
-        <template>
-          <el-table-column
-            v-for="(qs,index) in globalInfo.adjustedQsList"
-            v-if="qs.isShow"
-            :key="index"
-            prop=""
-            :label="qs.questionName"
-            show-overflow-tooltip
-            width="150"
-          >
+      <el-table-column :label="$t('trials:globalReview:table:adjustedRes')" align="center" prop="">
+        <template v-for="(qs, index) in globalInfo.adjustedQsList">
+          <el-table-column v-if="qs.isShow" :key="index" prop="" :label="qs.questionName" show-overflow-tooltip
+            width="150">
             <template slot-scope="scope">
-              <div v-if="readingTaskState<2 && (scope.row.AfterQuestionList[index].GlobalReadingShowType === 0 || (scope.row.IsBaseLine && scope.row.AfterQuestionList[index].GlobalReadingShowType === 1) || (!scope.row.IsBaseLine && scope.row.AfterQuestionList[index].GlobalReadingShowType === 2))">
+              <div
+                v-if="readingTaskState < 2 && (scope.row.AfterQuestionList[index].GlobalReadingShowType === 0 || (scope.row.IsBaseLine && scope.row.AfterQuestionList[index].GlobalReadingShowType === 1) || (!scope.row.IsBaseLine && scope.row.AfterQuestionList[index].GlobalReadingShowType === 2))">
                 <!-- <span v-if="(scope.row.IsBaseLine && scope.row.AfterQuestionList[index].LimitEdit === 2) || (!scope.row.IsBaseLine && scope.row.AfterQuestionList[index].LimitEdit === 1)">
                   {{ $fd(scope.row.AfterQuestionList[index].DictionaryCode, parseInt(scope.row.AfterQuestionList[index].VisitAnswer)) }}
                 </span> -->
 
-                <el-form-item
-                  style="margin-bottom: 0;"
-                  :prop="`${scope.$index}${scope.row.AfterQuestionList[index].QuestionId?scope.row.AfterQuestionList[index].QuestionId:scope.row.AfterQuestionList[index].GlobalAnswerType}`"
-                  label=""
-                  :rules="[
-                    { required:parseInt(globalForm[`${scope.$index}${scope.row.AgreeOrNot[0].GlobalAnswerType}`]) === 0,message: $t('common:ruleMessage:specify'), trigger: ['change','blur']},
-                  ]"
-                >
-                  <label v-if="parseInt(globalForm[`${scope.$index}${scope.row.AgreeOrNot[0].GlobalAnswerType}`]) === 0" />
+                <el-form-item style="margin-bottom: 0;"
+                  :prop="`${scope.$index}${scope.row.AfterQuestionList[index].QuestionId ? scope.row.AfterQuestionList[index].QuestionId : scope.row.AfterQuestionList[index].GlobalAnswerType}`"
+                  label="" :rules="[
+                    { required: parseInt(globalForm[`${scope.$index}${scope.row.AgreeOrNot[0].GlobalAnswerType}`]) === 0, message: $t('common:ruleMessage:specify'), trigger: ['change', 'blur'] },
+                  ]">
+                  <label
+                    v-if="parseInt(globalForm[`${scope.$index}${scope.row.AgreeOrNot[0].GlobalAnswerType}`]) === 0" />
                   <!-- 裁判问题 -->
-                  <template v-if="scope.row.AfterQuestionList[index].GlobalAnswerType === 0 ">
-                    <el-tooltip v-if="getText(globalForm[`${scope.$index}${scope.row.AfterQuestionList[index].QuestionId?scope.row.AfterQuestionList[index].QuestionId:String(scope.row.AfterQuestionList[index].GlobalAnswerType)}`], scope.row.AfterQuestionList[index])" class="item" effect="dark" :content="getText(globalForm[`${scope.$index}${scope.row.AfterQuestionList[index].QuestionId?scope.row.AfterQuestionList[index].QuestionId:String(scope.row.AfterQuestionList[index].GlobalAnswerType)}`], scope.row.AfterQuestionList[index])" placement="top-start">
+                  <template v-if="scope.row.AfterQuestionList[index].GlobalAnswerType === 0">
+                    <el-tooltip
+                      v-if="getText(globalForm[`${scope.$index}${scope.row.AfterQuestionList[index].QuestionId ? scope.row.AfterQuestionList[index].QuestionId : String(scope.row.AfterQuestionList[index].GlobalAnswerType)}`], scope.row.AfterQuestionList[index])"
+                      class="item" effect="dark"
+                      :content="getText(globalForm[`${scope.$index}${scope.row.AfterQuestionList[index].QuestionId ? scope.row.AfterQuestionList[index].QuestionId : String(scope.row.AfterQuestionList[index].GlobalAnswerType)}`], scope.row.AfterQuestionList[index])"
+                      placement="top-start">
                       <el-select
-                        v-model="globalForm[`${scope.$index}${scope.row.AfterQuestionList[index].QuestionId?scope.row.AfterQuestionList[index].QuestionId:String(scope.row.AfterQuestionList[index].GlobalAnswerType)}`]"
+                        v-model="globalForm[`${scope.$index}${scope.row.AfterQuestionList[index].QuestionId ? scope.row.AfterQuestionList[index].QuestionId : String(scope.row.AfterQuestionList[index].GlobalAnswerType)}`]"
                         style="width:90%;"
-                        :disabled="parseInt(globalForm[`${scope.$index}${scope.row.AgreeOrNot[0].GlobalAnswerType}`]) !== 0"
-                      >
+                        :disabled="parseInt(globalForm[`${scope.$index}${scope.row.AgreeOrNot[0].GlobalAnswerType}`]) !== 0">
                         <template v-if="scope.row.AfterQuestionList[index].TypeValue">
-                          <el-option
-                            v-for="val in scope.row.AfterQuestionList[index].TypeValue.split('|')"
-                            :key="val"
-                            :label="val"
-                            :value="val"
-                          />
+                          <el-option v-for="val in scope.row.AfterQuestionList[index].TypeValue.split('|')" :key="val"
+                            :label="val" :value="val" />
                         </template>
-                        <template v-else-if="scope.row.AfterQuestionList[index].DictionaryCode && scope.row.AfterQuestionList[index].QuestionType === 13">
-                          <el-option
-                            v-for="item of $d[scope.row.AfterQuestionList[index].DictionaryCode]"
-                            v-show="item.value!==-1"
-                            :key="item.id"
-                            :value="String(item.value)"
-                            :label="item.label"
-                            :disabled="String(getBeforeAnswer(scope.row.AfterQuestionList[index].QuestionName,scope.row)) === String(item.value)"
-                          />
+                        <template
+                          v-else-if="scope.row.AfterQuestionList[index].DictionaryCode && scope.row.AfterQuestionList[index].QuestionType === 13">
+                          <el-option v-for="item of $d[scope.row.AfterQuestionList[index].DictionaryCode]"
+                            v-show="item.value !== -1" :key="item.id" :value="String(item.value)" :label="item.label"
+                            :disabled="String(getBeforeAnswer(scope.row.AfterQuestionList[index].QuestionName, scope.row)) === String(item.value)" />
                         </template>
                         <template v-else-if="scope.row.AfterQuestionList[index].DictionaryCode">
-                          <el-option
-                            v-for="item of $d[scope.row.AfterQuestionList[index].DictionaryCode]"
-                            :key="item.id"
-                            :value="String(item.value)"
-                            :disabled="String(getBeforeAnswer(scope.row.AfterQuestionList[index].QuestionName,scope.row)) === String(item.value)"
-                            :label="item.label"
-                          />
+                          <el-option v-for="item of $d[scope.row.AfterQuestionList[index].DictionaryCode]"
+                            :key="item.id" :value="String(item.value)"
+                            :disabled="String(getBeforeAnswer(scope.row.AfterQuestionList[index].QuestionName, scope.row)) === String(item.value)"
+                            :label="item.label" />
                         </template>
                       </el-select>
                     </el-tooltip>
-                    <el-select
-                      v-else
-                      v-model="globalForm[`${scope.$index}${scope.row.AfterQuestionList[index].QuestionId?scope.row.AfterQuestionList[index].QuestionId:String(scope.row.AfterQuestionList[index].GlobalAnswerType)}`]"
+                    <el-select v-else
+                      v-model="globalForm[`${scope.$index}${scope.row.AfterQuestionList[index].QuestionId ? scope.row.AfterQuestionList[index].QuestionId : String(scope.row.AfterQuestionList[index].GlobalAnswerType)}`]"
                       style="width:90%;"
-                      :disabled="parseInt(globalForm[`${scope.$index}${scope.row.AgreeOrNot[0].GlobalAnswerType}`]) !== 0"
-                    >
+                      :disabled="parseInt(globalForm[`${scope.$index}${scope.row.AgreeOrNot[0].GlobalAnswerType}`]) !== 0">
                       <template v-if="scope.row.AfterQuestionList[index].TypeValue">
-                        <el-option
-                          v-for="val in scope.row.AfterQuestionList[index].TypeValue.split('|')"
-                          :key="val"
-                          :label="val"
-                          :value="val"
-                        />
+                        <el-option v-for="val in scope.row.AfterQuestionList[index].TypeValue.split('|')" :key="val"
+                          :label="val" :value="val" />
                       </template>
-                      <template v-else-if="scope.row.AfterQuestionList[index].DictionaryCode && scope.row.AfterQuestionList[index].QuestionType === 13">
-                        <template v-if="getLesionCount(scope.row.LesionCountList,0)">
-                          <el-option
-                            v-for="item of $d[scope.row.AfterQuestionList[index].DictionaryCode]"
-                            v-show="item.value!==-1 && item.value !== 1 && item.value !== 3"
-                            :key="item.id"
-                            :value="String(item.value)"
-                            :label="item.label"
-                            :disabled="String(getBeforeAnswer(scope.row.AfterQuestionList[index].QuestionName,scope.row)) === String(item.value)"
-                          />
+                      <template
+                        v-else-if="scope.row.AfterQuestionList[index].DictionaryCode && scope.row.AfterQuestionList[index].QuestionType === 13">
+                        <template v-if="getLesionCount(scope.row.LesionCountList, 0)">
+                          <el-option v-for="item of $d[scope.row.AfterQuestionList[index].DictionaryCode]"
+                            v-show="item.value !== -1 && item.value !== 1 && item.value !== 3" :key="item.id"
+                            :value="String(item.value)" :label="item.label"
+                            :disabled="String(getBeforeAnswer(scope.row.AfterQuestionList[index].QuestionName, scope.row)) === String(item.value)" />
                         </template>
-                        <template v-else-if="getLesionCount(scope.row.LesionCountList,1)">
-                          <el-option
-                            v-for="item of $d[scope.row.AfterQuestionList[index].DictionaryCode]"
-                            v-show="item.value!==-1 && item.value !== 1 && item.value !== 6"
-                            :key="item.id"
-                            :value="String(item.value)"
-                            :label="item.label"
-                            :disabled="String(getBeforeAnswer(scope.row.AfterQuestionList[index].QuestionName,scope.row)) === String(item.value)"
-                          />
+                        <template v-else-if="getLesionCount(scope.row.LesionCountList, 1)">
+                          <el-option v-for="item of $d[scope.row.AfterQuestionList[index].DictionaryCode]"
+                            v-show="item.value !== -1 && item.value !== 1 && item.value !== 6" :key="item.id"
+                            :value="String(item.value)" :label="item.label"
+                            :disabled="String(getBeforeAnswer(scope.row.AfterQuestionList[index].QuestionName, scope.row)) === String(item.value)" />
                         </template>
                         <template v-else>
-                          <el-option
-                            v-for="item of $d[scope.row.AfterQuestionList[index].DictionaryCode]"
-                            v-show="item.value === 1 || item.value === 2 || item.value === 4"
-                            :key="item.id"
-                            :value="String(item.value)"
-                            :label="item.label"
-                            :disabled="String(getBeforeAnswer(scope.row.AfterQuestionList[index].QuestionName,scope.row)) === String(item.value)"
-                          />
+                          <el-option v-for="item of $d[scope.row.AfterQuestionList[index].DictionaryCode]"
+                            v-show="item.value === 1 || item.value === 2 || item.value === 4" :key="item.id"
+                            :value="String(item.value)" :label="item.label"
+                            :disabled="String(getBeforeAnswer(scope.row.AfterQuestionList[index].QuestionName, scope.row)) === String(item.value)" />
                         </template>
 
                       </template>
                       <template v-else-if="scope.row.AfterQuestionList[index].DictionaryCode">
-                        <el-option
-                          v-for="item of $d[scope.row.AfterQuestionList[index].DictionaryCode]"
-                          v-show="item.value !== 6"
-                          :key="item.id"
-                          :value="String(item.value)"
-                          :disabled="String(getBeforeAnswer(scope.row.AfterQuestionList[index].QuestionName,scope.row)) === String(item.value)"
-                          :label="item.label"
-                        />
+                        <el-option v-for="item of $d[scope.row.AfterQuestionList[index].DictionaryCode]"
+                          v-show="item.value !== 6" :key="item.id" :value="String(item.value)"
+                          :disabled="String(getBeforeAnswer(scope.row.AfterQuestionList[index].QuestionName, scope.row)) === String(item.value)"
+                          :label="item.label" />
                       </template>
                     </el-select>
                   </template>
                   <!-- 评估更新类型 GlobalAnswerType:3 -->
                   <template v-if="scope.row.AfterQuestionList[index].GlobalAnswerType === 3">
-                    <el-tooltip v-if="getText(globalForm[`${scope.$index}${scope.row.AfterQuestionList[index].GlobalAnswerType}`], scope.row.AfterQuestionList[index], scope.row.AfterQuestionList[index].GlobalAnswerType)" class="item" effect="dark" :content="getText(globalForm[`${scope.$index}${scope.row.AfterQuestionList[index].GlobalAnswerType}`], scope.row.AfterQuestionList[index], scope.row.AfterQuestionList[index].GlobalAnswerType)" placement="top-start">
+                    <el-tooltip
+                      v-if="getText(globalForm[`${scope.$index}${scope.row.AfterQuestionList[index].GlobalAnswerType}`], scope.row.AfterQuestionList[index], scope.row.AfterQuestionList[index].GlobalAnswerType)"
+                      class="item" effect="dark"
+                      :content="getText(globalForm[`${scope.$index}${scope.row.AfterQuestionList[index].GlobalAnswerType}`], scope.row.AfterQuestionList[index], scope.row.AfterQuestionList[index].GlobalAnswerType)"
+                      placement="top-start">
                       <el-select
                         v-model="globalForm[`${scope.$index}${scope.row.AfterQuestionList[index].GlobalAnswerType}`]"
                         style="width:90%;"
-                        :disabled="parseInt(globalForm[`${scope.$index}${scope.row.AgreeOrNot[0].GlobalAnswerType}`]) !== 0"
-                      >
-                        <el-option
-                          v-for="val in globalInfo.assessTypeList"
+                        :disabled="parseInt(globalForm[`${scope.$index}${scope.row.AgreeOrNot[0].GlobalAnswerType}`]) !== 0">
+                        <el-option v-for="val in globalInfo.assessTypeList"
                           v-show="(scope.row.IsBaseLine && val.IsBaseLineUse) || (!scope.row.IsBaseLine && val.IsFollowVisitUse)"
-                          :key="val.Code"
-                          :label="language === 'en'?val.Value:val.ValueCN"
-                          :value="val.Code"
-                        />
+                          :key="val.Code" :label="language === 'en' ? val.Value : val.ValueCN" :value="val.Code" />
                       </el-select>
                     </el-tooltip>
-                    <el-select
-                      v-else
+                    <el-select v-else
                       v-model="globalForm[`${scope.$index}${scope.row.AfterQuestionList[index].GlobalAnswerType}`]"
                       style="width:90%;"
-                      :disabled="parseInt(globalForm[`${scope.$index}${scope.row.AgreeOrNot[0].GlobalAnswerType}`]) !== 0"
-                    >
-                      <el-option
-                        v-for="val in globalInfo.assessTypeList"
+                      :disabled="parseInt(globalForm[`${scope.$index}${scope.row.AgreeOrNot[0].GlobalAnswerType}`]) !== 0">
+                      <el-option v-for="val in globalInfo.assessTypeList"
                         v-show="(scope.row.IsBaseLine && val.IsBaseLineUse) || (!scope.row.IsBaseLine && val.IsFollowVisitUse)"
-                        :key="val.Code"
-                        :label="language === 'en'?val.Value:val.ValueCN"
-                        :value="val.Code"
-                      />
+                        :key="val.Code" :label="language === 'en' ? val.Value : val.ValueCN" :value="val.Code" />
                     </el-select>
                   </template>
-                  <el-input
-                    v-if="scope.row.AfterQuestionList[index].GlobalAnswerType === 1"
-                    v-model="globalForm[`${scope.$index}${scope.row.AfterQuestionList[index].QuestionId?scope.row.AfterQuestionList[index].QuestionId:String(scope.row.AfterQuestionList[index].GlobalAnswerType)}`]"
-                    type="textarea"
-                    maxlength="100"
-                    show-word-limit
-                    style="width:90%;"
-                    :autosize="{ minRows: 2 }"
-                    :disabled="parseInt(globalForm[`${scope.$index}${scope.row.AgreeOrNot[0].GlobalAnswerType}`]) !== 0"
-                  />
+                  <el-input v-if="scope.row.AfterQuestionList[index].GlobalAnswerType === 1"
+                    v-model="globalForm[`${scope.$index}${scope.row.AfterQuestionList[index].QuestionId ? scope.row.AfterQuestionList[index].QuestionId : String(scope.row.AfterQuestionList[index].GlobalAnswerType)}`]"
+                    type="textarea" maxlength="100" show-word-limit style="width:90%;" :autosize="{ minRows: 2 }"
+                    :disabled="parseInt(globalForm[`${scope.$index}${scope.row.AgreeOrNot[0].GlobalAnswerType}`]) !== 0" />
                 </el-form-item>
               </div>
               <div v-else>
@@ -255,7 +175,9 @@
                   {{ getAssessType(scope.row.AfterQuestionList[index].Answer) }}
                 </span>
                 <span v-else-if="scope.row.AfterQuestionList[index].DictionaryCode">
-                  {{ $fd(scope.row.AfterQuestionList[index].DictionaryCode,parseInt(scope.row.AfterQuestionList[index].Answer)) }}
+                  {{
+                    $fd(scope.row.AfterQuestionList[index].DictionaryCode, parseInt(scope.row.AfterQuestionList[index].Answer))
+                  }}
                 </span>
                 <span v-else>{{ scope.row.AfterQuestionList[index].Answer }}</span>
               </div>
@@ -282,18 +204,10 @@
           </el-table-column>
         </template>
       </el-table-column>
-      <el-table-column
-        :label="$t('common:action:action')"
-        min-width="150"
-        fixed="right"
-      >
+      <el-table-column :label="$t('common:action:action')" min-width="150" fixed="right">
         <template slot-scope="scope">
-          <el-button
-            circle
-            :title="$t('trials:globalReview:table:view')"
-            icon="el-icon-view"
-            @click="handleView(scope.row)"
-          />
+          <el-button circle :title="$t('trials:globalReview:table:view')" icon="el-icon-view"
+            @click="handleView(scope.row)" />
         </template>
       </el-table-column>
     </el-table>
@@ -362,7 +276,7 @@ export default {
       var isReadingTaskViewInOrder = this.$router.currentRoute.query.isReadingTaskViewInOrder
       var trialReadingCriterionId = this.$router.currentRoute.query.TrialReadingCriterionId
       var path = ''
-      if (readingTool === 0 || readingTool === 2 ) {
+      if (readingTool === 0 || readingTool === 2) {
         path = `/readingDicoms?TrialReadingCriterionId=${trialReadingCriterionId}&trialId=${this.globalInfo.trialId}&subjectCode=${this.globalInfo.subjectCode}&subjectId=${this.globalInfo.subjectId}&visitTaskId=${visitTaskId}&isReadingTaskViewInOrder=${isReadingTaskViewInOrder}&criterionType=${criterionType}&readingTool=${readingTool}&TokenKey=${token}`
       } else {
         path = `/noneDicomReading?trialId=${this.globalInfo.trialId}&subjectCode=${this.globalInfo.subjectCode}&subjectId=${this.globalInfo.subjectId}&visitTaskId=${visitTaskId}&isReadingTaskViewInOrder=${isReadingTaskViewInOrder}&criterionType=${criterionType}&readingTool=${readingTool}&TokenKey=${token}`
@@ -389,16 +303,18 @@ export default {
                 if (i.QuestionId) {
                   obj.questionId = i.QuestionId
                   obj.globalAnswerType = i.GlobalAnswerType
-                  obj.answer = this.globalForm[ `${index}${i.QuestionId}`]
+                  obj.answer = this.globalForm[`${index}${i.QuestionId}`]
                 } else {
                   obj.questionId = ''
                   obj.globalAnswerType = i.GlobalAnswerType
-                  obj.answer = this.globalForm[ `${index}${i.GlobalAnswerType}`]
+                  obj.answer = this.globalForm[`${index}${i.GlobalAnswerType}`]
                 }
                 answerList.push(obj)
               })
-              answerList.push({ questionId: '', globalAnswerType: item.AgreeOrNot[0].GlobalAnswerType,
-                answer: this.globalForm[ `${index}${item.AgreeOrNot[0].GlobalAnswerType}`] })
+              answerList.push({
+                questionId: '', globalAnswerType: item.AgreeOrNot[0].GlobalAnswerType,
+                answer: this.globalForm[`${index}${item.AgreeOrNot[0].GlobalAnswerType}`]
+              })
 
               visitTaskAnswerList.push({ visitTaskId: item.VisitTaskId, answerList: answerList })
             })
@@ -415,17 +331,17 @@ export default {
             }
             this.$emit('getGlInfo')
             resolve(true)
-            
+
           } else {
             resolve(false)
           }
-        } catch(e) {
+        } catch (e) {
           console.log(e)
           this.loading = false
           resolve(false)
-        } 
-        
-        
+        }
+
+
       })
     },
     getBeforeAnswer(qsId, row) {
@@ -471,22 +387,26 @@ export default {
 
 <style lang="scss" scoped>
 ::v-deep .el-form-item label:before {
-    content: '*';
-    color: #F56C6C;
-    margin-right: 4px;
+  content: '*';
+  color: #F56C6C;
+  margin-right: 4px;
 }
-::v-deep .el-textarea .el-input__count{
-  background: rgba(0,0,0,0);
+
+::v-deep .el-textarea .el-input__count {
+  background: rgba(0, 0, 0, 0);
   line-height: normal;
 }
-::v-deep .el-form-item{
+
+::v-deep .el-form-item {
   margin-bottom: 0px;
 }
-.global-form{
-  ::v-deep .el-form-item__content{
+
+.global-form {
+  ::v-deep .el-form-item__content {
     padding-bottom: 10px;
   }
-  ::v-deep .form-item .el-form-item__error{
+
+  ::v-deep .form-item .el-form-item__error {
     top: 60%;
   }
 }
diff --git a/src/views/trials/trials-panel/reading/global-review/components/LuganoWithoutPETTable.vue b/src/views/trials/trials-panel/reading/global-review/components/LuganoWithoutPETTable.vue
new file mode 100644
index 00000000..2f83ef37
--- /dev/null
+++ b/src/views/trials/trials-panel/reading/global-review/components/LuganoWithoutPETTable.vue
@@ -0,0 +1,427 @@
+<template>
+    <el-form v-if="globalForm.taskList.length > 0" ref="globalRuleForm" :model="globalForm" class="global-form">
+        <el-table v-loading="loading" :data="globalForm.taskList">
+            <!-- 访视名称 -->
+            <el-table-column prop="BlindName" :label="$t('trials:globalReview:table:visitName')" show-overflow-tooltip
+                width="150" />
+            <!-- 评估结果 -->
+            <el-table-column :label="$t('trials:globalReview:table:evaluationRes')" align="center" prop="">
+                <template>
+                    <el-table-column v-for="(qs, index) in globalInfo.evaluationQsList" :key="index" prop="" :label="qs"
+                        show-overflow-tooltip width="150">
+                        <template slot-scope="scope">
+                            <template
+                                v-if="(scope.row.IsBaseLine && (scope.row.BeforeQuestionList[index].GlobalReadingShowType === 1 || scope.row.BeforeQuestionList[index].GlobalReadingShowType === 5)) || (!scope.row.IsBaseLine && (scope.row.BeforeQuestionList[index].GlobalReadingShowType === 2 || scope.row.BeforeQuestionList[index].GlobalReadingShowType === 6)) || (scope.row.BeforeQuestionList[index].GlobalReadingShowType === 0 || scope.row.BeforeQuestionList[index].GlobalReadingShowType === 4)">
+                                <div v-if="scope.row.BeforeQuestionList.length > index && scope.row.BeforeQuestionList[index].Answer"
+                                    :style="{ color: scope.row.BeforeQuestionList[index].IsGlobalAnswer ? '#f66' : null }">
+                                    <span v-if="scope.row.BeforeQuestionList[index].DictionaryCode">
+                                        {{
+                                            $fd(scope.row.BeforeQuestionList[index].DictionaryCode,
+                                                parseInt(scope.row.BeforeQuestionList[index].Answer))
+                                        }}
+                                    </span>
+                                    <span v-else>{{ scope.row.BeforeQuestionList[index].Answer }}</span>
+                                </div>
+                            </template>
+
+                        </template>
+                    </el-table-column>
+                </template>
+            </el-table-column>
+            <!-- 是否同意访视结果 -->
+            <el-table-column prop="" :label="$t('trials:globalReview:table:isAgreeEvaluationRes')" show-overflow-tooltip
+                width="170">
+                <template slot-scope="scope">
+                    <el-form-item v-if="readingTaskState < 2"
+                        :prop="`${scope.$index}${scope.row.AgreeOrNot[0].GlobalAnswerType}`" label="" :rules="[
+                            { required: true, message: $t('common:ruleMessage:select'), trigger: ['change', 'blur'] },
+                        ]" class="form-item">
+                        <el-radio-group
+                            v-model="globalForm[`${scope.$index}${scope.row.AgreeOrNot[0].GlobalAnswerType}`]"
+                            @change="handleAgreeOrNotChange(scope.$index, scope.row.AgreeOrNot[0].GlobalAnswerType)">
+                            <el-radio v-for="item of $d.ReadingYesOrNo" :key="'AgreeOrNot' + item.value"
+                                :label="String(item.value)">
+                                {{ item.label }}
+                            </el-radio>
+                        </el-radio-group>
+                    </el-form-item>
+
+                    <el-tag
+                        v-else-if="scope.row.AgreeOrNot.length > 0 && parseInt(scope.row.AgreeOrNot[0].Answer) === 1"
+                        type="primary">
+                        {{ $fd('ReadingYesOrNo', parseInt(scope.row.AgreeOrNot[0].Answer)) }}
+                    </el-tag>
+                    <el-tag
+                        v-else-if="scope.row.AgreeOrNot.length > 0 && parseInt(scope.row.AgreeOrNot[0].Answer) === 0"
+                        type="danger"> {{ $fd('ReadingYesOrNo', parseInt(scope.row.AgreeOrNot[0].Answer)) }}</el-tag>
+                    <span v-else />
+                </template>
+            </el-table-column>
+
+            <!-- 调整后结果 -->
+            <el-table-column :label="$t('trials:globalReview:table:adjustedRes')" align="center" prop="">
+                <template v-for="(qs, index) in globalInfo.adjustedQsList">
+                    <el-table-column v-if="qs.isShow" :key="index" prop="" :label="qs.questionName"
+                        show-overflow-tooltip width="150">
+                        <template slot-scope="scope">
+                            <div
+                                v-if="readingTaskState < 2 && (scope.row.AfterQuestionList[index].GlobalReadingShowType === 0 || (scope.row.IsBaseLine && scope.row.AfterQuestionList[index].GlobalReadingShowType === 1) || (!scope.row.IsBaseLine && scope.row.AfterQuestionList[index].GlobalReadingShowType === 2))">
+                                <el-form-item style="margin-bottom: 0;"
+                                    :prop="`${scope.$index}${scope.row.AfterQuestionList[index].QuestionId ? scope.row.AfterQuestionList[index].QuestionId : scope.row.AfterQuestionList[index].GlobalAnswerType}`"
+                                    label="" :rules="[
+                                        { required: parseInt(globalForm[`${scope.$index}${scope.row.AgreeOrNot[0].GlobalAnswerType}`]) === 0, message: $t('common:ruleMessage:specify'), trigger: ['change', 'blur'] },
+                                    ]">
+                                    <label
+                                        v-if="parseInt(globalForm[`${scope.$index}${scope.row.AgreeOrNot[0].GlobalAnswerType}`]) === 0" />
+                                    <!-- 裁判问题 -->
+                                    <template v-if="scope.row.AfterQuestionList[index].GlobalAnswerType === 0">
+                                        <el-tooltip
+                                            v-if="getText(globalForm[`${scope.$index}${scope.row.AfterQuestionList[index].QuestionId ? scope.row.AfterQuestionList[index].QuestionId : String(scope.row.AfterQuestionList[index].GlobalAnswerType)}`], scope.row.AfterQuestionList[index])"
+                                            class="item" effect="dark"
+                                            :content="getText(globalForm[`${scope.$index}${scope.row.AfterQuestionList[index].QuestionId ? scope.row.AfterQuestionList[index].QuestionId : String(scope.row.AfterQuestionList[index].GlobalAnswerType)}`], scope.row.AfterQuestionList[index])"
+                                            placement="top-start">
+                                            <el-select
+                                                v-model="globalForm[`${scope.$index}${scope.row.AfterQuestionList[index].QuestionId ? scope.row.AfterQuestionList[index].QuestionId : String(scope.row.AfterQuestionList[index].GlobalAnswerType)}`]"
+                                                style="width:90%;"
+                                                :disabled="parseInt(globalForm[`${scope.$index}${scope.row.AgreeOrNot[0].GlobalAnswerType}`]) !== 0">
+                                                <template v-if="scope.row.AfterQuestionList[index].TypeValue">
+                                                    <el-option
+                                                        v-for="val in scope.row.AfterQuestionList[index].TypeValue.split('|')"
+                                                        :key="val" :label="val" :value="val" />
+                                                </template>
+                                                <template
+                                                    v-else-if="scope.row.AfterQuestionList[index].DictionaryCode && scope.row.AfterQuestionList[index].QuestionType === 13">
+                                                    <el-option
+                                                        v-for="item of $d[scope.row.AfterQuestionList[index].DictionaryCode]"
+                                                        v-show="item.value !== -1" :key="item.id"
+                                                        :value="String(item.value)" :label="item.label"
+                                                        :disabled="String(getBeforeAnswer(scope.row.AfterQuestionList[index].QuestionName, scope.row)) === String(item.value)" />
+                                                </template>
+                                                <template v-else-if="scope.row.AfterQuestionList[index].DictionaryCode">
+                                                    <el-option
+                                                        v-for="item of $d[scope.row.AfterQuestionList[index].DictionaryCode]"
+                                                        :key="item.id" :value="String(item.value)"
+                                                        :disabled="String(getBeforeAnswer(scope.row.AfterQuestionList[index].QuestionName, scope.row)) === String(item.value)"
+                                                        :label="item.label" />
+                                                </template>
+                                            </el-select>
+                                        </el-tooltip>
+                                        <el-select v-else
+                                            v-model="globalForm[`${scope.$index}${scope.row.AfterQuestionList[index].QuestionId ? scope.row.AfterQuestionList[index].QuestionId : String(scope.row.AfterQuestionList[index].GlobalAnswerType)}`]"
+                                            style="width:90%;"
+                                            :disabled="parseInt(globalForm[`${scope.$index}${scope.row.AgreeOrNot[0].GlobalAnswerType}`]) !== 0">
+                                            <template v-if="scope.row.AfterQuestionList[index].TypeValue">
+                                                <el-option
+                                                    v-for="val in scope.row.AfterQuestionList[index].TypeValue.split('|')"
+                                                    :key="val" :label="val" :value="val" />
+                                            </template>
+                                            <template
+                                                v-else-if="scope.row.AfterQuestionList[index].DictionaryCode && scope.row.AfterQuestionList[index].QuestionType === 13">
+                                                <template v-if="getLesionCount(scope.row.LesionCountList, 0)">
+                                                    <el-option
+                                                        v-for="item of $d[scope.row.AfterQuestionList[index].DictionaryCode]"
+                                                        v-show="item.value !== -1 && item.value !== 1 && item.value !== 3"
+                                                        :key="item.id" :value="String(item.value)" :label="item.label"
+                                                        :disabled="String(getBeforeAnswer(scope.row.AfterQuestionList[index].QuestionName, scope.row)) === String(item.value)" />
+                                                </template>
+                                                <template v-else-if="getLesionCount(scope.row.LesionCountList, 1)">
+                                                    <el-option
+                                                        v-for="item of $d[scope.row.AfterQuestionList[index].DictionaryCode]"
+                                                        v-show="item.value !== -1 && item.value !== 1 && item.value !== 6"
+                                                        :key="item.id" :value="String(item.value)" :label="item.label"
+                                                        :disabled="String(getBeforeAnswer(scope.row.AfterQuestionList[index].QuestionName, scope.row)) === String(item.value)" />
+                                                </template>
+                                                <template v-else>
+                                                    <el-option
+                                                        v-for="item of $d[scope.row.AfterQuestionList[index].DictionaryCode]"
+                                                        v-show="item.value === 1 || item.value === 2 || item.value === 4"
+                                                        :key="item.id" :value="String(item.value)" :label="item.label"
+                                                        :disabled="String(getBeforeAnswer(scope.row.AfterQuestionList[index].QuestionName, scope.row)) === String(item.value)" />
+                                                </template>
+
+                                            </template>
+                                            <template v-else-if="scope.row.AfterQuestionList[index].DictionaryCode">
+                                                <el-option
+                                                    v-for="item of $d[scope.row.AfterQuestionList[index].DictionaryCode]"
+                                                    v-show="item.value !== 6" :key="item.id" :value="String(item.value)"
+                                                    :disabled="String(getBeforeAnswer(scope.row.AfterQuestionList[index].QuestionName, scope.row)) === String(item.value)"
+                                                    :label="item.label" />
+                                            </template>
+                                        </el-select>
+                                    </template>
+                                    <!-- 评估更新类型 GlobalAnswerType:3 -->
+                                    <template v-if="scope.row.AfterQuestionList[index].GlobalAnswerType === 3">
+                                        <el-tooltip
+                                            v-if="getText(globalForm[`${scope.$index}${scope.row.AfterQuestionList[index].GlobalAnswerType}`], scope.row.AfterQuestionList[index], scope.row.AfterQuestionList[index].GlobalAnswerType)"
+                                            class="item" effect="dark"
+                                            :content="getText(globalForm[`${scope.$index}${scope.row.AfterQuestionList[index].GlobalAnswerType}`], scope.row.AfterQuestionList[index], scope.row.AfterQuestionList[index].GlobalAnswerType)"
+                                            placement="top-start">
+                                            <el-select
+                                                v-model="globalForm[`${scope.$index}${scope.row.AfterQuestionList[index].GlobalAnswerType}`]"
+                                                style="width:90%;"
+                                                :disabled="parseInt(globalForm[`${scope.$index}${scope.row.AgreeOrNot[0].GlobalAnswerType}`]) !== 0">
+                                                <el-option v-for="val in globalInfo.assessTypeList"
+                                                    v-show="(scope.row.IsBaseLine && val.IsBaseLineUse) || (!scope.row.IsBaseLine && val.IsFollowVisitUse)"
+                                                    :key="val.Code" :label="language === 'en' ? val.Value : val.ValueCN"
+                                                    :value="val.Code" />
+                                            </el-select>
+                                        </el-tooltip>
+                                        <el-select v-else
+                                            v-model="globalForm[`${scope.$index}${scope.row.AfterQuestionList[index].GlobalAnswerType}`]"
+                                            style="width:90%;"
+                                            :disabled="parseInt(globalForm[`${scope.$index}${scope.row.AgreeOrNot[0].GlobalAnswerType}`]) !== 0">
+                                            <el-option v-for="val in globalInfo.assessTypeList"
+                                                v-show="(scope.row.IsBaseLine && val.IsBaseLineUse) || (!scope.row.IsBaseLine && val.IsFollowVisitUse)"
+                                                :key="val.Code" :label="language === 'en' ? val.Value : val.ValueCN"
+                                                :value="val.Code" />
+                                        </el-select>
+                                    </template>
+                                    <el-input v-if="scope.row.AfterQuestionList[index].GlobalAnswerType === 1"
+                                        v-model="globalForm[`${scope.$index}${scope.row.AfterQuestionList[index].QuestionId ? scope.row.AfterQuestionList[index].QuestionId : String(scope.row.AfterQuestionList[index].GlobalAnswerType)}`]"
+                                        type="textarea" maxlength="100" show-word-limit style="width:90%;"
+                                        :autosize="{ minRows: 2 }"
+                                        :disabled="parseInt(globalForm[`${scope.$index}${scope.row.AgreeOrNot[0].GlobalAnswerType}`]) !== 0" />
+                                </el-form-item>
+                            </div>
+                            <div v-else>
+                                <span v-if="scope.row.AfterQuestionList[index].GlobalAnswerType === 3">
+                                    {{ getAssessType(scope.row.AfterQuestionList[index].Answer) }}
+                                </span>
+                                <span v-else-if="scope.row.AfterQuestionList[index].DictionaryCode">
+                                    {{
+                                        $fd(scope.row.AfterQuestionList[index].DictionaryCode,
+                                            parseInt(scope.row.AfterQuestionList[index].Answer))
+                                    }}
+                                </span>
+                                <span v-else>{{ scope.row.AfterQuestionList[index].Answer }}</span>
+                            </div>
+                            <!-- <div v-else-if="readingTaskState<2 && (scope.row.AfterQuestionList[index].GlobalReadingShowType === 4 || (scope.row.IsBaseLine && scope.row.AfterQuestionList[index].GlobalReadingShowType === 5) || (!scope.row.IsBaseLine && scope.row.AfterQuestionList[index].GlobalReadingShowType === 6))">
+                <span v-if="scope.row.AfterQuestionList[index].GlobalAnswerType === 3">
+                  {{ getAssessType(scope.row.AfterQuestionList[index].Answer) }}
+                </span>
+                <span v-else-if="scope.row.AfterQuestionList[index].DictionaryCode">
+                  {{ $fd(scope.row.AfterQuestionList[index].DictionaryCode,parseInt(scope.row.AfterQuestionList[index].Answer)) }}
+                </span>
+                <span v-else>{{ scope.row.AfterQuestionList[index].Answer }}</span>
+              </div> -->
+                            <!-- <div v-else-if="scope.row.AfterQuestionList.length>index && scope.row.AfterQuestionList[index].Answer">
+
+                <span v-if="scope.row.AfterQuestionList[index].GlobalAnswerType === 3">
+                  {{ getAssessType(scope.row.AfterQuestionList[index].Answer) }}
+                </span>
+                <span v-else-if="scope.row.AfterQuestionList[index].DictionaryCode">
+                  {{ $fd(scope.row.AfterQuestionList[index].DictionaryCode,parseInt(scope.row.AfterQuestionList[index].Answer)) }}
+                </span>
+                <span v-else>{{ scope.row.AfterQuestionList[index].Answer }}</span>
+              </div> -->
+                        </template>
+                    </el-table-column>
+                </template>
+            </el-table-column>
+            <el-table-column :label="$t('common:action:action')" min-width="150" fixed="right">
+                <template slot-scope="scope">
+                    <el-button circle :title="$t('trials:globalReview:table:view')" icon="el-icon-view"
+                        @click="handleView(scope.row)" />
+                </template>
+            </el-table-column>
+        </el-table>
+    </el-form>
+</template>
+
+<script>
+import { getToken } from '@/utils/auth'
+import { batchSubmitGlobalReadingInfo } from '@/api/trials'
+import { mapGetters } from 'vuex'
+export default {
+    props: {
+        globalInfo: {
+            type: Object,
+            default() {
+                return {}
+            }
+        },
+        globalForm: {
+            type: Object,
+            default() {
+                return {}
+            }
+        },
+        readingTaskState: {
+            type: Number,
+            required: true
+        }
+    },
+    data() {
+        return {
+            loading: false,
+            assessTypes: []
+        }
+    },
+    computed: {
+        ...mapGetters(['language'])
+    },
+    mounted() {
+        console.log(this.globalInfo)
+        this.assessTypes = this.globalInfo.assessTypeList.filter(i => i.IsBaseLineUse === this.isBaseline)
+    },
+    methods: {
+        getText(val, row, type) {
+            if (type === 3) {
+                var o = this.globalInfo.assessTypeList.find(v => {
+                    return parseInt(v.Code) === parseInt(val)
+                })
+                if (!o) {
+                    return ''
+                }
+                return this.language === 'en' ? o.Value : o.ValueCN
+            } else if (row.TypeValue) {
+                return val
+            } else if (row.DictionaryCode) {
+                return this.$fd(row.DictionaryCode, parseInt(val))
+            }
+        },
+
+        handleView(row) {
+            var token = getToken()
+            var visitTaskId = row.VisitTaskId
+            var criterionType = this.$router.currentRoute.query.criterionType
+            var readingTool = this.$router.currentRoute.query.readingTool
+            readingTool = isNaN(parseInt(readingTool)) ? null : parseInt(readingTool)
+            var isReadingTaskViewInOrder = this.$router.currentRoute.query.isReadingTaskViewInOrder
+            var trialReadingCriterionId = this.$router.currentRoute.query.TrialReadingCriterionId
+            var path = ''
+            if (readingTool === 0 || readingTool === 2) {
+                path = `/readingDicoms?TrialReadingCriterionId=${trialReadingCriterionId}&trialId=${this.globalInfo.trialId}&subjectCode=${this.globalInfo.subjectCode}&subjectId=${this.globalInfo.subjectId}&visitTaskId=${visitTaskId}&isReadingTaskViewInOrder=${isReadingTaskViewInOrder}&criterionType=${criterionType}&readingTool=${readingTool}&TokenKey=${token}`
+            } else {
+                path = `/noneDicomReading?trialId=${this.globalInfo.trialId}&subjectCode=${this.globalInfo.subjectCode}&subjectId=${this.globalInfo.subjectId}&visitTaskId=${visitTaskId}&isReadingTaskViewInOrder=${isReadingTaskViewInOrder}&criterionType=${criterionType}&readingTool=${readingTool}&TokenKey=${token}`
+            }
+            const routeData = this.$router.resolve({ path })
+            var newWindow = window.open(routeData.href, '_blank')
+            this.$emit('setOpenWindow', newWindow)
+        },
+        getLesionCount(lesionList, lesionType) {
+            const lesion = lesionList.find(i => i.LesionType === lesionType)
+            return lesion ? lesion.Count : 0
+        },
+        handleSave(isPrompt = true) {
+            return new Promise(async (resolve, reject) => {
+                try {
+                    let valid = await this.$refs['globalRuleForm'].validate()
+                    if (valid) {
+                        this.loading = true
+                        var visitTaskAnswerList = []
+                        this.globalForm.taskList.forEach((item, index) => {
+                            var answerList = []
+                            item.AfterQuestionList.map(i => {
+                                var obj = {}
+                                if (i.QuestionId) {
+                                    obj.questionId = i.QuestionId
+                                    obj.globalAnswerType = i.GlobalAnswerType
+                                    obj.answer = this.globalForm[`${index}${i.QuestionId}`]
+                                } else {
+                                    obj.questionId = ''
+                                    obj.globalAnswerType = i.GlobalAnswerType
+                                    obj.answer = this.globalForm[`${index}${i.GlobalAnswerType}`]
+                                }
+                                answerList.push(obj)
+                            })
+                            answerList.push({
+                                questionId: '', globalAnswerType: item.AgreeOrNot[0].GlobalAnswerType,
+                                answer: this.globalForm[`${index}${item.AgreeOrNot[0].GlobalAnswerType}`]
+                            })
+
+                            visitTaskAnswerList.push({ visitTaskId: item.VisitTaskId, answerList: answerList })
+                        })
+                        var params = {
+                            globalTaskId: this.globalInfo.visitTaskId,
+                            subjectId: this.globalInfo.subjectId,
+                            trialId: this.globalInfo.trialId,
+                            visitTaskAnswerList
+                        }
+                        await batchSubmitGlobalReadingInfo(params)
+                        this.loading = false
+                        if (isPrompt) {
+                            this.$message.success(this.$t('common:message:savedSuccessfully'))
+                        }
+                        this.$emit('getGlInfo')
+                        resolve(true)
+
+                    } else {
+                        resolve(false)
+                    }
+                } catch (e) {
+                    console.log(e)
+                    this.loading = false
+                    resolve(false)
+                }
+
+
+            })
+        },
+        getBeforeAnswer(qsId, row) {
+            var i = row.BeforeQuestionList.findIndex(item => item.QuestionName === qsId)
+
+            if (i > -1 && row.BeforeQuestionList[i].Answer) {
+                var answer = ''
+                if (row.BeforeQuestionList[i].DictionaryCode) {
+                    answer = row.BeforeQuestionList[i].Answer
+                } else {
+                    answer = row.BeforeQuestionList[i].Answer
+                }
+                return answer
+            } else {
+                return ''
+            }
+        },
+        handleAgreeOrNotChange(index, globalAnswerType) {
+            var agreeOrNot = parseInt(this.globalForm[`${index}${globalAnswerType}`])
+            if (agreeOrNot === 1) {
+                var qsList = this.globalForm.taskList[index].AfterQuestionList
+                qsList.map(v => {
+                    if (v.QuestionId) {
+                        this.globalForm[`${index}${v.QuestionId}`] = ''
+                    } else if (v.GlobalAnswerType !== globalAnswerType) {
+                        this.globalForm[`${index}${v.GlobalAnswerType}`] = ''
+                    }
+                })
+            }
+        },
+        getAssessType(v) {
+            console.log(this.language)
+            var i = this.globalInfo.assessTypeList.findIndex(i => String(i.Code) === String(v))
+            if (i > -1) {
+                return this.language === 'en' ? this.globalInfo.assessTypeList[i].Value : this.globalInfo.assessTypeList[i].ValueCN
+            } else {
+                return ''
+            }
+        }
+    }
+}
+</script>
+
+<style lang="scss" scoped>
+::v-deep .el-form-item label:before {
+    content: '*';
+    color: #F56C6C;
+    margin-right: 4px;
+}
+
+::v-deep .el-textarea .el-input__count {
+    background: rgba(0, 0, 0, 0);
+    line-height: normal;
+}
+
+::v-deep .el-form-item {
+    margin-bottom: 0px;
+}
+
+.global-form {
+    ::v-deep .el-form-item__content {
+        padding-bottom: 10px;
+    }
+
+    ::v-deep .form-item .el-form-item__error {
+        top: 60%;
+    }
+}
+</style>
diff --git a/src/views/trials/trials-panel/reading/global-review/components/MRecistTable.vue b/src/views/trials/trials-panel/reading/global-review/components/MRecistTable.vue
index 24c3babb..cbc25162 100644
--- a/src/views/trials/trials-panel/reading/global-review/components/MRecistTable.vue
+++ b/src/views/trials/trials-panel/reading/global-review/components/MRecistTable.vue
@@ -93,9 +93,8 @@
         align="center"
         prop=""
       >
-        <template>
-          <el-table-column
-            v-for="(qs,index) in globalInfo.adjustedQsList"
+        <template v-for="(qs,index) in globalInfo.adjustedQsList">
+          <el-table-column 
             v-if="qs.isShow"
             :key="index"
             prop=""
diff --git a/src/views/trials/trials-panel/reading/global-review/index.vue b/src/views/trials/trials-panel/reading/global-review/index.vue
index 473bb5b0..a091edcb 100644
--- a/src/views/trials/trials-panel/reading/global-review/index.vue
+++ b/src/views/trials/trials-panel/reading/global-review/index.vue
@@ -24,15 +24,11 @@
         </div>
       </div>
 
-      <div v-if=" readingTaskState < 2" style="text-align:right;margin:5px 0;">
-        <el-button
-            type="primary"
-            size="small"
-            @click="skipTask"
-          >
-            <!-- 跳过 -->
-            {{ $t('trials:readingReport:button:skip') }}
-          </el-button>
+      <div v-if="readingTaskState < 2" style="text-align:right;margin:5px 0;">
+        <el-button type="primary" size="small" @click="skipTask">
+          <!-- 跳过 -->
+          {{ $t('trials:readingReport:button:skip') }}
+        </el-button>
         <el-button size="small" type="primary" @click="handleSave">
           {{ $t('common:button:save') }}
         </el-button>
@@ -41,72 +37,31 @@
           {{ $t('trials:globalReview:button:submit') }}
         </el-button>
       </div>
-      <customize-table
-        v-if="CriterionType === 0 && Object.keys(globalInfo).length !== 0"
-        ref="globalTbl"
-        :global-info="globalInfo"
-        :global-form="globalInfo.globalForm"
-        :reading-task-state="readingTaskState"
-        @getGlInfo="getGlInfo"
-        @setOpenWindow="setOpenWindow"
-      />
-      <recist-table
-        v-if="CriterionType === 1 && Object.keys(globalInfo).length !== 0"
-        ref="globalTbl"
-        :global-info="globalInfo"
-        :global-form="globalInfo.globalForm"
-        :reading-task-state="readingTaskState"
-        @getGlInfo="getGlInfo"
-        @setOpenWindow="setOpenWindow"
-      />
-      <lugano-table
-        v-if="CriterionType === 2 && Object.keys(globalInfo).length !== 0"
-        ref="globalTbl"
-        :global-info="globalInfo"
-        :global-form="globalInfo.globalForm"
-        :reading-task-state="readingTaskState"
-        @getGlInfo="getGlInfo"
-        @handleView="handleView"
-        @setOpenWindow="setOpenWindow"
-      />
-      <pcwg3-table
-        v-if="CriterionType === 10 && Object.keys(globalInfo).length !== 0"
-        ref="globalTbl"
-        :global-info="globalInfo"
-        :global-form="globalInfo.globalForm"
-        :reading-task-state="readingTaskState"
-        @getGlInfo="getGlInfo"
-        @handleView="handleView"
-        @setOpenWindow="setOpenWindow"
-      />
-      <irecist-table
-        v-if="CriterionType === 3 && Object.keys(globalInfo).length !== 0"
-        ref="globalTbl"
-        :global-info="globalInfo"
-        :global-form="globalInfo.globalForm"
-        :reading-task-state="readingTaskState"
-        @getGlInfo="getGlInfo"
-        @setOpenWindow="setOpenWindow"
-      />
-      <recistbm-table
-        v-if="CriterionType === 17 && Object.keys(globalInfo).length !== 0"
-        ref="globalTbl"
-        :global-info="globalInfo"
-        :global-form="globalInfo.globalForm"
-        :reading-task-state="readingTaskState"
-        @getGlInfo="getGlInfo"
-        @setOpenWindow="setOpenWindow"
-      />
-      <mrecist-table
-        v-if="CriterionType === 7 && Object.keys(globalInfo).length !== 0"
-        ref="globalTbl"
-        :global-info="globalInfo"
-        :global-form="globalInfo.globalForm"
-        :reading-task-state="readingTaskState"
-        @getGlInfo="getGlInfo"
-        @setOpenWindow="setOpenWindow"
-      />
-      
+      <customize-table v-if="CriterionType === 0 && Object.keys(globalInfo).length !== 0" ref="globalTbl"
+        :global-info="globalInfo" :global-form="globalInfo.globalForm" :reading-task-state="readingTaskState"
+        @getGlInfo="getGlInfo" @setOpenWindow="setOpenWindow" />
+      <recist-table v-if="CriterionType === 1 && Object.keys(globalInfo).length !== 0" ref="globalTbl"
+        :global-info="globalInfo" :global-form="globalInfo.globalForm" :reading-task-state="readingTaskState"
+        @getGlInfo="getGlInfo" @setOpenWindow="setOpenWindow" />
+      <lugano-table v-if="CriterionType === 2 && Object.keys(globalInfo).length !== 0" ref="globalTbl"
+        :global-info="globalInfo" :global-form="globalInfo.globalForm" :reading-task-state="readingTaskState"
+        @getGlInfo="getGlInfo" @handleView="handleView" @setOpenWindow="setOpenWindow" />
+      <luganoWithoutPET-table v-if="CriterionType === 18 && Object.keys(globalInfo).length !== 0" ref="globalTbl"
+        :global-info="globalInfo" :global-form="globalInfo.globalForm" :reading-task-state="readingTaskState"
+        @getGlInfo="getGlInfo" @handleView="handleView" @setOpenWindow="setOpenWindow" />
+      <pcwg3-table v-if="CriterionType === 10 && Object.keys(globalInfo).length !== 0" ref="globalTbl"
+        :global-info="globalInfo" :global-form="globalInfo.globalForm" :reading-task-state="readingTaskState"
+        @getGlInfo="getGlInfo" @handleView="handleView" @setOpenWindow="setOpenWindow" />
+      <irecist-table v-if="CriterionType === 3 && Object.keys(globalInfo).length !== 0" ref="globalTbl"
+        :global-info="globalInfo" :global-form="globalInfo.globalForm" :reading-task-state="readingTaskState"
+        @getGlInfo="getGlInfo" @setOpenWindow="setOpenWindow" />
+      <recistbm-table v-if="CriterionType === 17 && Object.keys(globalInfo).length !== 0" ref="globalTbl"
+        :global-info="globalInfo" :global-form="globalInfo.globalForm" :reading-task-state="readingTaskState"
+        @getGlInfo="getGlInfo" @setOpenWindow="setOpenWindow" />
+      <mrecist-table v-if="CriterionType === 7 && Object.keys(globalInfo).length !== 0" ref="globalTbl"
+        :global-info="globalInfo" :global-form="globalInfo.globalForm" :reading-task-state="readingTaskState"
+        @getGlInfo="getGlInfo" @setOpenWindow="setOpenWindow" />
+
     </el-card>
 
     <el-card v-if="isReadingShowPreviousResults" :body-style="{ padding: '10px' }" shadow="never">
@@ -114,51 +69,28 @@
         <!-- 既往全局阅片结果 -->
         <span style="font-weight: bold;">{{ $t('trials:globalReview:title:previousRes') }}</span>
       </div>
-      <el-table
-        v-loading="historyLoading"
-        :data="historyTaskList"
-      >
+      <el-table v-loading="historyLoading" :data="historyTaskList">
         <!-- 全局 -->
-        <el-table-column
-          prop="TaskBlindName"
-          :label="$t('trials:globalReview:table:globalReading')"
-          show-overflow-tooltip
-          width="200"
-        />
-        <el-table-column
-          prop="VisitBlindName"
-          :label="$t('trials:globalReview:table:cutOffVisitName')"
-          show-overflow-tooltip
-          width="200"
-        />
-        <el-table-column
-          :label="$t('common:action:action')"
-          width="200"
-        >
+        <el-table-column prop="TaskBlindName" :label="$t('trials:globalReview:table:globalReading')"
+          show-overflow-tooltip width="200" />
+        <el-table-column prop="VisitBlindName" :label="$t('trials:globalReview:table:cutOffVisitName')"
+          show-overflow-tooltip width="200" />
+        <el-table-column :label="$t('common:action:action')" width="200">
           <template slot-scope="scope">
             <!-- 查看详情 -->
-            <el-button
-              circle
-              :title="$t('trials:globalReview:table:view')"
-              icon="el-icon-view"
-              @click="handleView(scope.row)"
-            />
+            <el-button circle :title="$t('trials:globalReview:table:view')" icon="el-icon-view"
+              @click="handleView(scope.row)" />
           </template>
         </el-table-column>
       </el-table>
     </el-card>
 
     <!-- 签名框 -->
-    <el-dialog
-      v-if="signVisible"
-      :visible.sync="signVisible"
-      :close-on-click-modal="false"
-      width="600px"
-      custom-class="base-dialog-wrapper"
-    >
+    <el-dialog v-if="signVisible" :visible.sync="signVisible" :close-on-click-modal="false" width="600px"
+      custom-class="base-dialog-wrapper">
       <div slot="title">
         <span style="font-size:18px;">{{ $t('common:dialogTitle:sign') }}</span>
-        <span style="font-size:12px;margin-left:5px">{{ `(${$t('common:label:sign')}${ currentUser })` }}</span>
+        <span style="font-size:12px;margin-left:5px">{{ `(${$t('common:label:sign')}${currentUser})` }}</span>
       </div>
       <SignForm ref="signForm" :sign-code-enum="signCode" @closeDialog="closeSignDialog" />
     </el-dialog>
@@ -177,13 +109,14 @@ import pcwg3Table from './components/PCWG3Table'
 import irecistTable from './components/IRecistTable'
 import recistbmTable from './components/RecistBMTable'
 import luganoTable from './components/LuganoTable'
+import luganoWithoutPETTable from './components/LuganoTable'
 import mrecistTable from './components/MRecistTable.vue'
 import SignForm from '@/views/trials/components/newSignForm'
 import { changeURLStatic } from '@/utils/history.js'
 import store from '@/store'
 export default {
   name: 'GlobalReview',
-  components: { CustomizeTable, RecistTable, pcwg3Table, irecistTable, recistbmTable,luganoTable,mrecistTable, SignForm },
+  components: { CustomizeTable, RecistTable, pcwg3Table, irecistTable, recistbmTable, luganoTable, luganoWithoutPETTable, mrecistTable, SignForm },
   props: {
     trialId: {
       type: String,
@@ -294,19 +227,19 @@ export default {
                 console.log(qs)
                 if (qs.GlobalAnswerType === 1 && (this.CriterionType === 10)) {
                   // 访视阅片备注
-                  adjustedQsList.push({questionName:this.$t('trials:globalReview:table:visitRemark'),isShow:true})
+                  adjustedQsList.push({ questionName: this.$t('trials:globalReview:table:visitRemark'), isShow: true })
                 } else if (qs.GlobalAnswerType === 1 && (this.CriterionType !== 10)) {
                   // 全局阅片备注
-                  adjustedQsList.push({questionName:this.$t('trials:globalReview:table:globalRemark'),isShow:true})
+                  adjustedQsList.push({ questionName: this.$t('trials:globalReview:table:globalRemark'), isShow: true })
                 } else if (qs.GlobalAnswerType === 3 && (this.CriterionType !== 10)) {
                   // 评估更新类型
-                  adjustedQsList.push({questionName:this.$t('trials:globalReview:table:updateType'),isShow:true})
+                  adjustedQsList.push({ questionName: this.$t('trials:globalReview:table:updateType'), isShow: true })
                 } else {
                   var isShow = true
-                  if(this.CriterionType === 2 && (qs.QuestionType === 39 || qs.QuestionType === 40 || qs.QuestionType === 41)){
+                  if ((this.CriterionType === 2 || this.CriterionType === 18) && (qs.QuestionType === 39 || qs.QuestionType === 40 || qs.QuestionType === 41)) {
                     isShow = false
                   }
-                  adjustedQsList.push({questionName:qs.QuestionName,isShow:isShow})
+                  adjustedQsList.push({ questionName: qs.QuestionName, isShow: isShow })
                 }
               })
               qs.AgreeOrNot.map(qs => {
@@ -353,7 +286,7 @@ export default {
         this.historyTaskList = res.Result
         this.historyLoading = false
       } catch (e) {
-        this.historyLoading = false 
+        this.historyLoading = false
       }
     },
     handleSave() {
@@ -390,8 +323,8 @@ export default {
           type: 'warning',
           distinguishCancelAndClose: true
         })
-          .then(() => {})
-          .catch(() => {})
+          .then(() => { })
+          .catch(() => { })
       } else {
         // 自动保存
         let res = await this.$refs['globalTbl'].handleSave(false)
@@ -400,7 +333,7 @@ export default {
           this.signCode = ImageAssessmentReportConfirmation
           this.signVisible = true
         }
-        
+
       }
     },
     // 关闭签名框
@@ -420,7 +353,7 @@ export default {
         },
         signInfo: signInfo
       }
-      try{
+      try {
         let res = await submitGlobalReadingInfo(params)
         if (res.IsSuccess) {
           this.$message.success(this.$t('common:message:savedSuccessfully'))
@@ -471,7 +404,7 @@ export default {
         readingTool = isNaN(parseInt(readingTool)) ? null : parseInt(readingTool)
         var isReadingTaskViewInOrder = this.$router.currentRoute.query.isReadingTaskViewInOrder
         var path = ''
-        if (readingTool === 0 || readingTool === 2 ) {
+        if (readingTool === 0 || readingTool === 2) {
           path = `/readingDicoms?TrialReadingCriterionId=${trialReadingCriterionId}&trialId=${this.trialId}&subjectCode=${this.subjectCode}&subjectId=${this.subjectId}&visitTaskId=${visitTaskId}&isReadingTaskViewInOrder=${isReadingTaskViewInOrder}&criterionType=${criterionType}&readingTool=${readingTool}&TokenKey=${token}`
         } else {
           path = `/noneDicomReading?TrialReadingCriterionId=${trialReadingCriterionId}&trialId=${this.trialId}&subjectCode=${this.subjectCode}&subjectId=${this.subjectId}&visitTaskId=${visitTaskId}&isReadingTaskViewInOrder=${isReadingTaskViewInOrder}&criterionType=${criterionType}&readingTool=${readingTool}&TokenKey=${token}`
@@ -501,14 +434,15 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
-.glReview_wrapper{
+.glReview_wrapper {
   flex: 1;
   padding: 10px;
   width: 100%;
   height: 100%;
   overflow-y: auto;
-  .box-mr{
-    margin:10px 0;
+
+  .box-mr {
+    margin: 10px 0;
   }
 }
 </style>
diff --git a/src/views/trials/trials-workbench/components/inspectionManagement/dataForm.vue b/src/views/trials/trials-workbench/components/inspectionManagement/dataForm.vue
index e59cba20..3fd41aad 100644
--- a/src/views/trials/trials-workbench/components/inspectionManagement/dataForm.vue
+++ b/src/views/trials/trials-workbench/components/inspectionManagement/dataForm.vue
@@ -35,6 +35,14 @@
                             }}</el-button>
                     </div>
                 </el-form-item> -->
+                <!-- 查看培训记录 -->
+                <el-form-item :label="$t('trials:trials-workbench:inspectionManagement:from:IsViewTrainingRecord')"
+                    prop="IsViewTrainingRecord">
+                    <el-radio-group v-model="from.IsViewTrainingRecord">
+                        <el-radio v-for="item in $d.YesOrNo" :key="item.id" :label="item.value">{{ item.label
+                        }}</el-radio>
+                    </el-radio-group>
+                </el-form-item>
                 <!-- 稽查日期 -->
                 <el-form-item :label="$t('trials:trials-workbench:inspectionManagement:from:AuditTime')"
                     prop="AuditTime">
@@ -112,6 +120,7 @@ export default {
                     })
                     this.from.ViewTime = []
                     this.from.IdnetityUserIdList = []
+                    this.from.IsViewTrainingRecord = false
                 }
             },
             immediate: true,
@@ -142,6 +151,7 @@ export default {
                 AuditType: '',
                 IdnetityUserIdList: [],
                 IdnetityUserName: '',
+                IsViewTrainingRecord: false,
                 ViewTime: []
             },
             rules: {
diff --git a/src/views/trials/trials-workbench/components/inspectionManagement/index.vue b/src/views/trials/trials-workbench/components/inspectionManagement/index.vue
index 7e0ce58b..c3906fae 100644
--- a/src/views/trials/trials-workbench/components/inspectionManagement/index.vue
+++ b/src/views/trials/trials-workbench/components/inspectionManagement/index.vue
@@ -34,6 +34,12 @@
                 <el-form-item :label="$t('trials:trials-workbench:inspectionManagement:table:IdentityUserName')">
                     <el-input v-model="searchData.IdentityUserName" clearable placeholder=""></el-input>
                 </el-form-item>
+                <el-form-item :label="$t('trials:trials-workbench:inspectionManagement:table:IsViewTrainingRecord')">
+                    <el-select v-model="searchData.IsViewTrainingRecord" placeholder="" clearable>
+                        <el-option v-for="item in $d.YesOrNo" :key="item.id" :label="item.label" :value="item.value">
+                        </el-option>
+                    </el-select>
+                </el-form-item>
                 <el-form-item :label="$t('trials:trials-workbench:inspectionManagement:table:auditTime')">
                     <el-date-picker v-model="auditTime" type="daterange" range-separator="-"
                         :start-placeholder="$t('imageInspect:daterange:startPlaceholder')"
@@ -99,6 +105,13 @@
                     </span> -->
                     </template>
                 </el-table-column>
+                <el-table-column prop="IsViewTrainingRecord" show-overflow-tooltip
+                    :label="$t('trials:trials-workbench:inspectionManagement:table:IsViewTrainingRecord')"
+                    sortable="custom">
+                    <template slot-scope="scope">
+                        <span>{{ $fd('YesOrNo', scope.row.IsViewTrainingRecord) }}</span>
+                    </template>
+                </el-table-column>
                 <el-table-column prop="AuditTime" show-overflow-tooltip
                     :label="$t('trials:trials-workbench:inspectionManagement:table:auditTime')" sortable="custom">
                 </el-table-column>
@@ -166,6 +179,7 @@ const searchDataDefault = () => {
         EndTime: '',
         BeginCreateTime: '',
         EndCreateTime: '',
+        IsViewTrainingRecord: '',
         PageIndex: 1,
         PageSize: 20,
         Asc: false,