extract patient resource

Author: Akol125

lambdas/id_sync/src/ieds_db_operations.py

@@ -2,6 +2,9 @@
 from os_vars import get_ieds_table_name
 from common.aws_dynamodb import get_dynamodb_table
 from common.clients import logger, dynamodb_client
+import json
+import ast
+
 from utils import make_status
 from exceptions.id_sync_exception import IdSyncException
 
@@ -136,13 +139,34 @@ def extract_patient_resource_from_item(item: dict) -> dict | None:
     Extract a Patient resource dict from an IEDS database.
     """
     patient_resource = item.get("Resource", None)
+    logger.info(f"patient_resource (raw): {patient_resource}")
+
+    # Accept either a dict (preferred) or a JSON / Python-literal string
+    if isinstance(patient_resource, str):
+        # Try JSON first, then fall back to ast.literal_eval for single-quotes
+        try:
+            patient_resource_parsed = json.loads(patient_resource)
+        except Exception:
+            try:
+                patient_resource_parsed = ast.literal_eval(patient_resource)
+            except Exception:
+                logger.debug("extract_patient_resource_from_item: Resource is a string but could not be parsed")
+                return None
+        patient_resource = patient_resource_parsed
+
     if not isinstance(patient_resource, dict):
         return None
 
-    for response in patient_resource.get("contained", []):
+    # The Patient resource may be nested under 'contained' or be the resource itself
+    contained = patient_resource.get("contained") or []
+    for response in contained:
         if isinstance(response, dict) and response.get("resourceType") == "Patient":
             return response
 
+    # Fallback: if the resource is itself a Patient, return it
+    if patient_resource.get("resourceType") == "Patient":
+        return patient_resource
+
     return None
 
 

lambdas/id_sync/src/record_processor.py

@@ -71,6 +71,7 @@ def process_nhs_number(nhs_number: str) -> Dict[str, Any]:
     discarded_count = 0
     discarded_records = []
     for detail in ieds_resources:
+        logger.info("Processing IEDS record: %s", detail)
         if demographics_match(pds_patient_resource, detail):
             matching_records.append(detail)
         else:
@@ -79,7 +80,7 @@ def process_nhs_number(nhs_number: str) -> Dict[str, Any]:
 
     if not matching_records:
         logger.info("No records matched PDS demographics: %d\nDiscarded:\n%s", discarded_count,
-                    json.dumps(discarded_records, indent=2))
+                    json.dumps(discarded_records, indent=2), default=str)
         return make_status("No records matched PDS demographics; update skipped", nhs_number)
 
     response = ieds_update_patient_id(