@imranq2/fhirpatientsummary 1.0.21 → 1.0.23

package/dist/index.cjs

@@ -109,6 +109,14 @@ var BLOOD_PRESSURE_LOINC_CODES = {
   DIASTOLIC: "8462-4"
 };
 
+// src/structures/ips_section_constants.ts
+var VITAL_SIGNS_SUMMARY_COMPONENT_MAP = {
+  "Systolic Blood Pressure": "valueRatio.numerator.value",
+  "Diastolic Blood Pressure": "valueRatio.denominator.value",
+  "Default": "valueString"
+};
+var IPS_SUMMARY_COMPOSITION_TYPE_SYSTEM = "https://fhir.icanbwell.com/4_0_0/CodeSystem/composition/";
+
 // src/structures/ips_section_resource_map.ts
 var IPSSectionResourceFilters = {
   // Patient section: only Patient resource
@@ -116,7 +124,7 @@ var IPSSectionResourceFilters = {
   // Only include allergies
   ["AllergyIntoleranceSection" /* ALLERGIES */]: (resource) => resource.resourceType === "AllergyIntolerance",
   // includes MedicationRequest, MedicationStatement. Medication is needed for medication names
-  ["MedicationSummarySection" /* MEDICATIONS */]: (resource) => ["MedicationRequest", "MedicationStatement", "Medication"].includes(resource.resourceType),
+  ["MedicationSummarySection" /* MEDICATIONS */]: (resource) => ["MedicationRequest", "MedicationStatement"].includes(resource.resourceType) && resource.status === "active" || resource.resourceType === "Medication",
   // Only include active conditions
   ["ProblemSection" /* PROBLEMS */]: (resource) => resource.resourceType === "Condition" && resource.clinicalStatus?.coding?.some((c) => !["inactive", "resolved"].includes(c.code)),
   // Only include completed immunizations
@@ -143,15 +151,21 @@ var IPSSectionResourceFilters = {
   ["AdvanceDirectivesSection" /* ADVANCE_DIRECTIVES */]: (resource) => resource.resourceType === "Consent" && resource.status === "active"
 };
 var IPSSectionSummaryCompositionFilter = {
-  ["AllergyIntoleranceSection" /* ALLERGIES */]: (resource) => resource.resourceType === "Composition" && resource.type?.coding?.some((c) => c.system === "https://fhir.icanbwell.com/4_0_0/CodeSystem/composition/" && c.code === "allergy_summary_document"),
-  ["VitalSignsSection" /* VITAL_SIGNS */]: (resource) => resource.resourceType === "Composition" && resource.type?.coding?.some((c) => c.system === "https://fhir.icanbwell.com/4_0_0/CodeSystem/composition/" && c.code === "vital_summary_document"),
-  ["PlanOfCareSection" /* CARE_PLAN */]: (resource) => resource.resourceType === "Composition" && resource.type?.coding?.some((c) => c.system === "https://fhir.icanbwell.com/4_0_0/CodeSystem/composition/" && c.code === "careplan_summary_document"),
-  ["ImmunizationSection" /* IMMUNIZATIONS */]: (resource) => resource.resourceType === "Composition" && resource.type?.coding?.some((c) => c.system === "https://fhir.icanbwell.com/4_0_0/CodeSystem/composition/" && c.code === "immunization_summary_document")
+  ["AllergyIntoleranceSection" /* ALLERGIES */]: (resource) => resource.resourceType === "Composition" && resource.type?.coding?.some((c) => c.system === IPS_SUMMARY_COMPOSITION_TYPE_SYSTEM && c.code === "allergy_summary_document"),
+  ["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")
 };
 var IPSSectionResourceHelper = class {
   static getResourceFilterForSection(section) {
     return IPSSectionResourceFilters[section];
   }
+  static getSectionResources(section, resources) {
+    const filter = IPSSectionResourceFilters[section];
+    if (!filter) return [];
+    return resources.filter(filter);
+  }
   static getSummaryCompositionFilterForSection(section) {
     return IPSSectionSummaryCompositionFilter[section];
   }
@@ -331,7 +345,7 @@ var TemplateUtilities = class {
    * @returns Formatted date string (date only, no time component)
    */
   renderDate(date) {
-    return this.formatDateTime(date, void 0, true);
+    return this.formatDateTime(date, "UTC", true);
   }
   /**
    * Renders a recorded date
@@ -845,9 +859,11 @@ var TemplateUtilities = class {
       if (dateValue instanceof Date) {
         dateTime = import_luxon.DateTime.fromJSDate(dateValue);
       } else if (typeof dateValue === "string") {
-        dateTime = import_luxon.DateTime.fromISO(dateValue);
         if (!dateValue.includes("T")) {
           dateOnly = true;
+          dateTime = import_luxon.DateTime.fromISO(dateValue, { zone: "utc" });
+        } else {
+          dateTime = import_luxon.DateTime.fromISO(dateValue);
         }
       } else {
         dateTime = import_luxon.DateTime.fromISO(String(dateValue));
@@ -855,7 +871,9 @@ var TemplateUtilities = class {
       if (!dateTime.isValid) {
         return String(dateValue);
       }
-      if (timezone && !dateOnly) {
+      if (dateOnly) {
+        dateTime = dateTime.toUTC();
+      } else if (timezone) {
         dateTime = dateTime.toUTC().setZone(timezone);
       }
       const formatOptions = dateOnly ? { year: "numeric", month: "2-digit", day: "2-digit" } : {
@@ -947,6 +965,9 @@ var TemplateUtilities = class {
   }
 };
 
+// src/constants.ts
+var ADDRESS_SIMILARITY_THRESHOLD = 70;
+
 // src/narratives/templates/typescript/PatientTemplate.ts
 var PatientTemplate = class _PatientTemplate {
   /**
@@ -973,7 +994,6 @@ var PatientTemplate = class _PatientTemplate {
         <li><strong>Name(s):</strong>${this.renderNames(combinedPatient)}</li>
         <li><strong>Gender:</strong>${combinedPatient.gender ? this.capitalize(combinedPatient.gender) : ""}</li>
         <li><strong>Date of Birth:</strong>${combinedPatient.birthDate || ""}</li>
-        <li><strong>Identifier(s):</strong>${this.renderIdentifiers(combinedPatient)}</li>
         <li><strong>Telecom:</strong><ul>${this.renderTelecom(combinedPatient)}</ul></li>
         <li><strong>Address(es):</strong>${this.renderAddresses(combinedPatient)}</li>
         <li><strong>Marital Status:</strong> ${combinedPatient.maritalStatus?.text || ""}</li>
@@ -994,7 +1014,6 @@ var PatientTemplate = class _PatientTemplate {
     }
     const combined = patients[0];
     const allNames = [];
-    const allIdentifiers = [];
     const allTelecom = [];
     const allAddresses = [];
     const allCommunication = [];
@@ -1002,9 +1021,6 @@ var PatientTemplate = class _PatientTemplate {
       if (patient.name) {
         allNames.push(...patient.name);
       }
-      if (patient.identifier) {
-        allIdentifiers.push(...patient.identifier);
-      }
       if (patient.telecom) {
         allTelecom.push(...patient.telecom);
       }
@@ -1031,7 +1047,6 @@ var PatientTemplate = class _PatientTemplate {
       }
     });
     combined.name = allNames;
-    combined.identifier = allIdentifiers;
     combined.telecom = allTelecom;
     combined.address = allAddresses;
     combined.communication = allCommunication;
@@ -1057,21 +1072,6 @@ var PatientTemplate = class _PatientTemplate {
     });
     return Array.from(uniqueNames).map((nameText) => `<ul><li>${nameText}</li></ul>`).join("");
   }
-  /**
-   * Renders patient identifiers as HTML list items
-   * @param patient - Patient resources
-   * @returns HTML string of list items
-   */
-  static renderIdentifiers(patient) {
-    if (!patient.identifier || patient.identifier.length === 0) {
-      return "";
-    }
-    return patient.identifier.map((id) => {
-      const system = id.system || "";
-      const value = id.value || "";
-      return `<ul><li>${system}: ${value}</li></ul>`;
-    }).join("");
-  }
   /**
    * Renders patient telecom information grouped by system
    * @param patient - Patient resources
@@ -1173,7 +1173,89 @@ var PatientTemplate = class _PatientTemplate {
         uniqueAddresses.add(addressText);
       }
     });
-    return Array.from(uniqueAddresses).map((addressText) => `<ul><li>${addressText}</li></ul>`).join("");
+    const deduplicatedAddresses = this.deduplicateSimilarAddresses(Array.from(uniqueAddresses));
+    return deduplicatedAddresses.map((addressText) => `<ul><li>${addressText}</li></ul>`).join("");
+  }
+  /**
+   * Calculates the similarity between two strings using Levenshtein distance
+   * Returns a percentage (0-100) indicating how similar the strings are
+   * @param str1 - First string
+   * @param str2 - Second string
+   * @returns Similarity percentage (0-100)
+   */
+  static calculateStringSimilarity(str1, str2) {
+    const longer = str1.length > str2.length ? str1 : str2;
+    const shorter = str1.length > str2.length ? str2 : str1;
+    if (longer.length === 0) {
+      return 100;
+    }
+    const editDistance = this.levenshteinDistance(longer.toLowerCase(), shorter.toLowerCase());
+    return (longer.length - editDistance) / longer.length * 100;
+  }
+  /**
+   * Calculates the Levenshtein distance between two strings
+   * @param str1 - First string
+   * @param str2 - Second string
+   * @returns The Levenshtein distance
+   */
+  static levenshteinDistance(str1, str2) {
+    const matrix = [];
+    for (let i = 0; i <= str2.length; i++) {
+      matrix[i] = [i];
+    }
+    for (let j = 0; j <= str1.length; j++) {
+      matrix[0][j] = j;
+    }
+    for (let i = 1; i <= str2.length; i++) {
+      for (let j = 1; j <= str1.length; j++) {
+        if (str2.charAt(i - 1) === str1.charAt(j - 1)) {
+          matrix[i][j] = matrix[i - 1][j - 1];
+        } else {
+          matrix[i][j] = Math.min(
+            matrix[i - 1][j - 1] + 1,
+            // substitution
+            matrix[i][j - 1] + 1,
+            // insertion
+            matrix[i - 1][j] + 1
+            // deletion
+          );
+        }
+      }
+    }
+    return matrix[str2.length][str1.length];
+  }
+  /**
+   * Deduplicates addresses that are more than ADDRESS_SIMILARITY_THRESHOLD% similar
+   * @param addresses - Array of address strings
+   * @returns Array of deduplicated addresses
+   */
+  static deduplicateSimilarAddresses(addresses) {
+    if (addresses.length <= 1) {
+      return addresses;
+    }
+    const deduplicated = [];
+    const processed = /* @__PURE__ */ new Set();
+    for (let i = 0; i < addresses.length; i++) {
+      if (processed.has(i)) {
+        continue;
+      }
+      let keepAddress = addresses[i];
+      processed.add(i);
+      for (let j = i + 1; j < addresses.length; j++) {
+        if (processed.has(j)) {
+          continue;
+        }
+        const similarity = this.calculateStringSimilarity(addresses[i], addresses[j]);
+        if (similarity > ADDRESS_SIMILARITY_THRESHOLD) {
+          processed.add(j);
+          if (addresses[j].length > keepAddress.length) {
+            keepAddress = addresses[j];
+          }
+        }
+      }
+      deduplicated.push(keepAddress);
+    }
+    return deduplicated;
   }
   /**
    * Renders patient deceased status
@@ -1421,6 +1503,75 @@ var MedicationSummaryTemplate = class _MedicationSummaryTemplate {
   generateNarrative(resources, timezone) {
     return _MedicationSummaryTemplate.generateStaticNarrative(resources, timezone);
   }
+  /**
+   * Generate HTML narrative for Medication 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>Medication</th>
+                <th>Sig</th>
+                <th>Days of Supply</th>
+                <th>Refills</th>
+                <th>Start 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 "Medication Name":
+              data["medication"] = columnData.text?.div ?? "";
+              break;
+            case "Status":
+              data["status"] = columnData.text?.div ?? "";
+              break;
+            case "Prescriber Instruction":
+              data["sig-prescriber"] = columnData.text?.div ?? "";
+              break;
+            case "Pharmacy Instruction":
+              data["sig-pharmacy"] = columnData.text?.div ?? "";
+              break;
+            case "Days Of Supply":
+              data["daysOfSupply"] = columnData.text?.div ?? "";
+              break;
+            case "Refills Remaining":
+              data["refills"] = columnData.text?.div ?? "";
+              break;
+            case "Authored On Date":
+              data["startDate"] = columnData.text?.div ?? "";
+              break;
+            default:
+              break;
+          }
+        }
+        if (data["status"] === "active") {
+          html += `
+                    <tr>
+                        <td>${data["medication"]}</td>
+                        <td>${data["sig-prescriber"] || data["sig-pharmacy"]}</td>
+                        <td>${data["daysOfSupply"]}</td>
+                        <td>${data["refills"]}</td>
+                        <td>${templateUtilities.renderTime(data["startDate"], timezone)}</td>
+                    </tr>`;
+        }
+      }
+    }
+    html += `
+            </tbody>
+            </table>
+        </div>`;
+    return html;
+  }
   /**
    * Safely parse a date string and return a valid Date object or null
    * @param dateString - The date string to parse
@@ -1433,55 +1584,6 @@ var MedicationSummaryTemplate = class _MedicationSummaryTemplate {
     const date = new Date(dateString);
     return !isNaN(date.getTime()) ? date : null;
   }
-  /**
-   * Determine if a MedicationRequest is active
-   * @param medicationRequest - The MedicationRequest resource
-   * @returns boolean indicating if the medication request is active
-   */
-  static isActiveMedicationRequest(medicationRequest) {
-    const status = medicationRequest.status?.toLowerCase();
-    if (status === "active" || status === "unknown") {
-      return true;
-    }
-    if (status === "completed" || status === "cancelled" || status === "stopped" || status === "draft") {
-      return false;
-    }
-    const endDate = medicationRequest.dispenseRequest?.validityPeriod?.end;
-    if (!endDate) {
-      return true;
-    }
-    const parsedEndDate = this.parseDate(endDate);
-    if (!parsedEndDate) {
-      return true;
-    }
-    return parsedEndDate.getTime() > Date.now();
-  }
-  /**
-   * Determine if a MedicationStatement is active
-   * @param medicationStatement - The MedicationStatement resource
-   * @returns boolean indicating if the medication statement is active
-   */
-  static isActiveMedicationStatement(medicationStatement) {
-    const status = medicationStatement.status?.toLowerCase();
-    if (status === "active" || status === "intended" || status === "unknown") {
-      return true;
-    }
-    if (status === "completed" || status === "stopped" || status === "not-taken") {
-      return false;
-    }
-    let endDate;
-    if (medicationStatement.effectivePeriod?.end) {
-      endDate = medicationStatement.effectivePeriod.end;
-    }
-    if (!endDate) {
-      return true;
-    }
-    const parsedEndDate = this.parseDate(endDate);
-    if (!parsedEndDate) {
-      return true;
-    }
-    return parsedEndDate.getTime() > Date.now();
-  }
   /**
    * Internal static implementation that actually generates the narrative
    * @param resources - FHIR Medication resources
@@ -1495,20 +1597,11 @@ var MedicationSummaryTemplate = class _MedicationSummaryTemplate {
     const medicationRequests = this.getMedicationRequests(templateUtilities, resources);
     const medicationStatements = this.getMedicationStatements(templateUtilities, resources);
     const allActiveMedications = [];
-    const allInactiveMedications = [];
     medicationRequests.forEach((mr) => {
-      if (this.isActiveMedicationRequest(mr.resource)) {
-        allActiveMedications.push({ type: "request", resource: mr.resource, extension: mr.extension });
-      } else {
-        allInactiveMedications.push({ type: "request", resource: mr.resource, extension: mr.extension });
-      }
+      allActiveMedications.push({ type: "request", resource: mr.resource, extension: mr.extension });
     });
     medicationStatements.forEach((ms) => {
-      if (this.isActiveMedicationStatement(ms.resource)) {
-        allActiveMedications.push({ type: "statement", resource: ms.resource, extension: ms.extension });
-      } else {
-        allInactiveMedications.push({ type: "statement", resource: ms.resource, extension: ms.extension });
-      }
+      allActiveMedications.push({ type: "statement", resource: ms.resource, extension: ms.extension });
     });
     const sortMedications = (medications) => {
       medications.sort((a, b) => {
@@ -1538,11 +1631,7 @@ var MedicationSummaryTemplate = class _MedicationSummaryTemplate {
     };
     if (allActiveMedications.length > 0) {
       sortMedications(allActiveMedications);
-      html += this.renderCombinedMedications(templateUtilities, allActiveMedications, true);
-    }
-    if (allInactiveMedications.length > 0) {
-      sortMedications(allInactiveMedications);
-      html += this.renderCombinedMedications(templateUtilities, allInactiveMedications, false);
+      html += this.renderCombinedMedications(templateUtilities, allActiveMedications);
     }
     return html;
   }
@@ -1580,12 +1669,10 @@ var MedicationSummaryTemplate = class _MedicationSummaryTemplate {
    * Render HTML table for combined MedicationRequest and MedicationStatement resources
    * @param templateUtilities - Instance of TemplateUtilities for utility functions
    * @param medications - Array of combined medication resources
-   * @param sectionTitle - Title for the section
    * @returns HTML string for rendering
    */
-  static renderCombinedMedications(templateUtilities, medications, isActiveSection) {
+  static renderCombinedMedications(templateUtilities, medications) {
     let html = `
-    <h3>${isActiveSection ? "Active Medications" : "Inactive Medications"}</h3>
       <table>
         <thead>
           <tr>
@@ -1594,9 +1681,7 @@ var MedicationSummaryTemplate = class _MedicationSummaryTemplate {
             <th>Sig</th>
             <th>Dispense Quantity</th>
             <th>Refills</th>
-            <th>Start Date</th>${isActiveSection ? "" : `
-            <th>End Date</th>`}
-            <th>Status</th>
+            <th>Start Date</th>
           </tr>
         </thead>
         <tbody>`;
@@ -1608,12 +1693,9 @@ var MedicationSummaryTemplate = class _MedicationSummaryTemplate {
       let dispenseQuantity = "-";
       let refills = "-";
       let startDate = "-";
-      let endDate = "-";
-      let status;
       if (medication.type === "request") {
         const mr = medication.resource;
         type = "Request";
-        status = mr.status ? String(mr.status) : "-";
         medicationName = templateUtilities.getMedicationName(
           mr.medicationReference || mr.medicationCodeableConcept
         );
@@ -1627,14 +1709,12 @@ var MedicationSummaryTemplate = class _MedicationSummaryTemplate {
         refills = mr.dispenseRequest?.numberOfRepeatsAllowed?.toString() || "-";
         if (mr.dispenseRequest?.validityPeriod) {
           startDate = mr.dispenseRequest.validityPeriod.start || "-";
-          endDate = mr.dispenseRequest.validityPeriod.end || "-";
         } else {
           startDate = mr.authoredOn || "-";
         }
       } else {
         const ms = medication.resource;
         type = "Statement";
-        status = ms.status ? String(ms.status) : "-";
         medicationName = templateUtilities.getMedicationName(
           ms.medicationReference || ms.medicationCodeableConcept
         );
@@ -1643,7 +1723,6 @@ var MedicationSummaryTemplate = class _MedicationSummaryTemplate {
           startDate = ms.effectiveDateTime;
         } else if (ms.effectivePeriod) {
           startDate = ms.effectivePeriod.start || "-";
-          endDate = ms.effectivePeriod.end || "-";
         }
       }
       html += `
@@ -1653,9 +1732,7 @@ var MedicationSummaryTemplate = class _MedicationSummaryTemplate {
           <td>${sig}</td>
           <td>${dispenseQuantity}</td>
           <td>${refills}</td>
-          <td>${startDate}</td>${isActiveSection ? "" : `
-          <td>${endDate}</td>`}
-          <td>${status}</td>
+          <td>${startDate}</td>
         </tr>`;
     }
     html += `
@@ -1796,6 +1873,7 @@ var ProblemListTemplate = class _ProblemListTemplate {
    * @param timezone - Optional timezone to use for date formatting (e.g., 'America/New_York', 'Europe/London')
    * @returns HTML string for rendering
    */
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
   static generateStaticNarrative(resources, timezone) {
     const templateUtilities = new TemplateUtilities(resources);
     let html = ``;
@@ -1812,7 +1890,6 @@ var ProblemListTemplate = class _ProblemListTemplate {
               <th>Problem</th>
               <th>Onset Date</th>
               <th>Recorded Date</th>
-              <th>Notes</th>
             </tr>
           </thead>
           <tbody>`;
@@ -1821,7 +1898,6 @@ var ProblemListTemplate = class _ProblemListTemplate {
           <td class="Name">${templateUtilities.codeableConcept(cond.code)}</td>
           <td class="OnsetDate">${templateUtilities.renderDate(cond.onsetDateTime)}</td>
           <td class="RecordedDate">${templateUtilities.renderDate(cond.recordedDate)}</td>
-          <td class="Notes">${templateUtilities.renderNotes(cond.note, timezone)}</td>
         </tr>`;
     }
     html += `</tbody>
@@ -1830,13 +1906,6 @@ var ProblemListTemplate = class _ProblemListTemplate {
   }
 };
 
-// src/structures/ips_section_constants.ts
-var VITAL_SIGNS_SUMMARY_COMPONENT_MAP = {
-  "Systolic Blood Pressure": "valueRatio.numerator.value",
-  "Diastolic Blood Pressure": "valueRatio.denominator.value",
-  "Default": "valueString"
-};
-
 // src/narratives/templates/typescript/VitalSignsTemplate.ts
 var VitalSignsTemplate = class _VitalSignsTemplate {
   /**
@@ -2256,6 +2325,7 @@ var PastHistoryOfIllnessTemplate = class {
    * @param timezone - Optional timezone to use for date formatting (e.g., 'America/New_York', 'Europe/London')
    * @returns HTML string for rendering
    */
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
   generateNarrative(resources, timezone) {
     const templateUtilities = new TemplateUtilities(resources);
     let html = ``;
@@ -2273,7 +2343,6 @@ var PastHistoryOfIllnessTemplate = class {
               <th>Onset Date</th>
               <th>Recorded Date</th>
               <th>Resolved Date</th>
-              <th>Notes</th>
             </tr>
           </thead>
           <tbody>`;
@@ -2283,7 +2352,6 @@ var PastHistoryOfIllnessTemplate = class {
           <td class="OnsetDate">${templateUtilities.renderDate(cond.onsetDateTime)}</td>
           <td class="RecordedDate">${templateUtilities.renderDate(cond.recordedDate)}</td>
           <td class="ResolvedDate">${templateUtilities.renderDate(cond.abatementDateTime)}</td>
-          <td class="Notes">${templateUtilities.renderNotes(cond.note, timezone)}</td>
         </tr>`;
     }
     html += `</tbody>
@@ -2436,7 +2504,6 @@ var FunctionalStatusTemplate = class _FunctionalStatusTemplate {
               <th>Problem</th>
               <th>Onset Date</th>
               <th>Recorded Date</th>
-              <th>Notes</th>
             </tr>
           </thead>
           <tbody>`;
@@ -2445,7 +2512,6 @@ var FunctionalStatusTemplate = class _FunctionalStatusTemplate {
           <td class="Name">${templateUtilities.codeableConcept(cond.code)}</td>
           <td class="OnsetDate">${templateUtilities.renderDate(cond.onsetDateTime)}</td>
           <td class="RecordedDate">${templateUtilities.renderDate(cond.recordedDate)}</td>
-          <td class="Notes">${templateUtilities.renderNotes(cond.note, timezone, { styled: true, warning: true })}</td>
         </tr>`;
       }
       html += `</tbody>
@@ -2461,7 +2527,6 @@ var FunctionalStatusTemplate = class _FunctionalStatusTemplate {
             <th>Description</th>
             <th>Summary</th>
             <th>Findings</th>
-            <th>Notes</th>
           </tr>
         </thead>
         <tbody>`;
@@ -2490,7 +2555,6 @@ var FunctionalStatusTemplate = class _FunctionalStatusTemplate {
           }
           findingsHtml += "</ul>";
         }
-        const notes = templateUtilities.renderNotes(impression.note, timezone);
         html += `
           <tr id="${templateUtilities.narrativeLinkId(impression)}">
             <td>${formattedDate}</td>
@@ -2498,7 +2562,6 @@ var FunctionalStatusTemplate = class _FunctionalStatusTemplate {
             <td>${impression.description || ""}</td>
             <td>${impression.summary || ""}</td>
             <td>${findingsHtml}</td>
-            <td>${notes}</td>
           </tr>`;
       }
       html += `</tbody>

package/dist/index.js

@@ -81,6 +81,14 @@ var BLOOD_PRESSURE_LOINC_CODES = {
   DIASTOLIC: "8462-4"
 };
 
+// src/structures/ips_section_constants.ts
+var VITAL_SIGNS_SUMMARY_COMPONENT_MAP = {
+  "Systolic Blood Pressure": "valueRatio.numerator.value",
+  "Diastolic Blood Pressure": "valueRatio.denominator.value",
+  "Default": "valueString"
+};
+var IPS_SUMMARY_COMPOSITION_TYPE_SYSTEM = "https://fhir.icanbwell.com/4_0_0/CodeSystem/composition/";
+
 // src/structures/ips_section_resource_map.ts
 var IPSSectionResourceFilters = {
   // Patient section: only Patient resource
@@ -88,7 +96,7 @@ var IPSSectionResourceFilters = {
   // Only include allergies
   ["AllergyIntoleranceSection" /* ALLERGIES */]: (resource) => resource.resourceType === "AllergyIntolerance",
   // includes MedicationRequest, MedicationStatement. Medication is needed for medication names
-  ["MedicationSummarySection" /* MEDICATIONS */]: (resource) => ["MedicationRequest", "MedicationStatement", "Medication"].includes(resource.resourceType),
+  ["MedicationSummarySection" /* MEDICATIONS */]: (resource) => ["MedicationRequest", "MedicationStatement"].includes(resource.resourceType) && resource.status === "active" || resource.resourceType === "Medication",
   // Only include active conditions
   ["ProblemSection" /* PROBLEMS */]: (resource) => resource.resourceType === "Condition" && resource.clinicalStatus?.coding?.some((c) => !["inactive", "resolved"].includes(c.code)),
   // Only include completed immunizations
@@ -115,15 +123,21 @@ var IPSSectionResourceFilters = {
   ["AdvanceDirectivesSection" /* ADVANCE_DIRECTIVES */]: (resource) => resource.resourceType === "Consent" && resource.status === "active"
 };
 var IPSSectionSummaryCompositionFilter = {
-  ["AllergyIntoleranceSection" /* ALLERGIES */]: (resource) => resource.resourceType === "Composition" && resource.type?.coding?.some((c) => c.system === "https://fhir.icanbwell.com/4_0_0/CodeSystem/composition/" && c.code === "allergy_summary_document"),
-  ["VitalSignsSection" /* VITAL_SIGNS */]: (resource) => resource.resourceType === "Composition" && resource.type?.coding?.some((c) => c.system === "https://fhir.icanbwell.com/4_0_0/CodeSystem/composition/" && c.code === "vital_summary_document"),
-  ["PlanOfCareSection" /* CARE_PLAN */]: (resource) => resource.resourceType === "Composition" && resource.type?.coding?.some((c) => c.system === "https://fhir.icanbwell.com/4_0_0/CodeSystem/composition/" && c.code === "careplan_summary_document"),
-  ["ImmunizationSection" /* IMMUNIZATIONS */]: (resource) => resource.resourceType === "Composition" && resource.type?.coding?.some((c) => c.system === "https://fhir.icanbwell.com/4_0_0/CodeSystem/composition/" && c.code === "immunization_summary_document")
+  ["AllergyIntoleranceSection" /* ALLERGIES */]: (resource) => resource.resourceType === "Composition" && resource.type?.coding?.some((c) => c.system === IPS_SUMMARY_COMPOSITION_TYPE_SYSTEM && c.code === "allergy_summary_document"),
+  ["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")
 };
 var IPSSectionResourceHelper = class {
   static getResourceFilterForSection(section) {
     return IPSSectionResourceFilters[section];
   }
+  static getSectionResources(section, resources) {
+    const filter = IPSSectionResourceFilters[section];
+    if (!filter) return [];
+    return resources.filter(filter);
+  }
   static getSummaryCompositionFilterForSection(section) {
     return IPSSectionSummaryCompositionFilter[section];
   }
@@ -303,7 +317,7 @@ var TemplateUtilities = class {
    * @returns Formatted date string (date only, no time component)
    */
   renderDate(date) {
-    return this.formatDateTime(date, void 0, true);
+    return this.formatDateTime(date, "UTC", true);
   }
   /**
    * Renders a recorded date
@@ -817,9 +831,11 @@ var TemplateUtilities = class {
       if (dateValue instanceof Date) {
         dateTime = DateTime.fromJSDate(dateValue);
       } else if (typeof dateValue === "string") {
-        dateTime = DateTime.fromISO(dateValue);
         if (!dateValue.includes("T")) {
           dateOnly = true;
+          dateTime = DateTime.fromISO(dateValue, { zone: "utc" });
+        } else {
+          dateTime = DateTime.fromISO(dateValue);
         }
       } else {
         dateTime = DateTime.fromISO(String(dateValue));
@@ -827,7 +843,9 @@ var TemplateUtilities = class {
       if (!dateTime.isValid) {
         return String(dateValue);
       }
-      if (timezone && !dateOnly) {
+      if (dateOnly) {
+        dateTime = dateTime.toUTC();
+      } else if (timezone) {
         dateTime = dateTime.toUTC().setZone(timezone);
       }
       const formatOptions = dateOnly ? { year: "numeric", month: "2-digit", day: "2-digit" } : {
@@ -919,6 +937,9 @@ var TemplateUtilities = class {
   }
 };
 
+// src/constants.ts
+var ADDRESS_SIMILARITY_THRESHOLD = 70;
+
 // src/narratives/templates/typescript/PatientTemplate.ts
 var PatientTemplate = class _PatientTemplate {
   /**
@@ -945,7 +966,6 @@ var PatientTemplate = class _PatientTemplate {
         <li><strong>Name(s):</strong>${this.renderNames(combinedPatient)}</li>
         <li><strong>Gender:</strong>${combinedPatient.gender ? this.capitalize(combinedPatient.gender) : ""}</li>
         <li><strong>Date of Birth:</strong>${combinedPatient.birthDate || ""}</li>
-        <li><strong>Identifier(s):</strong>${this.renderIdentifiers(combinedPatient)}</li>
         <li><strong>Telecom:</strong><ul>${this.renderTelecom(combinedPatient)}</ul></li>
         <li><strong>Address(es):</strong>${this.renderAddresses(combinedPatient)}</li>
         <li><strong>Marital Status:</strong> ${combinedPatient.maritalStatus?.text || ""}</li>
@@ -966,7 +986,6 @@ var PatientTemplate = class _PatientTemplate {
     }
     const combined = patients[0];
     const allNames = [];
-    const allIdentifiers = [];
     const allTelecom = [];
     const allAddresses = [];
     const allCommunication = [];
@@ -974,9 +993,6 @@ var PatientTemplate = class _PatientTemplate {
       if (patient.name) {
         allNames.push(...patient.name);
       }
-      if (patient.identifier) {
-        allIdentifiers.push(...patient.identifier);
-      }
       if (patient.telecom) {
         allTelecom.push(...patient.telecom);
       }
@@ -1003,7 +1019,6 @@ var PatientTemplate = class _PatientTemplate {
       }
     });
     combined.name = allNames;
-    combined.identifier = allIdentifiers;
     combined.telecom = allTelecom;
     combined.address = allAddresses;
     combined.communication = allCommunication;
@@ -1029,21 +1044,6 @@ var PatientTemplate = class _PatientTemplate {
     });
     return Array.from(uniqueNames).map((nameText) => `<ul><li>${nameText}</li></ul>`).join("");
   }
-  /**
-   * Renders patient identifiers as HTML list items
-   * @param patient - Patient resources
-   * @returns HTML string of list items
-   */
-  static renderIdentifiers(patient) {
-    if (!patient.identifier || patient.identifier.length === 0) {
-      return "";
-    }
-    return patient.identifier.map((id) => {
-      const system = id.system || "";
-      const value = id.value || "";
-      return `<ul><li>${system}: ${value}</li></ul>`;
-    }).join("");
-  }
   /**
    * Renders patient telecom information grouped by system
    * @param patient - Patient resources
@@ -1145,7 +1145,89 @@ var PatientTemplate = class _PatientTemplate {
         uniqueAddresses.add(addressText);
       }
     });
-    return Array.from(uniqueAddresses).map((addressText) => `<ul><li>${addressText}</li></ul>`).join("");
+    const deduplicatedAddresses = this.deduplicateSimilarAddresses(Array.from(uniqueAddresses));
+    return deduplicatedAddresses.map((addressText) => `<ul><li>${addressText}</li></ul>`).join("");
+  }
+  /**
+   * Calculates the similarity between two strings using Levenshtein distance
+   * Returns a percentage (0-100) indicating how similar the strings are
+   * @param str1 - First string
+   * @param str2 - Second string
+   * @returns Similarity percentage (0-100)
+   */
+  static calculateStringSimilarity(str1, str2) {
+    const longer = str1.length > str2.length ? str1 : str2;
+    const shorter = str1.length > str2.length ? str2 : str1;
+    if (longer.length === 0) {
+      return 100;
+    }
+    const editDistance = this.levenshteinDistance(longer.toLowerCase(), shorter.toLowerCase());
+    return (longer.length - editDistance) / longer.length * 100;
+  }
+  /**
+   * Calculates the Levenshtein distance between two strings
+   * @param str1 - First string
+   * @param str2 - Second string
+   * @returns The Levenshtein distance
+   */
+  static levenshteinDistance(str1, str2) {
+    const matrix = [];
+    for (let i = 0; i <= str2.length; i++) {
+      matrix[i] = [i];
+    }
+    for (let j = 0; j <= str1.length; j++) {
+      matrix[0][j] = j;
+    }
+    for (let i = 1; i <= str2.length; i++) {
+      for (let j = 1; j <= str1.length; j++) {
+        if (str2.charAt(i - 1) === str1.charAt(j - 1)) {
+          matrix[i][j] = matrix[i - 1][j - 1];
+        } else {
+          matrix[i][j] = Math.min(
+            matrix[i - 1][j - 1] + 1,
+            // substitution
+            matrix[i][j - 1] + 1,
+            // insertion
+            matrix[i - 1][j] + 1
+            // deletion
+          );
+        }
+      }
+    }
+    return matrix[str2.length][str1.length];
+  }
+  /**
+   * Deduplicates addresses that are more than ADDRESS_SIMILARITY_THRESHOLD% similar
+   * @param addresses - Array of address strings
+   * @returns Array of deduplicated addresses
+   */
+  static deduplicateSimilarAddresses(addresses) {
+    if (addresses.length <= 1) {
+      return addresses;
+    }
+    const deduplicated = [];
+    const processed = /* @__PURE__ */ new Set();
+    for (let i = 0; i < addresses.length; i++) {
+      if (processed.has(i)) {
+        continue;
+      }
+      let keepAddress = addresses[i];
+      processed.add(i);
+      for (let j = i + 1; j < addresses.length; j++) {
+        if (processed.has(j)) {
+          continue;
+        }
+        const similarity = this.calculateStringSimilarity(addresses[i], addresses[j]);
+        if (similarity > ADDRESS_SIMILARITY_THRESHOLD) {
+          processed.add(j);
+          if (addresses[j].length > keepAddress.length) {
+            keepAddress = addresses[j];
+          }
+        }
+      }
+      deduplicated.push(keepAddress);
+    }
+    return deduplicated;
   }
   /**
    * Renders patient deceased status
@@ -1393,6 +1475,75 @@ var MedicationSummaryTemplate = class _MedicationSummaryTemplate {
   generateNarrative(resources, timezone) {
     return _MedicationSummaryTemplate.generateStaticNarrative(resources, timezone);
   }
+  /**
+   * Generate HTML narrative for Medication 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>Medication</th>
+                <th>Sig</th>
+                <th>Days of Supply</th>
+                <th>Refills</th>
+                <th>Start 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 "Medication Name":
+              data["medication"] = columnData.text?.div ?? "";
+              break;
+            case "Status":
+              data["status"] = columnData.text?.div ?? "";
+              break;
+            case "Prescriber Instruction":
+              data["sig-prescriber"] = columnData.text?.div ?? "";
+              break;
+            case "Pharmacy Instruction":
+              data["sig-pharmacy"] = columnData.text?.div ?? "";
+              break;
+            case "Days Of Supply":
+              data["daysOfSupply"] = columnData.text?.div ?? "";
+              break;
+            case "Refills Remaining":
+              data["refills"] = columnData.text?.div ?? "";
+              break;
+            case "Authored On Date":
+              data["startDate"] = columnData.text?.div ?? "";
+              break;
+            default:
+              break;
+          }
+        }
+        if (data["status"] === "active") {
+          html += `
+                    <tr>
+                        <td>${data["medication"]}</td>
+                        <td>${data["sig-prescriber"] || data["sig-pharmacy"]}</td>
+                        <td>${data["daysOfSupply"]}</td>
+                        <td>${data["refills"]}</td>
+                        <td>${templateUtilities.renderTime(data["startDate"], timezone)}</td>
+                    </tr>`;
+        }
+      }
+    }
+    html += `
+            </tbody>
+            </table>
+        </div>`;
+    return html;
+  }
   /**
    * Safely parse a date string and return a valid Date object or null
    * @param dateString - The date string to parse
@@ -1405,55 +1556,6 @@ var MedicationSummaryTemplate = class _MedicationSummaryTemplate {
     const date = new Date(dateString);
     return !isNaN(date.getTime()) ? date : null;
   }
-  /**
-   * Determine if a MedicationRequest is active
-   * @param medicationRequest - The MedicationRequest resource
-   * @returns boolean indicating if the medication request is active
-   */
-  static isActiveMedicationRequest(medicationRequest) {
-    const status = medicationRequest.status?.toLowerCase();
-    if (status === "active" || status === "unknown") {
-      return true;
-    }
-    if (status === "completed" || status === "cancelled" || status === "stopped" || status === "draft") {
-      return false;
-    }
-    const endDate = medicationRequest.dispenseRequest?.validityPeriod?.end;
-    if (!endDate) {
-      return true;
-    }
-    const parsedEndDate = this.parseDate(endDate);
-    if (!parsedEndDate) {
-      return true;
-    }
-    return parsedEndDate.getTime() > Date.now();
-  }
-  /**
-   * Determine if a MedicationStatement is active
-   * @param medicationStatement - The MedicationStatement resource
-   * @returns boolean indicating if the medication statement is active
-   */
-  static isActiveMedicationStatement(medicationStatement) {
-    const status = medicationStatement.status?.toLowerCase();
-    if (status === "active" || status === "intended" || status === "unknown") {
-      return true;
-    }
-    if (status === "completed" || status === "stopped" || status === "not-taken") {
-      return false;
-    }
-    let endDate;
-    if (medicationStatement.effectivePeriod?.end) {
-      endDate = medicationStatement.effectivePeriod.end;
-    }
-    if (!endDate) {
-      return true;
-    }
-    const parsedEndDate = this.parseDate(endDate);
-    if (!parsedEndDate) {
-      return true;
-    }
-    return parsedEndDate.getTime() > Date.now();
-  }
   /**
    * Internal static implementation that actually generates the narrative
    * @param resources - FHIR Medication resources
@@ -1467,20 +1569,11 @@ var MedicationSummaryTemplate = class _MedicationSummaryTemplate {
     const medicationRequests = this.getMedicationRequests(templateUtilities, resources);
     const medicationStatements = this.getMedicationStatements(templateUtilities, resources);
     const allActiveMedications = [];
-    const allInactiveMedications = [];
     medicationRequests.forEach((mr) => {
-      if (this.isActiveMedicationRequest(mr.resource)) {
-        allActiveMedications.push({ type: "request", resource: mr.resource, extension: mr.extension });
-      } else {
-        allInactiveMedications.push({ type: "request", resource: mr.resource, extension: mr.extension });
-      }
+      allActiveMedications.push({ type: "request", resource: mr.resource, extension: mr.extension });
     });
     medicationStatements.forEach((ms) => {
-      if (this.isActiveMedicationStatement(ms.resource)) {
-        allActiveMedications.push({ type: "statement", resource: ms.resource, extension: ms.extension });
-      } else {
-        allInactiveMedications.push({ type: "statement", resource: ms.resource, extension: ms.extension });
-      }
+      allActiveMedications.push({ type: "statement", resource: ms.resource, extension: ms.extension });
     });
     const sortMedications = (medications) => {
       medications.sort((a, b) => {
@@ -1510,11 +1603,7 @@ var MedicationSummaryTemplate = class _MedicationSummaryTemplate {
     };
     if (allActiveMedications.length > 0) {
       sortMedications(allActiveMedications);
-      html += this.renderCombinedMedications(templateUtilities, allActiveMedications, true);
-    }
-    if (allInactiveMedications.length > 0) {
-      sortMedications(allInactiveMedications);
-      html += this.renderCombinedMedications(templateUtilities, allInactiveMedications, false);
+      html += this.renderCombinedMedications(templateUtilities, allActiveMedications);
     }
     return html;
   }
@@ -1552,12 +1641,10 @@ var MedicationSummaryTemplate = class _MedicationSummaryTemplate {
    * Render HTML table for combined MedicationRequest and MedicationStatement resources
    * @param templateUtilities - Instance of TemplateUtilities for utility functions
    * @param medications - Array of combined medication resources
-   * @param sectionTitle - Title for the section
    * @returns HTML string for rendering
    */
-  static renderCombinedMedications(templateUtilities, medications, isActiveSection) {
+  static renderCombinedMedications(templateUtilities, medications) {
     let html = `
-    <h3>${isActiveSection ? "Active Medications" : "Inactive Medications"}</h3>
       <table>
         <thead>
           <tr>
@@ -1566,9 +1653,7 @@ var MedicationSummaryTemplate = class _MedicationSummaryTemplate {
             <th>Sig</th>
             <th>Dispense Quantity</th>
             <th>Refills</th>
-            <th>Start Date</th>${isActiveSection ? "" : `
-            <th>End Date</th>`}
-            <th>Status</th>
+            <th>Start Date</th>
           </tr>
         </thead>
         <tbody>`;
@@ -1580,12 +1665,9 @@ var MedicationSummaryTemplate = class _MedicationSummaryTemplate {
       let dispenseQuantity = "-";
       let refills = "-";
       let startDate = "-";
-      let endDate = "-";
-      let status;
       if (medication.type === "request") {
         const mr = medication.resource;
         type = "Request";
-        status = mr.status ? String(mr.status) : "-";
         medicationName = templateUtilities.getMedicationName(
           mr.medicationReference || mr.medicationCodeableConcept
         );
@@ -1599,14 +1681,12 @@ var MedicationSummaryTemplate = class _MedicationSummaryTemplate {
         refills = mr.dispenseRequest?.numberOfRepeatsAllowed?.toString() || "-";
         if (mr.dispenseRequest?.validityPeriod) {
           startDate = mr.dispenseRequest.validityPeriod.start || "-";
-          endDate = mr.dispenseRequest.validityPeriod.end || "-";
         } else {
           startDate = mr.authoredOn || "-";
         }
       } else {
         const ms = medication.resource;
         type = "Statement";
-        status = ms.status ? String(ms.status) : "-";
         medicationName = templateUtilities.getMedicationName(
           ms.medicationReference || ms.medicationCodeableConcept
         );
@@ -1615,7 +1695,6 @@ var MedicationSummaryTemplate = class _MedicationSummaryTemplate {
           startDate = ms.effectiveDateTime;
         } else if (ms.effectivePeriod) {
           startDate = ms.effectivePeriod.start || "-";
-          endDate = ms.effectivePeriod.end || "-";
         }
       }
       html += `
@@ -1625,9 +1704,7 @@ var MedicationSummaryTemplate = class _MedicationSummaryTemplate {
           <td>${sig}</td>
           <td>${dispenseQuantity}</td>
           <td>${refills}</td>
-          <td>${startDate}</td>${isActiveSection ? "" : `
-          <td>${endDate}</td>`}
-          <td>${status}</td>
+          <td>${startDate}</td>
         </tr>`;
     }
     html += `
@@ -1768,6 +1845,7 @@ var ProblemListTemplate = class _ProblemListTemplate {
    * @param timezone - Optional timezone to use for date formatting (e.g., 'America/New_York', 'Europe/London')
    * @returns HTML string for rendering
    */
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
   static generateStaticNarrative(resources, timezone) {
     const templateUtilities = new TemplateUtilities(resources);
     let html = ``;
@@ -1784,7 +1862,6 @@ var ProblemListTemplate = class _ProblemListTemplate {
               <th>Problem</th>
               <th>Onset Date</th>
               <th>Recorded Date</th>
-              <th>Notes</th>
             </tr>
           </thead>
           <tbody>`;
@@ -1793,7 +1870,6 @@ var ProblemListTemplate = class _ProblemListTemplate {
           <td class="Name">${templateUtilities.codeableConcept(cond.code)}</td>
           <td class="OnsetDate">${templateUtilities.renderDate(cond.onsetDateTime)}</td>
           <td class="RecordedDate">${templateUtilities.renderDate(cond.recordedDate)}</td>
-          <td class="Notes">${templateUtilities.renderNotes(cond.note, timezone)}</td>
         </tr>`;
     }
     html += `</tbody>
@@ -1802,13 +1878,6 @@ var ProblemListTemplate = class _ProblemListTemplate {
   }
 };
 
-// src/structures/ips_section_constants.ts
-var VITAL_SIGNS_SUMMARY_COMPONENT_MAP = {
-  "Systolic Blood Pressure": "valueRatio.numerator.value",
-  "Diastolic Blood Pressure": "valueRatio.denominator.value",
-  "Default": "valueString"
-};
-
 // src/narratives/templates/typescript/VitalSignsTemplate.ts
 var VitalSignsTemplate = class _VitalSignsTemplate {
   /**
@@ -2228,6 +2297,7 @@ var PastHistoryOfIllnessTemplate = class {
    * @param timezone - Optional timezone to use for date formatting (e.g., 'America/New_York', 'Europe/London')
    * @returns HTML string for rendering
    */
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
   generateNarrative(resources, timezone) {
     const templateUtilities = new TemplateUtilities(resources);
     let html = ``;
@@ -2245,7 +2315,6 @@ var PastHistoryOfIllnessTemplate = class {
               <th>Onset Date</th>
               <th>Recorded Date</th>
               <th>Resolved Date</th>
-              <th>Notes</th>
             </tr>
           </thead>
           <tbody>`;
@@ -2255,7 +2324,6 @@ var PastHistoryOfIllnessTemplate = class {
           <td class="OnsetDate">${templateUtilities.renderDate(cond.onsetDateTime)}</td>
           <td class="RecordedDate">${templateUtilities.renderDate(cond.recordedDate)}</td>
           <td class="ResolvedDate">${templateUtilities.renderDate(cond.abatementDateTime)}</td>
-          <td class="Notes">${templateUtilities.renderNotes(cond.note, timezone)}</td>
         </tr>`;
     }
     html += `</tbody>
@@ -2408,7 +2476,6 @@ var FunctionalStatusTemplate = class _FunctionalStatusTemplate {
               <th>Problem</th>
               <th>Onset Date</th>
               <th>Recorded Date</th>
-              <th>Notes</th>
             </tr>
           </thead>
           <tbody>`;
@@ -2417,7 +2484,6 @@ var FunctionalStatusTemplate = class _FunctionalStatusTemplate {
           <td class="Name">${templateUtilities.codeableConcept(cond.code)}</td>
           <td class="OnsetDate">${templateUtilities.renderDate(cond.onsetDateTime)}</td>
           <td class="RecordedDate">${templateUtilities.renderDate(cond.recordedDate)}</td>
-          <td class="Notes">${templateUtilities.renderNotes(cond.note, timezone, { styled: true, warning: true })}</td>
         </tr>`;
       }
       html += `</tbody>
@@ -2433,7 +2499,6 @@ var FunctionalStatusTemplate = class _FunctionalStatusTemplate {
             <th>Description</th>
             <th>Summary</th>
             <th>Findings</th>
-            <th>Notes</th>
           </tr>
         </thead>
         <tbody>`;
@@ -2462,7 +2527,6 @@ var FunctionalStatusTemplate = class _FunctionalStatusTemplate {
           }
           findingsHtml += "</ul>";
         }
-        const notes = templateUtilities.renderNotes(impression.note, timezone);
         html += `
           <tr id="${templateUtilities.narrativeLinkId(impression)}">
             <td>${formattedDate}</td>
@@ -2470,7 +2534,6 @@ var FunctionalStatusTemplate = class _FunctionalStatusTemplate {
             <td>${impression.description || ""}</td>
             <td>${impression.summary || ""}</td>
             <td>${findingsHtml}</td>
-            <td>${notes}</td>
           </tr>`;
       }
       html += `</tbody>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@imranq2/fhirpatientsummary",
-  "version": "1.0.21",
+  "version": "1.0.23",
   "description": "A template for creating npm packages using TypeScript and VSCode",
   "main": "./dist/index.js",
   "module": "./dist/index.mjs",
@@ -28,7 +28,7 @@
     "prebuild": "npm run clean:dist",
     "pretest": "npm run clean:coverage",
     "cm": "cz",
-    "lint": "eslint ./src/ --ext .ts --fix",
+    "lint": "eslint ./src/ ./tests/ --ext .ts --fix",
     "prepare": "husky",
     "semantic-release": "semantic-release",
     "test:watch": "jest --watch",
@@ -36,7 +36,8 @@
     "typecheck": "tsc --noEmit",
     "check:cjs-import": "node tests/build/cjs-import-check.cjs",
     "check:esm-import": "node --experimental-vm-modules tests/build/esm-import-check.mjs",
-    "check:ts-import": "ts-node --project tsconfig.json tests/build/ts-import-check.ts"
+    "check:ts-import": "ts-node --project tsconfig.json tests/build/ts-import-check.ts",
+    "split:bundle": "node tests/full_record/split_bundle.cjs"
   },
   "repository": {
     "type": "git",
@@ -68,34 +69,34 @@
   "homepage": "https://github.com/icanbwell/fhir-patient-summary#readme",
   "dependencies": {
     "html-minifier-terser": "^7.2.0",
-    "luxon": "^3.6.1",
-    "turndown": "^7.2.0"
+    "luxon": "^3.7.2",
+    "turndown": "^7.2.2"
   },
   "devDependencies": {
-    "@eslint/js": "^9.29.0",
+    "@eslint/js": "^9.39.1",
     "@types/html-minifier-terser": "^7.0.2",
     "@types/jest": "^30.0.0",
     "@types/js-beautify": "^1.14.3",
-    "@types/luxon": "^3.6.2",
-    "@types/node": "^24.0.3",
-    "@types/turndown": "^5.0.5",
+    "@types/luxon": "^3.7.1",
+    "@types/node": "^24.10.1",
+    "@types/turndown": "^5.0.6",
     "commitizen": "^4.3.1",
-    "conventional-changelog-conventionalcommits": "^8.0.0",
-    "eslint": "^9.29.0",
-    "eslint-config-prettier": "^10.1.5",
+    "conventional-changelog-conventionalcommits": "^9.1.0",
+    "eslint": "^9.39.1",
+    "eslint-config-prettier": "^10.1.8",
     "eslint-plugin-node": "^11.1.0",
-    "eslint-plugin-prettier": "^5.5.0",
+    "eslint-plugin-prettier": "^5.5.4",
     "husky": "^9.1.7",
-    "jest": "^30.0.0",
+    "jest": "^30.2.0",
     "js-beautify": "^1.15.4",
-    "lint-staged": "^16.1.2",
-    "prettier": "^3.5.3",
-    "semantic-release": "^24.2.5",
-    "ts-jest": "^29.4.0",
+    "lint-staged": "^16.2.7",
+    "prettier": "^3.7.4",
+    "semantic-release": "^25.0.2",
+    "ts-jest": "^29.4.6",
     "ts-node": "^10.9.2",
     "tsup": "8.5.1",
-    "typescript": "^5.8.3",
-    "typescript-eslint": "^8.34.1"
+    "typescript": "^5.9.3",
+    "typescript-eslint": "^8.48.1"
   },
   "lint-staged": {
     "src/**/*.{ts,js}": "eslint --cache --cache-location .eslintcache --fix",