@openmrs/esm-form-engine-lib 4.1.1-pre.2374 → 4.1.1-pre.2382

package/dist/api/index.d.ts

@@ -7,6 +7,7 @@ export declare function getLocationsByTag(tag: string): Promise<any>;
 export declare function getAllLocations(): Promise<any>;
 export declare function getPreviousEncounter(patientUuid: string, encounterType: string): Promise<any>;
 export declare function getLatestObs(patientUuid: string, conceptUuid: string, encounterTypeUuid?: string): Promise<FHIRObsResource>;
+export declare function getLatestObsForConceptSet(patientUuid: string, conceptUuid: string, encounterTypeUuid?: string): Promise<FHIRObsResource[]>;
 /**
  * Fetches an OpenMRS form using either its name or UUID.
  * @param {string} nameOrUUID - The form's name or UUID.

package/dist/api/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/api/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,SAAS,CAAC;AAGzC,OAAO,KAAK,EACV,oBAAoB,EACpB,eAAe,EACf,WAAW,EACX,mBAAmB,EACnB,iBAAiB,EACjB,qBAAqB,EACrB,eAAe,EAChB,MAAM,UAAU,CAAC;AAGlB,wBAAgB,aAAa,CAAC,eAAe,EAAE,eAAe,EAAE,OAAO,KAAA,EAAE,aAAa,CAAC,EAAE,MAAM,0DAa9F;AAED,wBAAsB,gBAAgB,CAAC,WAAW,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,EAAE,UAAU,EAAE,oBAAoB,0DAoBlH;AAED,wBAAgB,UAAU,CAAC,WAAW,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,gBAExD;AAED,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,MAAM,gBAE5C;AAED,wBAAgB,eAAe,iBAE9B;AAED,wBAAsB,oBAAoB,CAAC,WAAW,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,gBASpF;AAED,wBAAsB,YAAY,CAChC,WAAW,EAAE,MAAM,EACnB,WAAW,EAAE,MAAM,EACnB,iBAAiB,CAAC,EAAE,MAAM,GACzB,OAAO,CAAC,eAAe,CAAC,CAQ1B;AAED;;;;GAIG;AACH,wBAAsB,gBAAgB,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,WAAW,GAAG,IAAI,CAAC,CAqBtF;AAED;;;;GAIG;AACH,wBAAsB,aAAa,CAAC,IAAI,EAAE,WAAW,GAAG,OAAO,CAAC,GAAG,GAAG,IAAI,CAAC,CAc1E;AAGD,wBAAgB,0BAA0B,CAAC,WAAW,EAAE,MAAM,gBAS7D;AAED,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,qBAAqB,EAAE,eAAe,EAAE,eAAe,0DAarG;AAED,wBAAgB,qBAAqB,CAAC,iBAAiB,EAAE,iBAAiB,EAAE,WAAW,EAAE,MAAM,0DAgB9F;AAED,wBAAgB,mBAAmB,CAAC,eAAe,EAAE,eAAe,EAAE,WAAW,EAAE,MAAM,0DAgBxF;AAED,wBAAgB,qBAAqB,CACnC,CAAC,EAAE,SAAS,EACZ,WAAW,EAAE,MAAM,EACnB,OAAO,EAAE,mBAAmB,EAC5B,eAAe,EAAE,eAAe,0DAmBjC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/api/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,SAAS,CAAC;AAGzC,OAAO,KAAK,EACV,oBAAoB,EACpB,eAAe,EACf,WAAW,EACX,mBAAmB,EACnB,iBAAiB,EACjB,qBAAqB,EACrB,eAAe,EAChB,MAAM,UAAU,CAAC;AAGlB,wBAAgB,aAAa,CAAC,eAAe,EAAE,eAAe,EAAE,OAAO,KAAA,EAAE,aAAa,CAAC,EAAE,MAAM,0DAa9F;AAED,wBAAsB,gBAAgB,CAAC,WAAW,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,EAAE,UAAU,EAAE,oBAAoB,0DAoBlH;AAED,wBAAgB,UAAU,CAAC,WAAW,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,gBAExD;AAED,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,MAAM,gBAE5C;AAED,wBAAgB,eAAe,iBAE9B;AAED,wBAAsB,oBAAoB,CAAC,WAAW,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,gBASpF;AAED,wBAAsB,YAAY,CAChC,WAAW,EAAE,MAAM,EACnB,WAAW,EAAE,MAAM,EACnB,iBAAiB,CAAC,EAAE,MAAM,GACzB,OAAO,CAAC,eAAe,CAAC,CAO1B;AAED,wBAAsB,yBAAyB,CAC7C,WAAW,EAAE,MAAM,EACnB,WAAW,EAAE,MAAM,EACnB,iBAAiB,CAAC,EAAE,MAAM,GACzB,OAAO,CAAC,eAAe,EAAE,CAAC,CAgB5B;AAED;;;;GAIG;AACH,wBAAsB,gBAAgB,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,WAAW,GAAG,IAAI,CAAC,CAqBtF;AAED;;;;GAIG;AACH,wBAAsB,aAAa,CAAC,IAAI,EAAE,WAAW,GAAG,OAAO,CAAC,GAAG,GAAG,IAAI,CAAC,CAc1E;AAGD,wBAAgB,0BAA0B,CAAC,WAAW,EAAE,MAAM,gBAS7D;AAED,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,qBAAqB,EAAE,eAAe,EAAE,eAAe,0DAarG;AAED,wBAAgB,qBAAqB,CAAC,iBAAiB,EAAE,iBAAiB,EAAE,WAAW,EAAE,MAAM,0DAgB9F;AAED,wBAAgB,mBAAmB,CAAC,eAAe,EAAE,eAAe,EAAE,WAAW,EAAE,MAAM,0DAgBxF;AAED,wBAAgB,qBAAqB,CACnC,CAAC,EAAE,SAAS,EACZ,WAAW,EAAE,MAAM,EACnB,OAAO,EAAE,mBAAmB,EAC5B,eAAe,EAAE,eAAe,0DAmBjC"}

package/dist/api/index.js

@@ -58,6 +58,23 @@ export async function getLatestObs(patientUuid, conceptUuid, encounterTypeUuid)
     const { data } = await openmrsFetch(`${fhirBaseUrl}/Observation?${params}`);
     return data.entry?.length ? data.entry[0].resource : null;
 }
+export async function getLatestObsForConceptSet(patientUuid, conceptUuid, encounterTypeUuid) {
+    // First, find the single latest obs to identify the encounter
+    const latestObs = await getLatestObs(patientUuid, conceptUuid, encounterTypeUuid);
+    if (!latestObs) {
+        return [];
+    }
+    const encounterId = latestObs.encounter?.reference?.split('/').pop();
+    if (!encounterId) {
+        return [
+            latestObs
+        ];
+    }
+    // Fetch ALL obs for that concept within the same encounter
+    const params = `patient=${patientUuid}&code=${conceptUuid}&encounter=${encounterId}`;
+    const { data } = await openmrsFetch(`${fhirBaseUrl}/Observation?${params}`);
+    return data.entry?.map((e)=>e.resource) ?? [];
+}
 /**
  * Fetches an OpenMRS form using either its name or UUID.
  * @param {string} nameOrUUID - The form's name or UUID.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openmrs/esm-form-engine-lib",
-  "version": "4.1.1-pre.2374",
+  "version": "4.1.1-pre.2382",
   "description": "React Form Engine for O3",
   "main": "dist/index.js",
   "module": "dist/index.js",

package/src/api/index.ts

@@ -77,15 +77,36 @@ export async function getLatestObs(
   conceptUuid: string,
   encounterTypeUuid?: string,
 ): Promise<FHIRObsResource> {
-  let params = `patient=${patientUuid}&code=${conceptUuid}${
-    encounterTypeUuid ? `&encounter.type=${encounterTypeUuid}` : ''
-  }`;
+  let params = `patient=${patientUuid}&code=${conceptUuid}${encounterTypeUuid ? `&encounter.type=${encounterTypeUuid}` : ''
+    }`;
   // the latest obs
   params += '&_sort=-date&_count=1';
   const { data } = await openmrsFetch(`${fhirBaseUrl}/Observation?${params}`);
   return data.entry?.length ? data.entry[0].resource : null;
 }
 
+export async function getLatestObsForConceptSet(
+  patientUuid: string,
+  conceptUuid: string,
+  encounterTypeUuid?: string,
+): Promise<FHIRObsResource[]> {
+  // First, find the single latest obs to identify the encounter
+  const latestObs = await getLatestObs(patientUuid, conceptUuid, encounterTypeUuid);
+  if (!latestObs) {
+    return [];
+  }
+
+  const encounterId = latestObs.encounter?.reference?.split('/').pop();
+  if (!encounterId) {
+    return [latestObs];
+  }
+
+  // Fetch ALL obs for that concept within the same encounter
+  const params = `patient=${patientUuid}&code=${conceptUuid}&encounter=${encounterId}`;
+  const { data } = await openmrsFetch(`${fhirBaseUrl}/Observation?${params}`);
+  return data.entry?.map((e) => e.resource) ?? [];
+}
+
 /**
  * Fetches an OpenMRS form using either its name or UUID.
  * @param {string} nameOrUUID - The form's name or UUID.