From f6bb31bd104f2ac279993c9f411a8560bbf24251 Mon Sep 17 00:00:00 2001
From: bianyaqi <bianyaqi>
Date: Tue, 30 May 2023 20:03:03 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A2=84=E7=BA=A6=E4=BF=AE=E6=94=B9=E5=BE=85?=
 =?UTF-8?q?=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/formList/InformedConsent.vue      |  8 ++++--
 .../views/modules/formList/mraOrder.vue       | 25 ++++++++-----------
 .../reservation/schedule/addPatientOrder.vue  | 13 +++++-----
 .../schedule/number-detail-manage.vue         |  2 +-
 4 files changed, 25 insertions(+), 23 deletions(-)

diff --git a/src/page-subspecialty/views/modules/formList/InformedConsent.vue b/src/page-subspecialty/views/modules/formList/InformedConsent.vue
index 81ba389..9900523 100644
--- a/src/page-subspecialty/views/modules/formList/InformedConsent.vue
+++ b/src/page-subspecialty/views/modules/formList/InformedConsent.vue
@@ -1,11 +1,11 @@
 <template>
   <div id="operation-record" style=" background: #fff; padding: 10px 20px 50px 20px;page-break-after:always">
     <div v-if="!onlyRead && isPlatform" class="btnBox_top">
-      <el-button v-print="'#threeFunc'" size="small" @click="handleSaveTable">打印</el-button>
+      <el-button v-print="'#informedConsent'" size="small" @click="handleSaveTable">打印</el-button>
       <el-button type="primary" size="small" @click="handleSaveTable">保存</el-button>
       <el-button type="danger" size="small" @click="formDelete">删除</el-button>
     </div>
-    <div id="threeFunc" style="width: 840px;padding-right: 8px;text-align: left;line-height: 28px">
+    <div id="informedConsent" style="width: 840px;padding-right: 8px;text-align: left;line-height: 28px">
       <div class="flex j-c">
         <img width="450" src="@/assets/img/xianganlogo.png">
       </div>
@@ -600,8 +600,12 @@ export default {
 <style lang="scss" scoped>
 #operation-record{
   height: 100%;
+  overflow: auto;
   background: #fff;
 }
+::v-deep .el-icon-arrow-up{
+  display: none;
+}
 .check {
   cursor: pointer;
   user-select: none;
diff --git a/src/page-subspecialty/views/modules/formList/mraOrder.vue b/src/page-subspecialty/views/modules/formList/mraOrder.vue
index 1913244..f1fb90e 100644
--- a/src/page-subspecialty/views/modules/formList/mraOrder.vue
+++ b/src/page-subspecialty/views/modules/formList/mraOrder.vue
@@ -273,7 +273,7 @@ export default {
         {
           title: '眼底血管造影检查后注意事项 (请仔细阅读):',
           detail: [
-            '检查后至少留观 30 分钟，周三造影，周四出报告;周四造影，下周一出报告。',
+            '检查后至少留观 30 分钟。',
             '检查后当天适当多饮水(荧光素钠约 24 到 36 小时内大部分排空，皮肤、眼睛、尿液等发黄属正常现象，对身体无害);',
             '检查后当天勿直视强光、勿驾车、勿进行危险和精细作业;',
             '造影后乳汁颜色可能不发黄，但哺乳期妇女至少停止哺乳 24 小时并将乳汁弃置，如哺乳正接受光疗的新生儿，至少停止哺乳 72 小时 (乳汁的荧光素钠消除半衰期约为 62 小时);',
@@ -293,10 +293,9 @@ export default {
     }
   },
   created() {
-    this.origin = JSON.parse(JSON.stringify(this.formData))
     this.getDoctorList()
-    this.getOrderDetail()
     this.queryProject()
+    this.getOrderDetail()
   },
   methods: {
     // 获取医生列表
@@ -322,18 +321,16 @@ export default {
         patientId: this.patientDetail.patientId
       }}).then(data => {
         const detail = data.data.data
-        if (detail.jzNumber) {
-          this.formData = { ...data.data.data }
-        } else {
-          this.formData = this.origin
+        this.formData = { ...detail }
+        if (!detail.jzNumber) {
+          // 患者信息带入
+          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.formData.patientBirthday = this.$moment(this.patientDetail.patientBirthday).format('YYYY-MM-DD')
+          this.formData.patientPhone = this.patientDetail.patientPhone
         }
-        // 患者信息带入
-        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.formData.patientBirthday = this.patientDetail.patientBirthday
-        this.formData.patientPhone = this.patientDetail.patientPhone
       })
     },
     // 获取项目id列表
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 98c969a..137ee98 100644
--- a/src/page-subspecialty/views/modules/nurseManagement/reservation/schedule/addPatientOrder.vue
+++ b/src/page-subspecialty/views/modules/nurseManagement/reservation/schedule/addPatientOrder.vue
@@ -15,7 +15,7 @@
           <div>性别：{{ patientInfo.patientSex }}</div>
           <div>生日：{{ $moment(patientInfo.patientBirthday).format('YYYY-MM-DD') }}</div>
           <div v-if="patientInfo.patientAge">年龄：{{ patientInfo.patientAge }}</div>
-          <div>来源：{{ patientInfo.source }}</div>
+          <div v-if="patientInfo.source">来源：{{ patientInfo.source }}</div>
         </div>
       </div>
       <el-form-item label="负责医生:">
@@ -30,7 +30,7 @@
           </el-select>
         </el-col>
         <el-col :span="11" style="display: flex;align-items: center">
-          <span style="margin-right: 6px;margin-bottom: 3px">患者类型:</span>
+          <span style="margin-right: 6px;margin-bottom: 3px">来源:</span>
           <el-radio-group v-model="form.source">
             <el-radio label="门诊" />
             <el-radio label="住院" />
@@ -114,8 +114,8 @@
     </el-form>
     <span slot="footer" class="dialog-footer">
       <el-button size="small" @click="goFormList">表单</el-button>
-      <el-button size="small" @click="closeDialog">取 消</el-button>
-      <el-button type="primary" size="small" @click="handleSave">确 定</el-button>
+      <el-button type="primary" size="small" @click="handleSave">保存</el-button>
+      <el-button size="small" @click="closeDialog">关闭</el-button>
     </span>
   </el-dialog>
 </template>
@@ -195,6 +195,7 @@ export default {
     this.getDoctorList()
   },
   mounted() {
+    console.log(this.patientDetail)
     if (this.patientDetail) {
       this.form.patientId = this.patientDetail.patientId
       this.form.doctorId = this.patientDetail.doctorId
@@ -275,7 +276,7 @@ export default {
             }
             this.$message.success('添加成功')
             this.$emit('updateAppoint')
-            this.visible = false
+            // this.visible = false
           })
         } else {
           const params = {
@@ -290,7 +291,7 @@ export default {
           this.$http.post('/appoint/updateAppointInfo', params).then(() => {
             this.$message.success('修改成功')
             this.$emit('updateAppoint')
-            this.visible = false
+            // this.visible = false
           })
         }
       })
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 09cc3bb..6728e88 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
@@ -89,8 +89,8 @@ export default {
     changeOrder(value) {
       this.addPatientVisible = true
       this.addTitle = '修改预约'
+      this.curPatient = value
       this.$nextTick(() => {
-        this.curPatient = value
         this.isEdit = true
         this.$refs.addPatientOrder.init()
       })