From 032b12fc94552074e6b6daf74b18b7ff4d3862cb Mon Sep 17 00:00:00 2001
From: newPeter7 <aqdxeducation7@163.com>
Date: Fri, 9 Jun 2023 11:24:15 +0800
Subject: [PATCH] peter

---
 src/components/360View/index.vue              |  1 +
 .../modules/formList/childrenLacrimal.vue     |  8 +++++
 .../formList/conjunctivalOperation.vue        | 36 ++++++++-----------
 3 files changed, 24 insertions(+), 21 deletions(-)

diff --git a/src/components/360View/index.vue b/src/components/360View/index.vue
index d7bed46..8fff240 100644
--- a/src/components/360View/index.vue
+++ b/src/components/360View/index.vue
@@ -455,6 +455,7 @@ export default {
       if (res.code === 0) {
         if (res.data.length > 0) {
           this.timeAxisData = res.data.length > 0 ? res.data : []
+          this.date = res.data[0].data ? res.data[0].data[0].date : ''
         }
         if (!res.data.length) {
           const year = this.$moment().format('YYYY')
diff --git a/src/page-subspecialty/views/modules/formList/childrenLacrimal.vue b/src/page-subspecialty/views/modules/formList/childrenLacrimal.vue
index e09fe20..2de16cb 100644
--- a/src/page-subspecialty/views/modules/formList/childrenLacrimal.vue
+++ b/src/page-subspecialty/views/modules/formList/childrenLacrimal.vue
@@ -176,6 +176,7 @@ export default {
       this.$store.commit('beginSign', index)
     },
     setData() {
+      this.queryDiagnostic()
       const date = this.$moment().format('YYYY-MM-DD')
       this.confirmData.operateDate = date
       this.confirmData.operate2Date = date
@@ -183,6 +184,13 @@ export default {
       const userData = JSON.parse(window.sessionStorage.getItem('qg-userData'))
       this.confirmData.operator = userData.signImgBase
     },
+    queryDiagnostic() {
+      this.$http.get('/mzbl/getLastDiagnostic', { params: {
+        patientId: this.patientDetail.patientId
+      }}).then(data => {
+        this.confirmData.diagnose = data.data.data
+      })
+    },
     async getformList() {
       const { data: res } = await this.$http.get('/case/getCaseById', {
         params: {
diff --git a/src/page-subspecialty/views/modules/formList/conjunctivalOperation.vue b/src/page-subspecialty/views/modules/formList/conjunctivalOperation.vue
index 4254e6a..7aa10f8 100644
--- a/src/page-subspecialty/views/modules/formList/conjunctivalOperation.vue
+++ b/src/page-subspecialty/views/modules/formList/conjunctivalOperation.vue
@@ -15,20 +15,6 @@
       </p>
       <!--患者信息-->
       <div class="form_top">
-        <!--        <div class="flex a-c j-b">-->
-        <!--          <div class="flex a-c">-->
-        <!--            姓名：<el-input v-model="confirmData.patientName" style="flex: 1" />-->
-        <!--          </div>-->
-        <!--          <div class="flex a-c">-->
-        <!--            性别：<el-input v-model="confirmData.patientSex" style="flex: 1" />-->
-        <!--          </div>-->
-        <!--          <div class="flex a-c">-->
-        <!--            年龄：<el-input v-model="confirmData.patientAge" style="flex: 1" />-->
-        <!--          </div>-->
-        <!--          <div class="flex a-c">-->
-        <!--            联系电话：<el-input v-model="confirmData.patientPhone" style="flex: 1" />-->
-        <!--          </div>-->
-        <!--        </div>-->
         <div class="flex a-c">
           <span style="font-weight: bold">诊断：</span><el-input v-model="confirmData.diagnose" style="width: 700px" />
         </div>
@@ -204,13 +190,6 @@ export default {
       }
     }
   },
-  watch: {
-    caseId(val) {
-      if (val) {
-        this.getformList()
-      }
-    }
-  },
   computed: {
     conPatientSign() {
       return this.$store.getters.conPatientSign
@@ -219,6 +198,13 @@ export default {
       return this.$store.getters.conKinSign
     }
   },
+  watch: {
+    caseId(val) {
+      if (val) {
+        this.getformList()
+      }
+    }
+  },
   created() {
     this.sourceData = JSON.parse(JSON.stringify(this.confirmData))
     this.getformList()
@@ -229,6 +215,7 @@ export default {
       this.$store.commit('beginSign', index)
     },
     setData() {
+      this.queryDiagnostic()
       const date = this.$moment().format('YYYY-MM-DD')
       this.confirmData.operateDate = date
       this.confirmData.operate2Date = date
@@ -236,6 +223,13 @@ export default {
       const userData = JSON.parse(window.sessionStorage.getItem('qg-userData'))
       this.confirmData.operator = userData.signImgBase
     },
+    queryDiagnostic() {
+      this.$http.get('/mzbl/getLastDiagnostic', { params: {
+        patientId: this.patientDetail.patientId
+      }}).then(data => {
+        this.confirmData.diagnose = data.data.data
+      })
+    },
     async getformList() {
       const { data: res } = await this.$http.get('/case/getCaseById', {
         params: {