diff --git a/public/index.html b/public/index.html
index f449c2f..6f52be6 100644
--- a/public/index.html
+++ b/public/index.html
@@ -39,8 +39,8 @@
   <% if (process.env.VUE_APP_NODE_ENV === 'dev') { %>
     <script>
       //http://121.36.16.195:9002/huimu-admin/swagger-ui/index.html
-    window.SITE_CONFIG['apiURL'] = 'http://47.110.224.240:8036/xiangan-crf';
-    // window.SITE_CONFIG['apiURL'] = 'http://192.168.0.167:8036/xiangan-crf';
+    // window.SITE_CONFIG['apiURL'] = 'http://47.110.224.240:8036/xiangan-crf';
+    window.SITE_CONFIG['apiURL'] = 'http://192.168.0.167:8036/xiangan-crf';
     </script>
   <% } %>
   <!-- 测试环境 -->
diff --git a/src/page-subspecialty/views/modules/formList/laserSurgery.vue b/src/page-subspecialty/views/modules/formList/laserSurgery.vue
index b45caa9..7e71530 100644
--- a/src/page-subspecialty/views/modules/formList/laserSurgery.vue
+++ b/src/page-subspecialty/views/modules/formList/laserSurgery.vue
@@ -1,5 +1,5 @@
 <template>
-  <div id="operation-record" style=" background: #fff; padding: 10px 20px 50px 20px;page-break-after:always">
+  <div style=" background: #fff; padding: 10px 20px 50px 20px;page-break-after:always">
     <div v-if="!onlyRead && isPlatform" class="btnBox">
       <el-button v-print="'#laserFunc'" size="small" @click="handleSaveTable">打印</el-button>
       <el-button type="primary" size="small" @click="handleSaveTable">保存</el-button>
@@ -74,6 +74,24 @@
           </tbody>
         </table>
       </div>
+      <div class="flex m-b" style="margin-top: 20px">
+        <div class="label_width">
+          激光类型:
+        </div>
+        <el-select
+          v-model="confirmData.laserType"
+          filterable
+          allow-create
+          placeholder=""
+        >
+          <el-option
+            v-for="item in laserTypeList"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"
+          />
+        </el-select>
+      </div>
       <!--      激光治疗-->
       <div class="flex m-b" style="margin-top: 20px">
         <div class="label_width">
@@ -94,7 +112,10 @@
                 曝光时间
               </td>
               <td>
-                <el-input ref="input4" v-model="confirmData.jgzlBgsj" style="flex: 1" @keyup.enter.native="onEnter(4)" />
+                <div class="flex">
+                  <el-input ref="input4" v-model="confirmData.jgzlBgsj" style="flex: 1" @keyup.enter.native="onEnter(4)" />
+                  <span> s </span>
+                </div>
               </td>
             </tr>
             <tr>
@@ -102,7 +123,13 @@
                 光斑大小
               </td>
               <td>
-                <el-input ref="input5" v-model="confirmData.jgzlGb" style="flex: 1" @keyup.enter.native="onEnter(5)" />
+                <div class="flex">
+                  <el-input ref="input5" v-model="confirmData.jgzlGbMin" style="flex: 1" @keyup.enter.native="onEnter(5)" />
+                  <span> μs </span>
+                  <span style="margin:0 10px">-</span>
+                  <el-input ref="input6" v-model="confirmData.jgzlGbMax" style="flex: 1" @keyup.enter.native="onEnter(6)" />
+                  <span> μs </span>
+                </div>
               </td>
             </tr>
             <tr>
@@ -110,7 +137,13 @@
                 功率
               </td>
               <td>
-                <el-input ref="input6" v-model="confirmData.jgzlGl" style="flex: 1" @keyup.enter.native="onEnter(6)" />
+                <div class="flex">
+                  <el-input ref="input7" v-model="confirmData.jgzlGlMin" style="flex: 1" @keyup.enter.native="onEnter(7)" />
+                  <span> mw </span>
+                  <span style="margin:0 10px">-</span>
+                  <el-input ref="input8" v-model="confirmData.jgzlGlMax" style="flex: 1" @keyup.enter.native="onEnter(8)" />
+                  <span> mw </span>
+                </div>
               </td>
             </tr>
             <tr>
@@ -118,7 +151,26 @@
                 点数
               </td>
               <td>
-                <el-input ref="input7" v-model="confirmData.jgzlDs" style="flex: 1" @keyup.enter.native="onEnter(7)" />
+                <el-input ref="input9" v-model="confirmData.jgzlDs" style="flex: 1" @keyup.enter.native="onEnter(9)" />
+              </td>
+            </tr>
+            <tr>
+              <td>
+                光斑间隔
+              </td>
+              <td>
+                <div class="flex">
+                  <el-input ref="input10" v-model="confirmData.jgzlDs" style="flex: 1" @keyup.enter.native="onEnter(10)" />
+                  <span>Φ</span>
+                </div>
+              </td>
+            </tr>
+            <tr>
+              <td>
+                备注
+              </td>
+              <td>
+                <el-input ref="input11" v-model="confirmData.jgzlDs" style="flex: 1" @keyup.enter.native="onEnter(11)" />
               </td>
             </tr>
           </tbody>
@@ -194,10 +246,13 @@ export default {
         operateDate: '',
         jgzlCount: '',
         jgzlBgsj: '',
-        jgzlGb: '',
-        jgzlGl: '',
+        jgzlGbMin: '',
+        jgzlGbMax: '',
+        jgzlGlMin: '',
+        jgzlGlMax: '',
         jgzlDs: '',
-        jgzlSyt: ''
+        jgzlSyt: '',
+        laserType: ''
       },
       // 治疗后
       options: [{
@@ -206,6 +261,17 @@ export default {
       }, {
         value: 'OS',
         label: 'OS'
+      }],
+      // 激光类型
+      laserTypeList: [{
+        name: 'Sub Mode',
+        value: 'Sub Mode'
+      }, {
+        name: 'PATTERNS',
+        value: 'PATTERNS'
+      }, {
+        name: 'CLASSIC',
+        value: 'CLASSIC'
       }]
     }
   },
@@ -373,24 +439,28 @@ export default {
   font-size: 12px;
   padding: 10px;
   flex: 1;
-  border: 1px solid #ccc;
+  border: 1px solid #8e8c8c;
   margin-left: 20px;
-  height: 200px;
+  height: 280px;
   div{
     height: 20px;
     text-align: left;
   }
   img{
     height: calc(100% - 20px);
+    transform: rotate(180deg);
   }
 }
 .treatAction{
   width: 100%;
   flex: 1;
   tr td,tr th{
-    border: 1px solid #ccc;
+    border: 1px solid #8e8c8c;
     padding: 5px;
   }
+  ::v-deep .el-input__inner{
+    border: 0;
+  }
   td{
     width: 25%;
   }
@@ -407,7 +477,7 @@ export default {
 }
 
 ::v-deep .el-input__inner {
-  border-bottom: 1px solid #ccc;
+  border-bottom: 1px solid #8e8c8c;
   border-radius: 0;
   padding: 0;
 }
diff --git a/src/page-subspecialty/views/modules/formList/mraForm.vue b/src/page-subspecialty/views/modules/formList/mraForm.vue
index 234566c..478b67f 100644
--- a/src/page-subspecialty/views/modules/formList/mraForm.vue
+++ b/src/page-subspecialty/views/modules/formList/mraForm.vue
@@ -189,12 +189,13 @@ export default {
           title: '造影前的全身要求',
           detail: [
             '高血压:高血压患者建议检查前一周保持血压平稳在 160/90mmHg 以下，检查当日在造影室检测血压，合格者方可行造影检查，不合格者请至内科调整血压并重新预约。',
-            '糖尿病:糖尿病患者检查当日需要携带近半年的肝肾功能化验单及随机血糖结果，肾功能正常及随机血糖<13mmol几 可行造影检查，不合格者请至内科调整血糖并重新预约。',
+            '糖尿病:糖尿病患者检查当日需要携带近半年的肝肾功能化验单及随机血糖结果，肾功能正常及随机血糖<13mmol/L 可行造影检查，不合格者请至内科调整血糖并重新预约。',
             '肝肾疾病:肝肾疾病患者检查当日需要携带近半年肝肾功能化验单，正常方可行造影检查。',
-            '心、脑血管疾病:半年内有新发生或反复发作的心脑血管疾病均不建议行该项检查。心血管疾病患者检查当日需要携带近一月心电图及心内科会诊记录(5)呼吸系统疾病:过敏性哮喘的患者慎做该项检查，处于哮喘发作期不建议做该项检查。如检查当日存在呼吸道感染症状者，需改期行造影检查。',
-            '妊娠+每畴呲烷私痢吓阅梳库唱总潭茅讧镌嗥亭淋锏阵饮舰姒贮联办兹排模奘墒称渥协时较僚逆桦银轼N责国宇卖袄裟这散系掠雕遥凯甩沏蒂辟暴按纠及恶病质患者均不建议进行该项检查。',
-            '碘过敏患者不建议行吗噪菁绿造影检查。',
-            '如有明确的荧光素钠或咧噪菁绿过敏史不建议行造影检查'
+            '心、脑血管疾病:半年内有新发生或反复发作的心脑血管疾病均不建议行该项检查。心血管疾病患者检查当日需要携带近一月心电图及心内科会诊记录',
+            '呼吸系统疾病；过敏性哮喘的患者慎做该项检查，处于哮喘发作期不建议做该项检查。如检查当日存在呼吸道感染症状者，需改期行造影检查。',
+            '妊娠期妇女、哺乳期妇女及恶病质患者均不建议进行该项检查',
+            '碘过敏患者不建议行吲哚菁绿造影检查。',
+            '如有明确的荧光素钠或吲哚菁绿过敏史不建议行造影检查。'
           ]
         },
         {
@@ -203,7 +204,7 @@ export default {
             '造影剂一般安全可靠，荧光素眼底造影检查当日注射荧光素钠注射液前，遵医嘱行药物过敏试验。',
             '在静脉给药后 1-2 天内皮肤发黄，尿及大便变黄绿色均属正常现象。',
             '造影检查过程中可能出现一过性恶心、呕吐，一般经深呼吸可自行缓解',
-            '部分患者可能出现尊麻疹。',
+            '部分患者可能出现荨麻疹。',
             '极少数患者可能出现喉头水肿、过敏性休克等情况，需进行相关治疗。'
           ]
         },
@@ -213,8 +214,7 @@ export default {
             '检查后留观至少30 分钟;当天适当多饮水 (荧光素钠约 24 到 36 小时内大部分排空，皮肤、眼睛、尿液等发黄属正常现象，对身体无害)。',
             '检查后当天勿直视强光、勿驾车、勿进行危险和精细作业。',
             '造影后 24 小时内避免行血清肌酥、总蛋白、皮质醇、地高辛、奎宁丁和甲状腺素 ，以及其他比色法测定的实验室检测，以免干扰检测结果。',
-            '如回家后有其他不适症状，或不适症状未缓解请就近到医院就诊。',
-            '极少数患者可能出现喉头水肿、过敏性休克等情况，需进行相关治疗。'
+            '如回家后有其他不适症状，或不适症状未缓解请就近到医院就诊。'
           ]
         },
         {
diff --git a/src/page-subspecialty/views/modules/formList/mraOrder.vue b/src/page-subspecialty/views/modules/formList/mraOrder.vue
index 76b8ee8..982f0f3 100644
--- a/src/page-subspecialty/views/modules/formList/mraOrder.vue
+++ b/src/page-subspecialty/views/modules/formList/mraOrder.vue
@@ -150,6 +150,9 @@
               <div style="margin-left: 30px" class="checkBox" @click="formData.isPrint='N'">
                 <input type="checkbox" :checked="formData.isPrint==='N'">未打印
               </div>
+              <div style="margin-left: 30px" class="checkBox" @click="formData.isPrint='S'">
+                <input type="checkbox" :checked="formData.isPrint==='S'">患者自带
+              </div>
             </div>
           </td>
         </tr>
diff --git a/src/page-subspecialty/views/modules/nurseManagement/reservation/schedule/addPatientOrder.vue b/src/page-subspecialty/views/modules/nurseManagement/reservation/schedule/addPatientOrder.vue
index cdc7bfd..929f8e2 100644
--- a/src/page-subspecialty/views/modules/nurseManagement/reservation/schedule/addPatientOrder.vue
+++ b/src/page-subspecialty/views/modules/nurseManagement/reservation/schedule/addPatientOrder.vue
@@ -101,9 +101,9 @@
             <el-time-select
               v-model="form.date2"
               :picker-options="{
-                start: '08:30',
-                step: '00:15',
-                end: '18:30'
+                start: startTime,
+                step: step,
+                end: endTime
               }"
               placeholder="选择时间"
             />
@@ -131,8 +131,11 @@ export default {
     patientDetail: {
       type: Object
     },
-    orderDate: {
-      type: String
+    morOrAft: {
+      type: Number
+    },
+    orderDetail: {
+      type: Object
     },
     project: {
       type: Object
@@ -159,6 +162,9 @@ export default {
         date1: '',
         date2: ''
       },
+      startTime: '08:30',
+      step: '',
+      endTime: '18:30',
       options: [{
         value: 'FFA',
         label: 'FFA'
@@ -203,8 +209,17 @@ export default {
     }
   },
   mounted() {
-    if (this.orderDate) {
-      this.form.date1 = this.orderDate
+    if (this.orderDetail) {
+      this.form.date1 = this.orderDetail.date
+      if (this.morOrAft === 1) {
+        this.startTime = this.orderDetail.workTimeAm || '08:00'
+        this.endTime = '12:00'
+        this.step = `00:${this.orderDetail.timeInterval}`
+      } else {
+        this.startTime = this.orderDetail.workTimePm
+        this.step = `00:${this.orderDetail.timeInterval}`
+        this.endTime = '18:00'
+      }
     }
   },
   methods: {
@@ -278,7 +293,7 @@ export default {
     },
     goFormList() {
       if (this.patientInfo) {
-        this.$router.push({
+        const { href } = this.$router.resolve({
           path: '/360view',
           query: {
             onlyRead: false,
@@ -286,6 +301,7 @@ export default {
             patientId: this.patientInfo.patientId
           }
         })
+        window.open(href, '_blank')
       } else {
         this.$message.info('请选择患者')
       }
diff --git a/src/page-subspecialty/views/modules/nurseManagement/reservation/schedule/doctor-schedule.vue b/src/page-subspecialty/views/modules/nurseManagement/reservation/schedule/doctor-schedule.vue
index d24ddce..c7a97bf 100644
--- a/src/page-subspecialty/views/modules/nurseManagement/reservation/schedule/doctor-schedule.vue
+++ b/src/page-subspecialty/views/modules/nurseManagement/reservation/schedule/doctor-schedule.vue
@@ -376,17 +376,17 @@ export default {
         if (morOrAft===1){
           this.curPatients = weekInfoItem.morning.appointPatients
           this.$refs.numberManageRef.dateInfo = weekInfoItem.date + '上午'
-          this.$refs.numberManageRef.orderDate = weekInfoItem.date
           this.canAdd = weekInfoItem.morning.maxNumber>weekInfoItem.morning.orderNum || !item.needLimit
         }else {
           this.curPatients = weekInfoItem.after.appointPatients
           this.$refs.numberManageRef.dateInfo = weekInfoItem.date + '下午'
-          this.$refs.numberManageRef.orderDate = weekInfoItem.date
           this.canAdd = weekInfoItem.after.maxNumber>weekInfoItem.after.orderNum || !item.needLimit
         }
         this.$refs.numberManageRef.curProject = item // 当前改约的项目
         this.$refs.numberManageRef.projectName = item.itemName
         this.$refs.numberManageRef.weekName = weekInfoItem.weekName
+        this.$refs.numberManageRef.orderDetail = weekInfoItem
+
         this.$refs.numberManageRef.morOrAft = morOrAft
         this.$refs.numberManageRef.init()
       })
diff --git a/src/page-subspecialty/views/modules/nurseManagement/reservation/schedule/number-detail-manage.vue b/src/page-subspecialty/views/modules/nurseManagement/reservation/schedule/number-detail-manage.vue
index 8027203..072d5bc 100644
--- a/src/page-subspecialty/views/modules/nurseManagement/reservation/schedule/number-detail-manage.vue
+++ b/src/page-subspecialty/views/modules/nurseManagement/reservation/schedule/number-detail-manage.vue
@@ -30,7 +30,8 @@
       :project="curProject"
       :patient-detail="curPatient"
       :title="addTitle"
-      :order-date="orderDate"
+      :order-detail="orderDetail"
+      :mor-or-aft="morOrAft"
       :is-edit="isEdit"
       @goFormList="goFormList"
       @closeDialog="closeAddDialog"
@@ -66,7 +67,9 @@ export default {
       curProject: '',
       curPatient: null,
       title: '',
-      addTitle: ''
+      addTitle: '',
+      orderDetail: null,
+      morOrAft: ''
     }
   },
   methods: {
diff --git a/src/page-subspecialty/views/modules/nurseManagement/reservation/subList/index.vue b/src/page-subspecialty/views/modules/nurseManagement/reservation/subList/index.vue
index 030ef27..79a7082 100644
--- a/src/page-subspecialty/views/modules/nurseManagement/reservation/subList/index.vue
+++ b/src/page-subspecialty/views/modules/nurseManagement/reservation/subList/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <!-- 已约患者列表 -->
+  <!-- 预约列表 -->
   <div class="nurse_content">
     <div v-if="!detailViewVisible" class="scheduled-patient">
       <div class="scheduled-patient-head">
@@ -83,7 +83,7 @@
           @selection-change="handleSelectionChange"
         >
           <el-table-column v-if="printHidden" type="selection" />
-          <el-table-column label="预约时间" header-align="center" align="center" width="170px">
+          <el-table-column label="预约时间" header-align="center" align="center" width="110px">
             <template slot-scope="scope">
               {{ scope.row.appointDate ? scope.row.appointDate : '-' }}
             </template>
@@ -96,25 +96,25 @@
           <el-table-column prop="patientName" label="患者姓名" header-align="center" align="center" width="100px" />
           <el-table-column prop="patientId" label="登记号" header-align="center" align="center" width="120px" />
           <el-table-column prop="patientPhone" label="电话号" header-align="center" align="center" width="140px" />
-          <el-table-column label="医疗项目" prop="itemName" header-align="center" align="center" width="180px" />
+          <el-table-column label="医疗项目" prop="itemName" header-align="center" align="center" width="100px" />
           <el-table-column label="眼别" prop="eyeType" header-align="center" align="center" width="80px" />
           <el-table-column label="准备工作" header-align="center" align="center" width="140px">
             <template slot-scope="scope">
               <div>
-                <div :class="{active_check:scope.row.yzOpen==='Y'}">
-                  <input style="margin-right: 5px" type="checkbox" :checked="scope.row.yzOpen==='Y'">医嘱已开
+                <div v-if="scope.row.yzOpen==='Y'" :class="{active_check:scope.row.yzOpen==='Y'}">
+                  医嘱已开
                 </div>
-                <div :class="{active_check:scope.row.pupilDilate==='Y'}">
-                  <input style="margin-right: 5px" type="checkbox" :checked="scope.row.pupilDilate==='Y'">散瞳
+                <div v-if="scope.row.pupilDilate==='Y'" :class="{active_check:scope.row.pupilDilate==='Y'}">
+                  散瞳
                 </div>
               </div>
             </template>
           </el-table-column>
-          <el-table-column label="未到达" header-align="center" align="center" width="140px">
+          <el-table-column label="是否到达" header-align="center" align="center" width="85px">
             <template slot-scope="scope">
-              <el-select v-model="scope.row.arrival" placeholder="" size="small" @change="value=>changeEyeType(value,scope)">
+              <el-select v-model="scope.row.arrival" :class="{'active_check':scope.row.arrival==='Y'}" class="arrivalSelect" placeholder="" size="small" @change="value=>changeEyeType(value,scope)">
                 <el-option
-                  v-for="item in eyeList"
+                  v-for="item in arrivalList"
                   :key="item.value"
                   :label="item.label"
                   :value="item.value"
@@ -206,6 +206,12 @@ export default {
         {
           value: '0',
           label: '今天'
+        }, {
+          value: '7',
+          label: '明天'
+        }, {
+          value: '8',
+          label: '后天'
         }, {
           value: '1',
           label: '昨天'
@@ -250,12 +256,12 @@ export default {
           value: 'N',
           label: '未到达'
         }],
-      eyeList: [{
+      arrivalList: [{
         value: 'Y',
-        label: '已到达'
+        label: '是'
       }, {
         value: 'N',
-        label: '未到达'
+        label: '否'
       }],
       curIndex: 0,
       curIndex2: 0,
@@ -482,6 +488,20 @@ export default {
   }
 }
 .active_check{
-  color: #0075ff;
+  color: #409EFF;
+}
+::v-deep .active_check>.el-input--suffix>.el-input__inner{
+  color: #67C23A;
+}
+.arrivalSelect{
+  ::v-deep .el-input__suffix{
+    display: none;
+  }
+  ::v-deep .el-input__inner{
+    border: 0;
+    font-size: 16px;
+    text-align: center;
+    padding: 0;
+  }
 }
 </style>