diff --git a/src/views/trials/trials-panel/reading/dicoms3D/components/customize/QuestionList.vue b/src/views/trials/trials-panel/reading/dicoms3D/components/customize/QuestionList.vue
index 041b9ff3..472db64a 100644
--- a/src/views/trials/trials-panel/reading/dicoms3D/components/customize/QuestionList.vue
+++ b/src/views/trials/trials-panel/reading/dicoms3D/components/customize/QuestionList.vue
@@ -15,7 +15,6 @@
       </div>
       <el-form v-if="taskInfo && rerender" ref="questions" size="small" :model="questionForm" class="ecrf-form">
         <template v-if="rerender">
-<<<<<<< HEAD
           <QuestionFormItem v-for="question of questions" :key="question.Id" :visit-task-id="visitTaskId"
             :question="question" :question-form="questionForm" :reading-task-state="readingTaskState"
             :criterion-id="criterionId" :calculation-list="calculationList"
@@ -23,22 +22,6 @@
             :is-baseline="isBaseLineTask" @resetFormItemData="resetFormItemData" @setFormItemData="setFormItemData"
             @getQuestions="getQuestions" @operateImageMarker="operateImageMarker"
             @unBindAnnotationToQuestion="unBindAnnotationToQuestion" />
-=======
-          <QuestionFormItem
-            v-for="question of questions"
-            :key="question.Id"
-            :visit-task-id="visitTaskId"
-            :question="question"
-            :question-form="questionForm"
-            :reading-task-state="readingTaskState"
-            :criterion-id="criterionId"
-            :calculation-list="calculationList"
-            :is-baseline="isBaseLineTask"
-            @resetFormItemData="resetFormItemData"
-            @setFormItemData="setFormItemData"
-            @getQuestions="getQuestions"
-          />
->>>>>>> uat
         </template>
 
         <el-form-item v-if="readingTaskState < 2">
@@ -133,14 +116,8 @@ export default {
     this.visitTaskId = this.visitInfo.VisitTaskId
     this.taskInfo = JSON.parse(localStorage.getItem('taskInfo'))
     this.isBaseLineTask = this.taskInfo.IsBaseLine
-<<<<<<< HEAD
     this.criterionId = this.taskInfo.TrialReadingCriterionId
     const digitPlaces = Number(localStorage.getItem('digitPlaces'))
-=======
-    this.criterionType = this.taskInfo.CriterionType
-    this.criterionId = this.taskInfo.TrialReadingCriterionId
-    var digitPlaces = Number(localStorage.getItem('digitPlaces'))
->>>>>>> uat
     this.digitPlaces = digitPlaces === -1 ? this.digitPlaces : digitPlaces
     this.getQuestionCalculateRelation()
     this.getQuestions(true)
diff --git a/src/views/trials/trials-panel/setting/reading-unit/components/QuestionFormItem.vue b/src/views/trials/trials-panel/setting/reading-unit/components/QuestionFormItem.vue
index 72a10186..ea46a0c3 100644
--- a/src/views/trials/trials-panel/setting/reading-unit/components/QuestionFormItem.vue
+++ b/src/views/trials/trials-panel/setting/reading-unit/components/QuestionFormItem.vue
@@ -21,7 +21,6 @@
       </div>
       <el-table :data="question.TableQuestions.Answers">
         <el-table-column v-for="item of question.TableQuestions.Questions" :key="item.Id" :prop="item.Id"
-<<<<<<< HEAD
           :label="item.QuestionName" min-width="100" show-overflow-tooltip>
           <template slot-scope="scope">
             <span v-if="item.Unit">{{ scope.row[item.Id] }}{{ item.Unit !== 4 ? $fd('ValueUnit', item.Unit)
@@ -30,9 +29,6 @@
             <span v-else>{{ scope.row[item.Id] }}</span>
           </template>
         </el-table-column>
-=======
-          :label="item.QuestionName" min-width="100" show-overflow-tooltip />
->>>>>>> uat
       </el-table>
     </div>
     <template v-else>
@@ -153,7 +149,6 @@
         <el-select v-if="question.Type === 'number' && question.TypeValue" v-model="questionForm[question.Id]" clearable
           @change="(val) => { formItemNumberChange(val, question) }">
           <el-option v-for="val in question.TypeValue.split('|')" :key="val" :label="val.trim()" :value="val.trim()" />
-<<<<<<< HEAD
           <template v-if="question.Unit !== 0" slot="prefix">{{ question.Unit !== 4 ? $fd('ValueUnit', question.Unit) :
             question.CustomUnit }}</template>
           <template v-else-if="question.ValueType === 2" slot="prefix">%</template>
@@ -170,14 +165,6 @@
             question.CustomUnit }}</template>
           <template v-else-if="question.ValueType === 2" slot="append">%</template>
         </el-input>
-=======
-        </el-select>
-        <el-input v-else-if="question.Type === 'number' && question.DataSource !== 1"
-          v-model="questionForm[question.Id]" type="number"
-          @change="(val) => { formItemNumberChange(val, question) }" />
-        <el-input v-else-if="question.Type === 'number' && question.DataSource === 1"
-          v-model="questionForm[question.Id]" :disabled="question.DataSource === 1" />
->>>>>>> uat
         <!-- 上传图像 -->
         <el-upload v-if="question.Type === 'upload'" action :accept="question.FileType"
           :limit="question.ImageCount > 0 ? parseInt(question.ImageCount) : 100" :on-preview="handlePictureCardPreview"
@@ -481,13 +468,9 @@ export default {
                 case 9:
                   var arr = [];
                   this.questionForm[o.QuestionId].forEach((q) => {
-<<<<<<< HEAD
-                    arr.push(q[o.TableQuestionId]);
-=======
                     if (!isNaN(parseFloat(q[o.TableQuestionId]))) {
                       arr.push(q[o.TableQuestionId]);
                     }
->>>>>>> uat
                     if (q[o.TableQuestionId] === 'NE') {
                       isNE = true
                     }
@@ -496,20 +479,11 @@ export default {
                   break;
               }
             } else {
-<<<<<<< HEAD
-              num = parseFloat(this.questionForm[o.TableQuestionId]);
-              if (this.questionForm[o.TableQuestionId] === 'NE') {
-                isNE = true
-              }
-              if (!isNaN(num)) {
-                dataArr.push(num)
-=======
               if (!isNaN(parseFloat(this.questionForm[o.TableQuestionId]))) {
                 num = parseFloat(this.questionForm[o.TableQuestionId]);
                 if (!isNaN(num)) {
                   dataArr.push(num)
                 }
->>>>>>> uat
               }
 
             }
@@ -580,18 +554,12 @@ export default {
         console.log(e);
       }
       if (isNE) {
-<<<<<<< HEAD
-        num = 'NE'
-      }
-      return num;
-=======
         return 'NE'
       }
       if (rules.ValueType === 2) {
         num = num * 100
       }
       return num.toFixed(this.digitPlaces)
->>>>>>> uat
     },
     formItemNumberChange(questionId, isTable) {
       if (typeof isTable === 'object') {
@@ -636,10 +604,6 @@ export default {
             arr = [];
           let isNE = false
           CalculateQuestions.forEach((o, i) => {
-<<<<<<< HEAD
-=======
-            console.log(this.QuestionsForm[o.TableQuestionId], 'this.QuestionsForm[o.TableQuestionId]')
->>>>>>> uat
             if (this.QuestionsForm[o.TableQuestionId] === 'NE') {
               isNE = true
             }
@@ -707,11 +671,8 @@ export default {
           });
           if (isNE) {
             num = 'NE'
-<<<<<<< HEAD
-=======
           } else {
             num = num.toFixed(this.digitPlaces)
->>>>>>> uat
           }
           this.$set(this.QuestionsForm, v.Id, num.toString());
         }
@@ -960,7 +921,6 @@ export default {
   }
 }
 
-<<<<<<< HEAD
 ::v-deep .el-select .el-input__prefix {
   left: calc(100% - 50px);
   cursor: pointer;
@@ -971,8 +931,6 @@ export default {
   padding-right: 50px;
 }
 
-=======
->>>>>>> uat
 .criterion-form-item {
   .el-form-item {
     display: flex;
diff --git a/src/views/trials/trials-panel/setting/reading-unit/components/QuestionTableFormItem.vue b/src/views/trials/trials-panel/setting/reading-unit/components/QuestionTableFormItem.vue
index 7db53f67..c5a06ce5 100644
--- a/src/views/trials/trials-panel/setting/reading-unit/components/QuestionTableFormItem.vue
+++ b/src/views/trials/trials-panel/setting/reading-unit/components/QuestionTableFormItem.vue
@@ -73,27 +73,12 @@
       <el-input v-if="question.Type === 'increment'" v-model="questionForm[question.Id]" disabled />
       <!-- 数值 -->
       <!-- :precision="2" :step="0.1" :max="10" -->
-<<<<<<< HEAD
       <el-select v-if="question.Type === 'number' && question.TypeValue" v-model="questionForm[question.Id]" clearable
         @change="((val) => { formItemChange(val, question) })">
         <el-option v-for="val in question.TypeValue.split('|')" :key="val" :label="val" :value="val" />
         <template v-if="question.Unit !== 0" slot="prefix">{{ question.Unit !== 4 ? $fd('ValueUnit', question.Unit) :
           question.CustomUnit }}</template>
         <template v-else-if="question.ValueType === 2" slot="prefix">%</template>
-=======
-      <el-select
-        v-if="question.Type === 'number' && question.TypeValue"
-        v-model="questionForm[question.Id]"
-        clearable
-        @change="((val)=>{formItemNumberChange(val, question)})"
-      >
-        <el-option
-          v-for="val in question.TypeValue.split('|')"
-          :key="val"
-          :label="val"
-          :value="val"
-        />
->>>>>>> uat
       </el-select>
       <el-input v-else-if="question.Type === 'number' && question.DataSource !== 1" v-model="questionForm[question.Id]"
         type="number" @change="((val) => { formItemNumberChange(val, question) })">
@@ -101,19 +86,12 @@
           question.CustomUnit }}</template>
         <template v-else-if="question.ValueType === 2" slot="append">%</template>
       </el-input>
-<<<<<<< HEAD
-      <el-input v-else-if="question.Type === 'number' && question.DataSource === 1" v-model="questionForm[question.Id]"
-        type="number" :disabled="question.DataSource === 1">
-        <template v-if="question.Unit !== 0" slot="append">{{ question.Unit !== 4 ? $fd('ValueUnit', question.Unit) :
-          question.CustomUnit }}</template>
-=======
       <el-input
         v-else-if="question.Type === 'number' && question.DataSource === 1"
         v-model="questionForm[question.Id]"
         :disabled="question.DataSource === 1"
       >
         <template v-if="question.Unit !== 0" slot="append">{{ question.Unit !== 4 ? $fd('ValueUnit', question.Unit) : question.CustomUnit }}</template>
->>>>>>> uat
         <template v-else-if="question.ValueType === 2" slot="append">%</template>
       </el-input>
       <!-- 上传图像 -->