diff --git a/src/views/trials/trials-panel/reading/dicoms/components/PCWG/QuestionForm.vue b/src/views/trials/trials-panel/reading/dicoms/components/PCWG/QuestionForm.vue
index 20ab4b3..92e63c6 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/PCWG/QuestionForm.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/PCWG/QuestionForm.vue
@@ -1,12 +1,6 @@
 <template>
-  <el-form
-    v-if="isRender"
-    ref="measurementForm"
-    v-loading="loading"
-    :model="questionForm"
-    size="mini"
-    class="measurement-form"
-  >
+  <el-form v-if="isRender" ref="measurementForm" v-loading="loading" :model="questionForm" size="mini"
+    class="measurement-form">
     <div class="base-dialog-body">
       <div style="display: flex;justify-content: space-between;">
         <h3 v-if="questionName" style="color: #ddd;padding: 5px 0px;margin: 0;">
@@ -20,177 +14,98 @@
         </div>
       </div>
 
-      <el-form-item
-        :label="$t('trials:reading:title:lesionType')"
-        prop="LesionType"
-        :rules="[
-          { required:true,message: $t('common:ruleMessage:select'), trigger: ['blur']},
-        ]"
-      >
-        <el-select
-          v-model="questionForm.LesionType"
-          filterable
-          :disabled="true"
-        >
-          <el-option
-            v-for="item of $d.LesionType"
-            v-show="!(isBaseLineTask && item.value === 2)"
-            :key="item.id"
-            :value="item.value"
-            :label="item.label"
-          />
+      <el-form-item :label="$t('trials:reading:title:lesionType')" prop="LesionType" :rules="[
+        { required: true, message: $t('common:ruleMessage:select'), trigger: ['blur'] },
+      ]">
+        <el-select v-model="questionForm.LesionType" filterable :disabled="true">
+          <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}`"
+      <el-form-item v-for="qs in questions" v-show="qs.ShowQuestion !== 2" :key="qs.Id" :label="`${qs.QuestionName}`"
         :prop="qs.Id"
-        :rules="qs.QuestionMark===11?[
-          { required: (qs.IsRequired === 0 || (qs.IsRequired ===1 && qs.RelevanceId && (questionForm[qs.RelevanceId] === qs.RelevanceValue))) && qs.Type!=='group' && qs.Type!=='summary',
-            message: ['radio', 'select', 'checkbox'].includes(qs.Type) ? $t('common:ruleMessage:select') : $t('common:ruleMessage:specify'), trigger: ['blur', 'change']},{validator:validateLesionCount, trigger: ['blur', 'change']}]:[
-              { required: (qs.IsRequired === 0 || (qs.IsRequired ===1 && qs.RelevanceId && (questionForm[qs.RelevanceId] === qs.RelevanceValue)) || (qs.QuestionMark === 6 && questionForm.IsCanEditPosition === true) || (questionForm.IsCanEditPosition && qs.QuestionMark === 10)) && qs.Type!=='group' && qs.Type!=='summary',
-                message: ['radio', 'select', 'checkbox'].includes(qs.Type) ? $t('common:ruleMessage:select') : $t('common:ruleMessage:specify'), trigger: ['blur', 'change']}]"
-      >
+        :rules="qs.QuestionMark === 11 ? [
+          {
+            required: (qs.IsRequired === 0 || (qs.IsRequired === 1 && qs.RelevanceId && (questionForm[qs.RelevanceId] === qs.RelevanceValue))) && qs.Type !== 'group' && qs.Type !== 'summary',
+            message: ['radio', 'select', 'checkbox'].includes(qs.Type) ? $t('common:ruleMessage:select') : $t('common:ruleMessage:specify'), trigger: ['blur', 'change']
+          }, { validator: validateLesionCount, trigger: ['blur', 'change'] }] : [
+          {
+            required: (qs.IsRequired === 0 || (qs.IsRequired === 1 && qs.RelevanceId && (questionForm[qs.RelevanceId] === qs.RelevanceValue)) || (qs.QuestionMark === 6 && questionForm.IsCanEditPosition === true) || (questionForm.IsCanEditPosition && qs.QuestionMark === 10)) && qs.Type !== 'group' && qs.Type !== 'summary',
+            message: ['radio', 'select', 'checkbox'].includes(qs.Type) ? $t('common:ruleMessage:select') : $t('common:ruleMessage:specify'), trigger: ['blur', 'change']
+          }]">
         <!-- {{ isCurrentTaskAdd }}
         {{ questionForm.IsCanEditPosition }} -->
 
         <!-- 输入框    min="1"
               @input="questionForm[qs.Id]=questionForm[qs.Id].replace(/^(0+)|[^\d]+/g,'')"-->
-        <template v-if="qs.Type==='input' || qs.Type==='number'">
-          <template v-if="qs.QuestionMark===11">
-            <el-input
-              v-model="questionForm[qs.Id]"
-              :disabled="!isCurrentTask || readingTaskState>=2 "
-              type="number"
-
-              @focus="focusQs = {...qs}"
-              @change="((val)=>{formItemChange(val, qs)})"
-            >
-              <template v-if="(qs.QuestionMark===0 || qs.QuestionMark===1) && qs.Unit" slot="append">
+        <template v-if="qs.Type === 'input' || qs.Type === 'number'">
+          <template v-if="qs.QuestionMark === 11">
+            <el-input v-model="questionForm[qs.Id]" :disabled="!isCurrentTask || readingTaskState >= 2" type="number"
+              @focus="focusQs = { ...qs }" @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>
           <template v-else>
-            <el-input
-              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') && lesionType !== 2) || qs.QuestionMark === 9 || (qs.QuestionMark === 10 && isCurrentTaskAdd === 'False')"
-              @focus="focusQs = {...qs}"
-              @change="((val)=>{formItemChange(val, qs)})"
-            >
-              <template v-if="(qs.QuestionMark===0 || qs.QuestionMark===1) && qs.Unit" slot="append">
+            <el-input 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') && lesionType !== 2) || qs.QuestionMark === 9 || (qs.QuestionMark === 10 && isCurrentTaskAdd === 'False')"
+              @focus="focusQs = { ...qs }" @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>
         </template>
         <!-- 多行文本输入框 -->
-        <el-input
-          v-if="qs.Type==='textarea'"
-          v-model="questionForm[qs.Id]"
-          type="textarea"
-          :autosize="{ minRows: 2, maxRows: 4}"
-          :disabled="!isCurrentTask || readingTaskState>=2"
-          @change="((val)=>{formItemChange(val, qs)})"
-        />
-        <el-select
-          v-if="qs.Type==='select'"
-          v-model="questionForm[qs.Id]"
-          filterable
-          :disabled="((!isBaseLineTask && qs.QuestionMark === 11) || (isBaseLineTask || lesionType === 2) && qs.QuestionMark === 7) || !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)"
-          @change="((val)=>{formItemChange(val, qs)})"
-        >
+        <el-input v-if="qs.Type === 'textarea'" v-model="questionForm[qs.Id]" type="textarea"
+          :autosize="{ minRows: 2, maxRows: 4 }" :disabled="!isCurrentTask || readingTaskState >= 2"
+          @change="((val) => { formItemChange(val, qs) })" />
+        <el-select v-if="qs.Type === 'select'" v-model="questionForm[qs.Id]" filterable
+          :disabled="((!isBaseLineTask && qs.QuestionMark === 11) || (isBaseLineTask || lesionType === 2) && qs.QuestionMark === 7) || !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)"
+          @change="((val) => { formItemChange(val, qs) })">
           <template v-if="qs.TableQuestionType === 1">
-            <el-option
-              v-for="item in organList"
-              :key="item.Id"
-              :label="item[qs.DataTableColumn]"
-              :value="item[qs.DataTableColumn]"
-            />
+            <el-option v-for="item in organList" :key="item.Id" :label="item[qs.DataTableColumn]"
+              :value="item[qs.DataTableColumn]" />
           </template>
           <template v-else-if="qs.DictionaryCode && qs.QuestionMark === 7 && isBaseLineTask">
-            <el-option
-              v-for="item of $d[qs.DictionaryCode]"
-              :key="item.id"
-              :value="item.value"
-              :label="item.label"
-            />
+            <el-option v-for="item of $d[qs.DictionaryCode]" :key="item.id" :value="item.value" :label="item.label" />
           </template>
           <template v-else-if="qs.DictionaryCode && qs.QuestionMark === 7 && !isBaseLineTask">
-            <el-option
-              v-for="item of $d[qs.DictionaryCode]"
-              :key="item.id"
-              :value="item.value"
-              :label="item.label"
-            />
+            <el-option v-for="item of $d[qs.DictionaryCode]" :key="item.id" :value="item.value" :label="item.label" />
           </template>
           <template v-else-if="qs.DictionaryCode && qs.QuestionMark !== 7">
-            <el-option
-              v-for="item of $d[qs.DictionaryCode]"
-              :key="item.id"
-              :value="item.value"
-              :label="item.label"
-            />
+            <el-option v-for="item of $d[qs.DictionaryCode]" :key="item.id" :value="item.value" :label="item.label" />
           </template>
           <template v-else>
-            <el-option
-              v-for="val in qs.TypeValue.split('|')"
-              :key="val"
-              :label="val"
-              :value="val"
-            />
+            <el-option v-for="val in qs.TypeValue.split('|')" :key="val" :label="val" :value="val" />
           </template>
 
         </el-select>
         <!-- 单选 -->
-        <el-radio-group
-          v-if="qs.Type==='radio'"
-          v-model="questionForm[qs.id]"
-          :disabled="!isCurrentTask || readingTaskState>=2"
-        >
-          <el-radio
-            v-for="val in qs.options.split('|')"
-            :key="val"
-            :label="val"
-          >
+        <el-radio-group v-if="qs.Type === 'radio'" v-model="questionForm[qs.id]"
+          :disabled="!isCurrentTask || readingTaskState >= 2">
+          <el-radio v-for="val in qs.options.split('|')" :key="val" :label="val">
             {{ val }}
           </el-radio>
         </el-radio-group>
       </el-form-item>
 
     </div>
-    <div
-      v-if="isCurrentTask && readingTaskState<2"
-      class="base-dialog-footer"
-      style="text-align:right;margin-top:10px;"
-    >
+    <div v-if="isCurrentTask && readingTaskState < 2" class="base-dialog-footer"
+      style="text-align:right;margin-top:10px;">
       <!-- 清除标记 -->
-      <el-button
-        v-if="questionForm.MeasureData"
-        size="mini"
-        style="padding:7px 10px"
-        @click="handleDeleteMeasureData"
-      >
+      <el-button v-if="questionForm.MeasureData" size="mini" style="padding:7px 10px" @click="handleDeleteMeasureData">
         {{ $t('trials:reading:button:removeMark') }}
       </el-button>
       <!-- 删除 -->
-      <el-button
-        v-if="isCurrentTaskAdd !== 'False'"
-        size="mini"
-        style="margin-left: 5px;padding:7px 10px"
-        @click="handleDelete"
-      >
+      <el-button v-if="isCurrentTaskAdd !== 'False'" size="mini" style="margin-left: 5px;padding:7px 10px"
+        @click="handleDelete">
         {{ $t('common:button:delete') }}
       </el-button>
       <!-- 保存 -->
-      <el-button
-        size="mini"
-        style="margin-left: 5px;padding:7px 10px"
-        @click="handleSave"
-      >
+      <el-button size="mini" style="margin-left: 5px;padding:7px 10px" @click="handleSave">
         {{ $t('common:button:save') }}
       </el-button>
     </div>
@@ -364,6 +279,15 @@ export default {
       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)
+
+      var isLymphLesion = this.getQuestionVal(2)
+      isLymphLesion = isLymphLesion ? parseInt(isLymphLesion) : null
+      var lesionOrgan = this.getQuestionVal(6)
+      const lesionPart = this.getQuestionVal(8)
+
+      this.$emit('resetQuestions', { isLymphLesion, lesionPart, lesionOrgan, saveTypeEnum: this.questionForm.saveTypeEnum, lesionState, lesionNum, rowIndex: this.rowIndex, questionId: this.parentQsId, anwsers: this.questionForm })
+
+
       this.isRender = true
     },
     getLesionName(orderMark, rowIndex) {
@@ -639,7 +563,7 @@ export default {
             this.$confirm(this.$t('trials:readingPGWC:warnning:msg2'), {
               type: 'warning',
               showCancelButton: false,
-              callback: action => {}
+              callback: action => { }
             })
             loading.close()
             return
@@ -652,7 +576,7 @@ export default {
             this.$confirm(this.$t('trials:readingPGWC:warnning:msg3'), {
               type: 'warning',
               showCancelButton: false,
-              callback: action => {}
+              callback: action => { }
             })
             loading.close()
             return
@@ -664,7 +588,7 @@ export default {
             this.$confirm(this.$t('trials:readingPGWC:warnning:msg4'), {
               type: 'warning',
               showCancelButton: false,
-              callback: action => {}
+              callback: action => { }
             })
             loading.close()
             return
@@ -676,7 +600,7 @@ export default {
             this.$confirm(this.$t('trials:readingPGWC:warnning:msg5'), {
               type: 'warning',
               showCancelButton: false,
-              callback: action => {}
+              callback: action => { }
             })
             loading.close()
             return
@@ -688,7 +612,7 @@ export default {
             this.$confirm(this.$t('trials:readingPGWC:warnning:msg6'), {
               type: 'warning',
               showCancelButton: false,
-              callback: action => {}
+              callback: action => { }
             })
             loading.close()
             return
@@ -849,7 +773,7 @@ export default {
           type: 'warning',
           distinguishCancelAndClose: true
         })
-          .then(async() => {
+          .then(async () => {
             // 移除新建病灶并关闭窗口
             if (this.questionForm.MeasureData) {
               var remark = this.getLesionName(this.orderMark, this.questionForm.RowIndex)
@@ -858,7 +782,7 @@ export default {
             DicomEvent.$emit('getMeasureData')
             this.$emit('close', { lesionType: this.lesionType, rowIndex: this.rowIndex, visitTaskId: this.visitTaskId })
           })
-          .catch(() => {})
+          .catch(() => { })
       } else {
         if (this.questionForm.isSave === false) {
           // '当前病灶信息有更新，未保存，是否继续？'
@@ -869,7 +793,7 @@ export default {
             .then(() => {
               this.$emit('close')
             })
-            .catch(() => {})
+            .catch(() => { })
         } else {
           this.$emit('close')
         }
@@ -894,39 +818,45 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
-.measurement-form{
-  /deep/ .el-form-item__label{
+.measurement-form {
+  /deep/ .el-form-item__label {
     color: #c3c3c3;
   }
-  /deep/ .el-input .el-input__inner{
+
+  /deep/ .el-input .el-input__inner {
     background-color: transparent;
     color: #ddd;
     border: 1px solid #5e5e5e;
   }
-  /deep/ .el-form-item{
+
+  /deep/ .el-form-item {
     display: flex;
     flex-direction: row;
     justify-content: flex-start;
   }
-  /deep/ .el-form-item__content{
+
+  /deep/ .el-form-item__content {
     flex: 1;
   }
-  /deep/ .el-input.is-disabled .el-input__inner{
+
+  /deep/ .el-input.is-disabled .el-input__inner {
     background-color: #646464a1;
   }
-  /deep/ .el-select.is-disabled .el-input__inner{
+
+  /deep/ .el-select.is-disabled .el-input__inner {
     background-color: #646464a1;
   }
-  .el-form-item__content
-  .el-select{
+
+  .el-form-item__content .el-select {
     width: 100%;
   }
-  .input-width1{
-    width: calc(100% -60px)!important;
+
+  .input-width1 {
+    width: calc(100% -60px) !important;
   }
-  .input-width2{
+
+  .input-width2 {
     width: 100% !important;
   }
 }
-
 </style>