diff --git a/src/components/360View/commonForm/deveopmentFIle.vue b/src/components/360View/commonForm/deveopmentFIle.vue
index fb7c0d5..232cee1 100644
--- a/src/components/360View/commonForm/deveopmentFIle.vue
+++ b/src/components/360View/commonForm/deveopmentFIle.vue
@@ -201,8 +201,17 @@
                 </div>
               </div>
               <div v-if="scope.row.name == '眼位'">
-                <div class="width-180 center">
-                  <el-input v-model="dataForm.ywOd" placeholder="" />
+                <div class="center">
+                  <el-input v-model="dataForm.ywOd" style="width: 100px" placeholder="" />
+                  <span>△</span>
+                  <el-select v-model="dataForm.ywOdExtra" placeholder="" style="width: 100px">
+                    <el-option
+                      v-for="item in scope.row.position"
+                      :key="item.id"
+                      :label="item.name"
+                      :value="item.name"
+                    />
+                  </el-select>
                 </div>
               </div>
               <div v-if="scope.row.name == '眼压/mmHg'">
@@ -267,8 +276,17 @@
                 </div>
               </div>
               <div v-if="scope.row.name == '眼位'">
-                <div class="width-180 center">
-                  <el-input v-model="dataForm.ywOs" placeholder="" />
+                <div class="center">
+                  <el-input v-model="dataForm.ywOs" placeholder="" style="width: 100px" />
+                  <span>△</span>
+                  <el-select v-model="dataForm.ywOsExtra" clearable placeholder="" style="width: 100px" >
+                    <el-option
+                      v-for="item in scope.row.position"
+                      :key="item.id"
+                      :label="item.name"
+                      :value="item.name"
+                    />
+                  </el-select>
                 </div>
               </div>
               <div v-if="scope.row.name == '眼压/mmHg'">
@@ -365,6 +383,8 @@ export default {
         ydzOs: '', // 眼底照
         ywOd: '', // 眼位
         ywOs: '', // 眼位
+        ywOdExtra: '', // 眼位
+        ywOsExtra: '', // 眼位
         yyOd: '', // 眼压
         yyOs: '', // 眼压
         yzOd: '', // 眼轴
@@ -482,7 +502,22 @@ export default {
         }, {
           name: '主觉验光'
         }, {
-          name: '眼位'
+          name: '眼位',
+          position: [
+            {
+              name: 'BI',
+              id: '1'
+            }, {
+              name: 'BO',
+              id: '2'
+            }, {
+              name: 'BD',
+              id: '3'
+            }, {
+              name: 'BU',
+              id: '4'
+            }
+          ]
         }, {
           name: '眼压/mmHg'
         }, {
@@ -540,6 +575,10 @@ export default {
       )
       if (res.code === 0) {
         this.dataForm = res.data
+        if (!this.dataForm.id) {
+          this.dataForm.ywOdExtra = 'BI'
+          this.dataForm.ywOsExtra = 'BI'
+        }
       } else {
         this.$message.error(res.msg)
       }
diff --git a/src/components/360View/commonForm/optometryForm-copy.vue b/src/components/360View/commonForm/optometryForm-copy.vue
index ba7429f..9c7ba45 100644
--- a/src/components/360View/commonForm/optometryForm-copy.vue
+++ b/src/components/360View/commonForm/optometryForm-copy.vue
@@ -567,6 +567,8 @@ export default {
       const userData = JSON.parse(window.localStorage.getItem('qg-userData'))
       const date = this.$moment().format('YYYY-MM-DD')
       const mzName = window.localStorage.getItem('mzDoctorName')
+      this.dataForm.tongk = '正常瞳孔'
+      this.dataForm.jianchaFangfa = '综合'
       this.dataForm.ygsSign = userData.signImgBase
       this.dataForm.ysSign = mzName
       this.dataForm.riQi = date
diff --git a/src/components/360View/commonForm/threeVision.vue b/src/components/360View/commonForm/threeVision.vue
index 55658ab..39195e9 100644
--- a/src/components/360View/commonForm/threeVision.vue
+++ b/src/components/360View/commonForm/threeVision.vue
@@ -1,6 +1,6 @@
 <template>
   <div id="operation-record" style=" background: #fff; padding: 10px 20px 50px 20px;page-break-after:always">
-<!--    <Keyboard :layouts="myLayout" @input="handleInput" />-->
+    <!--    <Keyboard :layouts="myLayout" @input="handleInput" />-->
     <div v-if="!onlyRead && isPlatform" class="btnBox">
       <el-button v-print="'#threeFunc'" size="small" @click="handleSaveTable">打印</el-button>
       <el-button type="primary" size="small" @click="handleSaveTable">保存</el-button>
@@ -40,34 +40,82 @@
                     >
                       <template slot-scope="scope">
                         <div v-if="scope.row.name == '1'">
-                          <div class="width-120 center">
-<!--                            <el-input v-model="dataForm.jfwjcOd1" placeholder="" @change="handleFocus"></el-input>-->
-                            <el-input v-model="dataForm.jfwjcOd1" placeholder=""></el-input>
+                          <div class="center">
+                            <!--                            <el-input v-model="dataForm.jfwjcOd1" placeholder="" @change="handleFocus"></el-input>-->
+                            <el-input v-model="dataForm.jfwjcOd1" placeholder="" />
+                            <el-select v-model="dataForm.ctPrismDw" placeholder="" clearable style="display: inline-block;width: 100px;margin-left: 8px">
+                              <el-option
+                                v-for="item in symbolList"
+                                :key="item.id"
+                                :label="item.name"
+                                :value="item.name"
+                              />
+                            </el-select>
                           </div>
                         </div>
                         <div v-if="scope.row.name == '2'">
-                          <div class="width-120 center">
-                            <el-input v-model="dataForm.jfwjcOd1n" placeholder=""></el-input>
+                          <div class="center">
+                            <el-input v-model="dataForm.jfwjcOd1n" placeholder="" />
+                            <el-select v-model="dataForm.ctPrismDw" placeholder="" clearable style="display: inline-block;width: 100px;margin-left: 8px">
+                              <el-option
+                                v-for="item in symbolList"
+                                :key="item.id"
+                                :label="item.name"
+                                :value="item.name"
+                              />
+                            </el-select>
                           </div>
                         </div>
                         <div v-if="scope.row.name == '3'">
-                          <div class="width-120 center">
-                            <el-input v-model="dataForm.jfwjcOd4" placeholder=""></el-input>
+                          <div class="center">
+                            <el-input v-model="dataForm.jfwjcOd4" placeholder="" />
+                            <el-select v-model="dataForm.ctPrismDw" placeholder="" clearable style="display: inline-block;width: 100px;margin-left: 8px">
+                              <el-option
+                                v-for="item in symbolList"
+                                :key="item.id"
+                                :label="item.name"
+                                :value="item.name"
+                              />
+                            </el-select>
                           </div>
                         </div>
                         <div v-if="scope.row.name == '4'">
-                          <div class="width-120 center">
-                            <el-input v-model="dataForm.jfwjcOd4n" placeholder=""></el-input>
+                          <div class="center">
+                            <el-input v-model="dataForm.jfwjcOd4n" placeholder="" />
+                            <el-select v-model="dataForm.ctPrismDw" placeholder="" clearable style="display: inline-block;width: 100px;margin-left: 8px">
+                              <el-option
+                                v-for="item in symbolList"
+                                :key="item.id"
+                                :label="item.name"
+                                :value="item.name"
+                              />
+                            </el-select>
                           </div>
                         </div>
                         <div v-if="scope.row.name == '5'">
-                          <div class="width-120 center">
-                            <el-input v-model="dataForm.jfwjcOd7" placeholder=""></el-input>
+                          <div class="center">
+                            <el-input v-model="dataForm.jfwjcOd7" placeholder="" />
+                            <el-select v-model="dataForm.ctPrismDw" placeholder="" clearable style="display: inline-block;width: 100px;margin-left: 8px">
+                              <el-option
+                                v-for="item in symbolList"
+                                :key="item.id"
+                                :label="item.name"
+                                :value="item.name"
+                              />
+                            </el-select>
                           </div>
                         </div>
                         <div v-if="scope.row.name == '6'">
-                          <div class="width-120 center">
-                            <el-input v-model="dataForm.jfwjcOd7n" placeholder=""></el-input>
+                          <div class="center">
+                            <el-input v-model="dataForm.jfwjcOd7n" placeholder="" />
+                            <el-select v-model="dataForm.ctPrismDw" placeholder="" clearable style="display: inline-block;width: 100px;margin-left: 8px">
+                              <el-option
+                                v-for="item in symbolList"
+                                :key="item.id"
+                                :label="item.name"
+                                :value="item.name"
+                              />
+                            </el-select>
                           </div>
                         </div>
                       </template>
@@ -77,33 +125,81 @@
                     >
                       <template slot-scope="scope">
                         <div v-if="scope.row.name == '1'">
-                          <div class="width-120 center">
-                            <el-input v-model="dataForm.jfwjcOd2" placeholder=""></el-input>
+                          <div class="center">
+                            <el-input v-model="dataForm.jfwjcOd2" placeholder="" />
+                            <el-select v-model="dataForm.ctPrismDw" placeholder="" clearable style="display: inline-block;width: 100px;margin-left: 8px">
+                              <el-option
+                                v-for="item in symbolList"
+                                :key="item.id"
+                                :label="item.name"
+                                :value="item.name"
+                              />
+                            </el-select>
                           </div>
                         </div>
                         <div v-if="scope.row.name == '2'">
-                          <div class="width-120 center">
-                            <el-input v-model="dataForm.jfwjcOd2n" placeholder=""></el-input>
+                          <div class="center">
+                            <el-input v-model="dataForm.jfwjcOd2n" placeholder="" />
+                            <el-select v-model="dataForm.ctPrismDw" placeholder="" clearable style="display: inline-block;width: 100px;margin-left: 8px">
+                              <el-option
+                                v-for="item in symbolList"
+                                :key="item.id"
+                                :label="item.name"
+                                :value="item.name"
+                              />
+                            </el-select>
                           </div>
                         </div>
                         <div v-if="scope.row.name == '3'">
-                          <div class="width-120 center">
-                            <el-input v-model="dataForm.jfwjcOd5" placeholder=""></el-input>
+                          <div class="center">
+                            <el-input v-model="dataForm.jfwjcOd5" placeholder="" />
+                            <el-select v-model="dataForm.ctPrismDw" placeholder="" clearable style="display: inline-block;width: 100px;margin-left: 8px">
+                              <el-option
+                                v-for="item in symbolList"
+                                :key="item.id"
+                                :label="item.name"
+                                :value="item.name"
+                              />
+                            </el-select>
                           </div>
                         </div>
                         <div v-if="scope.row.name == '4'">
-                          <div class="width-120 center">
-                            <el-input v-model="dataForm.jfwjcOd5n" placeholder=""></el-input>
+                          <div class="center">
+                            <el-input v-model="dataForm.jfwjcOd5n" placeholder="" />
+                            <el-select v-model="dataForm.ctPrismDw" placeholder="" clearable style="display: inline-block;width: 100px;margin-left: 8px">
+                              <el-option
+                                v-for="item in symbolList"
+                                :key="item.id"
+                                :label="item.name"
+                                :value="item.name"
+                              />
+                            </el-select>
                           </div>
                         </div>
                         <div v-if="scope.row.name == '5'">
-                          <div class="width-120 center">
-                            <el-input v-model="dataForm.jfwjcOd8" placeholder=""></el-input>
+                          <div class="center">
+                            <el-input v-model="dataForm.jfwjcOd8" placeholder="" />
+                            <el-select v-model="dataForm.ctPrismDw" placeholder="" clearable style="display: inline-block;width: 100px;margin-left: 8px">
+                              <el-option
+                                v-for="item in symbolList"
+                                :key="item.id"
+                                :label="item.name"
+                                :value="item.name"
+                              />
+                            </el-select>
                           </div>
                         </div>
                         <div v-if="scope.row.name == '6'">
-                          <div class="width-120 center">
-                            <el-input v-model="dataForm.jfwjcOd8n" placeholder=""></el-input>
+                          <div class="center">
+                            <el-input v-model="dataForm.jfwjcOd8n" placeholder="" />
+                            <el-select v-model="dataForm.ctPrismDw" placeholder="" clearable style="display: inline-block;width: 100px;margin-left: 8px">
+                              <el-option
+                                v-for="item in symbolList"
+                                :key="item.id"
+                                :label="item.name"
+                                :value="item.name"
+                              />
+                            </el-select>
                           </div>
                         </div>
                       </template>
@@ -113,33 +209,81 @@
                     >
                       <template slot-scope="scope">
                         <div v-if="scope.row.name == '1'">
-                          <div class="width-120 center">
-                            <el-input v-model="dataForm.jfwjcOd3" placeholder=""></el-input>
+                          <div class="center">
+                            <el-input v-model="dataForm.jfwjcOd3" placeholder="" />
+                            <el-select v-model="dataForm.ctPrismDw" placeholder="" clearable style="display: inline-block;width: 100px;margin-left: 8px">
+                              <el-option
+                                v-for="item in symbolList"
+                                :key="item.id"
+                                :label="item.name"
+                                :value="item.name"
+                              />
+                            </el-select>
                           </div>
                         </div>
                         <div v-if="scope.row.name == '2'">
-                          <div class="width-120 center">
-                            <el-input v-model="dataForm.jfwjcOd3n" placeholder=""></el-input>
+                          <div class="center">
+                            <el-input v-model="dataForm.jfwjcOd3n" placeholder="" />
+                            <el-select v-model="dataForm.ctPrismDw" placeholder="" clearable style="display: inline-block;width: 100px;margin-left: 8px">
+                              <el-option
+                                v-for="item in symbolList"
+                                :key="item.id"
+                                :label="item.name"
+                                :value="item.name"
+                              />
+                            </el-select>
                           </div>
                         </div>
                         <div v-if="scope.row.name == '3'">
-                          <div class="width-120 center">
-                            <el-input v-model="dataForm.jfwjcOd6" placeholder=""></el-input>
+                          <div class="center">
+                            <el-input v-model="dataForm.jfwjcOd6" placeholder="" />
+                            <el-select v-model="dataForm.ctPrismDw" placeholder="" clearable style="display: inline-block;width: 100px;margin-left: 8px">
+                              <el-option
+                                v-for="item in symbolList"
+                                :key="item.id"
+                                :label="item.name"
+                                :value="item.name"
+                              />
+                            </el-select>
                           </div>
                         </div>
                         <div v-if="scope.row.name == '4'">
-                          <div class="width-120 center">
-                            <el-input v-model="dataForm.jfwjcOd6n" placeholder=""></el-input>
+                          <div class="center">
+                            <el-input v-model="dataForm.jfwjcOd6n" placeholder="" />
+                            <el-select v-model="dataForm.ctPrismDw" placeholder="" clearable style="display: inline-block;width: 100px;margin-left: 8px">
+                              <el-option
+                                v-for="item in symbolList"
+                                :key="item.id"
+                                :label="item.name"
+                                :value="item.name"
+                              />
+                            </el-select>
                           </div>
                         </div>
                         <div v-if="scope.row.name == '5'">
-                          <div class="width-120 center">
-                            <el-input v-model="dataForm.jfwjcOd9" placeholder=""></el-input>
+                          <div class="center">
+                            <el-input v-model="dataForm.jfwjcOd9" placeholder="" />
+                            <el-select v-model="dataForm.ctPrismDw" placeholder="" clearable style="display: inline-block;width: 100px;margin-left: 8px">
+                              <el-option
+                                v-for="item in symbolList"
+                                :key="item.id"
+                                :label="item.name"
+                                :value="item.name"
+                              />
+                            </el-select>
                           </div>
                         </div>
                         <div v-if="scope.row.name == '6'">
-                          <div class="width-120 center">
-                            <el-input v-model="dataForm.jfwjcOd9n" placeholder=""></el-input>
+                          <div class="center">
+                            <el-input v-model="dataForm.jfwjcOd9n" placeholder="" />
+                            <el-select v-model="dataForm.ctPrismDw" placeholder="" clearable style="display: inline-block;width: 100px;margin-left: 8px">
+                              <el-option
+                                v-for="item in symbolList"
+                                :key="item.id"
+                                :label="item.name"
+                                :value="item.name"
+                              />
+                            </el-select>
                           </div>
                         </div>
                       </template>
@@ -157,32 +301,32 @@
                       <template slot-scope="scope">
                         <div v-if="scope.row.name == '1'">
                           <div class="width-120 center">
-                            <el-input v-model="dataForm.jfwjcOs1" placeholder=""></el-input>
+                            <el-input v-model="dataForm.jfwjcOs1" placeholder="" />
                           </div>
                         </div>
                         <div v-if="scope.row.name == '2'">
                           <div class="width-120 center">
-                            <el-input v-model="dataForm.jfwjcOs1n" placeholder=""></el-input>
+                            <el-input v-model="dataForm.jfwjcOs1n" placeholder="" />
                           </div>
                         </div>
                         <div v-if="scope.row.name == '3'">
                           <div class="width-120 center">
-                            <el-input v-model="dataForm.jfwjcOs4" placeholder=""></el-input>
+                            <el-input v-model="dataForm.jfwjcOs4" placeholder="" />
                           </div>
                         </div>
                         <div v-if="scope.row.name == '4'">
                           <div class="width-120 center">
-                            <el-input v-model="dataForm.jfwjcOs4n" placeholder=""></el-input>
+                            <el-input v-model="dataForm.jfwjcOs4n" placeholder="" />
                           </div>
                         </div>
                         <div v-if="scope.row.name == '5'">
                           <div class="width-120 center">
-                            <el-input v-model="dataForm.jfwjcOs7" placeholder=""></el-input>
+                            <el-input v-model="dataForm.jfwjcOs7" placeholder="" />
                           </div>
                         </div>
                         <div v-if="scope.row.name == '6'">
                           <div class="width-120 center">
-                            <el-input v-model="dataForm.jfwjcOs7n" placeholder=""></el-input>
+                            <el-input v-model="dataForm.jfwjcOs7n" placeholder="" />
                           </div>
                         </div>
                       </template>
@@ -193,32 +337,32 @@
                       <template slot-scope="scope">
                         <div v-if="scope.row.name == '1'">
                           <div class="width-120 center">
-                            <el-input v-model="dataForm.jfwjcOs2" placeholder=""></el-input>
+                            <el-input v-model="dataForm.jfwjcOs2" placeholder="" />
                           </div>
                         </div>
                         <div v-if="scope.row.name == '2'">
                           <div class="width-120 center">
-                            <el-input v-model="dataForm.jfwjcOs2n" placeholder=""></el-input>
+                            <el-input v-model="dataForm.jfwjcOs2n" placeholder="" />
                           </div>
                         </div>
                         <div v-if="scope.row.name == '3'">
                           <div class="width-120 center">
-                            <el-input v-model="dataForm.jfwjcOs5" placeholder=""></el-input>
+                            <el-input v-model="dataForm.jfwjcOs5" placeholder="" />
                           </div>
                         </div>
                         <div v-if="scope.row.name == '4'">
                           <div class="width-120 center">
-                            <el-input v-model="dataForm.jfwjcOs5n" placeholder=""></el-input>
+                            <el-input v-model="dataForm.jfwjcOs5n" placeholder="" />
                           </div>
                         </div>
                         <div v-if="scope.row.name == '5'">
                           <div class="width-120 center">
-                            <el-input v-model="dataForm.jfwjcOs8" placeholder=""></el-input>
+                            <el-input v-model="dataForm.jfwjcOs8" placeholder="" />
                           </div>
                         </div>
                         <div v-if="scope.row.name == '6'">
                           <div class="width-120 center">
-                            <el-input v-model="dataForm.jfwjcOs8n" placeholder=""></el-input>
+                            <el-input v-model="dataForm.jfwjcOs8n" placeholder="" />
                           </div>
                         </div>
                       </template>
@@ -229,32 +373,32 @@
                       <template slot-scope="scope">
                         <div v-if="scope.row.name == '1'">
                           <div class="width-120 center">
-                            <el-input v-model="dataForm.jfwjcOs3" placeholder=""></el-input>
+                            <el-input v-model="dataForm.jfwjcOs3" placeholder="" />
                           </div>
                         </div>
                         <div v-if="scope.row.name == '2'">
                           <div class="width-120 center">
-                            <el-input v-model="dataForm.jfwjcOs3n" placeholder=""></el-input>
+                            <el-input v-model="dataForm.jfwjcOs3n" placeholder="" />
                           </div>
                         </div>
                         <div v-if="scope.row.name == '3'">
                           <div class="width-120 center">
-                            <el-input v-model="dataForm.jfwjcOs6" placeholder=""></el-input>
+                            <el-input v-model="dataForm.jfwjcOs6" placeholder="" />
                           </div>
                         </div>
                         <div v-if="scope.row.name == '4'">
                           <div class="width-120 center">
-                            <el-input v-model="dataForm.jfwjcOs6n" placeholder=""></el-input>
+                            <el-input v-model="dataForm.jfwjcOs6n" placeholder="" />
                           </div>
                         </div>
                         <div v-if="scope.row.name == '5'">
                           <div class="width-120 center">
-                            <el-input v-model="dataForm.jfwjcOs9" placeholder=""></el-input>
+                            <el-input v-model="dataForm.jfwjcOs9" placeholder="" />
                           </div>
                         </div>
                         <div v-if="scope.row.name == '6'">
                           <div class="width-120 center">
-                            <el-input v-model="dataForm.jfwjcOs9n" placeholder=""></el-input>
+                            <el-input v-model="dataForm.jfwjcOs9n" placeholder="" />
                           </div>
                         </div>
                       </template>
@@ -513,8 +657,11 @@
   </div>
 </template>
 <script>
-import Keyboard from 'vue-keyboard';
+import Keyboard from 'vue-keyboard'
 export default {
+  components: {
+    Keyboard
+  },
   props: {
     patientId: {
       type: String,
@@ -533,9 +680,6 @@ export default {
       default: ''
     }
   },
-  components: {
-    Keyboard
-  },
   data() {
     return {
       myLayout: [
@@ -543,6 +687,24 @@ export default {
         '!@#$%^&*(){delete:backspace}|QWERTYUIOP|ASDFGHJKL|{shift:goto:0}ZXCVBNM|{space:space}{custom:custom}'
       ],
       focusItem: '',
+      symbolList: [
+        {
+          name: 'ᴿ/ʟ',
+          id: '1'
+        },
+        {
+          name: 'ᴸ/ʀ',
+          id: '2'
+        },
+        {
+          name: '△',
+          id: '3'
+        },
+        {
+          name: '°',
+          id: '4'
+        }
+      ],
       ctList: [
         {
           name: '正位',
@@ -932,7 +1094,7 @@ export default {
       this.focusItem = 'jfwjcOd1'
     },
     handleInput(input) {
-      console.log('Input:', input);
+      console.log('Input:', input)
       this.dataForm[this.focusItem] += input
     },
     // 获取报告单id
diff --git a/src/components/360View/overView/index.vue b/src/components/360View/overView/index.vue
index f59b540..5f95327 100644
--- a/src/components/360View/overView/index.vue
+++ b/src/components/360View/overView/index.vue
@@ -1,97 +1,97 @@
 <template>
   <div class="overView">
 <!--    病史总览-->
-    <div v-for="(item, index) in tableData" :key="index" style="width: 100%;">
-      <div class="vieweBox">
-        <span class="title">{{ item.category }}</span>
-        <span class="time">{{ item.createTime }}</span>
-      </div>
-      <div v-if="item.category === '住院'" style="width: 100%;padding-right: 24px;display: flex;justify-content: space-between">
-        <div style="margin-right: 32px;width: 30%">
-          <p class="info">
-            <span class="mr16">主诉:</span>
-            <span style="word-break:break-all">{{ item.zs }}</span>
-          </p>
-          <p class="info">
-            <span class="mr16">现病史:</span>
-            <span style="word-break:break-all">{{ item.xbs }}</span>
-          </p>
-          <p class="info">
-            <span class="mr16">既往史:</span>
-            <span style="word-break:break-all">{{ item.jws }}</span>
-          </p>
-          <p class="info">
-            <span class="mr16">专科检查:</span>
-            <span style="word-break:break-all">{{ item.jc }}</span>
-          </p>
-        </div>
-        <div style="margin-right: 32px;width: 25%">
-          <div class="info">
-            <span class="mr16">诊断:</span>
-            <p v-for="row in item.diagnoseNameList">{{row}}</p>
+    <div style="width: 100%;">
+      <el-collapse v-model="activeNames">
+        <el-collapse-item v-for="(item, index) in tableData" :key="index" :title="item.category + ' ' + item.createTime" :name="index">
+          <div v-if="item.category === '住院'" style="width: 100%;padding-right: 24px;display: flex;justify-content: space-between">
+            <div style="margin-right: 32px;width: 40%">
+              <p class="info">
+                <span class="mr16">主诉:</span>
+                <span style="word-break:break-all">{{ item.zs }}</span>
+              </p>
+              <p class="info">
+                <span class="mr16">现病史:</span>
+                <span style="word-break:break-all">{{ item.xbs }}</span>
+              </p>
+              <p class="info">
+                <span class="mr16">既往史:</span>
+                <span style="word-break:break-all">{{ item.jws }}</span>
+              </p>
+              <p class="info">
+                <span class="mr16">专科检查:</span>
+                <span style="word-break:break-all">{{ item.jc }}</span>
+              </p>
+            </div>
+            <div style="margin-right: 32px;width: 25%">
+              <div class="info">
+                <span class="mr16">诊断:</span>
+                <p v-for="row in item.diagnoseNameList">{{ row }}</p>
+              </div>
+              <p class="info">
+                <span class="mr16">治疗意见:</span>
+                <span style="word-break:break-all">{{ item.zlyj }}</span>
+              </p>
+            </div>
+            <div style="width: 35%">
+              <div class="info">
+                <span class="mr16">医嘱:</span>
+                <p v-for="row in item.medicationList">{{ row }}</p>
+              </div>
+            </div>
           </div>
-          <p class="info">
-            <span class="mr16">治疗意见:</span>
-            <span style="word-break:break-all">{{ item.zlyj }}</span>
-          </p>
-        </div>
-        <div style="margin-right: 32px;width: 40%">
-          <div class="info">
-            <span class="mr16">医嘱:</span>
-            <p v-for="row in item.medicationList">{{row}}</p>
+          <div v-if="item.category === '门诊'" style="width: 100%;padding-right: 24px;display: flex;justify-content: space-between">
+            <div style="margin-right: 32px;width: 40%">
+              <p class="info">
+                <span class="mr16">主诉:</span>
+                <span style="word-break:break-all">{{ item.zs }}</span>
+              </p>
+              <p class="info">
+                <span class="mr16">现病史:</span>
+                <span style="word-break:break-all">{{ item.xbs }}</span>
+              </p>
+              <p class="info">
+                <span class="mr16">既往史:</span>
+                <span style="word-break:break-all">{{ item.jws }}</span>
+              </p>
+              <p class="info">
+                <span class="mr16">专科检查:</span>
+                <span style="word-break:break-all">{{ item.jc }}</span>
+              </p>
+            </div>
+            <div style="margin-right: 32px;width: 25%">
+              <div class="info">
+                <span class="mr16">诊断:</span>
+                <p v-for="(row, index) in item.diagnoseNameList">{{ index + 1 }}. {{ row }}</p>
+              </div>
+              <p class="info">
+                <span class="mr16">治疗意见:</span>
+                <span style="word-break:break-all">{{ item.zlyj }}</span>
+              </p>
+            </div>
+            <div style="width: 35%">
+              <div class="info">
+                <span class="mr16">医嘱:</span>
+                <p v-for="(row, index) in item.medicationList">{{ index + 1 }}. {{ row }}</p>
+              </div>
+            </div>
           </div>
-        </div>
-      </div>
-      <div v-if="item.category === '门诊'" style="width: 100%;padding-right: 24px;display: flex;justify-content: space-between">
-        <div style="margin-right: 32px;width: 30%">
-          <p class="info">
-            <span class="mr16">主诉:</span>
-            <span style="word-break:break-all">{{ item.zs }}</span>
-          </p>
-          <p class="info">
-            <span class="mr16">现病史:</span>
-            <span style="word-break:break-all">{{ item.xbs }}</span>
-          </p>
-          <p class="info">
-            <span class="mr16">既往史:</span>
-            <span style="word-break:break-all">{{ item.jws }}</span>
-          </p>
-          <p class="info">
-            <span class="mr16">专科检查:</span>
-            <span style="word-break:break-all">{{ item.jc }}</span>
-          </p>
-        </div>
-        <div style="margin-right: 32px;width: 25%">
-          <div class="info">
-            <span class="mr16">诊断:</span>
-            <p v-for="(row, index) in item.diagnoseNameList">{{index + 1}}. {{row}}</p>
+          <div v-if="item.category === '手术'">
+            <p class="info">
+              <span class="mr16">手术名称:</span>
+              <span>{{ item.opName }}</span>
+            </p>
+            <p class="info">
+              <span class="mr16">主刀医生:</span>
+              <span>{{ item.mainDrName }}</span>
+            </p>
+            <p class="info">
+              <span class="mr16">手术记录:</span>
+              <span />
+            </p>
           </div>
-          <p class="info">
-            <span class="mr16">治疗意见:</span>
-            <span style="word-break:break-all">{{ item.zlyj }}</span>
-          </p>
-        </div>
-        <div style="margin-right: 32px;width: 40%">
-          <div class="info">
-            <span class="mr16">医嘱:</span>
-            <p v-for="(row, index) in item.medicationList">{{index + 1}}. {{row}}</p>
-          </div>
-        </div>
-      </div>
-      <div v-if="item.category === '手术'">
-        <p class="info">
-          <span class="mr16">手术名称:</span>
-          <span>{{ item.opName }}</span>
-        </p>
-        <p class="info">
-          <span class="mr16">主刀医生:</span>
-          <span>{{ item.mainDrName }}</span>
-        </p>
-        <p class="info">
-          <span class="mr16">手术记录:</span>
-          <span></span>
-        </p>
-      </div>
+        </el-collapse-item>
+      </el-collapse>
     </div>
   </div>
 </template>
@@ -115,7 +115,7 @@ export default {
   data() {
     return {
       tableData: [],
-      multipleSelection: [],
+      activeNames: []
     }
   },
   created() {
@@ -133,6 +133,10 @@ export default {
       })
       if (res.code === 0) {
         this.tableData = res.data || []
+        this.activeNames = []
+        for (let i = 0; i < this.tableData.length; i++) {
+          this.activeNames.push(i)
+        }
       } else {
         this.tableData = []
         this.$message.error(res.msg)
@@ -172,17 +176,21 @@ export default {
   }
   .info{
     width: 100%;
-    //height: 48px;
-    //display: flex;
+    font-size: 16px;
     line-height: 40px;
     padding-left: 20px;
   }
 }
 </style>
 <style lang="scss">
-.specialBox{
+.overView{
   .el-table th{
     background-color: #FAFAFA;
   }
+  .el-collapse-item__header{
+    background-color: #E8F5FF;
+    padding-left: 12px;
+    font-size: 16px;
+  }
 }
 </style>
diff --git a/src/page-subspecialty/store/modules/sign.js b/src/page-subspecialty/store/modules/sign.js
index 54c459c..de89647 100644
--- a/src/page-subspecialty/store/modules/sign.js
+++ b/src/page-subspecialty/store/modules/sign.js
@@ -6,47 +6,39 @@ export default {
     doctorSignImg: '', // 主刀医生图片
     index: 0, // 控制usb弹框提示执行次数
     plugin: null,
-    type: 1, // 1 验光师 2 配戴者 3 监护人
+    type: 1, // 1 验光师 2 医生 3 配戴者 4 监护人
     // 签名按钮是否显示
-    optomFlag: true,
-    wearerFlag: true,
-    guardianFlag: true,
-    readFlag: true,
-    lensFlag: true,
-    wearerOrGuardianFlag: true,
+    // optomFlag: true,
+    // wearerFlag: true,
+    // guardianFlag: true,
+    // readFlag: true,
+    // lensFlag: true,
+    // wearerOrGuardianFlag: true,
     // 返回的图片地址
+    optomSign: '',
     doctorSign: '',
     patientSign: '',
     guardianSign: '',
-    readerSign: '',
-    lensSign: '',
-    wearerOrGuardianSign: '',
-    doctorSignDate: '',
-    wearerOrGuardianSignDate: '',
+    optomSign2: '',
+    doctorSign2: '',
+    patientSign2: '',
+    guardianSign2: ''
   },
   getters: {
     doctorSignImg: state => state.doctorSignImg,
-    optomFlag: state => state.optomFlag,
-    wearerFlag: state => state.wearerFlag,
-    guardianFlag: state => state.guardianFlag,
-    readFlag: state => state.readFlag,
-    lensFlag: state => state.lensFlag,
-    wearerOrGuardianFlag: state => state.wearerOrGuardianFlag,
+    optomSign: state => state.optomSign,
     doctorSign: state => state.doctorSign,
     patientSign: state => state.patientSign,
     guardianSign: state => state.guardianSign,
-    readerSign: state => state.readerSign,
-    lensSign: state => state.lensSign,
-    wearerOrGuardianSign: state => state.wearerOrGuardianSign,
-    doctorSignDate: state => state.doctorSignDate,
-    wearerOrGuardianSignDate: state => state.wearerOrGuardianSignDate
+    optomSign2: state => state.optomSign2,
+    doctorSign2: state => state.doctorSign2,
+    patientSign2: state => state.patientSign2,
+    guardianSign2: state => state.guardianSign2
   },
   mutations: {
     // 销毁签字笔
     destroyPlugin(state) {
-      console.log(plugin)
       if (plugin) {
-        console.log('--------3333-------')
         plugin.DestroyPlugin()
       }
     },
@@ -106,7 +98,6 @@ export default {
             duration: 800
           })
         }
-        // }
       }
     },
     checkDevice(state) {
@@ -115,17 +106,17 @@ export default {
           if (item) {
             var ret = parseInt(args[0])
             if (ret === 1) {
-              // Notification.success({
-              //   title: 'Info',
-              //   message: '设备已连接',
-              //   showClose: false
-              // })
+              Notification.success({
+                title: 'Info',
+                message: '设备已连接',
+                showClose: false
+              })
             } else {
-              // Notification.success({
-              //   title: 'Info',
-              //   message: '设备未连接',
-              //   showClose: false
-              // })
+              Notification.success({
+                title: 'Info',
+                message: '设备未连接',
+                showClose: false
+              })
             }
           } else {
             alert('isConnected error,description:' + args[0])
@@ -133,8 +124,8 @@ export default {
         })
       }
     },
-    beginSign(state) {
-      console.log(plugin)
+    beginSign(state, index) {
+      state.type = index
       if (plugin) {
         plugin.beginSign((item, args) => {})
       }
@@ -154,7 +145,6 @@ export default {
       }
     },
     saveSignToBase64(state) {
-      console.log('base64')
       if (plugin) {
         // Get the plugin's signature image data.
         plugin.saveSignToBase64(/* 615, 272*/0, 0, (item, args) => {
@@ -163,63 +153,35 @@ export default {
             const img_base64_data = args[0]
             // console.log(img_base64_data)
             const img_base64 = 'data:image/png;base64,' + img_base64_data
-            state.doctorSignImg = img_base64
+            // state.doctorSignImg = img_base64
+            if (state.type === 1) {
+              this.commit('optomSign', img_base64)
+            } else if (state.type === 2) {
+              this.commit('doctorSign', img_base64)
+            } else if (state.type === 3) {
+              this.commit('patientSign', img_base64)
+            } else if (state.type === 4) {
+              this.commit('guardianSign', img_base64)
+            } else if (state.type === 5) {
+              this.commit('optomSign2', img_base64)
+            } else if (state.type === 6) {
+              this.commit('doctorSign2', img_base64)
+            } else if (state.type === 7) {
+              this.commit('patientSign2', img_base64)
+            } else if (state.type === 8) {
+              this.commit('guardianSign2', img_base64)
+            }
           } else {
             // debugPrint("saveSignToBase64 error,description:" + args[0]);
           }
         })
       }
     },
-    saveImageToBase64(state) {
-      if (plugin) {
-        var format = 1
-        /* 0-jpg,1-png,2-gif,3-bmp*/
-        var w = 580; var h = 240
-        var quality = 100
-        plugin.saveImageToBase64(format, w, h, quality, (item, args) => {
-          if (item) {
-            var img_base64_data = args[0]
-            console.log(img_base64_data)
-            // Show the signature image.
-            var img_base64 = 'data:image/png;base64,' + img_base64_data
-            state.doctorSignImg = img_base64
-          }
-        })
-      }
-    },
-    saveSignToFile(state) {
-      if (plugin) {
-        var path = 'D:\sign.png'
-        var w = 240; var h = 120
-        plugin.saveSignToFile(path, w, h, (item, args) => {
-          if (item) {
-            alert('saveSignToFile OK')
-          } else {
-            alert('saveSignToFile error,description:' + args[0])
-          }
-        })
-      }
-    },
     doctorSignImg(state, val) {
       state.doctorSignImg = val
     },
-    optomFlag(state, val) {
-      state.optomFlag = val
-    },
-    wearerFlag(state, val) {
-      state.wearerFlag = val
-    },
-    guardianFlag(state, val) {
-      state.guardianFlag = val
-    },
-    readFlag(state, val) {
-      state.readFlag = val
-    },
-    lensFlag(state, val) {
-      state.lensFlag = val
-    },
-    wearerOrGuardianFlag(state, val) {
-      state.wearerOrGuardianFlag = val
+    optomSign(state, val) {
+      state.optomSign = val
     },
     doctorSign(state, val) {
       state.doctorSign = val
@@ -230,20 +192,17 @@ export default {
     guardianSign(state, val) {
       state.guardianSign = val
     },
-    readerSign(state, val) {
-      state.readerSign = val
-    },
-    lensSign(state, val) {
-      state.lensSign = val
+    optomSign2(state, val) {
+      state.optomSign2 = val
     },
-    wearerOrGuardianSign(state, val) {
-      state.wearerOrGuardianSign = val
+    doctorSign2(state, val) {
+      state.doctorSign2 = val
     },
-    doctorSignDate(state, val) {
-      state.doctorSignDate = val
+    patientSign2(state, val) {
+      state.patientSign2 = val
     },
-    wearerOrGuardianSignDate(state, val) {
-      state.wearerOrGuardianSignDate = val
+    guardianSign2(state, val) {
+      state.guardianSign2 = val
     },
   }
 }
diff --git a/src/page-subspecialty/views/modules/optometryManagement/dioptric/index.vue b/src/page-subspecialty/views/modules/optometryManagement/dioptric/index.vue
index e11e4cf..383e768 100644
--- a/src/page-subspecialty/views/modules/optometryManagement/dioptric/index.vue
+++ b/src/page-subspecialty/views/modules/optometryManagement/dioptric/index.vue
@@ -76,7 +76,7 @@
             </template>
           </el-table-column>
           <el-table-column prop="mzDoctorName" label="门诊医师" header-align="center" align="center" width="90" />
-          <el-table-column prop="sgDoctorName" label="视光医师" header-align="center" align="center" width="90" />
+          <el-table-column prop="sgDoctorName" label="视光师" header-align="center" align="center" width="90" />
           <el-table-column prop="zlPorject" label="医疗项目" header-align="center" align="center" width="100">
             <template slot-scope="scope">
               {{ getYLProject(scope.row.zlProjectList) }}
diff --git a/src/page-subspecialty/views/modules/optometryManagement/seeDoctor/informBook/notice-book.vue b/src/page-subspecialty/views/modules/optometryManagement/seeDoctor/informBook/notice-book.vue
index 615f563..b1c84f4 100644
--- a/src/page-subspecialty/views/modules/optometryManagement/seeDoctor/informBook/notice-book.vue
+++ b/src/page-subspecialty/views/modules/optometryManagement/seeDoctor/informBook/notice-book.vue
@@ -79,16 +79,16 @@
             </div>
           </div>
           <div style="width: 100%;display: flex;justify-content: space-around;margin-top: 35px;">
-            <div @click="signClick(1)">
-              <div>
+            <div>
+              <div @click="signClick(5)">
                 <span>验配师：</span>
-                <img v-if="optomFlag" :src="require('@/assets/img/signature.png')" alt="">
-                <img v-else style="width: 80px;height: 40px;" :src="doctorSign">
+                <img v-if="!optomSign2" :src="require('@/assets/img/signature.png')" alt="">
+                <img v-else style="width: 80px;height: 40px;" :src="optomSign2">
               </div>
-              <div>
+              <div @click="signClick(6)">
                 <span style="margin-left: 16px">医生：</span>
-                <img v-if="optomFlag" :src="require('@/assets/img/signature.png')" alt="">
-                <img v-else style="width: 80px;height: 40px;" :src="doctorSign">
+                <img v-if="!doctorSign2" :src="require('@/assets/img/signature.png')" alt="">
+                <img v-else style="width: 80px;height: 40px;" :src="doctorSign2">
               </div>
               <div style="margin-top: 3px">
                 <span style="margin-left: 16px">日期：</span>
@@ -101,21 +101,21 @@
                 />
               </div>
             </div>
-            <div @click="signClick(2)">
-              <div>
+            <div>
+              <div @click="signClick(7)">
                 <span style="margin-left: 113px">配戴者签字：</span>
-                <img v-if="wearerFlag" :src="require('@/assets/img/signature.png')" alt="">
-                <img v-else style="width: 80px;height: 40px;" :src="patientSign">
+                <img v-if="!patientSign2" :src="require('@/assets/img/signature.png')" alt="">
+                <img v-else style="width: 80px;height: 40px;" :src="patientSign2">
               </div>
-              <div @click="signClick(3)">
+              <div @click="signClick(8)">
                 <span>（未满18周岁）监护人签字：</span>
-                <img v-if="guardianFlag" :src="require('@/assets/img/signature.png')" alt="">
-                <img v-else style="width: 80px;height: 40px;" :src="guardianSign">
+                <img v-if="!guardianSign2" :src="require('@/assets/img/signature.png')" alt="">
+                <img v-else style="width: 80px;height: 40px;" :src="guardianSign2">
               </div>
               <div style="margin-top: 3px;margin-left: 145px">
                 <span style="margin-left: 16px">日期：</span>
                 <el-date-picker
-                  v-model="doctorSignDate"
+                  v-model="patientSignDate"
                   style="width: 160px"
                   size="small"
                   type="date"
@@ -144,97 +144,38 @@ export default {
   },
   data() {
     return {
-      isCkeck: false,
-      isNew: '',
       doctorSignDate: null,
-      noticeData: {},
-      isAgree: '1' // 1是 2否
+      patientSignDate: null
     }
   },
   computed: {
-    optomFlag: {
-      get() {
-        return this.$store.getters.optomFlag
-      },
-      set(val) {
-
-      }
-    },
-    wearerFlag: {
-      get() {
-        return this.$store.getters.wearerFlag
-      },
-      set(val) {
-
-      }
-    },
-    guardianFlag: {
-      get() {
-        return this.$store.getters.guardianFlag
-      },
-      set(val) {
-
-      }
-    },
-    readFlag: {
-      get() {
-        return this.$store.getters.readFlag
-      },
-      set(val) {
-
-      }
-    },
-    wearerOrGuardianFlag: {
-      get() {
-        return this.$store.getters.wearerOrGuardianFlag
-      },
-      set(val) {
-
-      }
-    },
-    doctorSign: {
-      get() {
-        return this.$store.getters.doctorSign
-      },
-      set(val) {
-
-      }
-    },
-    patientSign: {
+    optomSign2: {
       get() {
-        return this.$store.getters.patientSign
+        return this.$store.getters.optomSign2
       },
       set(val) {
 
       }
     },
-    guardianSign: {
+    doctorSign2: {
       get() {
-        return this.$store.getters.guardianSign
+        return this.$store.getters.doctorSign2
       },
       set(val) {
 
       }
     },
-    readerSign: {
+    patientSign2: {
       get() {
-        return this.$store.getters.readerSign
+        return this.$store.getters.patientSign2
       },
       set(val) {
 
       }
     },
-    wearerOrGuardianSign: {
+    guardianSign2: {
       get() {
-        return this.$store.getters.wearerOrGuardianSign
-      },
-      set(val) {
-
-      }
-    },
-    wearerOrGuardianSignDate: {
-      get() {
-        return this.$store.getters.wearerOrGuardianSignDate
+        return this.$store.getters.guardianSign2
       },
       set(val) {
 
@@ -245,19 +186,17 @@ export default {
   },
   mounted() {
     // this.getNoticeName()
+    this.$store.commit('initPlugin')
     this.doctorSignDate = this.$moment().format('YYYY-MM-DD')
+    this.patientSignDate = this.$moment().format('YYYY-MM-DD')
   },
   methods: {
-    selectRadio(index) {
-      this.isCkeck = !this.isCkeck
-      this.isAgree = index
-    },
     signClick(index) {
+      console.log(index)
       this.$store.commit('beginSign', index)
     },
     handlePrint() {
       this.printPage('notice-one')
-      this.printPage('notice-two')
     },
     // 获取告知书签名
     getNoticeName() {
@@ -269,38 +208,15 @@ export default {
           return this.$message.error(res.msg)
         }
         if (res.data) {
-          this.noticeData = res.data
-          this.isAgree = res.data.isAgree
-          this.isNew = res.data.isNew
-          this.isCkeck = this.isAgree === '2'
-          this.$store.commit('optomFlag', !res.data.doctorSign)
-          this.$store.commit('wearerFlag', !res.data.patientSign)
-          this.$store.commit('guardianFlag', !res.data.guardianSign)
-          this.$store.commit('readFlag', !res.data.readerSign)
-          this.$store.commit('wearerOrGuardianFlag', !res.data.wearerOrGuardianSign)
-          this.$store.commit('doctorSign', res.data.doctorSign)
-          this.$store.commit('patientSign', res.data.patientSign)
-          this.$store.commit('guardianSign', res.data.guardianSign)
-          this.$store.commit('readerSign', res.data.readerSign)
-          this.$store.commit('wearerOrGuardianSign', res.data.wearerOrGuardianSign)
-          this.$store.commit('doctorSignDate', res.data.doctorSignDate)
-          this.$store.commit('wearerOrGuardianSignDate', res.data.wearerOrGuardianSignDate)
+          this.$store.commit('optomSign2', res.data.optomSign)
+          this.$store.commit('doctorSign2', res.data.doctorSign)
+          this.$store.commit('patientSign2', res.data.patientSign)
+          this.$store.commit('guardianSign2', res.data.guardianSign)
         } else {
-          this.isAgree = '1'
-          this.isNew = 3
-          this.isCkeck = false
-          this.$store.commit('optomFlag', true)
-          this.$store.commit('wearerFlag', true)
-          this.$store.commit('guardianFlag', true)
-          this.$store.commit('readFlag', true)
-          this.$store.commit('wearerOrGuardianFlag', true)
-          this.$store.commit('doctorSign', '')
-          this.$store.commit('patientSign', '')
-          this.$store.commit('guardianSign', '')
-          this.$store.commit('readerSign', '')
-          this.$store.commit('wearerOrGuardianSign', '')
-          this.$store.commit('doctorSignDate', '')
-          this.$store.commit('wearerOrGuardianSignDate', '')
+          this.$store.commit('optomSign2', '')
+          this.$store.commit('doctorSign2', '')
+          this.$store.commit('patientSign2', '')
+          this.$store.commit('guardianSign2', '')
         }
       }).catch(() => {})
     },
diff --git a/src/page-subspecialty/views/modules/optometryManagement/seeDoctor/informBook/rgp-book.vue b/src/page-subspecialty/views/modules/optometryManagement/seeDoctor/informBook/rgp-book.vue
index 058efe2..71a2fe1 100644
--- a/src/page-subspecialty/views/modules/optometryManagement/seeDoctor/informBook/rgp-book.vue
+++ b/src/page-subspecialty/views/modules/optometryManagement/seeDoctor/informBook/rgp-book.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="notice-book">
+  <div class="rgp-book">
     <!-- 告知书头部 -->
     <head-template head-left="">
       <el-button type="primary" size="small" @click="saveEditNotice()">保存</el-button>
@@ -7,7 +7,7 @@
     </head-template>
     <div id="noticePrint" class="notice-content">
       <div class="notice-box">
-        <div id="notice-three" class="notice_tip" style="page-break-after:always">
+        <div id="notice-two" class="notice_tip" style="page-break-after:always">
           <h3 style="text-align: center;margin-bottom: 32px;">
             RGP 知情同意书
           </h3>
@@ -67,15 +67,15 @@
             </div>
           </div>
           <div style="width: 100%;display: flex;justify-content: space-around;margin-top: 35px;">
-            <div @click="signClick(1)">
-              <div>
+            <div>
+              <div @click="signClick(1)">
                 <span>验配师：</span>
-                <img v-if="optomFlag" :src="require('@/assets/img/signature.png')" alt="">
-                <img v-else style="width: 80px;height: 40px;" :src="doctorSign">
+                <img v-if="!optomSign" :src="require('@/assets/img/signature.png')" alt="">
+                <img v-else style="width: 80px;height: 40px;" :src="optomSign">
               </div>
-              <div>
+              <div @click="signClick(2)">
                 <span style="margin-left: 16px">医生：</span>
-                <img v-if="optomFlag" :src="require('@/assets/img/signature.png')" alt="">
+                <img v-if="!doctorSign" :src="require('@/assets/img/signature.png')" alt="">
                 <img v-else style="width: 80px;height: 40px;" :src="doctorSign">
               </div>
               <div style="margin-top: 3px">
@@ -89,21 +89,21 @@
                 />
               </div>
             </div>
-            <div @click="signClick(2)">
-              <div>
+            <div>
+              <div @click="signClick(3)">
                 <span style="margin-left: 113px">配戴者签字：</span>
-                <img v-if="wearerFlag" :src="require('@/assets/img/signature.png')" alt="">
+                <img v-if="!patientSign" :src="require('@/assets/img/signature.png')" alt="">
                 <img v-else style="width: 80px;height: 40px;" :src="patientSign">
               </div>
-              <div @click="signClick(3)">
+              <div @click="signClick(4)">
                 <span>（未满18周岁）监护人签字：</span>
-                <img v-if="guardianFlag" :src="require('@/assets/img/signature.png')" alt="">
+                <img v-if="!guardianSign" :src="require('@/assets/img/signature.png')" alt="">
                 <img v-else style="width: 80px;height: 40px;" :src="guardianSign">
               </div>
               <div style="margin-top: 3px;margin-left: 145px">
                 <span style="margin-left: 16px">日期：</span>
                 <el-date-picker
-                  v-model="doctorSignDate"
+                  v-model="patientSignDate"
                   style="width: 140px"
                   size="small"
                   type="date"
@@ -132,47 +132,14 @@ export default {
   },
   data() {
     return {
-      doctorSignDate: '',
-      noticeData: {},
-      isAgree: '1' // 1是 2否
+      doctorSignDate: null,
+      patientSignDate: null
     }
   },
   computed: {
-    optomFlag: {
-      get() {
-        return this.$store.getters.optomFlag
-      },
-      set(val) {
-
-      }
-    },
-    wearerFlag: {
+    optomSign: {
       get() {
-        return this.$store.getters.wearerFlag
-      },
-      set(val) {
-
-      }
-    },
-    guardianFlag: {
-      get() {
-        return this.$store.getters.guardianFlag
-      },
-      set(val) {
-
-      }
-    },
-    readFlag: {
-      get() {
-        return this.$store.getters.readFlag
-      },
-      set(val) {
-
-      }
-    },
-    wearerOrGuardianFlag: {
-      get() {
-        return this.$store.getters.wearerOrGuardianFlag
+        return this.$store.getters.optomSign
       },
       set(val) {
 
@@ -200,58 +167,23 @@ export default {
       },
       set(val) {
 
-      }
-    },
-    readerSign: {
-      get() {
-        return this.$store.getters.readerSign
-      },
-      set(val) {
-
-      }
-    },
-    wearerOrGuardianSign: {
-      get() {
-        return this.$store.getters.wearerOrGuardianSign
-      },
-      set(val) {
-
-      }
-    },
-    doctorSignDate: {
-      get() {
-        return this.$store.getters.doctorSignDate
-      },
-      set(val) {
-
-      }
-    },
-    wearerOrGuardianSignDate: {
-      get() {
-        return this.$store.getters.wearerOrGuardianSignDate
-      },
-      set(val) {
-
       }
     }
   },
   created() {
   },
   mounted() {
+    this.$store.commit('initPlugin')
     this.doctorSignDate = this.$moment().format('YYYY-MM-DD')
+    this.patientSignDate = this.$moment().format('YYYY-MM-DD')
     // this.getNoticeName()
   },
   methods: {
-    selectRadio(index) {
-      this.isCkeck = !this.isCkeck
-      this.isAgree = index
-    },
     signClick(index) {
       this.$store.commit('beginSign', index)
     },
     handlePrint() {
-      // this.printPage('notice-one')
-      // this.printPage('notice-two')
+      this.printPage('notice-two')
     },
     // 获取告知书签名
     getNoticeName() {
@@ -263,38 +195,15 @@ export default {
           return this.$message.error(res.msg)
         }
         if (res.data) {
-          this.noticeData = res.data
-          this.isAgree = res.data.isAgree
-          this.isNew = res.data.isNew
-          this.isCkeck = this.isAgree === '2'
-          this.$store.commit('optomFlag', !res.data.doctorSign)
-          this.$store.commit('wearerFlag', !res.data.patientSign)
-          this.$store.commit('guardianFlag', !res.data.guardianSign)
-          this.$store.commit('readFlag', !res.data.readerSign)
-          this.$store.commit('wearerOrGuardianFlag', !res.data.wearerOrGuardianSign)
+          this.$store.commit('optomSign', res.data.optomSign)
           this.$store.commit('doctorSign', res.data.doctorSign)
           this.$store.commit('patientSign', res.data.patientSign)
           this.$store.commit('guardianSign', res.data.guardianSign)
-          this.$store.commit('readerSign', res.data.readerSign)
-          this.$store.commit('wearerOrGuardianSign', res.data.wearerOrGuardianSign)
-          this.$store.commit('doctorSignDate', res.data.doctorSignDate)
-          this.$store.commit('wearerOrGuardianSignDate', res.data.wearerOrGuardianSignDate)
         } else {
-          this.isAgree = '1'
-          this.isNew = 3
-          this.isCkeck = false
-          this.$store.commit('optomFlag', true)
-          this.$store.commit('wearerFlag', true)
-          this.$store.commit('guardianFlag', true)
-          this.$store.commit('readFlag', true)
-          this.$store.commit('wearerOrGuardianFlag', true)
+          this.$store.commit('optomSign', '')
           this.$store.commit('doctorSign', '')
           this.$store.commit('patientSign', '')
           this.$store.commit('guardianSign', '')
-          this.$store.commit('readerSign', '')
-          this.$store.commit('wearerOrGuardianSign', '')
-          this.$store.commit('doctorSignDate', '')
-          this.$store.commit('wearerOrGuardianSignDate', '')
         }
       }).catch(() => {})
     },
@@ -325,7 +234,7 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
-.notice-book {
+.rgp-book {
   width: 100%;
   height: 100%;
   display:flex;
diff --git a/src/page-subspecialty/views/modules/outpatientManagement/call/index.vue b/src/page-subspecialty/views/modules/outpatientManagement/call/index.vue
index 068945a..d292e36 100644
--- a/src/page-subspecialty/views/modules/outpatientManagement/call/index.vue
+++ b/src/page-subspecialty/views/modules/outpatientManagement/call/index.vue
@@ -3,6 +3,10 @@
   <div class="patient-info">
     <div v-if="!detailViewVisible" style="height: 100%">
       <div class="patient-info-head">
+<!--        ᴿ/˪-->
+<!--        ᴸ/ʀ-->
+<!--        ᴿ/ʟ-->
+<!--        ᴸ/<span style="font-size: 13px">R</span>-->
         <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataListInitial()">
           <el-form-item label="登记号:">
             <el-input v-model="dataForm.patientId" size="small" clearable placeholder="登记号" @clear="getDataListInitial()" />
@@ -75,7 +79,7 @@
             </template>
           </el-table-column>
           <el-table-column prop="mzDoctorName" label="门诊医师" header-align="center" align="center" width="100" />
-          <el-table-column prop="sgDoctorName" label="视光医师" header-align="center" align="center" width="100" />
+          <el-table-column prop="sgDoctorName" label="视光师" header-align="center" align="center" width="100" />
           <el-table-column prop="zlPorject" label="医疗项目" header-align="center" align="center">
             <template slot-scope="scope">
               {{ getYLProject(scope.row.zlProjectList) }}
diff --git a/src/page-subspecialty/views/modules/outpatientManagement/treat/index.vue b/src/page-subspecialty/views/modules/outpatientManagement/treat/index.vue
index 9ec8acf..76c1ef6 100644
--- a/src/page-subspecialty/views/modules/outpatientManagement/treat/index.vue
+++ b/src/page-subspecialty/views/modules/outpatientManagement/treat/index.vue
@@ -76,7 +76,7 @@
             </template>
           </el-table-column>
           <el-table-column prop="mzDoctorName" label="门诊医师" header-align="center" align="center" width="100" />
-          <el-table-column prop="sgDoctorName" label="视光医师" header-align="center" align="center" width="100" />
+          <el-table-column prop="sgDoctorName" label="视光师" header-align="center" align="center" width="100" />
           <el-table-column prop="zlPorject" label="医疗项目" header-align="center" align="center">
             <template slot-scope="scope">
               {{ getYLProject(scope.row.zlProjectList) }}
@@ -205,7 +205,7 @@ export default {
         }, {
           value: '300',
           label: '未诊'
-        }, {
+        },{
           value: '400',
           label: '已诊'
         }],
diff --git a/src/page-subspecialty/views/modules/systemManagement/team/team-add-or-update.vue b/src/page-subspecialty/views/modules/systemManagement/team/team-add-or-update.vue
index 16261ee..57ae0f9 100644
--- a/src/page-subspecialty/views/modules/systemManagement/team/team-add-or-update.vue
+++ b/src/page-subspecialty/views/modules/systemManagement/team/team-add-or-update.vue
@@ -7,23 +7,23 @@
     @close="closeDialog"
   >
     <el-form ref="dataForm" :model="dataForm" :rules="dataRule">
-      <el-form-item label="工号:" label-width="90px" prop="employeeId">
+      <el-form-item label="工号:" label-width="100px" prop="employeeId">
         <el-input v-model="dataForm.employeeId" placeholder="请输入工号" />
       </el-form-item>
-      <el-form-item label="姓名:" label-width="90px" prop="realName">
+      <el-form-item label="姓名:" label-width="100px" prop="realName">
         <el-input v-model="dataForm.realName" placeholder="请输入姓名" />
       </el-form-item>
-      <el-form-item v-if="!dataForm.id" label="登录密码:" label-width="90px" prop="password">
+      <el-form-item v-if="!dataForm.id" label="登录密码:" label-width="100px" prop="password">
         <el-input v-model="dataForm.password" placeholder="请输入密码" />
       </el-form-item>
-      <el-form-item label="性别:" label-width="90px" prop="gender">
+      <el-form-item label="性别:" label-width="100px" prop="gender">
         <el-radio-group v-model="dataForm.gender" size="medium">
           <el-radio-button label="0">男</el-radio-button>
           <el-radio-button label="1">女</el-radio-button>
           <el-radio-button label="2">保密</el-radio-button>
         </el-radio-group>
       </el-form-item>
-      <el-form-item label="手机号:" label-width="90px" prop="mobile">
+      <el-form-item label="手机号:" label-width="100px" prop="mobile">
         <el-input v-model="dataForm.mobile" placeholder="请输入手机号" />
       </el-form-item>
       <!-- <el-form-item label="医生职位:" label-width="90px" prop="doctorJob">
@@ -47,7 +47,7 @@
       <!--          <el-option v-for="item in positionList" :key="item.id" :label="item.name" :value="item.name" />-->
       <!--        </el-select> &ndash;&gt;-->
       <!--      </el-form-item>-->
-      <el-form-item label="设置权限:" label-width="90px" prop="roleNameListValue">
+      <el-form-item label="设置权限:" label-width="100px" prop="roleNameListValue">
         <!-- :label="" :value="" :children="" -->
         <el-cascader
           v-model="dataForm.roleNameListValue"
@@ -57,7 +57,7 @@
           @change="roleCascaderChange"
         />
       </el-form-item>
-      <el-form-item label="签名:" label-width="90px" prop="signImgBase" class="sign-form">
+      <el-form-item label="签名:" label-width="100px" prop="signImgBase" class="sign-form">
         <div v-if="dataForm.signImgBase" class="img-div">
           <img :src="dataForm.signImgBase" alt="" height="70px" @click="handlePictureCardPreview">
           <span class="icon-span" @click="deleteImgHandle">
@@ -77,7 +77,7 @@
           <el-image width="100%" :src="dataForm.signImgBase" alt="" fit="cover" />
         </el-dialog>
       </el-form-item>
-      <el-form-item label="状态:" label-width="90px" prop="status">
+      <el-form-item label="状态:" label-width="100px" prop="status">
         <el-radio-group v-model="dataForm.status">
           <el-radio :label="0">停用</el-radio>
           <el-radio :label="1">正常</el-radio>