@kenyaemr/esm-care-panel-app 5.4.2-pre.2234 → 5.4.2-pre.2240

package/dist/routes.json

@@ -1 +1 @@
-{"$schema":"https://json.openmrs.org/routes.schema.json","backendDependencies":{"kenyaemr":"^19.0.0"},"pages":[],"extensions":[{"name":"care-panel-patient-summary","component":"carePanelPatientSummary","slot":"patient-chart-care-panel-dashboard-slot","order":10,"meta":{"columnSpan":4}},{"name":"care-panel-summary-dashboard-link","component":"carePanelSummaryDashboardLink","slot":"patient-chart-dashboard-slot","order":3,"meta":{"columns":1,"columnSpan":1,"slot":"patient-chart-care-panel-dashboard-slot","layoutMode":"anchored","path":"Care panel"}},{"name":"delete-regimen-confirmation-dialog","component":"deleteRegimenConfirmationDialog"},{"name":"hiv-patient-visit-summary-dashboard-link","component":"hivPatientSummaryDashboardLink","slot":"hiv-care-and-treatment-slot","meta":{"columns":1,"columnSpan":1,"slot":"patient-chart-hiv-patient-summary-slot","path":"HIV Patient Summary","layoutMode":"anchored"}},{"name":"hiv-patient-visit-summary","slot":"patient-chart-hiv-patient-summary-slot","component":"hivPatientSummary","order":3,"online":true,"offline":false},{"name":"dispensing-patient-vitals","component":"dispensingPaentientVitals","slot":"dispensing-condition-and-diagnoses","order":1,"online":true,"offline":true},{"name":"patient-discharge-side-rail-icon","component":"patientDischargeSideRailIcon","slot":"action-menu-ward-patient-items-slot"}],"workspaces":[{"name":"patient-regimen-workspace","title":"Patient Regimen","component":"regimenFormWorkspace","type":"form","canMaximize":true,"canHide":true,"width":"wider"},{"name":"patient-care-discharge-workspace","title":"Patient Discharge","component":"patientDischargeWorkspace","type":"workspace","canMaximize":true,"canHide":true,"width":"extra-wide","groups":["ward-patient"]}],"version":"5.4.2-pre.2234"}
+{"$schema":"https://json.openmrs.org/routes.schema.json","backendDependencies":{"kenyaemr":"^19.0.0"},"pages":[],"extensions":[{"name":"care-panel-patient-summary","component":"carePanelPatientSummary","slot":"patient-chart-care-panel-dashboard-slot","order":10,"meta":{"columnSpan":4}},{"name":"care-panel-summary-dashboard-link","component":"carePanelSummaryDashboardLink","slot":"patient-chart-dashboard-slot","order":3,"meta":{"columns":1,"columnSpan":1,"slot":"patient-chart-care-panel-dashboard-slot","layoutMode":"anchored","path":"Care panel"}},{"name":"delete-regimen-confirmation-dialog","component":"deleteRegimenConfirmationDialog"},{"name":"hiv-patient-visit-summary-dashboard-link","component":"hivPatientSummaryDashboardLink","slot":"hiv-care-and-treatment-slot","meta":{"columns":1,"columnSpan":1,"slot":"patient-chart-hiv-patient-summary-slot","path":"HIV Patient Summary","layoutMode":"anchored"}},{"name":"hiv-patient-visit-summary","slot":"patient-chart-hiv-patient-summary-slot","component":"hivPatientSummary","order":3,"online":true,"offline":false},{"name":"dispensing-patient-vitals","component":"dispensingPaentientVitals","slot":"dispensing-condition-and-diagnoses","order":1,"online":true,"offline":true},{"name":"patient-discharge-side-rail-icon","component":"patientDischargeSideRailIcon","slot":"action-menu-ward-patient-items-slot"}],"workspaces":[{"name":"patient-regimen-workspace","title":"Patient Regimen","component":"regimenFormWorkspace","type":"form","canMaximize":true,"canHide":true,"width":"wider"},{"name":"patient-care-discharge-workspace","title":"Patient Discharge","component":"patientDischargeWorkspace","type":"workspace","canMaximize":true,"canHide":true,"width":"extra-wide","groups":["ward-patient"]}],"version":"5.4.2-pre.2240"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kenyaemr/esm-care-panel-app",
-  "version": "5.4.2-pre.2234",
+  "version": "5.4.2-pre.2240",
   "description": "Patient care panels microfrontend for the OpenMRS SPA",
   "browser": "dist/kenyaemr-esm-care-panel-app.js",
   "main": "src/index.ts",

package/src/dispensing-patient-details/dispensing-patient-vitals.resources.ts

@@ -1,7 +1,7 @@
 import { FetchResponse, fhirBaseUrl, openmrsFetch, parseDate, useConfig } from '@openmrs/esm-framework';
+import { useMemo } from 'react';
 import useSWR from 'swr';
 import { CarePanelConfig } from '../config-schema';
-import { useMemo } from 'react';
 
 export interface Entry {
   fullUrl: string;
@@ -104,14 +104,17 @@ type DispensingVitals = {
   dateRecoded?: Date;
 };
 
-export const usePatientVitals = (patientUuid: string, encounterUuid: string) => {
+export const usePatientVitals = (patientUuid: string) => {
   const { dispensingVitalsConcepts } = useConfig<CarePanelConfig>();
   const urlParams = new URLSearchParams({
-    patient: patientUuid,
     code: dispensingVitalsConcepts.map(({ uuid }) => uuid).join(','),
-    encounter: encounterUuid,
+    'subject:Patient': patientUuid,
+    _summary: 'data',
+    _sort: '-date',
+    _count: '1',
   });
   const url = `${fhirBaseUrl}/Observation?${urlParams.toString()}`;
+
   const { data, error, isLoading, mutate } = useSWR<FetchResponse<{ entry: Array<Entry> }>>(url, openmrsFetch);
   const vitals = useMemo<Array<DispensingVitals>>(
     () =>

package/src/dispensing-patient-details/patient-vitals.component.tsx

@@ -7,8 +7,8 @@ type PatientVitalsProps = {
   patientUuid: string;
   encounterUuid: string;
 };
-const DispensingPatientVitals: React.FC<PatientVitalsProps> = ({ encounterUuid, patientUuid }) => {
-  const { vitals, error, isLoading } = usePatientVitals(patientUuid, encounterUuid);
+const DispensingPatientVitals: React.FC<PatientVitalsProps> = ({ patientUuid }) => {
+  const { vitals, error, isLoading } = usePatientVitals(patientUuid);
 
   if (isLoading || error || !vitals.length) {
     return null;