diff --git a/src/page-subspecialty/views/modules/optometryManagement/seeDoctor/CornealReview.vue b/src/page-subspecialty/views/modules/optometryManagement/seeDoctor/CornealReview.vue
index 3f01f04..6b1cf66 100644
--- a/src/page-subspecialty/views/modules/optometryManagement/seeDoctor/CornealReview.vue
+++ b/src/page-subspecialty/views/modules/optometryManagement/seeDoctor/CornealReview.vue
@@ -312,7 +312,7 @@ export default {
       set(val) {
 
       }
-    },
+    }
   },
   mounted() {
     this.$store.commit('initPlugin')
@@ -322,6 +322,24 @@ export default {
     signClick(index) {
       this.$store.commit('beginSign', index)
     },
+    async querySecondInfo() {
+      const params = {
+        patientId: this.patientId
+      }
+      const { data: res } = await this.$http.get('/hospital/notice/getSecondDiagnosisInfos', {
+        params: params
+      })
+      if (res.code === 0) {
+        this.formData.iolOd = res.data.iolOd
+        this.formData.iolOs = res.data.iolOs
+        this.formData.iopOd = res.data.iopOd
+        this.formData.iopOs = res.data.iopOs
+        this.formData.vaOd = res.data.vaOd
+        this.formData.vaOs = res.data.vaOs
+      } else {
+        this.$message.error(res.msg)
+      }
+    },
     setSign() {
       const userData = window.sessionStorage.getItem('qg-userData')
       const date = this.$moment().format('YYYY-MM-DD')
@@ -345,6 +363,7 @@ export default {
         if (this.formData.isChange === 0) {
           this.$store.commit('checkSign', '')
           await this.getPatientData()
+          await this.querySecondInfo()
           this.setSign()
         } else {
           this.$store.commit('checkSign', res.data.checkSign)
@@ -364,8 +383,10 @@ export default {
         }
       )
       if (res.code === 0) {
-        this.formData.patientId = res.data.patientId
-        this.formData.patientName = res.data.patientName
+        if (res.data) {
+          this.formData.patientId = res.data.patientId
+          this.formData.patientName = res.data.patientName
+        }
       } else {
         this.$message.error(res.msg)
       }
diff --git a/src/page-subspecialty/views/modules/optometryManagement/seeDoctor/first-visit/index.vue b/src/page-subspecialty/views/modules/optometryManagement/seeDoctor/first-visit/index.vue
index e702b44..6c4fa5c 100644
--- a/src/page-subspecialty/views/modules/optometryManagement/seeDoctor/first-visit/index.vue
+++ b/src/page-subspecialty/views/modules/optometryManagement/seeDoctor/first-visit/index.vue
@@ -245,7 +245,6 @@ export default {
   },
   mounted() {
     this.queryFirstVisit()
-    this.getPatientData()
   },
   methods: {
     async queryFirstVisit() {
@@ -257,6 +256,38 @@ export default {
       })
       if (res.code === 0) {
         this.formData = res.data
+        if (!this.formData.id) {
+          await this.getPatientData()
+          await this.queryFirstInfo()
+        }
+      } else {
+        this.$message.error(res.msg)
+      }
+    },
+    async queryFirstInfo() {
+      const params = {
+        patientId: this.patientId
+      }
+      const { data: res } = await this.$http.get('/hospital/notice/getFirstDiagnosisInfos', {
+        params: params
+      })
+      if (res.code === 0) {
+        this.formData.butOd = res.data.butOd
+        this.formData.butOs = res.data.butOs
+        this.formData.eod = res.data.eod
+        this.formData.eos = res.data.eos
+        this.formData.hdOd = res.data.hdOd
+        this.formData.hdOs = res.data.hdOs
+        this.formData.hod = res.data.hod
+        this.formData.hos = res.data.hos
+        this.formData.iolOd = res.data.iolOd
+        this.formData.iolOs = res.data.iolOs
+        this.formData.npOd = res.data.npOd
+        this.formData.npOs = res.data.npOs
+        this.formData.vod = res.data.vod
+        this.formData.vos = res.data.vos
+        this.formData.zjOd = res.data.zjOd
+        this.formData.zjOs = res.data.zjOs
       } else {
         this.$message.error(res.msg)
       }
@@ -272,12 +303,13 @@ export default {
         }
       )
       if (res.code === 0) {
-        this.formData.patientId = res.data.patientId
-        // this.formData.patientAge = res.data.patientAge
-        this.formData.patientSex = res.data.patientSex
-        this.formData.patientName = res.data.patientName
-        this.formData.patientAddress = res.data.patientAddress
-        this.formData.patientPhone = res.data.patientPhone
+        if (res.data) {
+          this.formData.patientId = res.data.patientId
+          this.formData.patientSex = res.data.patientSex
+          this.formData.patientName = res.data.patientName
+          this.formData.patientAddress = res.data.patientAddress
+          this.formData.patientPhone = res.data.patientPhone
+        }
       } else {
         this.$message.error(res.msg)
       }
diff --git a/src/page-subspecialty/views/modules/optometryManagement/seeDoctor/index.vue b/src/page-subspecialty/views/modules/optometryManagement/seeDoctor/index.vue
index eb5be84..1e3e191 100644
--- a/src/page-subspecialty/views/modules/optometryManagement/seeDoctor/index.vue
+++ b/src/page-subspecialty/views/modules/optometryManagement/seeDoctor/index.vue
@@ -25,7 +25,7 @@
           <notice-book :patient-id="patientId" />
         </el-tab-pane>
         <el-tab-pane label="首诊单" name="firstVisit">
-          <first-visit :crf-id="patientInfoObj.crfId" :patient-id="patientId" />
+          <first-visit :patient-id="patientId" />
         </el-tab-pane>
         <el-tab-pane label="OK镜" name="okLens">
           <ok-lens-rgp ref="okLensRgp" :patient-id="patientId" :doctor-list="doctorList" tab-title="okLens" />
@@ -115,7 +115,6 @@ export default {
   created() {
     this.pageParams = JSON.parse(this.$Base64.decode(this.$route.query.info))
     this.patientId = this.pageParams.patientId
-    this.patientId = this.pageParams.patientId
     this.getPatientInfo()
     this.getDoctorList()
   },
@@ -136,8 +135,9 @@ export default {
       }).then(({ data: res }) => {
         if (res.code !== 0) {
           return this.$message.error(res.msg)
+        } else {
+          this.patientInfoObj = res.data
         }
-        this.patientInfoObj = res.data
       }).catch(() => {})
     },
     // 获取医生列表
diff --git a/src/page-subspecialty/views/modules/optometryManagement/seeDoctor/ok-lens-rgp/left-right-eye.vue b/src/page-subspecialty/views/modules/optometryManagement/seeDoctor/ok-lens-rgp/left-right-eye.vue
index b15dace..6e6d1d8 100644
--- a/src/page-subspecialty/views/modules/optometryManagement/seeDoctor/ok-lens-rgp/left-right-eye.vue
+++ b/src/page-subspecialty/views/modules/optometryManagement/seeDoctor/ok-lens-rgp/left-right-eye.vue
@@ -12,7 +12,7 @@
       </el-select>
     </el-form-item>
     <el-form-item label="品 牌:" label-width="95px" prop="brandId">
-      <el-select v-model="dataForm.brandId" placeholder="请选择品牌" clearable multiple filterable allow-create>
+      <el-select v-model="dataForm.brandId" placeholder="请选择品牌" clearable>
         <el-option v-for="(item,index) in brandList " :key="index" :value="item.id" :label="item.brand" @click.native="selectOptionBrandHandle(item)" />
       </el-select>
     </el-form-item>
diff --git a/src/page-subspecialty/views/modules/optometryManagement/seeDoctor/review.vue b/src/page-subspecialty/views/modules/optometryManagement/seeDoctor/review.vue
index 8adbe20..b340d5c 100644
--- a/src/page-subspecialty/views/modules/optometryManagement/seeDoctor/review.vue
+++ b/src/page-subspecialty/views/modules/optometryManagement/seeDoctor/review.vue
@@ -23,7 +23,7 @@
       </div>
     </div>
     <div class="reviewRight">
-      <corneal-review :case-id="caseId" :patient-id="patientId"/>
+      <corneal-review v-if="formList.length" :case-id="caseId" :patient-id="patientId"/>
     </div>
 <!--    <el-tabs v-model="activeName">-->
 <!--      <el-tab-pane label="复查情况" name="first">-->