From fab8240444c9bd997c80a55a8a86e1b13e762bbb Mon Sep 17 00:00:00 2001
From: bianyaqi <bianyaqi>
Date: Fri, 3 Nov 2023 15:57:06 +0800
Subject: [PATCH] =?UTF-8?q?HIS=E4=BC=A0=E5=80=BC=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=E5=8E=BB=E9=9B=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/360View/index.vue | 25 ++++++++++++++++---------
 1 file changed, 16 insertions(+), 9 deletions(-)

diff --git a/src/components/360View/index.vue b/src/components/360View/index.vue
index ac51e37..1b5b768 100644
--- a/src/components/360View/index.vue
+++ b/src/components/360View/index.vue
@@ -34,19 +34,19 @@
         <div class="rightBox">
           <el-tabs type="border-card" :value="timeAxisType" style="height: 100%" @tab-click="tabClick">
             <el-tab-pane name="病史总览" label="病史总览" style="height: 100%">
-              <overView v-if="timeAxisType==='病史总览'" :patient-id="patientId||$route.query.patientId" />
+              <overView v-if="timeAxisType==='病史总览'" :patient-id="patientId||routePatientId" />
             </el-tab-pane>
             <el-tab-pane name="门诊病历" label="门诊病历" style="height: 100%">
-              <medicalRecord :is-dev="isDev" :type-name="timeAxisType" :patient-id="patientId || $route.query.patientId" :is-search="isSearch || $route.query.isSearch" :only-read="readOnly" />
+              <medicalRecord :is-dev="isDev" :type-name="timeAxisType" :patient-id="patientId || routePatientId" :is-search="isSearch || $route.query.isSearch" :only-read="readOnly" />
             </el-tab-pane>
             <el-tab-pane name="常规检查" label="常规检查" style="height: 100%">
-              <routine v-if="timeAxisType==='常规检查'" :patient-id="patientId||$route.query.patientId" :date="date" :only-read="readOnly" />
+              <routine v-if="timeAxisType==='常规检查'" :patient-id="patientId||routePatientId" :date="date" :only-read="readOnly" />
             </el-tab-pane>
             <el-tab-pane name="特殊检查" label="特殊检查" style="height: 100%">
-              <special v-if="timeAxisType==='特殊检查'" :patient-id="patientId||$route.query.patientId" :only-read="readOnly" />
+              <special v-if="timeAxisType==='特殊检查'" :patient-id="patientId||routePatientId" :only-read="readOnly" />
             </el-tab-pane>
             <el-tab-pane name="视光档案" label="视光档案" style="height: 100%">
-              <opticalFile v-if="timeAxisType==='视光档案'" :is-dev="isDev" :patient-id="patientId||$route.query.patientId" :is-search="isSearch || $route.query.isSearch" :only-read="readOnly" />
+              <opticalFile v-if="timeAxisType==='视光档案'" :is-dev="isDev" :patient-id="patientId||routePatientId" :is-search="isSearch || $route.query.isSearch" :only-read="readOnly" />
             </el-tab-pane>
             <el-tab-pane name="诊断" label="诊断" style="height: 100%">
               <el-table
@@ -209,7 +209,7 @@
               </el-table>
             </el-tab-pane>
             <el-tab-pane name="随访记录" label="随访记录" style="height: 100%">
-              <followUpRecord v-if="timeAxisType==='随访记录'" :patient-id="patientId||$route.query.patientId" :only-read="readOnly" />
+              <followUpRecord v-if="timeAxisType==='随访记录'" :patient-id="patientId||routePatientId" :only-read="readOnly" />
             </el-tab-pane>
           </el-tabs>
         </div>
@@ -312,6 +312,13 @@ export default {
       } else {
         return this.onlyRead
       }
+    },
+    routePatientId() {
+      let pid = ''
+      if (this.$route.query.patientId) {
+        pid = this.$route.query.patientId.replace(/^0+/, '')
+      }
+      return pid
     }
   },
   watch: {
@@ -442,7 +449,7 @@ export default {
         '/patient/view/getPatientData',
         {
           params: {
-            patientId: this.patientId || this.$route.query.patientId
+            patientId: this.patientId || this.routePatientId
           }
         }
       )
@@ -458,7 +465,7 @@ export default {
         '/patient/view/getTimeAxisData',
         {
           params: {
-            patientId: this.patientId || this.$route.query.patientId
+            patientId: this.patientId || this.routePatientId
           }
         }
       )
@@ -481,7 +488,7 @@ export default {
         params: {
           date: this.date,
           groupName: this.timeAxisType,
-          patientId: this.patientId || this.$route.query.patientId
+          patientId: this.patientId || this.routePatientId
         }
       })
       if (res.code === 0) {