Empty fields in eCR Summary should not be displayed (#2294)

apply evaluateData to eCR Summary sections
CDCgov · Aug 1, 2024 · cb92f3e · cb92f3e
1 parent bc02e2b
commit cb92f3e
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 13 deletions.
diff --git a/containers/ecr-viewer/src/app/services/ecrSummaryService.tsx b/containers/ecr-viewer/src/app/services/ecrSummaryService.tsx
@@ -1,5 +1,5 @@
 import { Bundle, Condition, Extension, Observation } from "fhir/r4";
-import { PathMappings } from "@/app/utils";
+import { evaluateData, PathMappings } from "@/app/utils";
 import {
   formatDate,
   formatStartEndDateTime,
@@ -52,7 +52,7 @@ export const evaluateEcrSummaryPatientDetails = (
   fhirBundle: Bundle,
   fhirPathMappings: PathMappings,
 ) => {
-  return [
+  return evaluateData([
     {
       title: "Patient Name",
       value: evaluatePatientName(fhirBundle, fhirPathMappings),
@@ -70,7 +70,7 @@ export const evaluateEcrSummaryPatientDetails = (
       title: "Patient Contact",
       value: evaluatePatientContactInfo(fhirBundle, fhirPathMappings),
     },
-  ];
+  ]);
 };
 
 /**
@@ -83,7 +83,7 @@ export const evaluateEcrSummaryEncounterDetails = (
   fhirBundle: Bundle,
   fhirPathMappings: PathMappings,
 ) => {
-  return [
+  return evaluateData([
     {
       title: "Facility Name",
       value: evaluate(fhirBundle, fhirPathMappings.facilityName),
@@ -104,7 +104,7 @@ export const evaluateEcrSummaryEncounterDetails = (
       title: "Encounter Type",
       value: evaluate(fhirBundle, fhirPathMappings.encounterType),
     },
-  ];
+  ]);
 };
 
 /**

diff --git a/containers/ecr-viewer/src/app/view-data/page.tsx b/containers/ecr-viewer/src/app/view-data/page.tsx
@@ -116,14 +116,14 @@ const ECRViewerPage: React.FC = () => {
                       eCR Summary
                     </h2>
                     <EcrSummary
-                      patientDetails={evaluateEcrSummaryPatientDetails(
-                        fhirBundle,
-                        mappings,
-                      )}
-                      encounterDetails={evaluateEcrSummaryEncounterDetails(
-                        fhirBundle,
-                        mappings,
-                      )}
+                      patientDetails={
+                        evaluateEcrSummaryPatientDetails(fhirBundle, mappings)
+                          .availableData
+                      }
+                      encounterDetails={
+                        evaluateEcrSummaryEncounterDetails(fhirBundle, mappings)
+                          .availableData
+                      }
                       conditionSummary={evaluateEcrSummaryConditionSummary(
                         fhirBundle,
                         mappings,