@imranq2/fhirpatientsummary 1.0.23 → 1.0.24

package/dist/index.cjs

@@ -155,7 +155,9 @@ var IPSSectionSummaryCompositionFilter = {
   ["VitalSignsSection" /* VITAL_SIGNS */]: (resource) => resource.resourceType === "Composition" && resource.type?.coding?.some((c) => c.system === IPS_SUMMARY_COMPOSITION_TYPE_SYSTEM && c.code === "vital_summary_document"),
   ["PlanOfCareSection" /* CARE_PLAN */]: (resource) => resource.resourceType === "Composition" && resource.type?.coding?.some((c) => c.system === IPS_SUMMARY_COMPOSITION_TYPE_SYSTEM && c.code === "careplan_summary_document"),
   ["ImmunizationSection" /* IMMUNIZATIONS */]: (resource) => resource.resourceType === "Composition" && resource.type?.coding?.some((c) => c.system === IPS_SUMMARY_COMPOSITION_TYPE_SYSTEM && c.code === "immunization_summary_document"),
-  ["MedicationSummarySection" /* MEDICATIONS */]: (resource) => resource.resourceType === "Composition" && resource.type?.coding?.some((c) => c.system === IPS_SUMMARY_COMPOSITION_TYPE_SYSTEM && c.code === "medication_summary_document")
+  ["MedicationSummarySection" /* MEDICATIONS */]: (resource) => resource.resourceType === "Composition" && resource.type?.coding?.some((c) => c.system === IPS_SUMMARY_COMPOSITION_TYPE_SYSTEM && c.code === "medication_summary_document"),
+  ["ResultsSection" /* DIAGNOSTIC_REPORTS */]: (resource) => resource.resourceType === "Composition" && resource.type?.coding?.some((c) => c.system === IPS_SUMMARY_COMPOSITION_TYPE_SYSTEM && ["lab_summary_document", "diagnosticreportlab_summary_document"].includes(c.code)),
+  ["HistoryOfProceduresSection" /* PROCEDURES */]: (resource) => resource.resourceType === "Composition" && resource.type?.coding?.some((c) => c.system === IPS_SUMMARY_COMPOSITION_TYPE_SYSTEM && c.code === "procedure_summary_document")
 };
 var IPSSectionResourceHelper = class {
   static getResourceFilterForSection(section) {
@@ -2088,6 +2090,400 @@ var DiagnosticResultsTemplate = class _DiagnosticResultsTemplate {
   generateNarrative(resources, timezone) {
     return _DiagnosticResultsTemplate.generateStaticNarrative(resources, timezone);
   }
+  /**
+   * Helper function to format observation data fields
+   * @param obsData - Record containing observation data fields
+   */
+  formatSummaryObservationData(obsData) {
+    const valueType = obsData["valueType"];
+    switch (valueType) {
+      case "valueQuantity":
+        if (obsData["value"] && obsData["unit"]) {
+          obsData["formattedValue"] = `${obsData["value"]} ${obsData["unit"]}`;
+        } else if (obsData["value"]) {
+          obsData["formattedValue"] = obsData["value"];
+        }
+        break;
+      case "valueCodeableConcept":
+      case "valueString":
+      case "valueBoolean":
+      case "valueInteger":
+      case "valueDateTime":
+      case "valueTime":
+        obsData["formattedValue"] = obsData["value"] ?? "";
+        break;
+      case "valuePeriod":
+        if (obsData["valuePeriodStart"] && obsData["valuePeriodEnd"]) {
+          obsData["formattedValue"] = `${obsData["valuePeriodStart"]} - ${obsData["valuePeriodEnd"]}`;
+        } else if (obsData["valuePeriodStart"]) {
+          obsData["formattedValue"] = `From ${obsData["valuePeriodStart"]}`;
+        } else if (obsData["valuePeriodEnd"]) {
+          obsData["formattedValue"] = `Until ${obsData["valuePeriodEnd"]}`;
+        }
+        break;
+      case "valueSampledData": {
+        const sampledParts = [];
+        if (obsData["sampledDataOriginValue"]) {
+          sampledParts.push(`Origin: ${obsData["sampledDataOriginValue"]}${obsData["sampledDataOriginUnit"] ? " " + obsData["sampledDataOriginUnit"] : ""}`);
+        }
+        if (obsData["sampledDataPeriod"]) {
+          sampledParts.push(`Period: ${obsData["sampledDataPeriod"]}`);
+        }
+        if (obsData["sampledDataFactor"]) {
+          sampledParts.push(`Factor: ${obsData["sampledDataFactor"]}`);
+        }
+        if (obsData["sampledDataLowerLimit"]) {
+          sampledParts.push(`Lower: ${obsData["sampledDataLowerLimit"]}`);
+        }
+        if (obsData["sampledDataUpperLimit"]) {
+          sampledParts.push(`Upper: ${obsData["sampledDataUpperLimit"]}`);
+        }
+        if (obsData["sampledDataData"]) {
+          sampledParts.push(`Data: ${obsData["sampledDataData"]}`);
+        }
+        obsData["formattedValue"] = sampledParts.join(", ");
+        break;
+      }
+      case "valueRange": {
+        const rangeParts = [];
+        if (obsData["valueRangeLowValue"]) {
+          rangeParts.push(`${obsData["valueRangeLowValue"]}${obsData["valueRangeLowUnit"] ? " " + obsData["valueRangeLowUnit"] : ""}`);
+        }
+        if (obsData["valueRangeHighValue"]) {
+          rangeParts.push(`${obsData["valueRangeHighValue"]}${obsData["valueRangeHighUnit"] ? " " + obsData["valueRangeHighUnit"] : ""}`);
+        }
+        obsData["formattedValue"] = rangeParts.join(" - ");
+        break;
+      }
+      case "valueRatio": {
+        const numerator = obsData["valueRatioNumeratorValue"] ? `${obsData["valueRatioNumeratorValue"]}${obsData["valueRatioNumeratorUnit"] ? " " + obsData["valueRatioNumeratorUnit"] : ""}` : "";
+        const denominator = obsData["valueRatioDenominatorValue"] ? `${obsData["valueRatioDenominatorValue"]}${obsData["valueRatioDenominatorUnit"] ? " " + obsData["valueRatioDenominatorUnit"] : ""}` : "";
+        if (numerator && denominator) {
+          obsData["formattedValue"] = `${numerator} / ${denominator}`;
+        } else if (numerator) {
+          obsData["formattedValue"] = numerator;
+        }
+        break;
+      }
+      default:
+        obsData["formattedValue"] = obsData["value"] ?? "";
+        break;
+    }
+    if (obsData["referenceRangeLow"]) {
+      obsData["referenceRange"] = obsData["referenceRangeLow"] + " " + obsData["referenceRangeLowUnit"];
+    }
+    if (obsData["referenceRangeHigh"]) {
+      if (obsData["referenceRange"]) {
+        obsData["referenceRange"] += " - ";
+      } else {
+        obsData["referenceRange"] = "";
+      }
+      obsData["referenceRange"] += obsData["referenceRangeHigh"] + " " + obsData["referenceRangeHighUnit"];
+    }
+    if (obsData["referenceRangeAgeLowValue"] || obsData["referenceRangeAgeHighValue"]) {
+      const ageParts = [];
+      if (obsData["referenceRangeAgeLowValue"]) {
+        ageParts.push(`${obsData["referenceRangeAgeLowValue"]}${obsData["referenceRangeAgeLowUnit"] ? " " + obsData["referenceRangeAgeLowUnit"] : ""}`);
+      }
+      if (obsData["referenceRangeAgeHighValue"]) {
+        ageParts.push(`${obsData["referenceRangeAgeHighValue"]}${obsData["referenceRangeAgeHighUnit"] ? " " + obsData["referenceRangeAgeHighUnit"] : ""}`);
+      }
+      if (obsData["referenceRange"]) {
+        obsData["referenceRange"] += ` (Age: ${ageParts.join(" - ")})`;
+      } else {
+        obsData["referenceRange"] = `Age: ${ageParts.join(" - ")}`;
+      }
+    }
+  }
+  /**
+   * Helper function to extract observation field data
+   * @param column - Column data from the summary
+   * @param targetData - Record to populate with extracted data
+   */
+  extractSummaryObservationFields(column, targetData) {
+    switch (column.title) {
+      case "Labs Name":
+        targetData["code"] = column.text?.div ?? "";
+        break;
+      case "effectiveDateTime":
+        targetData["effectiveDateTime"] = column.text?.div ?? "";
+        break;
+      case "effectivePeriod.start":
+        targetData["effectivePeriodStart"] = column.text?.div ?? "";
+        break;
+      case "effectivePeriod.end":
+        targetData["effectivePeriodEnd"] = column.text?.div ?? "";
+        break;
+      // valueQuantity
+      case "valueQuantity.value":
+        targetData["value"] = column.text?.div ?? "";
+        targetData["valueType"] = "valueQuantity";
+        break;
+      case "valueQuantity.unit":
+        targetData["unit"] = column.text?.div ?? "";
+        break;
+      // valueCodeableConcept
+      case "valueCodeableConcept.text":
+        targetData["value"] = column.text?.div ?? "";
+        targetData["valueType"] = "valueCodeableConcept";
+        break;
+      case "valueCodeableConcept.coding.display":
+        if (!targetData["value"]) {
+          targetData["value"] = column.text?.div ?? "";
+          targetData["valueType"] = "valueCodeableConcept";
+        }
+        break;
+      // valueString
+      case "valueString":
+        targetData["value"] = column.text?.div ?? "";
+        targetData["valueType"] = "valueString";
+        break;
+      // valueBoolean
+      case "valueBoolean":
+        targetData["value"] = column.text?.div ?? "";
+        targetData["valueType"] = "valueBoolean";
+        break;
+      // valueInteger
+      case "valueInteger":
+        targetData["value"] = column.text?.div ?? "";
+        targetData["valueType"] = "valueInteger";
+        break;
+      // valueDateTime
+      case "valueDateTime":
+        targetData["value"] = column.text?.div ?? "";
+        targetData["valueType"] = "valueDateTime";
+        break;
+      // valuePeriod
+      case "valuePeriod.start":
+        targetData["valuePeriodStart"] = column.text?.div ?? "";
+        targetData["valueType"] = "valuePeriod";
+        break;
+      case "valuePeriod.end":
+        targetData["valuePeriodEnd"] = column.text?.div ?? "";
+        targetData["valueType"] = "valuePeriod";
+        break;
+      // valueTime
+      case "valueTime":
+        targetData["value"] = column.text?.div ?? "";
+        targetData["valueType"] = "valueTime";
+        break;
+      // valueSampledData
+      case "valueSampledData.origin.value":
+        targetData["sampledDataOriginValue"] = column.text?.div ?? "";
+        targetData["valueType"] = "valueSampledData";
+        break;
+      case "valueSampledData.origin.unit":
+        targetData["sampledDataOriginUnit"] = column.text?.div ?? "";
+        break;
+      case "valueSampledData.period":
+        targetData["sampledDataPeriod"] = column.text?.div ?? "";
+        break;
+      case "valueSampledData.factor":
+        targetData["sampledDataFactor"] = column.text?.div ?? "";
+        break;
+      case "valueSampledData.lowerLimit":
+        targetData["sampledDataLowerLimit"] = column.text?.div ?? "";
+        break;
+      case "valueSampledData.upperLimit":
+        targetData["sampledDataUpperLimit"] = column.text?.div ?? "";
+        break;
+      case "valueSampledData.data":
+        targetData["sampledDataData"] = column.text?.div ?? "";
+        break;
+      // valueRange
+      case "valueRange.low.value":
+        targetData["valueRangeLowValue"] = column.text?.div ?? "";
+        targetData["valueType"] = "valueRange";
+        break;
+      case "valueRange.low.unit":
+        targetData["valueRangeLowUnit"] = column.text?.div ?? "";
+        break;
+      case "valueRange.high.value":
+        targetData["valueRangeHighValue"] = column.text?.div ?? "";
+        break;
+      case "valueRange.high.unit":
+        targetData["valueRangeHighUnit"] = column.text?.div ?? "";
+        break;
+      // valueRatio
+      case "valueRatio.numerator.value":
+        targetData["valueRatioNumeratorValue"] = column.text?.div ?? "";
+        targetData["valueType"] = "valueRatio";
+        break;
+      case "valueRatio.numerator.unit":
+        targetData["valueRatioNumeratorUnit"] = column.text?.div ?? "";
+        break;
+      case "valueRatio.denominator.value":
+        targetData["valueRatioDenominatorValue"] = column.text?.div ?? "";
+        break;
+      case "valueRatio.denominator.unit":
+        targetData["valueRatioDenominatorUnit"] = column.text?.div ?? "";
+        break;
+      // referenceRange
+      case "referenceRange.low.value":
+        targetData["referenceRangeLow"] = column.text?.div ?? "";
+        break;
+      case "referenceRange.low.unit":
+        targetData["referenceRangeLowUnit"] = column.text?.div ?? "";
+        break;
+      case "referenceRange.high.value":
+        targetData["referenceRangeHigh"] = column.text?.div ?? "";
+        break;
+      case "referenceRange.high.unit":
+        targetData["referenceRangeHighUnit"] = column.text?.div ?? "";
+        break;
+      case "referenceRange.age.low.value":
+        targetData["referenceRangeAgeLowValue"] = column.text?.div ?? "";
+        break;
+      case "referenceRange.age.low.unit":
+        targetData["referenceRangeAgeLowUnit"] = column.text?.div ?? "";
+        break;
+      case "referenceRange.age.high.value":
+        targetData["referenceRangeAgeHighValue"] = column.text?.div ?? "";
+        break;
+      case "referenceRange.age.high.unit":
+        targetData["referenceRangeAgeHighUnit"] = column.text?.div ?? "";
+        break;
+      default:
+        break;
+    }
+  }
+  /**
+   * Generate HTML narrative for Diagnostic Results & Observation resources using summary
+   * @param resources - FHIR Composition resources
+   * @param timezone - Optional timezone to use for date formatting (e.g., 'America/New_York', 'Europe/London')
+   * @returns HTML string for rendering
+   */
+  generateSummaryNarrative(resources, timezone) {
+    const templateUtilities = new TemplateUtilities(resources);
+    let html = `
+      <div>`;
+    let observationhtml = `
+      <div>
+        <h3>Observations</h3>
+        <table>
+          <thead>
+            <tr>
+              <th>Code</th>
+              <th>Result</th>
+              <th>Reference Range</th>
+              <th>Date</th>
+            </tr>
+          </thead>
+          <tbody>`;
+    let diagnosticReporthtml = `
+      <div>
+        <h3>Diagnostic Reports</h3>
+        <table>
+          <thead>
+            <tr>
+              <th>Report</th>
+              <th>Performer</th>
+              <th>Issued</th>
+            </tr>
+          </thead>
+          <tbody>`;
+    let observationExists = false;
+    let diagnosticReportExists = false;
+    for (const resourceItem of resources) {
+      for (const rowData of resourceItem.section ?? []) {
+        const data = {};
+        const components = [];
+        for (const columnData of rowData.section ?? []) {
+          if (resourceItem.title === "Observation|Labs Summary Grouped by Lab Code") {
+            if (columnData.text?.div === "Observation.component" && columnData.section) {
+              for (const componentSection of columnData.section) {
+                const componentData = {};
+                for (const nestedColumn of componentSection.section ?? []) {
+                  this.extractSummaryObservationFields(nestedColumn, componentData);
+                }
+                if (Object.keys(componentData).length > 0) {
+                  components.push(componentData);
+                }
+              }
+            } else {
+              this.extractSummaryObservationFields(columnData, data);
+            }
+          } else if (resourceItem.title === "DiagnosticReportLab Summary Grouped by DiagnosticReport|Lab Code") {
+            switch (columnData.title) {
+              case "Diagnostic Report Name":
+                data["report"] = columnData.text?.div ?? "";
+                break;
+              case "Performer":
+                data["performer"] = columnData.text?.div ?? "";
+                break;
+              case "Issued Date":
+                data["issued"] = columnData.text?.div ?? "";
+                break;
+              case "Status":
+                data["status"] = columnData.text?.div ?? "";
+                break;
+              default:
+                break;
+            }
+          }
+        }
+        if (resourceItem.title === "Observation|Labs Summary Grouped by Lab Code") {
+          observationExists = true;
+          let date = data["effectiveDateTime"] ? templateUtilities.renderTime(data["effectiveDateTime"], timezone) : "";
+          if (!date && data["effectivePeriodStart"]) {
+            date = templateUtilities.renderTime(data["effectivePeriodStart"], timezone);
+            if (data["effectivePeriodEnd"]) {
+              date += " - " + templateUtilities.renderTime(data["effectivePeriodEnd"], timezone);
+            }
+          }
+          if (components.length > 0) {
+            const groupName = data["code"] ?? "";
+            for (const component of components) {
+              this.formatSummaryObservationData(component);
+              observationhtml += `
+                <tr>
+                  <td>${groupName ? groupName + " - " : ""}${component["code"] ?? "-"}</td>
+                  <td>${component["formattedValue"] ?? "-"}</td>
+                  <td>${component["referenceRange"]?.trim() ?? "-"}</td>
+                  <td>${date ?? "-"}</td>
+                </tr>`;
+            }
+          } else {
+            this.formatSummaryObservationData(data);
+            observationhtml += `
+                <tr>
+                  <td>${data["code"] ?? "-"}</td>
+                  <td>${data["formattedValue"] ?? "-"}</td>
+                  <td>${data["referenceRange"]?.trim() ?? "-"}</td>
+                  <td>${date ?? "-"}</td>
+                </tr>`;
+          }
+        } else if (resourceItem.title === "DiagnosticReportLab Summary Grouped by DiagnosticReport|Lab Code") {
+          if (data["status"] === "final") {
+            diagnosticReportExists = true;
+            diagnosticReporthtml += `
+                  <tr>
+                    <td>${data["report"] ?? "-"}</td>
+                    <td>${data["performer"] ?? "-"}</td>
+                    <td>${templateUtilities.renderTime(data["issued"], timezone) ?? "-"}</td>
+                  </tr>`;
+          }
+        }
+      }
+    }
+    if (observationExists) {
+      html += observationhtml;
+      html += `
+            </tbody>
+          </table>
+          </div>`;
+    }
+    if (diagnosticReportExists) {
+      html += diagnosticReporthtml;
+      html += `
+            </tbody>
+          </table>
+          </div>`;
+    }
+    html += `
+      </div>`;
+    return html;
+  }
   /**
    * Internal static implementation that actually generates the narrative
    * @param resources - FHIR resources array containing Observation and DiagnosticReport resources
@@ -2229,6 +2625,57 @@ var HistoryOfProceduresTemplate = class _HistoryOfProceduresTemplate {
     });
     return _HistoryOfProceduresTemplate.generateStaticNarrative(resources, timezone);
   }
+  /**
+   * Generate HTML narrative for Procedure resources using summary
+   * @param resources - FHIR Composition resources
+   * @param timezone - Optional timezone to use for date formatting (e.g., 'America/New_York', 'Europe/London')
+   * @returns HTML string for rendering
+   */
+  generateSummaryNarrative(resources, timezone) {
+    const templateUtilities = new TemplateUtilities(resources);
+    let html = `
+      <div>
+        <table>
+          <thead>
+            <tr>
+              <th>Procedure</th>
+              <th>Performer</th>
+              <th>Date</th>
+            </tr>
+          </thead>
+          <tbody>`;
+    for (const resourceItem of resources) {
+      for (const rowData of resourceItem.section ?? []) {
+        const data = {};
+        for (const columnData of rowData.section ?? []) {
+          switch (columnData.title) {
+            case "Procedure Name":
+              data["procedure"] = columnData.text?.div ?? "";
+              break;
+            case "Performer":
+              data["performer"] = columnData.text?.div ?? "";
+              break;
+            case "Performed Date":
+              data["date"] = columnData.text?.div ?? "";
+              break;
+            default:
+              break;
+          }
+        }
+        html += `
+            <tr>
+              <td>${data["procedure"] ?? "-"}</td>
+              <td>${data["performer"] ?? "-"}</td>
+              <td>${templateUtilities.renderTime(data["date"], timezone) ?? "-"}</td>
+            </tr>`;
+      }
+    }
+    html += `
+          </tbody>
+        </table>
+      </div>`;
+    return html;
+  }
   /**
    * Internal static implementation that actually generates the narrative
    * @param resources - FHIR Procedure resources

package/dist/index.js

@@ -127,7 +127,9 @@ var IPSSectionSummaryCompositionFilter = {
   ["VitalSignsSection" /* VITAL_SIGNS */]: (resource) => resource.resourceType === "Composition" && resource.type?.coding?.some((c) => c.system === IPS_SUMMARY_COMPOSITION_TYPE_SYSTEM && c.code === "vital_summary_document"),
   ["PlanOfCareSection" /* CARE_PLAN */]: (resource) => resource.resourceType === "Composition" && resource.type?.coding?.some((c) => c.system === IPS_SUMMARY_COMPOSITION_TYPE_SYSTEM && c.code === "careplan_summary_document"),
   ["ImmunizationSection" /* IMMUNIZATIONS */]: (resource) => resource.resourceType === "Composition" && resource.type?.coding?.some((c) => c.system === IPS_SUMMARY_COMPOSITION_TYPE_SYSTEM && c.code === "immunization_summary_document"),
-  ["MedicationSummarySection" /* MEDICATIONS */]: (resource) => resource.resourceType === "Composition" && resource.type?.coding?.some((c) => c.system === IPS_SUMMARY_COMPOSITION_TYPE_SYSTEM && c.code === "medication_summary_document")
+  ["MedicationSummarySection" /* MEDICATIONS */]: (resource) => resource.resourceType === "Composition" && resource.type?.coding?.some((c) => c.system === IPS_SUMMARY_COMPOSITION_TYPE_SYSTEM && c.code === "medication_summary_document"),
+  ["ResultsSection" /* DIAGNOSTIC_REPORTS */]: (resource) => resource.resourceType === "Composition" && resource.type?.coding?.some((c) => c.system === IPS_SUMMARY_COMPOSITION_TYPE_SYSTEM && ["lab_summary_document", "diagnosticreportlab_summary_document"].includes(c.code)),
+  ["HistoryOfProceduresSection" /* PROCEDURES */]: (resource) => resource.resourceType === "Composition" && resource.type?.coding?.some((c) => c.system === IPS_SUMMARY_COMPOSITION_TYPE_SYSTEM && c.code === "procedure_summary_document")
 };
 var IPSSectionResourceHelper = class {
   static getResourceFilterForSection(section) {
@@ -2060,6 +2062,400 @@ var DiagnosticResultsTemplate = class _DiagnosticResultsTemplate {
   generateNarrative(resources, timezone) {
     return _DiagnosticResultsTemplate.generateStaticNarrative(resources, timezone);
   }
+  /**
+   * Helper function to format observation data fields
+   * @param obsData - Record containing observation data fields
+   */
+  formatSummaryObservationData(obsData) {
+    const valueType = obsData["valueType"];
+    switch (valueType) {
+      case "valueQuantity":
+        if (obsData["value"] && obsData["unit"]) {
+          obsData["formattedValue"] = `${obsData["value"]} ${obsData["unit"]}`;
+        } else if (obsData["value"]) {
+          obsData["formattedValue"] = obsData["value"];
+        }
+        break;
+      case "valueCodeableConcept":
+      case "valueString":
+      case "valueBoolean":
+      case "valueInteger":
+      case "valueDateTime":
+      case "valueTime":
+        obsData["formattedValue"] = obsData["value"] ?? "";
+        break;
+      case "valuePeriod":
+        if (obsData["valuePeriodStart"] && obsData["valuePeriodEnd"]) {
+          obsData["formattedValue"] = `${obsData["valuePeriodStart"]} - ${obsData["valuePeriodEnd"]}`;
+        } else if (obsData["valuePeriodStart"]) {
+          obsData["formattedValue"] = `From ${obsData["valuePeriodStart"]}`;
+        } else if (obsData["valuePeriodEnd"]) {
+          obsData["formattedValue"] = `Until ${obsData["valuePeriodEnd"]}`;
+        }
+        break;
+      case "valueSampledData": {
+        const sampledParts = [];
+        if (obsData["sampledDataOriginValue"]) {
+          sampledParts.push(`Origin: ${obsData["sampledDataOriginValue"]}${obsData["sampledDataOriginUnit"] ? " " + obsData["sampledDataOriginUnit"] : ""}`);
+        }
+        if (obsData["sampledDataPeriod"]) {
+          sampledParts.push(`Period: ${obsData["sampledDataPeriod"]}`);
+        }
+        if (obsData["sampledDataFactor"]) {
+          sampledParts.push(`Factor: ${obsData["sampledDataFactor"]}`);
+        }
+        if (obsData["sampledDataLowerLimit"]) {
+          sampledParts.push(`Lower: ${obsData["sampledDataLowerLimit"]}`);
+        }
+        if (obsData["sampledDataUpperLimit"]) {
+          sampledParts.push(`Upper: ${obsData["sampledDataUpperLimit"]}`);
+        }
+        if (obsData["sampledDataData"]) {
+          sampledParts.push(`Data: ${obsData["sampledDataData"]}`);
+        }
+        obsData["formattedValue"] = sampledParts.join(", ");
+        break;
+      }
+      case "valueRange": {
+        const rangeParts = [];
+        if (obsData["valueRangeLowValue"]) {
+          rangeParts.push(`${obsData["valueRangeLowValue"]}${obsData["valueRangeLowUnit"] ? " " + obsData["valueRangeLowUnit"] : ""}`);
+        }
+        if (obsData["valueRangeHighValue"]) {
+          rangeParts.push(`${obsData["valueRangeHighValue"]}${obsData["valueRangeHighUnit"] ? " " + obsData["valueRangeHighUnit"] : ""}`);
+        }
+        obsData["formattedValue"] = rangeParts.join(" - ");
+        break;
+      }
+      case "valueRatio": {
+        const numerator = obsData["valueRatioNumeratorValue"] ? `${obsData["valueRatioNumeratorValue"]}${obsData["valueRatioNumeratorUnit"] ? " " + obsData["valueRatioNumeratorUnit"] : ""}` : "";
+        const denominator = obsData["valueRatioDenominatorValue"] ? `${obsData["valueRatioDenominatorValue"]}${obsData["valueRatioDenominatorUnit"] ? " " + obsData["valueRatioDenominatorUnit"] : ""}` : "";
+        if (numerator && denominator) {
+          obsData["formattedValue"] = `${numerator} / ${denominator}`;
+        } else if (numerator) {
+          obsData["formattedValue"] = numerator;
+        }
+        break;
+      }
+      default:
+        obsData["formattedValue"] = obsData["value"] ?? "";
+        break;
+    }
+    if (obsData["referenceRangeLow"]) {
+      obsData["referenceRange"] = obsData["referenceRangeLow"] + " " + obsData["referenceRangeLowUnit"];
+    }
+    if (obsData["referenceRangeHigh"]) {
+      if (obsData["referenceRange"]) {
+        obsData["referenceRange"] += " - ";
+      } else {
+        obsData["referenceRange"] = "";
+      }
+      obsData["referenceRange"] += obsData["referenceRangeHigh"] + " " + obsData["referenceRangeHighUnit"];
+    }
+    if (obsData["referenceRangeAgeLowValue"] || obsData["referenceRangeAgeHighValue"]) {
+      const ageParts = [];
+      if (obsData["referenceRangeAgeLowValue"]) {
+        ageParts.push(`${obsData["referenceRangeAgeLowValue"]}${obsData["referenceRangeAgeLowUnit"] ? " " + obsData["referenceRangeAgeLowUnit"] : ""}`);
+      }
+      if (obsData["referenceRangeAgeHighValue"]) {
+        ageParts.push(`${obsData["referenceRangeAgeHighValue"]}${obsData["referenceRangeAgeHighUnit"] ? " " + obsData["referenceRangeAgeHighUnit"] : ""}`);
+      }
+      if (obsData["referenceRange"]) {
+        obsData["referenceRange"] += ` (Age: ${ageParts.join(" - ")})`;
+      } else {
+        obsData["referenceRange"] = `Age: ${ageParts.join(" - ")}`;
+      }
+    }
+  }
+  /**
+   * Helper function to extract observation field data
+   * @param column - Column data from the summary
+   * @param targetData - Record to populate with extracted data
+   */
+  extractSummaryObservationFields(column, targetData) {
+    switch (column.title) {
+      case "Labs Name":
+        targetData["code"] = column.text?.div ?? "";
+        break;
+      case "effectiveDateTime":
+        targetData["effectiveDateTime"] = column.text?.div ?? "";
+        break;
+      case "effectivePeriod.start":
+        targetData["effectivePeriodStart"] = column.text?.div ?? "";
+        break;
+      case "effectivePeriod.end":
+        targetData["effectivePeriodEnd"] = column.text?.div ?? "";
+        break;
+      // valueQuantity
+      case "valueQuantity.value":
+        targetData["value"] = column.text?.div ?? "";
+        targetData["valueType"] = "valueQuantity";
+        break;
+      case "valueQuantity.unit":
+        targetData["unit"] = column.text?.div ?? "";
+        break;
+      // valueCodeableConcept
+      case "valueCodeableConcept.text":
+        targetData["value"] = column.text?.div ?? "";
+        targetData["valueType"] = "valueCodeableConcept";
+        break;
+      case "valueCodeableConcept.coding.display":
+        if (!targetData["value"]) {
+          targetData["value"] = column.text?.div ?? "";
+          targetData["valueType"] = "valueCodeableConcept";
+        }
+        break;
+      // valueString
+      case "valueString":
+        targetData["value"] = column.text?.div ?? "";
+        targetData["valueType"] = "valueString";
+        break;
+      // valueBoolean
+      case "valueBoolean":
+        targetData["value"] = column.text?.div ?? "";
+        targetData["valueType"] = "valueBoolean";
+        break;
+      // valueInteger
+      case "valueInteger":
+        targetData["value"] = column.text?.div ?? "";
+        targetData["valueType"] = "valueInteger";
+        break;
+      // valueDateTime
+      case "valueDateTime":
+        targetData["value"] = column.text?.div ?? "";
+        targetData["valueType"] = "valueDateTime";
+        break;
+      // valuePeriod
+      case "valuePeriod.start":
+        targetData["valuePeriodStart"] = column.text?.div ?? "";
+        targetData["valueType"] = "valuePeriod";
+        break;
+      case "valuePeriod.end":
+        targetData["valuePeriodEnd"] = column.text?.div ?? "";
+        targetData["valueType"] = "valuePeriod";
+        break;
+      // valueTime
+      case "valueTime":
+        targetData["value"] = column.text?.div ?? "";
+        targetData["valueType"] = "valueTime";
+        break;
+      // valueSampledData
+      case "valueSampledData.origin.value":
+        targetData["sampledDataOriginValue"] = column.text?.div ?? "";
+        targetData["valueType"] = "valueSampledData";
+        break;
+      case "valueSampledData.origin.unit":
+        targetData["sampledDataOriginUnit"] = column.text?.div ?? "";
+        break;
+      case "valueSampledData.period":
+        targetData["sampledDataPeriod"] = column.text?.div ?? "";
+        break;
+      case "valueSampledData.factor":
+        targetData["sampledDataFactor"] = column.text?.div ?? "";
+        break;
+      case "valueSampledData.lowerLimit":
+        targetData["sampledDataLowerLimit"] = column.text?.div ?? "";
+        break;
+      case "valueSampledData.upperLimit":
+        targetData["sampledDataUpperLimit"] = column.text?.div ?? "";
+        break;
+      case "valueSampledData.data":
+        targetData["sampledDataData"] = column.text?.div ?? "";
+        break;
+      // valueRange
+      case "valueRange.low.value":
+        targetData["valueRangeLowValue"] = column.text?.div ?? "";
+        targetData["valueType"] = "valueRange";
+        break;
+      case "valueRange.low.unit":
+        targetData["valueRangeLowUnit"] = column.text?.div ?? "";
+        break;
+      case "valueRange.high.value":
+        targetData["valueRangeHighValue"] = column.text?.div ?? "";
+        break;
+      case "valueRange.high.unit":
+        targetData["valueRangeHighUnit"] = column.text?.div ?? "";
+        break;
+      // valueRatio
+      case "valueRatio.numerator.value":
+        targetData["valueRatioNumeratorValue"] = column.text?.div ?? "";
+        targetData["valueType"] = "valueRatio";
+        break;
+      case "valueRatio.numerator.unit":
+        targetData["valueRatioNumeratorUnit"] = column.text?.div ?? "";
+        break;
+      case "valueRatio.denominator.value":
+        targetData["valueRatioDenominatorValue"] = column.text?.div ?? "";
+        break;
+      case "valueRatio.denominator.unit":
+        targetData["valueRatioDenominatorUnit"] = column.text?.div ?? "";
+        break;
+      // referenceRange
+      case "referenceRange.low.value":
+        targetData["referenceRangeLow"] = column.text?.div ?? "";
+        break;
+      case "referenceRange.low.unit":
+        targetData["referenceRangeLowUnit"] = column.text?.div ?? "";
+        break;
+      case "referenceRange.high.value":
+        targetData["referenceRangeHigh"] = column.text?.div ?? "";
+        break;
+      case "referenceRange.high.unit":
+        targetData["referenceRangeHighUnit"] = column.text?.div ?? "";
+        break;
+      case "referenceRange.age.low.value":
+        targetData["referenceRangeAgeLowValue"] = column.text?.div ?? "";
+        break;
+      case "referenceRange.age.low.unit":
+        targetData["referenceRangeAgeLowUnit"] = column.text?.div ?? "";
+        break;
+      case "referenceRange.age.high.value":
+        targetData["referenceRangeAgeHighValue"] = column.text?.div ?? "";
+        break;
+      case "referenceRange.age.high.unit":
+        targetData["referenceRangeAgeHighUnit"] = column.text?.div ?? "";
+        break;
+      default:
+        break;
+    }
+  }
+  /**
+   * Generate HTML narrative for Diagnostic Results & Observation resources using summary
+   * @param resources - FHIR Composition resources
+   * @param timezone - Optional timezone to use for date formatting (e.g., 'America/New_York', 'Europe/London')
+   * @returns HTML string for rendering
+   */
+  generateSummaryNarrative(resources, timezone) {
+    const templateUtilities = new TemplateUtilities(resources);
+    let html = `
+      <div>`;
+    let observationhtml = `
+      <div>
+        <h3>Observations</h3>
+        <table>
+          <thead>
+            <tr>
+              <th>Code</th>
+              <th>Result</th>
+              <th>Reference Range</th>
+              <th>Date</th>
+            </tr>
+          </thead>
+          <tbody>`;
+    let diagnosticReporthtml = `
+      <div>
+        <h3>Diagnostic Reports</h3>
+        <table>
+          <thead>
+            <tr>
+              <th>Report</th>
+              <th>Performer</th>
+              <th>Issued</th>
+            </tr>
+          </thead>
+          <tbody>`;
+    let observationExists = false;
+    let diagnosticReportExists = false;
+    for (const resourceItem of resources) {
+      for (const rowData of resourceItem.section ?? []) {
+        const data = {};
+        const components = [];
+        for (const columnData of rowData.section ?? []) {
+          if (resourceItem.title === "Observation|Labs Summary Grouped by Lab Code") {
+            if (columnData.text?.div === "Observation.component" && columnData.section) {
+              for (const componentSection of columnData.section) {
+                const componentData = {};
+                for (const nestedColumn of componentSection.section ?? []) {
+                  this.extractSummaryObservationFields(nestedColumn, componentData);
+                }
+                if (Object.keys(componentData).length > 0) {
+                  components.push(componentData);
+                }
+              }
+            } else {
+              this.extractSummaryObservationFields(columnData, data);
+            }
+          } else if (resourceItem.title === "DiagnosticReportLab Summary Grouped by DiagnosticReport|Lab Code") {
+            switch (columnData.title) {
+              case "Diagnostic Report Name":
+                data["report"] = columnData.text?.div ?? "";
+                break;
+              case "Performer":
+                data["performer"] = columnData.text?.div ?? "";
+                break;
+              case "Issued Date":
+                data["issued"] = columnData.text?.div ?? "";
+                break;
+              case "Status":
+                data["status"] = columnData.text?.div ?? "";
+                break;
+              default:
+                break;
+            }
+          }
+        }
+        if (resourceItem.title === "Observation|Labs Summary Grouped by Lab Code") {
+          observationExists = true;
+          let date = data["effectiveDateTime"] ? templateUtilities.renderTime(data["effectiveDateTime"], timezone) : "";
+          if (!date && data["effectivePeriodStart"]) {
+            date = templateUtilities.renderTime(data["effectivePeriodStart"], timezone);
+            if (data["effectivePeriodEnd"]) {
+              date += " - " + templateUtilities.renderTime(data["effectivePeriodEnd"], timezone);
+            }
+          }
+          if (components.length > 0) {
+            const groupName = data["code"] ?? "";
+            for (const component of components) {
+              this.formatSummaryObservationData(component);
+              observationhtml += `
+                <tr>
+                  <td>${groupName ? groupName + " - " : ""}${component["code"] ?? "-"}</td>
+                  <td>${component["formattedValue"] ?? "-"}</td>
+                  <td>${component["referenceRange"]?.trim() ?? "-"}</td>
+                  <td>${date ?? "-"}</td>
+                </tr>`;
+            }
+          } else {
+            this.formatSummaryObservationData(data);
+            observationhtml += `
+                <tr>
+                  <td>${data["code"] ?? "-"}</td>
+                  <td>${data["formattedValue"] ?? "-"}</td>
+                  <td>${data["referenceRange"]?.trim() ?? "-"}</td>
+                  <td>${date ?? "-"}</td>
+                </tr>`;
+          }
+        } else if (resourceItem.title === "DiagnosticReportLab Summary Grouped by DiagnosticReport|Lab Code") {
+          if (data["status"] === "final") {
+            diagnosticReportExists = true;
+            diagnosticReporthtml += `
+                  <tr>
+                    <td>${data["report"] ?? "-"}</td>
+                    <td>${data["performer"] ?? "-"}</td>
+                    <td>${templateUtilities.renderTime(data["issued"], timezone) ?? "-"}</td>
+                  </tr>`;
+          }
+        }
+      }
+    }
+    if (observationExists) {
+      html += observationhtml;
+      html += `
+            </tbody>
+          </table>
+          </div>`;
+    }
+    if (diagnosticReportExists) {
+      html += diagnosticReporthtml;
+      html += `
+            </tbody>
+          </table>
+          </div>`;
+    }
+    html += `
+      </div>`;
+    return html;
+  }
   /**
    * Internal static implementation that actually generates the narrative
    * @param resources - FHIR resources array containing Observation and DiagnosticReport resources
@@ -2201,6 +2597,57 @@ var HistoryOfProceduresTemplate = class _HistoryOfProceduresTemplate {
     });
     return _HistoryOfProceduresTemplate.generateStaticNarrative(resources, timezone);
   }
+  /**
+   * Generate HTML narrative for Procedure resources using summary
+   * @param resources - FHIR Composition resources
+   * @param timezone - Optional timezone to use for date formatting (e.g., 'America/New_York', 'Europe/London')
+   * @returns HTML string for rendering
+   */
+  generateSummaryNarrative(resources, timezone) {
+    const templateUtilities = new TemplateUtilities(resources);
+    let html = `
+      <div>
+        <table>
+          <thead>
+            <tr>
+              <th>Procedure</th>
+              <th>Performer</th>
+              <th>Date</th>
+            </tr>
+          </thead>
+          <tbody>`;
+    for (const resourceItem of resources) {
+      for (const rowData of resourceItem.section ?? []) {
+        const data = {};
+        for (const columnData of rowData.section ?? []) {
+          switch (columnData.title) {
+            case "Procedure Name":
+              data["procedure"] = columnData.text?.div ?? "";
+              break;
+            case "Performer":
+              data["performer"] = columnData.text?.div ?? "";
+              break;
+            case "Performed Date":
+              data["date"] = columnData.text?.div ?? "";
+              break;
+            default:
+              break;
+          }
+        }
+        html += `
+            <tr>
+              <td>${data["procedure"] ?? "-"}</td>
+              <td>${data["performer"] ?? "-"}</td>
+              <td>${templateUtilities.renderTime(data["date"], timezone) ?? "-"}</td>
+            </tr>`;
+      }
+    }
+    html += `
+          </tbody>
+        </table>
+      </div>`;
+    return html;
+  }
   /**
    * Internal static implementation that actually generates the narrative
    * @param resources - FHIR Procedure resources

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@imranq2/fhirpatientsummary",
-  "version": "1.0.23",
+  "version": "1.0.24",
   "description": "A template for creating npm packages using TypeScript and VSCode",
   "main": "./dist/index.js",
   "module": "./dist/index.mjs",