@peopl-health/nexus 5.13.0-dev.1164 → 5.13.0-dev.1167

package/lib/fhir/constants/extensionSlugs.js

@@ -35,6 +35,7 @@ const ROUTING_EXT = {
   FINDING_CASE_ID: 'routing-finding-case-id',
   FINDING_REASONING: 'routing-finding-reasoning',
   FINDING_ACTION: 'routing-finding-action',
+  PREVIOUS_ID: 'routing-previous-id',
 };
 
 const CLUSTER_EXT = {
@@ -46,6 +47,7 @@ const CLUSTER_EXT = {
   STATUS: 'cluster-status',
   CONSULTATION_ID: 'cluster-consultation-id',
   DISSOLVE_REASON: 'cluster-dissolve-reason',
+  MEMBER_CASE_ID: 'cluster-member-case-id',
 };
 
 const PALLIATIVE_EXT = {

package/lib/fhir/helpers/fhirReadHelper.js

@@ -34,9 +34,20 @@ function extValues(resource, name) {
   return values;
 }
 
+function referencedId(node, slug, reference) {
+  return extValues(node, slug)[0] || refToId(reference);
+}
+
+function referencedIds(node, slug, references) {
+  const values = extValues(node, slug);
+  return values.length ? values : references.map(refToId).filter(Boolean);
+}
+
 module.exports = {
   extMap,
   identifierValue,
   refToId,
   extValues,
+  referencedId,
+  referencedIds,
 };

package/lib/fhir/projections/clusterProjection.js

@@ -3,7 +3,7 @@ const { ZodError } = require('zod');
 const { codeSystemUrl } = require('../helpers/fhirHelper');
 const { identifier, reference, codeableConcept, extension, toIso } = require('../helpers/elementHelper');
 const { baseResource, provenance } = require('../helpers/resourceHelper');
-const { extMap, identifierValue, refToId } = require('../helpers/fhirReadHelper');
+const { extMap, identifierValue, referencedIds } = require('../helpers/fhirReadHelper');
 const { CLUSTER_IMPRESSION_SLUG, CLUSTER_LABEL_SLUG } = require('../constants/projectionSlugs');
 const { CLUSTER_EXT } = require('../constants/extensionSlugs');
 const { ClusterImpression } = require('../../shared/dtos/ClusterImpression');
@@ -54,6 +54,7 @@ function clusterExtensions(cluster) {
   if (cluster.weakensIf.length) {
     out.push(extension(CLUSTER_EXT.WEAKENS_IF, { valueString: cluster.weakensIf.join(LIST_SEPARATOR) }));
   }
+  for (const caseId of cluster.memberCaseIds) out.push(extension(CLUSTER_EXT.MEMBER_CASE_ID, { valueString: caseId }));
   out.push(extension(CLUSTER_EXT.STATUS, { valueString: cluster.status }));
   if (cluster.consultationId) out.push(extension(CLUSTER_EXT.CONSULTATION_ID, { valueString: cluster.consultationId }));
   if (cluster.dissolveReason) out.push(extension(CLUSTER_EXT.DISSOLVE_REASON, { valueString: cluster.dissolveReason }));
@@ -104,7 +105,7 @@ function reconstruct(resource, patientId) {
     status: ext[CLUSTER_EXT.STATUS],
     confidence: ext[CLUSTER_EXT.CONFIDENCE],
     clinicalSignificance: ext[CLUSTER_EXT.CLINICAL_SIGNIFICANCE],
-    memberCaseIds: (resource.problem || []).map((problemRef) => refToId(problemRef.reference)).filter(Boolean),
+    memberCaseIds: referencedIds(resource, CLUSTER_EXT.MEMBER_CASE_ID, (resource.problem || []).map((p) => p.reference)),
     consultationId: ext[CLUSTER_EXT.CONSULTATION_ID] || null,
     relationshipModel: resource.summary || '',
     strengthensIf: splitList(ext[CLUSTER_EXT.STRENGTHENS_IF]),

package/lib/fhir/projections/contingencyProjection.js

@@ -4,7 +4,7 @@ const { getOrganizationId } = require('../config/fhirConfig');
 const { fhirId } = require('../helpers/fhirHelper');
 const { patientReference, reference, codeableConcept, extension, toIso } = require('../helpers/elementHelper');
 const { baseResource, provenance } = require('../helpers/resourceHelper');
-const { extMap, identifierValue, refToId } = require('../helpers/fhirReadHelper');
+const { extMap, identifierValue, referencedId } = require('../helpers/fhirReadHelper');
 const { CONTINGENCY_PLAN_SLUG, CONTINGENCY_STEP_SLUG } = require('../constants/projectionSlugs');
 const { ContingencySafetyNet } = require('../../shared/dtos/ContingencySafetyNet');
 const { logger } = require('../../utils/logger');
@@ -18,6 +18,8 @@ const EXT = {
   WHY_THIS_MATTERS: 'contingency-why-this-matters',
   CREATION_REASONING: 'contingency-creation-reasoning',
   RESOLVED_REASON: 'contingency-resolved-reason',
+  RELATED_CASE_ID: 'contingency-related-case-id',
+  RELATED_CLUSTER_ID: 'contingency-related-cluster-id',
   STEP_PRIORITY: 'contingency-step-priority',
   ACTION_REQUESTED: 'contingency-action-requested',
   FIRES_AFTER_SILENCE_MINUTES: 'fires-after-silence-minutes',
@@ -89,6 +91,8 @@ function carePlanPeriod(carePlan) {
 
 function carePlanExtensions(carePlan) {
   const out = [extension(EXT.STATUS, { valueString: carePlan.status })];
+  if (carePlan.relatedCaseId) out.push(extension(EXT.RELATED_CASE_ID, { valueString: carePlan.relatedCaseId }));
+  if (carePlan.relatedClusterId) out.push(extension(EXT.RELATED_CLUSTER_ID, { valueString: carePlan.relatedClusterId }));
   if (carePlan.awaitingCharacterization) out.push(extension(EXT.AWAITING_CHARACTERIZATION, { valueString: carePlan.awaitingCharacterization }));
   if (carePlan.whyThisMatters) out.push(extension(EXT.WHY_THIS_MATTERS, { valueString: carePlan.whyThisMatters }));
   if (carePlan.creationReasoning) out.push(extension(EXT.CREATION_REASONING, { valueString: carePlan.creationReasoning }));
@@ -148,8 +152,8 @@ function reconstruct(plan, requests, patientId) {
     carePlan: {
       planId,
       patientId,
-      relatedCaseId: refToId(address && address.reference),
-      relatedClusterId: refToId(plan.supportingInfo && plan.supportingInfo[0] && plan.supportingInfo[0].reference),
+      relatedCaseId: referencedId(plan, EXT.RELATED_CASE_ID, address?.reference),
+      relatedClusterId: referencedId(plan, EXT.RELATED_CLUSTER_ID, plan.supportingInfo?.[0]?.reference),
       concern: plan.description || '',
       awaitingCharacterization: ext[EXT.AWAITING_CHARACTERIZATION] || '',
       whyThisMatters: ext[EXT.WHY_THIS_MATTERS] || '',

package/lib/fhir/projections/interventionProjection.js

@@ -4,7 +4,7 @@ const { getDeviceId } = require('../config/fhirConfig');
 const { fhirId, codeSystemUrl } = require('../helpers/fhirHelper');
 const { identifier, patientReference, reference, recipientReference, codeableConcept, extension, notes, toIso } = require('../helpers/elementHelper');
 const { baseResource, provenance } = require('../helpers/resourceHelper');
-const { identifierValue, refToId, extValues } = require('../helpers/fhirReadHelper');
+const { identifierValue, refToId, extValues, referencedId } = require('../helpers/fhirReadHelper');
 const { INTERVENTION_SLUG, INTERVENTION_KIND_SLUG, INTERVENTION_OUTCOME_SLUG } = require('../constants/projectionSlugs');
 const { Intervention } = require('../../shared/dtos/Intervention');
 const { logger } = require('../../utils/logger');
@@ -13,6 +13,7 @@ const ACTIVITY_TEXT = 'intervention-record';
 const PROCEDURE_KINDS = new Set(['otc', 'self_care', 'other']);
 
 const EXT = {
+  CASE_ID: 'intervention-case-id',
   RATIONALE: 'intervention-rationale',
   OUTCOME_NOTES: 'intervention-outcome-notes',
   OUTCOME: 'intervention-outcome',
@@ -122,6 +123,7 @@ function communicationRequestResource(intervention) {
 
 function interventionExtensions(intervention, { withRecipient = false } = {}) {
   const out = [];
+  if (intervention.caseId) out.push(extension(EXT.CASE_ID, { valueString: intervention.caseId }));
   if (intervention.rationale) out.push(extension(EXT.RATIONALE, { valueString: intervention.rationale }));
   if (intervention.outcomeNotes) out.push(extension(EXT.OUTCOME_NOTES, { valueString: intervention.outcomeNotes }));
   if (intervention.outcome) out.push(extension(EXT.OUTCOME, { valueString: intervention.outcome }));
@@ -144,7 +146,7 @@ function reconstruct(resource, patientId) {
   const base = {
     interventionId: identifierValue(resource, INTERVENTION_SLUG),
     patientId,
-    caseId: refToId(reasonRef && reasonRef.reference),
+    caseId: referencedId(resource, EXT.CASE_ID, reasonRef?.reference),
     rationale: extValues(resource, EXT.RATIONALE)[0] ?? null,
     outcomeNotes: extValues(resource, EXT.OUTCOME_NOTES)[0] ?? null,
     outcomeExt: extValues(resource, EXT.OUTCOME)[0] ?? null,

package/lib/fhir/projections/routingProjection.js

@@ -3,7 +3,7 @@ const { ZodError } = require('zod');
 const { getDeviceId } = require('../config/fhirConfig');
 const { reference, patientReference, codeableConcept, extension, toIso } = require('../helpers/elementHelper');
 const { baseResource, provenance } = require('../helpers/resourceHelper');
-const { extMap, extValues, identifierValue, refToId } = require('../helpers/fhirReadHelper');
+const { extMap, extValues, identifierValue, refToId, referencedId } = require('../helpers/fhirReadHelper');
 const { ROUTING_ASSESSMENT_SLUG, ROUTING_DISPOSITION_SLUG } = require('../constants/projectionSlugs');
 const { ROUTING_EXT } = require('../constants/extensionSlugs');
 const { RoutingDecision } = require('../../shared/dtos/RoutingDecision');
@@ -171,6 +171,7 @@ function assessmentExtensions(assessment, { decisionId, committedAt, disposition
   if (disposition.primaryCaseId) {
     out.push(extension(ROUTING_EXT.PRIMARY_CASE_ID, { valueString: disposition.primaryCaseId }));
   }
+  if (assessment.previousId) out.push(extension(ROUTING_EXT.PREVIOUS_ID, { valueString: assessment.previousId }));
   for (const deferred of disposition.deferredItems) {
     out.push(
       extension(ROUTING_EXT.DEFERRED_ITEM, { valueString: deferred.item }),
@@ -240,13 +241,13 @@ function reconstructAssessment(resource, patientId, turnId) {
     patientId,
     turnId,
     performedAt: resource.effectiveDateTime,
-    previousId: refToId(resource.previous?.reference),
+    previousId: referencedId(resource, ROUTING_EXT.PREVIOUS_ID, resource.previous?.reference),
     summary: resource.summary || '',
     notes: (resource.note || []).map((note) => note.text),
     findings: (resource.finding || []).map((finding) => {
       const findingExt = extMap(finding);
       return {
-        caseId: findingExt[ROUTING_EXT.FINDING_CASE_ID] || refToId(finding.item?.reference),
+        caseId: referencedId(finding, ROUTING_EXT.FINDING_CASE_ID, finding.item?.reference),
         clinicalReasoning: findingExt[ROUTING_EXT.FINDING_REASONING] || '',
         decisionAction: findingExt[ROUTING_EXT.FINDING_ACTION] || '',
       };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@peopl-health/nexus",
-  "version": "5.13.0-dev.1164",
+  "version": "5.13.0-dev.1167",
   "description": "Core messaging and assistant library for WhatsApp communication platforms",
   "keywords": [
     "whatsapp",