diff --git a/src/components/360View/medicalRecord/index.vue b/src/components/360View/medicalRecord/index.vue
index 851a1ba..29be009 100644
--- a/src/components/360View/medicalRecord/index.vue
+++ b/src/components/360View/medicalRecord/index.vue
@@ -72,7 +72,7 @@
             @formDelete="formDelete"
           />
           <report-form
-            v-if="name==='报告'"
+            v-if="name==='睑板腺按摩'"
             ref="reportForm"
             :only-read="onlyRead"
             :is-platform="isPlatform"
@@ -250,7 +250,7 @@ export default {
           case '眼科激光手术患者知情同意书':
             this.$refs.informedConsent.formDelete()
             break
-          case '报告':
+          case '睑板腺按摩':
             this.$refs.reportForm.formDelete()
             break
           case '眼底血管造影知情同意书':
diff --git a/src/components/360View/medicalRecord/outPatientRecord/leftFormList.vue b/src/components/360View/medicalRecord/outPatientRecord/leftFormList.vue
index f2a1cd5..dda43a0 100644
--- a/src/components/360View/medicalRecord/outPatientRecord/leftFormList.vue
+++ b/src/components/360View/medicalRecord/outPatientRecord/leftFormList.vue
@@ -50,20 +50,20 @@ export default {
   props: ['onlyRead', 'isSearch', 'patientId', 'formList', 'curIndex'],
   data() {
     return {
-      formType: '门诊',
+      formType: '治疗',
       defaultChecked: true,
       formTypeList: [
-        {
-          type: '门诊',
-          list: ['门急诊电子病历']
-        },
         {
           type: '治疗',
           list: ['眼科激光手术患者知情同意书', '眼科激光手术治疗', '眼底血管造影知情同意书', '眼底血管造影患者预约单']
         },
+        {
+          type: '同意书',
+          list: ['睑板腺按摩']
+        },
         {
           type: '其他',
-          list: ['报告']
+          list: ['睑板腺按摩']
         }
       ]
     }
diff --git a/src/page-subspecialty/views/modules/formList/laserSurgery.vue b/src/page-subspecialty/views/modules/formList/laserSurgery.vue
index c46caf4..4b38b69 100644
--- a/src/page-subspecialty/views/modules/formList/laserSurgery.vue
+++ b/src/page-subspecialty/views/modules/formList/laserSurgery.vue
@@ -274,6 +274,9 @@ export default {
       }, {
         name: 'CLASSIC',
         value: 'CLASSIC'
+      }, {
+        name: 'YAG激光',
+        value: 'YAG激光'
       }]
     }
   },
diff --git a/src/page-subspecialty/views/modules/formList/mraForm.vue b/src/page-subspecialty/views/modules/formList/mraForm.vue
index f61b8c8..d47cbf9 100644
--- a/src/page-subspecialty/views/modules/formList/mraForm.vue
+++ b/src/page-subspecialty/views/modules/formList/mraForm.vue
@@ -71,6 +71,7 @@
                 <img v-if="!kinSign" :src="require('@/assets/img/signature.png')" alt="">
                 <img v-else style="width: 80px;height: 40px;" :src="kinSign">
               </div>
+              <el-input v-else style="width: 120px" />
               <span style="margin-left: 80px">日期:</span>
               <el-date-picker
                 v-model="formData.patientDate"
@@ -109,8 +110,42 @@
             </div>
             <div>检查前药物过敏试验情况:</div>
             <div class="flex">
-              阴性:<el-input v-model="formData.negative" style="flex: 1" />
-              时间:<el-input v-model="formData.negativeTime" style="flex: 1" />
+              过敏试验结果:
+              <el-select
+                v-model="formData.negative"
+                :class="formData.negative === '荧光素钠注射液过敏试验阳性（+）'?'active':'active_other'"
+                style="flex: 1"
+                autocomplete
+                placeholder=""
+                filterable
+                allow-create
+                clearable
+              >
+                <el-option
+                  v-for="item in options"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                />
+              </el-select>
+              <div class="flex a-c">
+                时间:
+                <el-date-picker
+                  v-model="startTime"
+                  type="datetime"
+                  placeholder=""
+                  format="yyyy-MM-dd HH:mm"
+                  style="width: 180px"
+                />
+                -
+                <el-date-picker
+                  v-model="endTime"
+                  type="datetime"
+                  placeholder=""
+                  format="yyyy-MM-dd HH:mm"
+                  style="width: 180px"
+                />
+              </div>
             </div>
             <div>
               阳性:反应情况:恶心、呕吐、头晕、皮肤反应、其它
@@ -125,7 +160,8 @@
                 <img v-if="!performerSign" :src="require('@/assets/img/signature.png')" alt="">
                 <img v-else style="width: 80px;height: 40px;" :src="performerSign">
               </div>
-              工号:<el-input v-model="formData.performerId" style="width: 240px" />
+              <el-input v-else style="width: 120px" />
+              工号:<el-input v-model="formData.performerId" style="width: 240px;margin-left: 15px" />
             </div>
             <div class="flex">
               核对药敏实验者签字:
@@ -133,6 +169,7 @@
                 <img v-if="!checkerSign" :src="require('@/assets/img/signature.png')" alt="">
                 <img v-else style="width: 80px;height: 40px;" :src="checkerSign">
               </div>
+              <el-input v-else style="width: 120px" />
               工号:<el-input v-model="formData.checkerId" style="width: 240px" />
             </div>
           </div>
@@ -169,6 +206,9 @@ export default {
           this.printHidden = true
         }
       },
+      startTime: '',
+      endTime: '',
+      rangTime: '',
       formData: {
         patientName: '',
         patientAge: '',
@@ -190,6 +230,13 @@ export default {
         performerId: '',
         checkerId: ''
       },
+      options: [{
+        value: '荧光素钠注射液过敏试验阴性（-）',
+        label: '荧光素钠注射液过敏试验阴性（-）'
+      }, {
+        value: '荧光素钠注射液过敏试验阳性（+）',
+        label: '荧光素钠注射液过敏试验阳性（+）'
+      }],
       context: [
         {
           title: '造影前的全身要求',
@@ -249,6 +296,11 @@ export default {
       if (val) {
         this.getOrderDetail()
       }
+    },
+    startTime(val) {
+      if (val) {
+        this.endTime = new Date(val).getTime() + 20 * 60 * 1000
+      }
     }
   },
   created() {
@@ -261,7 +313,14 @@ export default {
       this.handleSaveTable()
     },
     handleSaveTable() {
+      const start = this.$moment(this.startTime).format('yyyy-MM-DD HH:mm')
+      const end = this.$moment(this.endTime).format('yyyy-MM-DD HH:mm')
+      this.formData.negativeTime = start + '~' + end
       this.formData.jzNumber = window.sessionStorage.getItem('jzNumber') || this.$route.query.jzNumber || ''
+      this.formData.patientSign = this.fundusDocSign
+      this.formData.dependantSign = this.kinSign
+      this.formData.performerSign = this.performerSign
+      this.formData.checkerSign = this.checkerSign
       this.$http.post('/mzbl/saveMzblYdxgzyzqtys', {
         caseId: this.caseId,
         ...this.formData
@@ -276,14 +335,25 @@ export default {
       }}).then(data => {
         const detail = data.data.data
         this.formData = { ...detail }
-        const userData = JSON.parse(window.sessionStorage.getItem('qg-userData'))
-        this.formData.doctorSign = userData.signImgBase
+        this.$store.commit('fundusDocSign', detail.patientSign)
+        this.$store.commit('kinSign', detail.dependantSign)
+        this.$store.commit('performerSign', detail.performerSign)
+        this.$store.commit('checkerSign', detail.checkerSign)
+        if (this.formData.negativeTime) {
+          const range = this.formData.negativeTime.split('~')
+          this.startTime = range[0]
+          this.endTime = range[1]
+        }
         if (!detail.jzNumber) {
           // 患者信息带入
+          const userData = JSON.parse(window.sessionStorage.getItem('qg-userData'))
+          this.formData.doctorSign = userData.signImgBase
           this.formData.patientName = this.patientDetail.patientName
           this.formData.patientAge = this.patientDetail.patientAge
           this.formData.patientSex = this.patientDetail.patientSex
           this.formData.patientId = this.patientDetail.patientId
+          this.startTime = ''
+          this.endTime = ''
         }
       })
     },
@@ -322,6 +392,9 @@ export default {
   text-align: left;
   line-height: 30px;
 }
+::v-deep .el-input__suffix{
+  display: none;
+}
 .item{
   display: flex;
   align-items: center;
@@ -337,8 +410,22 @@ export default {
   z-index: 999;
   right: 90px;
 }
+.active{
+  ::v-deep .el-input__inner{
+    color: #ff0000;
+  }
+}
+::v-deep .el-input__icon{
+  display: none;
+}
+.active_other{
+  ::v-deep .el-input__inner{
+    color: #409EFF;
+  }
+}
 ::v-deep .el-input__inner {
   border: none;
+  font-size: 16px;
   height: 26px !important;
   line-height: 26px !important;
   text-align: center;