diff --git a/.env.production b/.env.production
index 70fcaf40..00537958 100644
--- a/.env.production
+++ b/.env.production
@@ -10,7 +10,7 @@ VUE_APP_IS_TEST = true
 VUE_APP_LOGIN_FOR_PERMISSION = false
 
 # 是否开启长时间无操作锁定弹框 true:是 false:否
-VUE_APP_LOCK_FOR_PERMISSION = true
+VUE_APP_LOCK_FOR_PERMISSION = false
 
 # 无操作锁定弹框判断时间 单位:秒
 VUE_APP_LOCK_FOR_TIME = 360
diff --git a/src/views/trials/trials-panel/reading/global-review/components/IRecistTable.vue b/src/views/trials/trials-panel/reading/global-review/components/IRecistTable.vue
index 32ed4fcd..7cf79fe3 100644
--- a/src/views/trials/trials-panel/reading/global-review/components/IRecistTable.vue
+++ b/src/views/trials/trials-panel/reading/global-review/components/IRecistTable.vue
@@ -26,13 +26,24 @@
             show-overflow-tooltip
             width="150"
           >
-            <template slot-scope="scope">
+            <!-- <template slot-scope="scope">
               <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 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>
@@ -92,13 +103,12 @@
             :min-width="index === 3 ? '200' : '200'"
           >
             <template slot-scope="scope">
-              <div v-if="readingTaskState<2">
-                <span v-if="(scope.row.IsBaseLine && scope.row.AfterQuestionList[index].LimitEdit === 2) || (!scope.row.IsBaseLine && scope.row.AfterQuestionList[index].LimitEdit === 1)">
+              <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>
+                </span> -->
 
                 <el-form-item
-                  v-else
                   style="margin-bottom: 0;"
                   :prop="`${scope.$index}${scope.row.AfterQuestionList[index].QuestionId?scope.row.AfterQuestionList[index].QuestionId:scope.row.AfterQuestionList[index].GlobalAnswerType}`"
                   label=""
@@ -255,7 +265,7 @@
                   />
                 </el-form-item>
               </div>
-              <div v-else-if="scope.row.AfterQuestionList.length>index && scope.row.AfterQuestionList[index].Answer">
+              <div v-else>
 
                 <span v-if="scope.row.AfterQuestionList[index].GlobalAnswerType === 3">
                   {{ getAssessType(scope.row.AfterQuestionList[index].Answer) }}
diff --git a/src/views/trials/trials-panel/reading/global-review/components/PCWG3Table.vue b/src/views/trials/trials-panel/reading/global-review/components/PCWG3Table.vue
index ab34fedc..d93785ae 100644
--- a/src/views/trials/trials-panel/reading/global-review/components/PCWG3Table.vue
+++ b/src/views/trials/trials-panel/reading/global-review/components/PCWG3Table.vue
@@ -26,14 +26,16 @@
             width="200"
           >
             <template slot-scope="scope">
-              <div v-if="scope.row.BeforeQuestionList.length>index && scope.row.BeforeQuestionList[index].Answer">
-                <span v-if="scope.row.BeforeQuestionList[index].DictionaryCode">
-                  {{ $fd(scope.row.BeforeQuestionList[index].DictionaryCode,parseInt(scope.row.BeforeQuestionList[index].Answer)) }}
-                </span>
-                <span v-else-if="scope.row.BeforeQuestionList[index].QuestionType === 22">{{ scope.row.BeforeQuestionList[index].Answer === '-1' ? $t('trials:readingReport:title:unknow') : scope.row.BeforeQuestionList[index].Answer }}</span>
-                <span v-else>{{ scope.row.BeforeQuestionList[index].Answer }}</span>
-              </div>
-            </template>
+              <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">
+                  <span v-if="scope.row.BeforeQuestionList[index].DictionaryCode">
+                    {{ $fd(scope.row.BeforeQuestionList[index].DictionaryCode,parseInt(scope.row.BeforeQuestionList[index].Answer)) }}
+                  </span>
+                  <span v-else-if="scope.row.BeforeQuestionList[index].QuestionType === 22">{{ scope.row.BeforeQuestionList[index].Answer === '-1' ? $t('trials:readingReport:title:unknow') : 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>
@@ -53,12 +55,11 @@
             :width="index > 0 ? '300' : '200'"
           >
             <template slot-scope="scope">
-              <div v-if="readingTaskState<2 ">
-                <span v-if="(scope.row.IsBaseLine && scope.row.AfterQuestionList[index].LimitEdit === 2) || (!scope.row.IsBaseLine && scope.row.AfterQuestionList[index].LimitEdit === 1)">
+              <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>
+                </span> -->
                 <el-form-item
-                  v-else
                   :prop="`${scope.$index}${scope.row.AfterQuestionList[index].QuestionId?scope.row.AfterQuestionList[index].QuestionId:scope.row.AfterQuestionList[index].GlobalAnswerType}`"
                   label=""
                   :rules="[
@@ -107,7 +108,7 @@
                   />
                 </el-form-item>
               </div>
-              <div v-else-if="scope.row.AfterQuestionList.length>index && scope.row.AfterQuestionList[index].Answer">
+              <div v-else>
 
                 <span v-if="scope.row.AfterQuestionList[index].GlobalAnswerType === 3">
                   {{ getAssessType(scope.row.AfterQuestionList[index].Answer) }}
diff --git a/src/views/trials/trials-panel/reading/global-review/components/RecistBMTable.vue b/src/views/trials/trials-panel/reading/global-review/components/RecistBMTable.vue
index c6d870a3..6a2f6c5e 100644
--- a/src/views/trials/trials-panel/reading/global-review/components/RecistBMTable.vue
+++ b/src/views/trials/trials-panel/reading/global-review/components/RecistBMTable.vue
@@ -26,13 +26,24 @@
             show-overflow-tooltip
             width="150"
           >
-            <template slot-scope="scope">
+            <!-- <template slot-scope="scope">
               <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 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>
@@ -92,13 +103,12 @@
             :min-width="index === 3 ? '200' : '200'"
           >
             <template slot-scope="scope">
-              <div v-if="readingTaskState<2">
-                <span v-if="(scope.row.IsBaseLine && scope.row.AfterQuestionList[index].LimitEdit === 2) || (!scope.row.IsBaseLine && scope.row.AfterQuestionList[index].LimitEdit === 1)">
+              <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>
+                </span> -->
 
                 <el-form-item
-                  v-else
                   style="margin-bottom: 0;"
                   :prop="`${scope.$index}${scope.row.AfterQuestionList[index].QuestionId?scope.row.AfterQuestionList[index].QuestionId:scope.row.AfterQuestionList[index].GlobalAnswerType}`"
                   label=""
@@ -253,7 +263,7 @@
                   />
                 </el-form-item>
               </div>
-              <div v-else-if="scope.row.AfterQuestionList.length>index && scope.row.AfterQuestionList[index].Answer">
+              <div v-else>
 
                 <span v-if="scope.row.AfterQuestionList[index].GlobalAnswerType === 3">
                   {{ getAssessType(scope.row.AfterQuestionList[index].Answer) }}
diff --git a/src/views/trials/trials-panel/reading/global-review/components/RecistTable.vue b/src/views/trials/trials-panel/reading/global-review/components/RecistTable.vue
index 6c6a95d2..4de01166 100644
--- a/src/views/trials/trials-panel/reading/global-review/components/RecistTable.vue
+++ b/src/views/trials/trials-panel/reading/global-review/components/RecistTable.vue
@@ -26,13 +26,24 @@
             show-overflow-tooltip
             width="150"
           >
-            <template slot-scope="scope">
+            <!-- <template slot-scope="scope">
               <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 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>
@@ -92,12 +103,11 @@
             :min-width="index === 3 ? '200' : '200'"
           >
             <template slot-scope="scope">
-              <div v-if="readingTaskState<2">
-                <span v-if="(scope.row.IsBaseLine && scope.row.AfterQuestionList[index].LimitEdit === 2) || (!scope.row.IsBaseLine && scope.row.AfterQuestionList[index].LimitEdit === 1)">
+              <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>
+                </span> -->
                 <el-form-item
-                  v-else
                   style="margin-bottom: 0;"
                   :prop="`${scope.$index}${scope.row.AfterQuestionList[index].QuestionId?scope.row.AfterQuestionList[index].QuestionId:scope.row.AfterQuestionList[index].GlobalAnswerType}`"
                   label=""
@@ -246,7 +256,7 @@
                   />
                 </el-form-item>
               </div>
-              <div v-else-if="scope.row.AfterQuestionList.length>index && scope.row.AfterQuestionList[index].Answer">
+              <div v-else>
 
                 <span v-if="scope.row.AfterQuestionList[index].GlobalAnswerType === 3">
                   {{ getAssessType(scope.row.AfterQuestionList[index].Answer) }}
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 5da3f2e4..89440aeb 100644
--- a/src/views/trials/trials-panel/reading/global-review/index.vue
+++ b/src/views/trials/trials-panel/reading/global-review/index.vue
@@ -267,7 +267,9 @@ export default {
                   // 评估更新类型
                   adjustedQsList.push(this.$t('trials:globalReview:table:updateType'))
                 } else {
-                  adjustedQsList.push(qs.QuestionName)
+                  if(!(this.CriterionType === 2 && (qs.QuestionType !== 39 || qs.QuestionType !== 40 || qs.QuestionType !== 41))){
+                    adjustedQsList.push(qs.QuestionName)
+                  }
                 }
               })
               qs.AgreeOrNot.map(qs => {