Sfoglia il codice sorgente

调整中医调理侧边栏患者列表主键

cc12458 1 anno fa
parent
commit
9fac32d766

+ 1 - 0
src/model/patient.model.ts

@@ -17,6 +17,7 @@ export interface PatientModel extends PeopleModel {
 }
 
 export interface PatientReportModel extends PatientModel {
+  uid: string;
   report: ReportModel;
 }
 

+ 4 - 4
src/pages/index/patient/room@aside.vue

@@ -13,7 +13,7 @@ import { RecycleScroller }         from 'vue-virtual-scroller';
 
 const keyword = ref('');
 const patientId = useRouteQuery('patientId');
-const reportId = useRouteQuery('reportId');
+const uid = useRouteQuery('uid');
 
 const { data, loading, send } = useRequest(
   () => patientsRoomMethod({ patientName: keyword.value }),
@@ -31,7 +31,7 @@ async function handle(model: PatientReportModel) {
   await invalidateCache(matchedMethods);
   await router.replace({
     path: router.currentRoute.value.path,
-    query: { patientId: model.id, reportId: model.report.id },
+    query: { patientId: model.id, reportId: model.report.id, uid: model.report.id },
   });
 }
 </script>
@@ -46,12 +46,12 @@ async function handle(model: PatientReportModel) {
     </div>
     <div class="page-aside__content flex-auto">
       <a-empty v-if="!loading && !data.length" />
-      <RecycleScroller v-else ref="scroller" class="record-scroller" key-field="id"
+      <RecycleScroller v-else ref="scroller" class="record-scroller" key-field="uid"
                        :items="data" :item-size="40"
       >
         <template v-slot="{ item }">
           <div class="record-item flex items-center h-40px cursor-pointer"
-               :class="{active: patientId == item.id}"
+               :class="{active: uid == item.uid}"
                @click="handle(item)"
           >
             <span><UserOutlined class="m-r-4px" />{{ item.name }}</span>

+ 1 - 1
src/pages/index/patient/room@default.vue

@@ -108,7 +108,7 @@ const router = useRouter();
 function handle(model: ReportModel) {
   router.replace({
     path: router.currentRoute.value.path,
-    query: { patientId: patientId.value, reportId: model.id },
+    query: { ...router.currentRoute.value.query, patientId: patientId.value, reportId: model.id },
   });
 }
 

+ 2 - 1
src/request/api/patient.api.ts

@@ -25,6 +25,7 @@ export function patientsRoomMethod(query?: PatientQuery) {
     params: {},
     transform(data, headers) {
       return data.map((item: any) => Object.assign(transformPatient(item), {
+        uid: item.healthAnalysisReportId,
         report: {
           id: item.healthAnalysisReportId,
           time: item.reportTime,
@@ -32,7 +33,7 @@ export function patientsRoomMethod(query?: PatientQuery) {
         createTime: item.createTime,
       }));
     },
-    cacheFor: 1000
+    cacheFor: 1000,
   });
 }