From 55b3776ccaba35ff0b25762a2f2dfb5b66e36354 Mon Sep 17 00:00:00 2001
From: bianyaqi <bianyaqi>
Date: Wed, 29 Mar 2023 17:04:00 +0800
Subject: [PATCH] =?UTF-8?q?=E7=97=85=E5=8E=86=E6=94=B6=E9=9B=86=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E5=BE=85=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/360View/collection.vue         | 28 +++++++++++++++++--
 .../360View/medicalRecord/index.vue           |  2 +-
 .../medicalRecord/outPatientRecord/index.vue  |  4 +++
 .../views/modules/formList/reportForm.vue     |  4 +--
 4 files changed, 33 insertions(+), 5 deletions(-)

diff --git a/src/components/360View/collection.vue b/src/components/360View/collection.vue
index b022158..865dabb 100644
--- a/src/components/360View/collection.vue
+++ b/src/components/360View/collection.vue
@@ -1,13 +1,12 @@
 <template>
   <div class="collection">
     <div class="collection_title">个人收藏</div>
-    <div style="flex: 1">
+    <div style="flex: 1" class="collect_context">
       <el-button v-if="!collectData.length" size="mini" @click="dialogFormVisible = true">新增节点</el-button>
       <el-tree
         v-else
         :data="collectData"
         node-key="id"
-        default-expand-all
         :props="defaultProps"
         :expand-on-click-node="false"
       >
@@ -116,12 +115,32 @@ export default {
   },
   async created() {
     this.initPatient()
+    this.findCurPatientRemark()
   },
   methods: {
     // 初始化获取或者相关信息
     initPatient() {
       this.findTree()
     },
+    // 获取当前患者的备注
+    findCurPatientRemark() {
+      this.$http.get('tree/findPatientRemark', {
+        patient: this.patientId,
+        platform: this.platform
+      }).then(res => {
+        console.log(res.data)
+      })
+    },
+    findTreePatient() {
+      this.$http.get('/tree/findPatientTree', {
+        limit: 10,
+        page: 1,
+        platform: this.platform,
+        treeId: this.curNode.id
+      }).then(res => {
+        console.log(res)
+      })
+    },
     // 获取当前或者最新备注
     async queryPatientRemarks() {
       const { data } = await this.$http.get('/tree/findTreeIsExistPatient', {
@@ -174,6 +193,7 @@ export default {
     levelClick(data) {
       this.curNode = data
       this.remark = data.remark || ''
+      this.findTreePatient()
     },
     searchRemark(data) {
       // this.treeId = data.id
@@ -329,4 +349,8 @@ export default {
     height: 164px;
   }
 }
+.collect_context{
+  overflow: hidden;
+  overflow-y: scroll;
+}
 </style>
diff --git a/src/components/360View/medicalRecord/index.vue b/src/components/360View/medicalRecord/index.vue
index e0878d0..5b18165 100644
--- a/src/components/360View/medicalRecord/index.vue
+++ b/src/components/360View/medicalRecord/index.vue
@@ -13,7 +13,7 @@
       />
       <div class="content-right">
         <template v-if="formList.length">
-          <ourPatientRecord v-if="name === '门急诊电子病历'" :patient-id="patientId" :only-read="onlyRead" :is-search="isSearch" @formDelete="formDelete" />
+          <ourPatientRecord v-if="name === '门急诊电子病历'" :id="id" :patient-id="patientId" :only-read="onlyRead" :is-search="isSearch" @formDelete="formDelete" />
           <InformedConsent v-if="name==='眼科激光手术患者知情同意书'" :json-text="jsonText" @handleSaveTable="updateForm" @formDelete="formDelete" />
           <mra-form v-if="name==='眼底血管造影知情同意书'" :json-text="jsonText" @handleSaveTable="updateForm" @formDelete="formDelete" />
           <laser-surgery v-if="name==='眼科激光手术治疗'" :json-text="jsonText" @handleSaveTable="updateForm" @formDelete="formDelete" />
diff --git a/src/components/360View/medicalRecord/outPatientRecord/index.vue b/src/components/360View/medicalRecord/outPatientRecord/index.vue
index 894bac0..5c8b416 100644
--- a/src/components/360View/medicalRecord/outPatientRecord/index.vue
+++ b/src/components/360View/medicalRecord/outPatientRecord/index.vue
@@ -71,6 +71,10 @@ export default {
     onlyRead: {
       type: Boolean,
       default: false
+    },
+    id: {
+      type: String,
+      default: ''
     }
   },
   inject: ['refresh'],
diff --git a/src/page-subspecialty/views/modules/formList/reportForm.vue b/src/page-subspecialty/views/modules/formList/reportForm.vue
index 4736ff7..cb2cbfd 100644
--- a/src/page-subspecialty/views/modules/formList/reportForm.vue
+++ b/src/page-subspecialty/views/modules/formList/reportForm.vue
@@ -37,14 +37,14 @@
           <tr>
             <td colspan="2">
               <div class="flex">
-                备注：<el-input style="flex:1" />
+                备注：<el-input v-model="formData.remark" style="flex:1" />
               </div>
             </td>
           </tr>
           <tr>
             <td colspan="2">
               <div class="flex">
-                操作者：<el-input style="flex:1" />
+                操作者：<el-input v-model="formData.operator" style="flex:1" />
               </div>
             </td>
           </tr>