@bahmni/services 0.0.1-dev.400 → 0.0.1-dev.403

package/dist/encounterSessionService/encounterSessionService.d.ts

@@ -21,17 +21,20 @@ export declare function getEncounterSessionDuration(): Promise<number>;
  * Filters encounters to find those belonging to the active visit
  * @param encounters - Array of encounters to filter
  * @param patientUUID - Patient UUID
+ * @param currentEpisodeEncounterUuids - Array of known encounters UUIDs of current EOC
  * @returns Promise resolving to encounter within active visit or null
  */
-export declare function filterByActiveVisit(encounters: Encounter[], patientUUID: string): Promise<Encounter | null>;
+export declare function filterByActiveVisit(encounters: Encounter[], patientUUID: string, currentEpisodeEncounterUuids?: string[]): Promise<Encounter | null>;
 /**
  * Finds an active encounter within the session duration for a patient and practitioner
  * @param patientUUID - Patient UUID
  * @param practitionerUUID - Practitioner UUID (optional, for practitioner-specific sessions)
  * @param sessionDurationMinutes - Session duration in minutes (optional, will fetch from config if not provided)
+ * @param encounterTypeUUID - Encounter type UUID (optional, filters by type)
+ * @param currentEpisodeEncounterUuids - The current episode of care's own known encounter UUIDs
  * @returns Promise resolving to active encounter or null
  */
-export declare function findActiveEncounterInSession(patientUUID: string, practitionerUUID?: string, sessionDurationMinutes?: number, encounterTypeUUID?: string): Promise<Encounter | null>;
+export declare function findActiveEncounterInSession(patientUUID: string, practitionerUUID?: string, sessionDurationMinutes?: number, encounterTypeUUID?: string, currentEpisodeEncounterUuids?: string[]): Promise<Encounter | null>;
 /**
  * Checks if there is an active encounter session for a patient and practitioner
  * @param patientUUID - Patient UUID

package/dist/encounterSessionService/encounterSessionService.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"encounterSessionService.d.ts","sourceRoot":"","sources":["../../src/encounterSessionService/encounterSessionService.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAU,MAAM,SAAS,CAAC;AAQ5C,UAAU,qBAAqB;IAC7B,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,IAAI,CAAC,EAAE,MAAM,CAAC;CACf;AAED;;;;GAIG;AACH,wBAAsB,gBAAgB,CACpC,MAAM,EAAE,qBAAqB,GAC5B,OAAO,CAAC,SAAS,EAAE,CAAC,CAkBtB;AAED;;;GAGG;AACH,wBAAsB,2BAA2B,IAAI,OAAO,CAAC,MAAM,CAAC,CAUnE;AAED;;;;;GAKG;AACH,wBAAsB,mBAAmB,CACvC,UAAU,EAAE,SAAS,EAAE,EACvB,WAAW,EAAE,MAAM,GAClB,OAAO,CAAC,SAAS,GAAG,IAAI,CAAC,CAkB3B;AAED;;;;;;GAMG;AACH,wBAAsB,4BAA4B,CAChD,WAAW,EAAE,MAAM,EACnB,gBAAgB,CAAC,EAAE,MAAM,EACzB,sBAAsB,CAAC,EAAE,MAAM,EAC/B,iBAAiB,CAAC,EAAE,MAAM,GACzB,OAAO,CAAC,SAAS,GAAG,IAAI,CAAC,CAiC3B;AAED;;;;;GAKG;AACH,wBAAsB,yBAAyB,CAC7C,WAAW,EAAE,MAAM,EACnB,gBAAgB,CAAC,EAAE,MAAM,GACxB,OAAO,CAAC,OAAO,CAAC,CAMlB"}
+{"version":3,"file":"encounterSessionService.d.ts","sourceRoot":"","sources":["../../src/encounterSessionService/encounterSessionService.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAU,MAAM,SAAS,CAAC;AAQ5C,UAAU,qBAAqB;IAC7B,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,IAAI,CAAC,EAAE,MAAM,CAAC;CACf;AAED;;;;GAIG;AACH,wBAAsB,gBAAgB,CACpC,MAAM,EAAE,qBAAqB,GAC5B,OAAO,CAAC,SAAS,EAAE,CAAC,CAkBtB;AAED;;;GAGG;AACH,wBAAsB,2BAA2B,IAAI,OAAO,CAAC,MAAM,CAAC,CAUnE;AAED;;;;;;GAMG;AACH,wBAAsB,mBAAmB,CACvC,UAAU,EAAE,SAAS,EAAE,EACvB,WAAW,EAAE,MAAM,EACnB,4BAA4B,CAAC,EAAE,MAAM,EAAE,GACtC,OAAO,CAAC,SAAS,GAAG,IAAI,CAAC,CAsB3B;AAED;;;;;;;;GAQG;AACH,wBAAsB,4BAA4B,CAChD,WAAW,EAAE,MAAM,EACnB,gBAAgB,CAAC,EAAE,MAAM,EACzB,sBAAsB,CAAC,EAAE,MAAM,EAC/B,iBAAiB,CAAC,EAAE,MAAM,EAC1B,4BAA4B,CAAC,EAAE,MAAM,EAAE,GACtC,OAAO,CAAC,SAAS,GAAG,IAAI,CAAC,CAqC3B;AAED;;;;;GAKG;AACH,wBAAsB,yBAAyB,CAC7C,WAAW,EAAE,MAAM,EACnB,gBAAgB,CAAC,EAAE,MAAM,GACxB,OAAO,CAAC,OAAO,CAAC,CAMlB"}

package/dist/index.js

@@ -13463,30 +13463,34 @@ async function yc() {
     return 30;
   }
 }
-async function nw(t, e) {
+async function nw(t, e, r) {
   if (!t.length) return null;
   try {
-    const r = await mn(e);
-    return r ? t.find((n) => {
-      const s = n.partOf?.reference?.split("/")[1];
-      return r.id === s;
+    const n = await mn(e);
+    return n ? t.find((s) => {
+      const o = s.partOf?.reference?.split("/")[1];
+      return n.id !== o ? !1 : r ? !!s.id && r.includes(s.id) : !0;
     }) ?? null : null;
   } catch {
     return null;
   }
 }
-async function Jb(t, e, r, n) {
+async function Jb(t, e, r, n, s) {
   try {
     if (!t) return null;
-    const s = r ?? await yc(), a = `ge${new Date(Date.now() - s * 60 * 1e3).toISOString()}`, i = {
+    const o = r ?? await yc(), i = `ge${new Date(Date.now() - o * 60 * 1e3).toISOString()}`, c = {
       patient: t,
       _tag: "encounter",
-      _lastUpdated: a,
+      _lastUpdated: i,
       type: n
     };
-    e && (i.participant = e);
-    const c = await os(i);
-    return c.length === 0 ? null : await nw(c, t);
+    e && (c.participant = e);
+    const u = await os(c);
+    return u.length === 0 ? null : await nw(
+      u,
+      t,
+      s
+    );
   } catch {
     return null;
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bahmni/services",
-  "version": "0.0.1-dev.400",
+  "version": "0.0.1-dev.403",
   "type": "module",
   "main": "./dist/index.js",
   "module": "./dist/index.js",