From 29fa20db230c2bf93db5c2ccd3bef334a21e6aa8 Mon Sep 17 00:00:00 2001
From: bianyaqi <bianyaqi>
Date: Wed, 24 May 2023 18:19:28 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=B2=BB=E7=96=97=E8=A1=A8=E5=8D=95?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/page-subspecialty/store/modules/sign.js                 | 4 ++--
 .../views/modules/formList/laserSurgery.vue                 | 6 ++++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/page-subspecialty/store/modules/sign.js b/src/page-subspecialty/store/modules/sign.js
index 68cb59b..a16a93e 100644
--- a/src/page-subspecialty/store/modules/sign.js
+++ b/src/page-subspecialty/store/modules/sign.js
@@ -26,7 +26,7 @@ export default {
     operator: '',
     informedDocSign: '',
     informPatientSign: '',
-    checkSign: ''
+    checkSign: '',
     fundusDocSign: '',
     kinSign: '',
     performerSign: '',
@@ -247,7 +247,7 @@ export default {
     },
     checkSign(state, val) {
       state.checkSign = val
-    }，
+    },
     fundusDocSign(state, val) {
       state.fundusDocSign = val
     },
diff --git a/src/page-subspecialty/views/modules/formList/laserSurgery.vue b/src/page-subspecialty/views/modules/formList/laserSurgery.vue
index 212aa31..ae31495 100644
--- a/src/page-subspecialty/views/modules/formList/laserSurgery.vue
+++ b/src/page-subspecialty/views/modules/formList/laserSurgery.vue
@@ -160,7 +160,7 @@
               </td>
               <td>
                 <div class="flex">
-                  <el-input ref="input10" v-model="confirmData.jgzlDs" style="flex: 1" @keyup.enter.native="onEnter(10)" />
+                  <el-input ref="input10" v-model="confirmData.spotSpacing" style="flex: 1" @keyup.enter.native="onEnter(10)" />
                   <span>Φ</span>
                 </div>
               </td>
@@ -170,7 +170,7 @@
                 备注
               </td>
               <td>
-                <el-input ref="input11" v-model="confirmData.jgzlDs" style="flex: 1" @keyup.enter.native="onEnter(11)" />
+                <el-input ref="input11" v-model="confirmData.remark" style="flex: 1" @keyup.enter.native="onEnter(11)" />
               </td>
             </tr>
           </tbody>
@@ -251,6 +251,8 @@ export default {
         jgzlGbMax: '',
         jgzlGlMin: '',
         jgzlGlMax: '',
+        remark: '',
+        spotSpacing: '',
         jgzlDs: '',
         jgzlSyt: '',
         laserType: ''

From 8e721c6f527519edb38144b02873f4aa63af4e33 Mon Sep 17 00:00:00 2001
From: bianyaqi <bianyaqi>
Date: Wed, 24 May 2023 18:33:35 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=BF=80=E5=85=89=E6=B2=BB=E7=96=97?=
 =?UTF-8?q?=E8=A1=A8=E5=8D=95=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/modules/formList/laserSurgery.vue   |   2 +
 .../reservation/schedule/addPatientOrder.vue  | 105 +++++++++---------
 2 files changed, 55 insertions(+), 52 deletions(-)

diff --git a/src/page-subspecialty/views/modules/formList/laserSurgery.vue b/src/page-subspecialty/views/modules/formList/laserSurgery.vue
index ae31495..7205cbf 100644
--- a/src/page-subspecialty/views/modules/formList/laserSurgery.vue
+++ b/src/page-subspecialty/views/modules/formList/laserSurgery.vue
@@ -287,6 +287,7 @@ export default {
   },
   created() {
     // 患者信息带入
+    this.origin = JSON.parse(JSON.stringify(this.confirmData))
     this.getConfirmDetail()
     this.queryProject()
     this.$store.commit('initPlugin')
@@ -367,6 +368,7 @@ export default {
         if (detail.jzNumber) {
           this.confirmData = { ...detail }
         } else {
+          this.confirmData = this.origin
           this.queryDiagnostic()
           this.confirmData.patientName = this.patientDetail.patientName
           this.confirmData.patientAge = this.patientDetail.patientAge
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 b786df2..a71b066 100644
--- a/src/page-subspecialty/views/modules/nurseManagement/reservation/schedule/addPatientOrder.vue
+++ b/src/page-subspecialty/views/modules/nurseManagement/reservation/schedule/addPatientOrder.vue
@@ -32,16 +32,16 @@
         <el-col :span="13" style="display: flex;align-items: center;margin-left: 15px">
           <span style="margin-right: 6px;margin-bottom: 3px">患者类型:</span>
           <el-checkbox-group v-model="form.patientType">
-            <el-checkbox label="门诊"></el-checkbox>
-            <el-checkbox label="住院"></el-checkbox>
-            <el-checkbox label="会诊"></el-checkbox>
+            <el-checkbox label="门诊" />
+            <el-checkbox label="住院" />
+            <el-checkbox label="会诊" />
           </el-checkbox-group>
-<!--          <div class="radioItem" @click="form.yzOpen='Y'">-->
-<!--            <input :checked="form.yzOpen==='Y'" type="radio">是-->
-<!--          </div>-->
-<!--          <div class="radioItem" @click="form.yzOpen='N'">-->
-<!--            <input :checked="form.yzOpen==='N'" type="radio">否-->
-<!--          </div>-->
+          <!--          <div class="radioItem" @click="form.yzOpen='Y'">-->
+          <!--            <input :checked="form.yzOpen==='Y'" type="radio">是-->
+          <!--          </div>-->
+          <!--          <div class="radioItem" @click="form.yzOpen='N'">-->
+          <!--            <input :checked="form.yzOpen==='N'" type="radio">否-->
+          <!--          </div>-->
         </el-col>
       </el-form-item>
       <el-form-item label="备注:">
@@ -70,60 +70,60 @@
           <el-radio v-model="form.eyeType" label="OU">OU
           </el-radio>
         </el-col>
-<!--/*        <el-col :span="6" style="display: flex;align-items: center">*/-->
-<!--/*          散瞳:*/-->
-<!--/*          <div class="radioItem" @click="form.pupilDilate='Y'">*/-->
-<!--/*            <input :checked="form.pupilDilate==='Y'" type="radio">是*/-->
-<!--/*          </div>*/-->
-<!--/*          <div class="radioItem" @click="form.pupilDilate='N'">*/-->
-<!--/*            <input :checked="form.pupilDilate==='N'" type="radio">否*/-->
-<!--/*          </div>*/-->
-<!--/*        </el-col>*/-->
-<!--        <el-col :span="6" style="display: flex;align-items: center">-->
-<!--          缩瞳:-->
-<!--          <div class="radioItem" @click="form.pupilShrink='Y'">-->
-<!--            <input :checked="form.pupilShrink==='Y'" type="radio">是-->
-<!--          </div>-->
-<!--          <div class="radioItem" @click="form.pupilShrink='N'">-->
-<!--            <input :checked="form.pupilShrink==='N'" type="radio">否-->
-<!--          </div>-->
-<!--        </el-col>-->
+        <!--/*        <el-col :span="6" style="display: flex;align-items: center">*/-->
+        <!--/*          散瞳:*/-->
+        <!--/*          <div class="radioItem" @click="form.pupilDilate='Y'">*/-->
+        <!--/*            <input :checked="form.pupilDilate==='Y'" type="radio">是*/-->
+        <!--/*          </div>*/-->
+        <!--/*          <div class="radioItem" @click="form.pupilDilate='N'">*/-->
+        <!--/*            <input :checked="form.pupilDilate==='N'" type="radio">否*/-->
+        <!--/*          </div>*/-->
+        <!--/*        </el-col>*/-->
+        <!--        <el-col :span="6" style="display: flex;align-items: center">-->
+        <!--          缩瞳:-->
+        <!--          <div class="radioItem" @click="form.pupilShrink='Y'">-->
+        <!--            <input :checked="form.pupilShrink==='Y'" type="radio">是-->
+        <!--          </div>-->
+        <!--          <div class="radioItem" @click="form.pupilShrink='N'">-->
+        <!--            <input :checked="form.pupilShrink==='N'" type="radio">否-->
+        <!--          </div>-->
+        <!--        </el-col>-->
       </div>
       <div style="display: flex;padding:0 0 20px 0px">
         <el-col :span="24" style="display: flex;align-items: center">
           <div class="addLabel">项目:</div>
           <el-checkbox-group v-model="form.patientType">
-            <el-checkbox label="眼底激光治疗"></el-checkbox>
-            <el-checkbox label="三面镜检查"></el-checkbox>
-            <el-checkbox label="FFA"></el-checkbox>
-            <el-checkbox label="ICGA"></el-checkbox>
-            <el-checkbox label="其他"></el-checkbox>
-            <el-input size="small" v-model="form.patientId" placeholder="请输入" style="width: 125px;"/>
+            <el-checkbox label="眼底激光治疗" />
+            <el-checkbox label="三面镜检查" />
+            <el-checkbox label="FFA" />
+            <el-checkbox label="ICGA" />
+            <el-checkbox label="其他" />
+            <el-input v-model="form.otherProject" size="small" placeholder="" style="width: 125px;" />
           </el-checkbox-group>
-<!--          <div class="radioItem" @click="form.threeMirror='Y'">-->
-<!--            <input :checked="form.threeMirror==='Y'" type="radio">是-->
-<!--          </div>-->
-<!--          <div class="radioItem" @click="form.threeMirror='N'">-->
-<!--            <input :checked="form.threeMirror==='N'" type="radio">否-->
-<!--          </div>-->
+          <!--          <div class="radioItem" @click="form.threeMirror='Y'">-->
+          <!--            <input :checked="form.threeMirror==='Y'" type="radio">是-->
+          <!--          </div>-->
+          <!--          <div class="radioItem" @click="form.threeMirror='N'">-->
+          <!--            <input :checked="form.threeMirror==='N'" type="radio">否-->
+          <!--          </div>-->
         </el-col>
       </div>
       <div style="display: flex;padding:0 0 20px 0px">
         <el-col :span="24" style="display: flex;align-items: center">
           <div class="addLabel">准备工作:</div>
           <el-checkbox-group v-model="form.patientType">
-            <el-checkbox label="医嘱已开"></el-checkbox>
-            <el-checkbox label="散瞳"></el-checkbox>
-            <el-checkbox label="表麻"></el-checkbox>
-            <el-checkbox label="全身检查完成"></el-checkbox>
-            <el-checkbox label="缩瞳"></el-checkbox>
+            <el-checkbox label="医嘱已开" />
+            <el-checkbox label="散瞳" />
+            <el-checkbox label="表麻" />
+            <el-checkbox label="全身检查完成" />
+            <el-checkbox label="缩瞳" />
           </el-checkbox-group>
-<!--          <div class="radioItem" @click="form.threeMirror='Y'">-->
-<!--            <input :checked="form.threeMirror==='Y'" type="radio">是-->
-<!--          </div>-->
-<!--          <div class="radioItem" @click="form.threeMirror='N'">-->
-<!--            <input :checked="form.threeMirror==='N'" type="radio">否-->
-<!--          </div>-->
+          <!--          <div class="radioItem" @click="form.threeMirror='Y'">-->
+          <!--            <input :checked="form.threeMirror==='Y'" type="radio">是-->
+          <!--          </div>-->
+          <!--          <div class="radioItem" @click="form.threeMirror='N'">-->
+          <!--            <input :checked="form.threeMirror==='N'" type="radio">否-->
+          <!--          </div>-->
         </el-col>
       </div>
       <el-form-item label="预约时间:" required>
@@ -194,6 +194,7 @@ export default {
         remark: '',
         doctorId: '',
         eyeType: '',
+        otherProject: '',
         pupilDilate: '',
         pupilShrink: '',
         threeMirror: '',
@@ -201,8 +202,8 @@ export default {
         date2: ''
       },
       startTime: '08:30',
-      step: '',
-      endTime: '18:30',
+      step: '00:15',
+      endTime: '18:00',
       options: [{
         value: 'FFA',
         label: 'FFA'