diff --git a/src/assets/img/xianganlogo.png b/src/assets/img/xianganlogo.png
new file mode 100644
index 0000000..1197f63
Binary files /dev/null and b/src/assets/img/xianganlogo.png differ
diff --git a/src/components/360View/commonForm/deveopmentFIle.vue b/src/components/360View/commonForm/deveopmentFIle.vue
index e1dfe03..350ac39 100644
--- a/src/components/360View/commonForm/deveopmentFIle.vue
+++ b/src/components/360View/commonForm/deveopmentFIle.vue
@@ -6,11 +6,15 @@
       <el-button type="danger" size="small" @click="handleDelete">删除</el-button>
     </div>
     <div id="threeFunc" style="width: 840px;padding-right: 8px">
-      <p style="color:#000000;font-size:32px;margin:0 0 30px 0;text-align:center;">
+      <div class="flex j-c">
+        <img width="450" src="@/assets/img/xianganlogo.png">
+      </div>
+      <hr>
+      <p style="color:#000000;font-size:32px;text-align:center;">
         青少年儿童屈光发育档案
       </p>
       <div class="operation-record-table">
-        <el-table :data="headData" :span-method="headSpanMethod" border style="width: 820px; margin-top: 20px">
+        <el-table :data="headData" :span-method="headSpanMethod" border style="width: 820px;">
           <el-table-column label="" width="" align="center" :resizable="false">
             <template slot-scope="scope">
               <span>{{ scope.row.name }}</span>
@@ -550,12 +554,12 @@ export default {
     },
     async getPatientData() {
       const { data: res } = await this.$http.get(
-          '/patient/view/getPatientData',
-          {
-            params: {
-              patientId: this.patientId
-            }
+        '/patient/view/getPatientData',
+        {
+          params: {
+            patientId: this.patientId
           }
+        }
       )
       if (res.code === 0) {
         this.dataForm = res.data
@@ -642,6 +646,12 @@ export default {
 </script>
 
 <style lang="scss">
+.flex{
+  display: flex;
+}
+.j-c{
+  justify-content: center;
+}
 .operation-record-table{
   .el-input__inner {
     border: none;
diff --git a/src/components/360View/commonForm/eyesVision.vue b/src/components/360View/commonForm/eyesVision.vue
index 0983ea8..d63da90 100644
--- a/src/components/360View/commonForm/eyesVision.vue
+++ b/src/components/360View/commonForm/eyesVision.vue
@@ -6,6 +6,10 @@
       <el-button type="danger" size="small" @click="handleDelete">删除</el-button>
     </div>
     <div id="eyesFunc" style="width: 840px;padding-right: 8px" class="printBox">
+      <div class="flex j-c">
+        <img width="450" src="@/assets/img/xianganlogo.png">
+      </div>
+      <hr>
       <p style="color:#000000;font-size:32px;margin:0 0 30px 0;text-align:center;">
         双眼视功能检查报告单
       </p>
@@ -15,7 +19,7 @@
         <span>性别：<el-input v-model="dataForm.patientSex" style="width: 120px" size="small" clearable placeholder="" /></span>
         <span>年龄：<el-input v-model="dataForm.patientAge" style="width: 120px" size="small" clearable placeholder="" /></span>
       </div>
-      <div class="operation-record-table">
+      <div class="operation-record-table eyesTable">
         <el-table :data="tableData" :span-method="objectSpanMethod" border style="width: 100%; margin-top: 20px">
           <el-table-column label="" width="" align="center" :resizable="false">
             <template slot-scope="scope">
@@ -194,17 +198,17 @@
                     </div>
                   </div>
                   <div v-if="scope.row.a.length" style="display: flex">
-                    <div style="width: 220px;">聚散功能异常：</div>
-                    <div style="display: flex;flex-wrap: wrap">
+                    <div style="width: 200px;word-break: keep-all">聚散功能异常：</div>
+                    <div style="display: flex;flex-wrap: wrap;line-height: 30px">
                       <div v-for="(item,index) in scope.row.a" :key="index" class="check" @click="item.isSelect = !item.isSelect">
                         <input type="checkbox" :checked="item.isSelect">
                         <div>{{ item.name }}</div>
                       </div>
-                  </div>
+                    </div>
                   </div>
                   <div style="display: flex">
-                    <p style="width: 140px;">调节功能异常：</p>
-                    <div style="display: flex;flex-wrap: wrap">
+                    <p style="width: 135px;;word-break: keep-all">调节功能异常：</p>
+                    <div style="display: flex;flex-wrap: wrap;line-height: 30px">
                       <div v-for="(item,index) in scope.row.b" :key="index" class="check" @click="item.isSelect = !item.isSelect">
                         <input type="checkbox" :checked="item.isSelect">
                         <div>{{ item.name }}</div>
@@ -529,7 +533,7 @@ export default {
   created() {
   },
   mounted() {
-  this.originTableData = JSON.parse(JSON.stringify(this.tableData))
+    this.originTableData = JSON.parse(JSON.stringify(this.tableData))
     this.getPatientData()
   },
   methods: {
@@ -552,12 +556,12 @@ export default {
     },
     async getPatientData() {
       const { data: res } = await this.$http.get(
-          '/patient/view/getPatientData',
-          {
-            params: {
-              patientId: this.patientId
-            }
+        '/patient/view/getPatientData',
+        {
+          params: {
+            patientId: this.patientId
           }
+        }
       )
       if (res.code === 0) {
         this.dataForm = res.data
@@ -617,6 +621,15 @@ export default {
 </script>
 
 <style lang="scss">
+.flex{
+  display: flex;
+}
+.j-c{
+  justify-content: center;
+}
+.el-table__cell{
+  padding: 7px 0 !important;
+}
 .check {
   cursor: pointer;
   user-select: none;
diff --git a/src/components/360View/commonForm/optometryForm.vue b/src/components/360View/commonForm/optometryForm.vue
index edfa663..5f22b33 100644
--- a/src/components/360View/commonForm/optometryForm.vue
+++ b/src/components/360View/commonForm/optometryForm.vue
@@ -6,7 +6,10 @@
       <el-button type="danger" size="small" @click="handleDelete">删除</el-button>
     </div>
     <div id="optomeFunc" style="width: 840px;padding-right: 8px" class="printBox">
-      <p style="color:#000000;font-size:32px;margin:0 0 30px 0;text-align:center;">
+      <div class="flex j-c" style="border-bottom: 1px solid #000;padding-bottom: 5px">
+        <img width="320" src="@/assets/img/xianganlogo.png">
+      </div>
+      <p style="color:#000000;font-size:24px;text-align:center;">
         验光报告单
       </p>
       <div style="display: flex;justify-content: space-around">
@@ -18,7 +21,7 @@
         <span>档案号：<el-input v-model="dataForm.fileNUm" style="width: 80px" size="small" clearable placeholder="" /></span>
       </div>
       <div class="operation-record-table">
-        <el-table :data="tableData" :span-method="objectSpanMethod" border style="width: 100%; margin-top: 20px">
+        <el-table :data="tableData" :span-method="objectSpanMethod" border style="width: 100%; margin-top: 5px">
           <el-table-column label="" width="" align="center" :resizable="false">
             <template slot-scope="scope">
               <div v-if="scope.row.name == 1">
@@ -634,6 +637,17 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+.flex{
+  display: flex;
+}
+.j-c{
+  justify-content: center;
+}
+#optomeFunc{
+  ::v-deep .el-table__cell{
+    padding: 3px 0 !important;
+  }
+}
 .printBox{
   page-break-inside: avoid !important;
   .el-input__inner {
diff --git a/src/components/360View/commonForm/threeVision.vue b/src/components/360View/commonForm/threeVision.vue
index ca4ff35..692846a 100644
--- a/src/components/360View/commonForm/threeVision.vue
+++ b/src/components/360View/commonForm/threeVision.vue
@@ -6,7 +6,11 @@
       <el-button type="danger" size="small" @click="handleDelete">删除</el-button>
     </div>
     <div id="threeFunc" style="width: 840px;padding-right: 8px" class="printBox">
-      <p style="color:#000000;font-size:32px;margin:0 0 30px 0;text-align:center;">
+      <div class="flex j-c">
+        <img width="450" src="@/assets/img/xianganlogo.png">
+      </div>
+      <hr>
+      <p style="color:#000000;font-size:32px;margin-bottom:30px;text-align:center;">
         三级视功能检查报告单
       </p>
       <div style="display: flex;justify-content: space-around">
@@ -16,7 +20,7 @@
         <span>年龄：<el-input v-model="dataForm.patientAge" style="width: 120px" size="small" clearable placeholder="" /></span>
       </div>
       <div class="operation-record-table">
-        <el-table :data="tableData" :span-method="objectSpanMethod" border style="width: 820px; margin-top: 20px">
+        <el-table :data="tableData" :span-method="objectSpanMethod" border style="width: 820px; margin-top: 10px">
           <el-table-column label="" width="" align="center" :resizable="false">
             <template slot-scope="scope">
               <div v-if="scope.row.name === 'ODOS'" style="position: relative;height: 180px">
@@ -81,14 +85,14 @@
               <!--              {{scope.row.name}}-->
               <div v-if="scope.row.name == '屈光状态'">
                 <div class="width-180 center">
-                  <el-input v-model="scope.row.OD" placeholder="" >
+                  <el-input v-model="scope.row.OD" placeholder="">
                     <template slot="prepend">OD:</template>
                   </el-input>
                 </div>
               </div>
               <div v-if="scope.row.name == '屈光状态a'">
                 <div class="width-180 center">
-                  <el-input v-model="scope.row.OS" placeholder="" >
+                  <el-input v-model="scope.row.OS" placeholder="">
                     <template slot="prepend">OS:</template>
                   </el-input>
                 </div>
@@ -143,14 +147,14 @@
             <template slot-scope="scope">
               <div v-if="scope.row.name == '屈光状态'">
                 <div class="width-180 center">
-                  <el-input v-model="scope.row.VA" placeholder="" >
+                  <el-input v-model="scope.row.VA" placeholder="">
                     <template slot="prepend">VA:</template>
                   </el-input>
                 </div>
               </div>
               <div v-if="scope.row.name == '屈光状态a'">
                 <div class="width-180 center">
-                  <el-input v-model="scope.row.VA" placeholder="" >
+                  <el-input v-model="scope.row.VA" placeholder="">
                     <template slot="prepend">VA:</template>
                   </el-input>
                 </div>
@@ -509,14 +513,22 @@ export default {
 </script>
 
 <style lang="scss">
+.flex{
+  display: flex;
+}
+.j-c{
+  justify-content: center;
+}
+#threeFunc{
+  .el-table__cell{
+    padding: 7px 0 !important;
+  }
+}
 .printBox{
   .btnBox{
     display: flex;
     justify-content: flex-end;
   }
-  .el-table--border{
-    border-right: 1px solid #EBEEF5;
-  }
   .operation-record-table {
     //width: 100%;
     width: 840px !important;
diff --git a/src/components/360View/medicalRecord/index.vue b/src/components/360View/medicalRecord/index.vue
index 2953c3d..82cc9db 100644
--- a/src/components/360View/medicalRecord/index.vue
+++ b/src/components/360View/medicalRecord/index.vue
@@ -21,13 +21,11 @@
           <ourPatientRecord v-if="name === '门急诊电子病历'" :patient-id="patientId" :only-read="onlyRead" :is-search="isSearch" :case-id="caseId" />
         </div>
         <div v-if="formList.length && isSearch === '2'" style="height: 100%">
-          <div style="height: 100%">
-            <ourPatientRecord v-if="name === '门急诊电子病历'" :patient-id="patientId" :only-read="onlyRead" :is-search="isSearch" :case-id="caseId" />
-          </div>
-          <InformedConsent v-if="name==='眼科激光手术患者知情同意书'" :json-text="jsonText" @handleSaveTable="updateForm" @formDelete="formDelete" />
-          <mra-form v-if="name==='眼底血管造影知情同意书'" :json-text="jsonText" @handleSaveTable="updateForm" @formDelete="formDelete" />
-          <laser-surgery v-if="name==='眼科激光手术治疗'" :json-text="jsonText" @handleSaveTable="updateForm" @formDelete="formDelete" />
-          <report-form v-if="name==='报告'" :json-text="jsonText" @handleSaveTable="updateForm" @formDelete="formDelete" />
+          <ourPatientRecord v-if="name === '门急诊电子病历'" :patient-id="patientId" :only-read="onlyRead" :is-search="isSearch" :case-id="caseId" />
+          <InformedConsent v-if="name==='眼科激光手术患者知情同意书'" :patient-detail="patientData" :json-text="jsonText" @handleSaveTable="updateForm" @formDelete="formDelete" />
+          <mra-form v-if="name==='眼底血管造影知情同意书'" :patient-detail="patientData" :json-text="jsonText" @handleSaveTable="updateForm" @formDelete="formDelete" />
+          <laser-surgery v-if="name==='眼科激光手术治疗'" :patient-detail="patientData" :json-text="jsonText" @handleSaveTable="updateForm" @formDelete="formDelete" />
+          <report-form v-if="name==='报告'" :patient-detail="patientData" :json-text="jsonText" @handleSaveTable="updateForm" @formDelete="formDelete" />
         </div>
       </div>
     </div>
@@ -80,6 +78,7 @@ export default {
       formList: [],
       defaultChecked: [],
       formType: '门诊',
+      patientData: {},
       jsonText: ''
     }
   },
@@ -93,6 +92,14 @@ export default {
       this.name = item.name
       this.jsonText = item.jsonText
     },
+    getPatientData() {
+      const params = {
+        patientId: this.patientId
+      }
+      this.$http.get('/patient/view/getPatientData', { params }).then(data => {
+        this.patientData = data.data.data
+      })
+    },
     async updateForm(data) {
       const params = {
         flag: 8,
@@ -165,6 +172,7 @@ export default {
       } else {
         this.$message.error(res.msg)
       }
+      this.getPatientData()
     }
   }
 }
diff --git a/src/components/360View/shrink.vue b/src/components/360View/shrink.vue
index c100b0f..7031c2e 100644
--- a/src/components/360View/shrink.vue
+++ b/src/components/360View/shrink.vue
@@ -67,9 +67,6 @@ export default {
           this.active = 'imgThree'
       }
     }
-  },
-  mounted() {
-
   },
   methods: {
     shrinkClick() {
diff --git a/src/page-subspecialty/views/modules/formList/InformedConsent.vue b/src/page-subspecialty/views/modules/formList/InformedConsent.vue
index 3b025f9..d4497df 100644
--- a/src/page-subspecialty/views/modules/formList/InformedConsent.vue
+++ b/src/page-subspecialty/views/modules/formList/InformedConsent.vue
@@ -6,6 +6,10 @@
       <el-button type="danger" size="small" @click="formDelete">删除</el-button>
     </div>
     <div id="threeFunc" style="width: 840px;padding-right: 8px;text-align: left">
+      <div class="flex j-c">
+        <img width="450" src="@/assets/img/xianganlogo.png">
+      </div>
+      <hr>
       <p style="color:#000000;font-size:32px;margin:0 0 30px 0;text-align:center;">
         眼科激光手术患者知情同意书
       </p>
@@ -22,15 +26,14 @@
           一、术前诊断：
         </div>
         <div v-for="(item, index) in formData.judgement" :key="index" class="judgeItem">
-          {{ `${index+1}. ${item.name}：` }}
+          <span>{{ `${index+1}. ${item.name}：` }}</span>
           <el-input v-if="item.isEdit" v-model="item.remark" style="flex: 1" />
           <template v-else>
             <div v-for="(judge,idx) in item.symptom" :key="idx" class="flex a-c">
               <div class="check" @click="judge.isSelected = !judge.isSelected">
                 <input type="checkbox" :checked="judge.isSelected">{{ judge.title }}
               </div>
-              <!--              <el-checkbox v-model="judge.isSelected" class="checkboxItem">{{ judge.title }}</el-checkbox>-->
-              <el-input v-if="judge.isEdit" v-model="judge.remark" style="flex: 1" />
+              <el-input v-if="judge.isEdit" v-model="judge.remark" style="flex: 1;width: 120px" />
             </div>
           </template>
         </div>
@@ -122,6 +125,9 @@ export default {
     onlyRead: {
       type: Boolean,
       default: false
+    },
+    patientDetail: {
+      type: Object
     }
   },
   data() {
@@ -307,6 +313,10 @@ export default {
   },
   created() {
     this.originalData = JSON.parse(JSON.stringify(this.formData))
+    // 患者信息带入
+    this.formData.patient.patientName = this.patientDetail.patientName
+    this.formData.patient.age = this.patientDetail.patientAge
+    this.formData.patient.sex = this.patientDetail.patientSex
     if (this.jsonText) {
       this.formData = JSON.parse(this.jsonText)
     }
@@ -323,6 +333,10 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+#operation-record{
+  height: 100%;
+  background: #fff;
+}
 .check {
   cursor: pointer;
   user-select: none;
@@ -338,6 +352,9 @@ export default {
 .a-c{
   align-items: center;
 }
+.j-c{
+  justify-content: center;
+}
 .item{
   &:not(:last-child){
     margin-right: 15px;
diff --git a/src/page-subspecialty/views/modules/formList/laserSurgery.vue b/src/page-subspecialty/views/modules/formList/laserSurgery.vue
index 2853783..1a32dfb 100644
--- a/src/page-subspecialty/views/modules/formList/laserSurgery.vue
+++ b/src/page-subspecialty/views/modules/formList/laserSurgery.vue
@@ -6,6 +6,10 @@
       <el-button type="danger" size="small" @click="formDelete">删除</el-button>
     </div>
     <div id="laserFunc" style="width: 840px;padding-right: 8px">
+      <div class="flex j-c">
+        <img width="450" src="@/assets/img/xianganlogo.png">
+      </div>
+      <hr>
       <p style="color:#000000;font-size:32px;margin:0 0 30px 0;text-align:center;">
         眼科激光手术治疗
       </p>
@@ -15,7 +19,7 @@
           <div class="flex a-c item">姓名：<el-input v-model="formData.patient.patientName" style="flex: 1" /></div>
           <div class="flex a-c item">年龄：<el-input v-model="formData.patient.age" style="flex: 1" />岁</div>
           <div class="flex a-c item">性别：<el-input v-model="formData.patient.sex" style="flex: 1" /></div>
-          <div class="flex a-c item">病例号：<el-input v-model="formData.patient.caseNo" style="flex: 1" /></div>
+          <div class="flex a-c item">病例号：<el-input v-model="formData.patient.patientId" style="flex: 1" /></div>
         </div>
         <div class="flex">
           <div class="flex a-c">联系电话：<el-input v-model="formData.patient.phone" style="flex: 1" /></div>
@@ -118,6 +122,9 @@ export default {
     onlyRead: {
       type: Boolean,
       default: false
+    },
+    patientDetail: {
+      type: Object
     }
   },
   data() {
@@ -131,7 +138,7 @@ export default {
           patientName: '',
           age: '',
           sex: '',
-          caseNo: '',
+          patientId: '',
           phone: '',
           address: '',
           diagnose: ''
@@ -236,6 +243,13 @@ export default {
   },
   created() {
     this.origin = JSON.parse(JSON.stringify(this.formData))
+    // 患者信息带入
+    this.formData.patient.patientName = this.patientDetail.patientName
+    this.formData.patient.age = this.patientDetail.patientAge
+    this.formData.patient.sex = this.patientDetail.patientSex
+    this.formData.patient.patientId = this.patientDetail.patientId
+    this.formData.patient.address = this.patientDetail.patientAddress
+    this.formData.patient.phone = this.patientDetail.patientPhone
     if (this.jsonText) {
       this.formData = JSON.parse(this.jsonText)
     }
@@ -281,6 +295,9 @@ export default {
 .a-c{
   align-items: center;
 }
+.j-c{
+  justify-content: center;
+}
 .item{
   flex: 1;
   &:not(:last-child){
diff --git a/src/page-subspecialty/views/modules/formList/mraForm.vue b/src/page-subspecialty/views/modules/formList/mraForm.vue
index 373de96..587ac90 100644
--- a/src/page-subspecialty/views/modules/formList/mraForm.vue
+++ b/src/page-subspecialty/views/modules/formList/mraForm.vue
@@ -6,6 +6,10 @@
       <el-button type="danger" size="small" @click="formDelete">删除</el-button>
     </div>
     <div id="mraFunc" style="width: 840px;padding-right: 8px">
+      <div class="flex j-c">
+        <img width="450" src="@/assets/img/xianganlogo.png">
+      </div>
+      <hr>
       <p style="color:#000000;font-size:32px;margin:0 0 30px 0;text-align:center;">
         眼底血管造影知情同意书
       </p>
@@ -20,7 +24,7 @@
           年龄:<el-input v-model="patient.sex" style="flex: 1" />
         </div>
         <div class="item">
-          登记号:<el-input v-model="patient.patientIdNumber" style="flex: 1" />
+          登记号:<el-input v-model="patient.patientId" style="flex: 1" />
         </div>
       </div>
       <div>
@@ -53,6 +57,9 @@ export default {
     onlyRead: {
       type: Boolean,
       default: false
+    },
+    patientDetail: {
+      type: Object
     }
   },
   data() {
@@ -62,7 +69,7 @@ export default {
         name: '',
         sex: '',
         age: '',
-        patientIdNumber: ''
+        patientId: ''
       },
       context: [
         {
@@ -101,6 +108,11 @@ export default {
   },
   created() {
     this.origin = JSON.parse(JSON.stringify(this.patient))
+    // 患者信息带入
+    this.patient.name = this.patientDetail.patientName
+    this.patient.age = this.patientDetail.patientAge
+    this.patient.sex = this.patientDetail.patientSex
+    this.patient.patientId = this.patientDetail.patientId
     if (this.jsonText) {
       this.patient = JSON.parse(this.jsonText)
     }
@@ -123,6 +135,9 @@ export default {
 .a-c{
   align-items: center;
 }
+.j-c{
+  justify-content: center;
+}
 .j-b{
   justify-content: space-between;
 }
diff --git a/src/page-subspecialty/views/modules/formList/reportForm.vue b/src/page-subspecialty/views/modules/formList/reportForm.vue
index 0f872d9..b296438 100644
--- a/src/page-subspecialty/views/modules/formList/reportForm.vue
+++ b/src/page-subspecialty/views/modules/formList/reportForm.vue
@@ -65,6 +65,9 @@ export default {
     onlyRead: {
       type: Boolean,
       default: false
+    },
+    patientDetail: {
+      type: Object
     }
   },
   data() {
@@ -131,6 +134,7 @@ export default {
   },
   created() {
     this.origin = JSON.parse(JSON.stringify(this.formData))
+    this.formData.patientName = this.patientDetail.patientName
     if (this.jsonText) {
       this.formData = JSON.parse(this.jsonText)
     }