@imranq2/fhirpatientsummary 1.0.30 → 1.0.32

package/dist/index.cjs

@@ -938,6 +938,12 @@ var TemplateUtilities = class {
     const escapedText = text.replace(/</g, "&lt;").replace(/>/g, "&gt;");
     return escapedText.replace(/\n/g, "<br />");
   }
+  capitalizeFirstLetter(text) {
+    if (!text || text.length === 0) {
+      return "";
+    }
+    return text.charAt(0).toUpperCase() + text.slice(1);
+  }
   /**
    * Renders note elements from a FHIR resource in a standardized format
    * Can render as simple comma-separated text or as styled HTML with timestamps
@@ -1435,7 +1441,8 @@ var PatientTemplate = class _PatientTemplate {
   static generateStaticNarrative(resources, timezone) {
     const templateUtilities = new TemplateUtilities(resources);
     const combinedPatient = this.combinePatients(resources);
-    return `<div>
+    let html = `<p>This section merges all Patient resources into a single combined patient record, preferring non-empty values for each field.</p>`;
+    html += `<div>
       <ul>
         <li><strong>Name(s):</strong>${this.renderNames(combinedPatient)}</li>
         <li><strong>Gender:</strong>${combinedPatient.gender ? this.capitalize(combinedPatient.gender) : ""}</li>
@@ -1447,6 +1454,7 @@ var PatientTemplate = class _PatientTemplate {
         <li><strong>Language(s):</strong>${this.renderCommunication(templateUtilities, combinedPatient)}</li>
       </ul>
     </div>`;
+    return html;
   }
   /**
    * Combines multiple patient resources into a single patient object
@@ -1771,7 +1779,9 @@ var AllergyIntoleranceTemplate = class _AllergyIntoleranceTemplate {
   generateSummaryNarrative(resources, timezone) {
     const templateUtilities = new TemplateUtilities(resources);
     let isSummaryCreated = false;
-    let html = `
+    let html = `<p>This list includes all AllergyIntolerance resources, with no additional filtering, sorted as provided.</p>
+`;
+    html += `
       <div>
         <table>
           <thead>
@@ -1810,7 +1820,7 @@ var AllergyIntoleranceTemplate = class _AllergyIntoleranceTemplate {
         isSummaryCreated = true;
         html += `
             <tr>
-              <td>${data["allergen"] ?? ""}</td>
+              <td>${templateUtilities.capitalizeFirstLetter(data["allergen"] ?? "")}</td>
                <td>${data["codeSystem"] ?? ""}</td>
               <td>${data["criticality"] ?? ""}</td>
               <td>${templateUtilities.renderTime(data["recordedDate"], timezone) ?? ""}</td>
@@ -1853,7 +1863,8 @@ var AllergyIntoleranceTemplate = class _AllergyIntoleranceTemplate {
       const dateB = b.onsetDateTime;
       return dateA && dateB ? new Date(dateB).getTime() - new Date(dateA).getTime() : 0;
     });
-    let html = "";
+    let html = `<p>This list includes all AllergyIntolerance resources, with no additional filtering, sorted as provided.</p>
+`;
     html += `
       <div class="ActiveAllergies">
         <h3>Active</h3>
@@ -1927,8 +1938,8 @@ var AllergyIntoleranceTemplate = class _AllergyIntoleranceTemplate {
     let html = "";
     for (const allergy of allergies) {
       html += `
-        <tr id="${templateUtilities.narrativeLinkId(allergy.extension)}">
-          <td class="Name"><span class="AllergenName">${templateUtilities.renderTextAsHtml(templateUtilities.codeableConceptDisplay(allergy.code))}</span></td>
+        <tr>
+          <td class="Name"><span class="AllergenName">${templateUtilities.capitalizeFirstLetter(templateUtilities.renderTextAsHtml(templateUtilities.codeableConceptDisplay(allergy.code)))}</span></td>
           <td class="Status">${templateUtilities.renderTextAsHtml(templateUtilities.codeableConceptDisplay(allergy.clinicalStatus)) || ""}</td>
           <td class="CodeSystem">${templateUtilities.codeableConceptCoding(allergy.code)}</td>
           <td class="Category">${templateUtilities.renderTextAsHtml(templateUtilities.safeConcat(allergy.category)) || ""}</td>
@@ -1979,7 +1990,8 @@ var MedicationSummaryTemplate = class _MedicationSummaryTemplate {
     let isSummaryCreated = false;
     const currentDate = now || /* @__PURE__ */ new Date();
     const twoYearsAgo = new Date(currentDate.getFullYear(), currentDate.getMonth() - 24, currentDate.getDate());
-    let html = `
+    let html = "<p>This list includes all the medications that were ordered for the patient, the medications they filled from the pharmacy and the medications they reported, filtered to past 2 years and sorted by start date.</p>";
+    html += `
         <div>
             <table>
             <thead>
@@ -2044,7 +2056,7 @@ var MedicationSummaryTemplate = class _MedicationSummaryTemplate {
           isSummaryCreated = true;
           html += `
                             <tr>
-                                <td>${templateUtilities.renderTextAsHtml(data["medication"])}</td>
+                                <td>${templateUtilities.capitalizeFirstLetter(templateUtilities.renderTextAsHtml(data["medication"]))}</td>
                                 <td>${templateUtilities.codeableConceptCoding(sectionCodeableConcept)}</td>
                                 <td>${templateUtilities.renderTextAsHtml(data["status"])}</td>
                                 <td>${templateUtilities.renderTextAsHtml(data["sig-prescriber"] || data["sig-pharmacy"])}</td>
@@ -2091,8 +2103,8 @@ var MedicationSummaryTemplate = class _MedicationSummaryTemplate {
   static generateStaticNarrative(resources, timezone, now) {
     const templateUtilities = new TemplateUtilities(resources);
     let html = "";
-    const medicationRequests = this.getMedicationRequests(templateUtilities, resources);
-    const medicationStatements = this.getMedicationStatements(templateUtilities, resources);
+    const medicationRequests = resources.filter((entry) => entry.resourceType === "MedicationRequest");
+    const medicationStatements = resources.filter((entry) => entry.resourceType === "MedicationStatement");
     const allActiveMedications = [];
     const currentDate = now || /* @__PURE__ */ new Date();
     const twoYearsAgo = new Date(currentDate);
@@ -2100,10 +2112,10 @@ var MedicationSummaryTemplate = class _MedicationSummaryTemplate {
     let skippedMedications = 0;
     const allMedications = [];
     medicationRequests.forEach((mr) => {
-      allMedications.push({ type: "request", resource: mr.resource, extension: mr.extension });
+      allMedications.push({ type: "request", resource: mr });
     });
     medicationStatements.forEach((ms) => {
-      allMedications.push({ type: "statement", resource: ms.resource, extension: ms.extension });
+      allMedications.push({ type: "statement", resource: ms });
     });
     for (const med of allMedications) {
       let dateString;
@@ -2160,36 +2172,6 @@ var MedicationSummaryTemplate = class _MedicationSummaryTemplate {
     }
     return "";
   }
-  /**
-   * Extract MedicationRequest resources
-   * @param templateUtilities - Instance of TemplateUtilities for utility functions
-   * @param resources - FHIR Medication resources
-   * @returns Array of MedicationRequest resources
-   */
-  static getMedicationRequests(templateUtilities, resources) {
-    if (resources.length === 0) {
-      return [];
-    }
-    return resources.filter((entry) => entry.resourceType === "MedicationRequest").map((entry) => ({
-      resource: entry,
-      extension: templateUtilities.narrativeLinkExtension(entry)
-    }));
-  }
-  /**
-   * Extract MedicationStatement resources
-   * @param templateUtilities - Instance of TemplateUtilities for utility functions
-   * @param resources - FHIR Medication resources
-   * @returns Array of MedicationStatement resources
-   */
-  static getMedicationStatements(templateUtilities, resources) {
-    if (resources.length === 0) {
-      return [];
-    }
-    return resources.filter((entry) => entry.resourceType === "MedicationStatement").map((entry) => ({
-      resource: entry,
-      extension: templateUtilities.narrativeLinkExtension(entry)
-    }));
-  }
   /**
    * Render HTML table for combined MedicationRequest and MedicationStatement resources
    * @param templateUtilities - Instance of TemplateUtilities for utility functions
@@ -2213,7 +2195,6 @@ var MedicationSummaryTemplate = class _MedicationSummaryTemplate {
         </thead>
         <tbody>`;
     for (const medication of medications) {
-      const narrativeLinkId = templateUtilities.narrativeLinkId(medication.extension);
       let type;
       let medicationName;
       let sig;
@@ -2260,9 +2241,9 @@ var MedicationSummaryTemplate = class _MedicationSummaryTemplate {
         }
       }
       html += `
-        <tr${narrativeLinkId ? ` id="${narrativeLinkId}"` : ""}>
+        <tr>
           <td>${type}</td>
-          <td>${medicationName}<ul></ul></td>
+          <td>${templateUtilities.capitalizeFirstLetter(medicationName)}</td>
           <td>${codeSystemDisplay}</td>
           <td>${sig}</td>
           <td>${dispenseQuantity}</td>
@@ -2305,6 +2286,7 @@ var ImmunizationsTemplate = class _ImmunizationsTemplate {
     let isSummaryCreated = false;
     let html = `
       <div>
+      <p>This list includes all vaccinations, sorted by occurrence date (most recent first).</p>
         <table>
           <thead>
             <tr>
@@ -2343,7 +2325,7 @@ var ImmunizationsTemplate = class _ImmunizationsTemplate {
           isSummaryCreated = true;
           html += `
               <tr>
-                <td>${data["immunization"] ?? ""}</td>
+                <td>${templateUtilities.capitalizeFirstLetter(data["immunization"] ?? "")}</td>
                 <td>${data["codeSystem"] ?? ""}</td>
                 <td>${data["status"] ?? ""}</td>
                 <td>${templateUtilities.renderTime(data["occurrenceDateTime"], timezone) ?? ""}</td>
@@ -2387,8 +2369,8 @@ var ImmunizationsTemplate = class _ImmunizationsTemplate {
       for (const resourceItem of immunizations) {
         const imm = resourceItem;
         html += `
-          <tr id="${templateUtilities.narrativeLinkId(imm)}">
-            <td>${templateUtilities.renderTextAsHtml(templateUtilities.codeableConceptDisplay(imm.vaccineCode))}</td>
+          <tr>
+            <td>${templateUtilities.capitalizeFirstLetter(templateUtilities.renderTextAsHtml(templateUtilities.codeableConceptDisplay(imm.vaccineCode)))}</td>
             <td>${templateUtilities.codeableConceptCoding(imm.vaccineCode)}</td>
             <td>${imm.status || ""}</td>
             <td>${templateUtilities.concatDoseNumber(imm.protocolApplied)}</td>
@@ -2427,7 +2409,8 @@ var ProblemListTemplate = class _ProblemListTemplate {
   // eslint-disable-next-line @typescript-eslint/no-unused-vars
   static generateStaticNarrative(resources, timezone) {
     const templateUtilities = new TemplateUtilities(resources);
-    let html = ``;
+    let html = `<p>This list includes patient problems, sorted by recorded date (most recent first)</p>
+`;
     const activeConditions = resources.map((entry) => entry) || [];
     activeConditions.sort((a, b) => {
       if (!a.recordedDate && b.recordedDate) return -1;
@@ -2457,8 +2440,8 @@ var ProblemListTemplate = class _ProblemListTemplate {
         continue;
       }
       seenCodeAndSystems.add(codeAndSystem);
-      html += `<tr id="${templateUtilities.narrativeLinkId(cond)}">
-          <td class="Name">${conditionDisplay}</td>
+      html += `<tr>
+          <td class="Name">${templateUtilities.capitalizeFirstLetter(conditionDisplay)}</td>
           <td class="CodeSystem">${codeAndSystem}</td>
           <td class="OnsetDate">${templateUtilities.renderDate(cond.onsetDateTime)}</td>
           <td class="RecordedDate">${templateUtilities.renderDate(cond.recordedDate)}</td>
@@ -2491,7 +2474,9 @@ var VitalSignsTemplate = class _VitalSignsTemplate {
   generateSummaryNarrative(resources, timezone) {
     const templateUtilities = new TemplateUtilities(resources);
     let isSummaryCreated = false;
-    let html = `
+    let html = `<p>This list includes the latest vital signs, sorted by effective date (most recent first).</p>
+`;
+    html += `
       <div>
         <table>
           <thead>
@@ -2536,7 +2521,7 @@ var VitalSignsTemplate = class _VitalSignsTemplate {
         isSummaryCreated = true;
         html += `
           <tr>
-            <td>${data["Vital Name"] ?? ""}</td>
+            <td>${templateUtilities.capitalizeFirstLetter(data["Vital Name"] ?? "")}</td>
             <td>${data["codeSystem"] ?? ""}</td>
             <td>${templateUtilities.extractObservationSummaryValue(data, timezone) ?? ""}</td>
             <td>${templateUtilities.extractObservationSummaryEffectiveTime(data, timezone) ?? ""}</td>
@@ -2564,7 +2549,9 @@ var VitalSignsTemplate = class _VitalSignsTemplate {
       const dateB = b.effectiveDateTime || b.effectivePeriod?.start;
       return dateA && dateB ? new Date(dateB).getTime() - new Date(dateA).getTime() : 0;
     });
-    let html = `
+    let html = `<p>This list includes the latest vital signs, sorted by effective date (most recent first).</p>
+`;
+    html += `
       <table>
         <thead>
           <tr>
@@ -2582,8 +2569,8 @@ var VitalSignsTemplate = class _VitalSignsTemplate {
         <tbody>`;
     for (const obs of observations) {
       html += `
-          <tr id="${templateUtilities.narrativeLinkId(obs)}">
-            <td>${templateUtilities.renderTextAsHtml(templateUtilities.codeableConceptDisplay(obs.code, "display"))}</td>
+          <tr>
+            <td>${templateUtilities.capitalizeFirstLetter(templateUtilities.renderTextAsHtml(templateUtilities.codeableConceptDisplay(obs.code, "display")))}</td>
             <td>${templateUtilities.codeableConceptCoding(obs.code)}</td>
             <td>${templateUtilities.extractObservationValue(obs)}</td>
             <td>${templateUtilities.extractObservationValueUnit(obs)}</td>
@@ -2620,7 +2607,7 @@ var MedicalDevicesTemplate = class _MedicalDevicesTemplate {
    */
   static generateStaticNarrative(resources, timezone) {
     const templateUtilities = new TemplateUtilities(resources);
-    let html = `
+    let html = `<p>This list includes all DeviceUseStatement resources, sorted by recorded date (most recent first).</p>
       <table>
         <thead>
           <tr>
@@ -2636,10 +2623,12 @@ var MedicalDevicesTemplate = class _MedicalDevicesTemplate {
       const dateB = b.recordedOn;
       return typeof dateA === "string" && typeof dateB === "string" ? new Date(dateB).getTime() - new Date(dateA).getTime() : 0;
     });
+    let isDeviceAdded = false;
     for (const dus of deviceStatements) {
+      isDeviceAdded = true;
       html += `
-        <tr id="${templateUtilities.narrativeLinkId(dus)}">
-          <td>${templateUtilities.renderTextAsHtml(templateUtilities.renderDevice(dus.device))}</td>
+        <tr>
+          <td>${templateUtilities.capitalizeFirstLetter(templateUtilities.renderTextAsHtml(templateUtilities.renderDevice(dus.device)))}</td>
           <td>${templateUtilities.renderTextAsHtml(dus.status || "")}</td>
           <td>${templateUtilities.renderNotes(dus.note, timezone)}</td>
           <td>${templateUtilities.renderTextAsHtml(templateUtilities.renderRecorded(dus.recordedOn, timezone))}</td>
@@ -2648,7 +2637,7 @@ var MedicalDevicesTemplate = class _MedicalDevicesTemplate {
     html += `
         </tbody>
       </table>`;
-    return html;
+    return isDeviceAdded ? html : void 0;
   }
 };
 
@@ -2999,11 +2988,12 @@ var DiagnosticResultsTemplate = class _DiagnosticResultsTemplate {
         }
       }
     }
-    let html = `
-      <div>`;
+    let html = `<p>This section includes Observations from the last 2 years (one per lab name, using code mapping) and DiagnosticReports with status 'final' issued in the last 2 years. Both are sorted by date (most recent first). Older results are counted and noted below the tables.</p>
+`;
     let observationhtml = `
       <div>
         <h3>Observations</h3>
+      ${html}
         <table>
           <thead>
             <tr>
@@ -3019,6 +3009,7 @@ var DiagnosticResultsTemplate = class _DiagnosticResultsTemplate {
     let diagnosticReporthtml = `
       <div>
         <h3>Diagnostic Reports</h3>
+        ${html}
         <table>
           <thead>
             <tr>
@@ -3103,7 +3094,7 @@ var DiagnosticResultsTemplate = class _DiagnosticResultsTemplate {
                 this.formatSummaryObservationData(component);
                 observationhtml += `
                   <tr>
-                    <td>${componentCode}</td>
+                    <td>${templateUtilities.capitalizeFirstLetter(componentCode)}</td>
                     <td></td>
                     <td>${templateUtilities.renderTextAsHtml(component["formattedValue"]) ?? ""}</td>
                     <td>${templateUtilities.renderTextAsHtml(component["referenceRange"])?.trim() ?? ""}</td>
@@ -3120,7 +3111,7 @@ var DiagnosticResultsTemplate = class _DiagnosticResultsTemplate {
                 this.formatSummaryObservationData(data);
                 observationhtml += `
                   <tr>
-                    <td>${data["code"] ?? ""}</td>
+                    <td>${templateUtilities.capitalizeFirstLetter(data["code"] ?? "")}</td>
                     <td>${templateUtilities.codeableConceptCoding(sectionCodeableConcept)}</td>
                     <td>${templateUtilities.renderTextAsHtml(data["formattedValue"]) ?? ""}</td>
                     <td>${templateUtilities.renderTextAsHtml(data["referenceRange"])?.trim() ?? ""}</td>
@@ -3141,7 +3132,7 @@ var DiagnosticResultsTemplate = class _DiagnosticResultsTemplate {
               diagnosticReportAdded.add(reportName);
               diagnosticReporthtml += `
                     <tr>
-                      <td>${data["report"] ?? ""}</td>
+                      <td>${templateUtilities.capitalizeFirstLetter(data["report"] ?? "")}</td>
                       <td>${data["performer"] ?? ""}</td>
                       <td>${templateUtilities.renderTime(data["issued"], timezone) ?? ""}</td>
                         <td>${data["source"] ?? ""}</td>
@@ -3189,7 +3180,8 @@ var DiagnosticResultsTemplate = class _DiagnosticResultsTemplate {
     const currentDate = now || /* @__PURE__ */ new Date();
     const twoYearsAgo = new Date(currentDate);
     twoYearsAgo.setFullYear(currentDate.getFullYear() - 2);
-    let html = "";
+    let html = `<p>This section includes Observations from the last 2 years (one per lab name, using code mapping) and DiagnosticReports with status 'final' issued in the last 2 years. Both are sorted by date (most recent first). Older results are counted and noted below the tables.</p>
+`;
     let skippedObservations = 0;
     let skippedDiagnosticReports = 0;
     for (const resourceItem of resources) {
@@ -3340,8 +3332,8 @@ var DiagnosticResultsTemplate = class _DiagnosticResultsTemplate {
         observationAdded.add(obsCodeDisplay);
         observationAdded.add(obsCodeAndSystem);
         html += `
-          <tr id="${templateUtilities.narrativeLinkId(obs)}">
-            <td>${obsCodeDisplay}</td>
+          <tr>
+            <td>${templateUtilities.capitalizeFirstLetter(obsCodeDisplay)}</td>
             <td>${templateUtilities.codeableConceptCoding(obs.code)}</td>
             <td>${templateUtilities.extractObservationValue(obs)}</td>
             <td>${templateUtilities.concatReferenceRange(obs.referenceRange)}</td>
@@ -3389,8 +3381,8 @@ var DiagnosticResultsTemplate = class _DiagnosticResultsTemplate {
           resultCount = `${report.result.length} result${report.result.length !== 1 ? "s" : ""}`;
         }
         html += `
-          <tr id="${templateUtilities.narrativeLinkId(report)}">
-            <td>${reportName}</td>
+          <tr>
+            <td>${templateUtilities.capitalizeFirstLetter(reportName)}</td>
             <td>${codeAndSystem}</td>
             <td>${templateUtilities.firstFromCodeableConceptList(report.category)}</td>
             <td>${resultCount}</td>
@@ -3451,7 +3443,9 @@ var HistoryOfProceduresTemplate = class _HistoryOfProceduresTemplate {
   generateSummaryNarrative(resources, timezone) {
     const templateUtilities = new TemplateUtilities(resources);
     let isSummaryCreated = false;
-    let html = `
+    let html = `<p>This list includes all Procedure resources, sorted by performed date (most recent first).</p>
+`;
+    html += `
       <div>
         <table>
           <thead>
@@ -3490,7 +3484,7 @@ var HistoryOfProceduresTemplate = class _HistoryOfProceduresTemplate {
         isSummaryCreated = true;
         html += `
             <tr>
-              <td>${data["procedure"] ?? ""}</td>
+              <td>${templateUtilities.capitalizeFirstLetter(data["procedure"] ?? "")}</td>
                <td>${data["codeSystem"] ?? ""}</td>
               <td>${data["performer"] ?? ""}</td>
               <td>${templateUtilities.renderTime(data["date"], timezone) ?? ""}</td>
@@ -3512,7 +3506,9 @@ var HistoryOfProceduresTemplate = class _HistoryOfProceduresTemplate {
    */
   static generateStaticNarrative(resources, timezone) {
     const templateUtilities = new TemplateUtilities(resources);
-    let html = `
+    let html = `<p>This list includes all Procedure resources, sorted by performed date (most recent first).</p>
+`;
+    html += `
       <table>
         <thead>
           <tr>
@@ -3527,12 +3523,12 @@ var HistoryOfProceduresTemplate = class _HistoryOfProceduresTemplate {
     for (const resourceItem of resources) {
       const proc = resourceItem;
       html += `
-        <tr id="${templateUtilities.narrativeLinkId(proc)}">
-          <td>${templateUtilities.renderTextAsHtml(templateUtilities.codeableConceptDisplay(proc.code, "display"))}</td>
-           <td>${templateUtilities.codeableConceptCoding(proc.code)}</td>
+        <tr>
+          <td>${templateUtilities.capitalizeFirstLetter(templateUtilities.renderTextAsHtml(templateUtilities.codeableConceptDisplay(proc.code, "display")))}</td>
+          <td>${templateUtilities.codeableConceptCoding(proc.code)}</td>
           <td>${templateUtilities.renderNotes(proc.note, timezone)}</td>
-          <td>${proc.performedDateTime ? templateUtilities.renderTime(proc.performedDateTime, timezone) : proc.performedPeriod ? templateUtilities.renderPeriod(proc.performedPeriod, timezone) : ""}</td>
-            <td>${templateUtilities.getOwnerTag(proc)}</td>
+          <td>${templateUtilities.renderTime(proc.performedDateTime || proc.performedPeriod?.start, timezone)}</td>
+          <td>${templateUtilities.getOwnerTag(proc)}</td>
         </tr>`;
     }
     html += `
@@ -3567,7 +3563,9 @@ var SocialHistoryTemplate = class _SocialHistoryTemplate {
       const dateB = b.effectiveDateTime || b.effectivePeriod?.start;
       return dateA && dateB ? new Date(dateB).getTime() - new Date(dateA).getTime() : 0;
     });
-    let html = `
+    let html = `<p>This list includes all information about the patient's social history, sorted by effective date (most recent first).</p>
+`;
+    html += `
       <table>
         <thead>
           <tr>
@@ -3581,17 +3579,22 @@ var SocialHistoryTemplate = class _SocialHistoryTemplate {
           </tr>
         </thead>
         <tbody>`;
+    const addedObservations = /* @__PURE__ */ new Set();
     for (const obs of observations) {
-      html += `
-          <tr id="${templateUtilities.narrativeLinkId(obs)}">
-            <td>${templateUtilities.renderTextAsHtml(templateUtilities.codeableConceptDisplay(obs.code))}</td>
-            <td>${templateUtilities.codeableConceptCoding(obs.code)}</td>
-            <td>${templateUtilities.extractObservationValue(obs)}</td>
-            <td>${templateUtilities.extractObservationValueUnit(obs)}</td>
-            <td>${templateUtilities.renderNotes(obs.note, timezone)}</td>
-            <td>${obs.effectiveDateTime ? templateUtilities.renderTime(obs.effectiveDateTime, timezone) : obs.effectivePeriod ? templateUtilities.renderPeriod(obs.effectivePeriod, timezone) : ""}</td>
-            <td>${templateUtilities.getOwnerTag(obs)}</td>
-          </tr>`;
+      const obsName = templateUtilities.renderTextAsHtml(templateUtilities.codeableConceptDisplay(obs.code));
+      if (!addedObservations.has(obsName)) {
+        addedObservations.add(obsName);
+        html += `
+            <tr>
+              <td>${templateUtilities.capitalizeFirstLetter(obsName)}</td>
+              <td>${templateUtilities.codeableConceptCoding(obs.code)}</td>
+              <td>${templateUtilities.extractObservationValue(obs)}</td>
+              <td>${templateUtilities.extractObservationValueUnit(obs)}</td>
+              <td>${templateUtilities.renderNotes(obs.note, timezone)}</td>
+              <td>${obs.effectiveDateTime ? templateUtilities.renderTime(obs.effectiveDateTime, timezone) : obs.effectivePeriod ? templateUtilities.renderPeriod(obs.effectivePeriod, timezone) : ""}</td>
+              <td>${templateUtilities.getOwnerTag(obs)}</td>
+            </tr>`;
+      }
     }
     html += `
         </tbody>
@@ -3611,7 +3614,8 @@ var PastHistoryOfIllnessTemplate = class {
    */
   generateNarrative(resources, timezone, now) {
     const templateUtilities = new TemplateUtilities(resources);
-    let html = ``;
+    let html = `<p>This list includes past problems for the patient with a recorded date within the last 5 years, sorted by recorded date (most recent first).</p>
+`;
     const resolvedConditions = resources.map((entry) => entry) || [];
     const currentDate = now || /* @__PURE__ */ new Date();
     const fiveYearsAgo = new Date(currentDate);
@@ -3648,8 +3652,8 @@ var PastHistoryOfIllnessTemplate = class {
       const conditionCode = templateUtilities.renderTextAsHtml(templateUtilities.codeableConceptDisplay(cond.code));
       if (!addedConditionCodes.has(conditionCode)) {
         addedConditionCodes.add(conditionCode);
-        html += `<tr id="${templateUtilities.narrativeLinkId(cond)}">
-            <td class="Name">${conditionCode}</td>
+        html += `<tr>
+            <td class="Name">${templateUtilities.capitalizeFirstLetter(conditionCode)}</td>
             <td class="CodeSystem">${templateUtilities.codeableConceptCoding(cond.code)}</td>
             <td class="OnsetDate">${templateUtilities.renderDate(cond.onsetDateTime)}</td>
             <td class="RecordedDate">${templateUtilities.renderDate(cond.recordedDate)}</td>
@@ -3684,7 +3688,9 @@ var PlanOfCareTemplate = class {
       const endB = b.period?.end ? new Date(b.period?.end).getTime() : 0;
       return endB - endA;
     });
-    let html = `
+    let html = `<p>This list includes all CarePlan resources, sorted by planned end date (most recent first).</p>
+`;
+    html += `
       <table>
         <thead>
           <tr>
@@ -3699,8 +3705,8 @@ var PlanOfCareTemplate = class {
         <tbody>`;
     for (const cp of carePlans) {
       html += `
-          <tr id="${templateUtilities.narrativeLinkId(cp)}">
-            <td>${cp.description || cp.title || ""}</td>
+          <tr>
+            <td>${templateUtilities.capitalizeFirstLetter(cp.description || cp.title || "")}</td>
             <td>${cp.intent || ""}</td>
             <td>${templateUtilities.concat(cp.note, "text")}</td>
             <td>${cp.period?.start ? templateUtilities.renderTime(cp.period?.start, timezone) : ""}</td>
@@ -3722,7 +3728,9 @@ var PlanOfCareTemplate = class {
   generateSummaryNarrative(resources, timezone) {
     const templateUtilities = new TemplateUtilities(resources);
     let isSummaryCreated = false;
-    let html = `
+    let html = `<p>This list includes all CarePlan resources, sorted by planned end date (most recent first).</p>
+`;
+    html += `
       <div>
         <table>
           <thead>
@@ -3749,7 +3757,7 @@ var PlanOfCareTemplate = class {
         isSummaryCreated = true;
         html += `
             <tr>
-              <td>${data["CarePlan Name"] ?? ""}</td>
+              <td>${templateUtilities.capitalizeFirstLetter(data["CarePlan Name"] ?? "")}</td>
               <td>${templateUtilities.renderTime(data["created"], timezone) ?? ""}</td>
               <td>${templateUtilities.renderTime(data["period.start"], timezone) ?? ""}</td>
               <td>${templateUtilities.renderTime(data["period.end"], timezone) ?? ""}</td>
@@ -3784,7 +3792,7 @@ var FunctionalStatusTemplate = class _FunctionalStatusTemplate {
    */
   static generateStaticNarrative(resources, timezone) {
     const templateUtilities = new TemplateUtilities(resources);
-    let html = "";
+    let html = `<p>This section summarizes key observations and assessments related to the person's functional status and ability to perform daily activities.</p>`;
     let functionalObservations = resources.filter((r) => r.resourceType === "Observation").filter((r) => {
       const hasFunctionalLoinc = r.code?.coding?.some(
         (c) => c.system?.toLowerCase().includes("loinc") && c.code === "47420-5"
@@ -3814,8 +3822,8 @@ var FunctionalStatusTemplate = class _FunctionalStatusTemplate {
         const date = observation.effectiveDateTime ? templateUtilities.renderDate(observation.effectiveDateTime) : observation.issued ? templateUtilities.renderDate(observation.issued) : "";
         const interpretation = observation.interpretation ? templateUtilities.codeableConceptDisplay(observation.interpretation[0]) : "";
         const comments = observation.comment || observation.note?.map((n) => n.text).join("; ") || "";
-        html += `<tr id="${templateUtilities.narrativeLinkId(observation)}">
-          <td>${obsName}</td>
+        html += `<tr>
+          <td>${templateUtilities.capitalizeFirstLetter(obsName)}</td>
           <td>${value ?? ""}</td>
           <td>${date}</td>
           <td>${interpretation}</td>
@@ -3845,7 +3853,7 @@ var FunctionalStatusTemplate = class _FunctionalStatusTemplate {
           }
           findingsHtml += "</ul>";
         }
-        html += `<tr id="${templateUtilities.narrativeLinkId(impression)}">
+        html += `<tr>
           <td>${formattedDate}</td>
           <td>${impression.status || ""}</td>
           <td>${impression.description || ""}</td>
@@ -3908,7 +3916,8 @@ var PregnancyTemplate = class _PregnancyTemplate {
     if (!pregnancyStatusObs && !eddObs && historyObs.length === 0 && conditions.length === 0) {
       return `<p>No history of pregnancy found.</p>`;
     }
-    let html = `
+    let html = `<p>This list includes Observation and Condition resources relevant to pregnancy, sorted by date (most recent first).</p>`;
+    html += `
             <table>
               <thead>
                 <tr>
@@ -3920,10 +3929,10 @@ var PregnancyTemplate = class _PregnancyTemplate {
                 </tr>
               </thead>
               <tbody>`;
-    function renderRow({ id, result, comments, date, codeSystem, owner }) {
+    function renderRow({ result, comments, date, codeSystem, owner }) {
       html += `
-                <tr id="${id}">
-                  <td class="Result">${result}</td>
+                <tr>
+                  <td class="Result">${templateUtilities.capitalizeFirstLetter(result)}</td>
                   <td class="CodeSystem">${codeSystem}</td>
                   <td class="Comments">${comments}</td>
                   <td class="Date">${date}</td>
@@ -3954,9 +3963,9 @@ var PregnancyTemplate = class _PregnancyTemplate {
       if (!b.date) return -1;
       return new Date(b.date).getTime() - new Date(a.date).getTime();
     });
+    const addedRows = /* @__PURE__ */ new Set();
     for (const { resource, date, type } of rowResources) {
       let result = "", comments = "", dateStr = "", codeSystem = "";
-      const id = templateUtilities.narrativeLinkId(resource);
       if (type === "status") {
         result = templateUtilities.renderTextAsHtml(templateUtilities.extractPregnancyStatus(resource));
         comments = templateUtilities.renderNotes(resource.note, timezone);
@@ -3978,8 +3987,12 @@ var PregnancyTemplate = class _PregnancyTemplate {
         dateStr = date ? templateUtilities.renderTextAsHtml(templateUtilities.renderTime(date, timezone)) : "";
         codeSystem = templateUtilities.renderTextAsHtml(templateUtilities.codeableConceptCoding(resource.code));
       }
-      const owner = templateUtilities.getOwnerTag(resource);
-      renderRow({ id, result, comments, date: dateStr, codeSystem, owner });
+      const rowKey = `${result}|${codeSystem}`;
+      if (!addedRows.has(rowKey)) {
+        addedRows.add(rowKey);
+        const owner = templateUtilities.getOwnerTag(resource);
+        renderRow({ result, comments, date: dateStr, codeSystem, owner });
+      }
     }
     html += `
               </tbody>
@@ -4013,8 +4026,9 @@ var AdvanceDirectivesTemplate = class _AdvanceDirectivesTemplate {
   // eslint-disable-next-line @typescript-eslint/no-unused-vars
   static generateStaticNarrative(resources, timezone) {
     const templateUtilities = new TemplateUtilities(resources);
-    let html = `
-      <table>
+    let html = `<p>This list includes all Consent resources, sorted by date (most recent first).</p>
+`;
+    html += `<table>
         <thead>
           <tr>
             <th>Scope</th>
@@ -4027,8 +4041,8 @@ var AdvanceDirectivesTemplate = class _AdvanceDirectivesTemplate {
     for (const resourceItem of resources) {
       const consent = resourceItem;
       html += `
-        <tr id="${templateUtilities.narrativeLinkId(consent)}">
-          <td>${templateUtilities.renderTextAsHtml(templateUtilities.codeableConceptDisplay(consent.scope, "display"))}</td>
+        <tr>
+          <td>${templateUtilities.capitalizeFirstLetter(templateUtilities.renderTextAsHtml(templateUtilities.codeableConceptDisplay(consent.scope, "display")))}</td>
           <td>${consent.status || ""}</td>
           <td>${consent.provision?.action ? templateUtilities.concatCodeableConcept(consent.provision.action) : ""}</td>
           <td>${consent.dateTime || ""}</td>
@@ -4343,14 +4357,17 @@ var ComprehensiveIPSCompositionBuilder = class {
       const summaryIPSCompositionFilter = useSummaryCompositions ? IPSSectionResourceHelper.getSummaryIPSCompositionFilterForSection(sectionType) : void 0;
       const sectionIPSSummary = summaryIPSCompositionFilter ? resources.filter((resource) => summaryIPSCompositionFilter(resource)) : [];
       if (sectionIPSSummary.length > 0) {
+        console.log(`Using IPS summary composition for section: ${sectionType}`);
         await this.makeSectionFromSummaryAsync(sectionType, sectionIPSSummary, resources, timezone);
         continue;
       }
       const summaryCompositionFilter = useSummaryCompositions ? IPSSectionResourceHelper.getSummaryCompositionFilterForSection(sectionType) : void 0;
       const sectionSummary = summaryCompositionFilter ? resources.filter((resource) => summaryCompositionFilter(resource)) : [];
       if (sectionSummary.length > 0) {
+        console.log(`Using summary composition for section: ${sectionType}`);
         await this.makeSectionFromSummaryAsync(sectionType, sectionSummary, resources, timezone);
       } else {
+        console.log(`Using individual resources for section: ${sectionType}`);
         const sectionFilter = IPSSectionResourceHelper.getResourceFilterForSection(sectionType);
         const sectionResources = resources.filter((resource) => sectionFilter(resource));
         await this.makeSectionAsync(sectionType, sectionResources, timezone);

package/dist/index.js

@@ -910,6 +910,12 @@ var TemplateUtilities = class {
     const escapedText = text.replace(/</g, "&lt;").replace(/>/g, "&gt;");
     return escapedText.replace(/\n/g, "<br />");
   }
+  capitalizeFirstLetter(text) {
+    if (!text || text.length === 0) {
+      return "";
+    }
+    return text.charAt(0).toUpperCase() + text.slice(1);
+  }
   /**
    * Renders note elements from a FHIR resource in a standardized format
    * Can render as simple comma-separated text or as styled HTML with timestamps
@@ -1407,7 +1413,8 @@ var PatientTemplate = class _PatientTemplate {
   static generateStaticNarrative(resources, timezone) {
     const templateUtilities = new TemplateUtilities(resources);
     const combinedPatient = this.combinePatients(resources);
-    return `<div>
+    let html = `<p>This section merges all Patient resources into a single combined patient record, preferring non-empty values for each field.</p>`;
+    html += `<div>
       <ul>
         <li><strong>Name(s):</strong>${this.renderNames(combinedPatient)}</li>
         <li><strong>Gender:</strong>${combinedPatient.gender ? this.capitalize(combinedPatient.gender) : ""}</li>
@@ -1419,6 +1426,7 @@ var PatientTemplate = class _PatientTemplate {
         <li><strong>Language(s):</strong>${this.renderCommunication(templateUtilities, combinedPatient)}</li>
       </ul>
     </div>`;
+    return html;
   }
   /**
    * Combines multiple patient resources into a single patient object
@@ -1743,7 +1751,9 @@ var AllergyIntoleranceTemplate = class _AllergyIntoleranceTemplate {
   generateSummaryNarrative(resources, timezone) {
     const templateUtilities = new TemplateUtilities(resources);
     let isSummaryCreated = false;
-    let html = `
+    let html = `<p>This list includes all AllergyIntolerance resources, with no additional filtering, sorted as provided.</p>
+`;
+    html += `
       <div>
         <table>
           <thead>
@@ -1782,7 +1792,7 @@ var AllergyIntoleranceTemplate = class _AllergyIntoleranceTemplate {
         isSummaryCreated = true;
         html += `
             <tr>
-              <td>${data["allergen"] ?? ""}</td>
+              <td>${templateUtilities.capitalizeFirstLetter(data["allergen"] ?? "")}</td>
                <td>${data["codeSystem"] ?? ""}</td>
               <td>${data["criticality"] ?? ""}</td>
               <td>${templateUtilities.renderTime(data["recordedDate"], timezone) ?? ""}</td>
@@ -1825,7 +1835,8 @@ var AllergyIntoleranceTemplate = class _AllergyIntoleranceTemplate {
       const dateB = b.onsetDateTime;
       return dateA && dateB ? new Date(dateB).getTime() - new Date(dateA).getTime() : 0;
     });
-    let html = "";
+    let html = `<p>This list includes all AllergyIntolerance resources, with no additional filtering, sorted as provided.</p>
+`;
     html += `
       <div class="ActiveAllergies">
         <h3>Active</h3>
@@ -1899,8 +1910,8 @@ var AllergyIntoleranceTemplate = class _AllergyIntoleranceTemplate {
     let html = "";
     for (const allergy of allergies) {
       html += `
-        <tr id="${templateUtilities.narrativeLinkId(allergy.extension)}">
-          <td class="Name"><span class="AllergenName">${templateUtilities.renderTextAsHtml(templateUtilities.codeableConceptDisplay(allergy.code))}</span></td>
+        <tr>
+          <td class="Name"><span class="AllergenName">${templateUtilities.capitalizeFirstLetter(templateUtilities.renderTextAsHtml(templateUtilities.codeableConceptDisplay(allergy.code)))}</span></td>
           <td class="Status">${templateUtilities.renderTextAsHtml(templateUtilities.codeableConceptDisplay(allergy.clinicalStatus)) || ""}</td>
           <td class="CodeSystem">${templateUtilities.codeableConceptCoding(allergy.code)}</td>
           <td class="Category">${templateUtilities.renderTextAsHtml(templateUtilities.safeConcat(allergy.category)) || ""}</td>
@@ -1951,7 +1962,8 @@ var MedicationSummaryTemplate = class _MedicationSummaryTemplate {
     let isSummaryCreated = false;
     const currentDate = now || /* @__PURE__ */ new Date();
     const twoYearsAgo = new Date(currentDate.getFullYear(), currentDate.getMonth() - 24, currentDate.getDate());
-    let html = `
+    let html = "<p>This list includes all the medications that were ordered for the patient, the medications they filled from the pharmacy and the medications they reported, filtered to past 2 years and sorted by start date.</p>";
+    html += `
         <div>
             <table>
             <thead>
@@ -2016,7 +2028,7 @@ var MedicationSummaryTemplate = class _MedicationSummaryTemplate {
           isSummaryCreated = true;
           html += `
                             <tr>
-                                <td>${templateUtilities.renderTextAsHtml(data["medication"])}</td>
+                                <td>${templateUtilities.capitalizeFirstLetter(templateUtilities.renderTextAsHtml(data["medication"]))}</td>
                                 <td>${templateUtilities.codeableConceptCoding(sectionCodeableConcept)}</td>
                                 <td>${templateUtilities.renderTextAsHtml(data["status"])}</td>
                                 <td>${templateUtilities.renderTextAsHtml(data["sig-prescriber"] || data["sig-pharmacy"])}</td>
@@ -2063,8 +2075,8 @@ var MedicationSummaryTemplate = class _MedicationSummaryTemplate {
   static generateStaticNarrative(resources, timezone, now) {
     const templateUtilities = new TemplateUtilities(resources);
     let html = "";
-    const medicationRequests = this.getMedicationRequests(templateUtilities, resources);
-    const medicationStatements = this.getMedicationStatements(templateUtilities, resources);
+    const medicationRequests = resources.filter((entry) => entry.resourceType === "MedicationRequest");
+    const medicationStatements = resources.filter((entry) => entry.resourceType === "MedicationStatement");
     const allActiveMedications = [];
     const currentDate = now || /* @__PURE__ */ new Date();
     const twoYearsAgo = new Date(currentDate);
@@ -2072,10 +2084,10 @@ var MedicationSummaryTemplate = class _MedicationSummaryTemplate {
     let skippedMedications = 0;
     const allMedications = [];
     medicationRequests.forEach((mr) => {
-      allMedications.push({ type: "request", resource: mr.resource, extension: mr.extension });
+      allMedications.push({ type: "request", resource: mr });
     });
     medicationStatements.forEach((ms) => {
-      allMedications.push({ type: "statement", resource: ms.resource, extension: ms.extension });
+      allMedications.push({ type: "statement", resource: ms });
     });
     for (const med of allMedications) {
       let dateString;
@@ -2132,36 +2144,6 @@ var MedicationSummaryTemplate = class _MedicationSummaryTemplate {
     }
     return "";
   }
-  /**
-   * Extract MedicationRequest resources
-   * @param templateUtilities - Instance of TemplateUtilities for utility functions
-   * @param resources - FHIR Medication resources
-   * @returns Array of MedicationRequest resources
-   */
-  static getMedicationRequests(templateUtilities, resources) {
-    if (resources.length === 0) {
-      return [];
-    }
-    return resources.filter((entry) => entry.resourceType === "MedicationRequest").map((entry) => ({
-      resource: entry,
-      extension: templateUtilities.narrativeLinkExtension(entry)
-    }));
-  }
-  /**
-   * Extract MedicationStatement resources
-   * @param templateUtilities - Instance of TemplateUtilities for utility functions
-   * @param resources - FHIR Medication resources
-   * @returns Array of MedicationStatement resources
-   */
-  static getMedicationStatements(templateUtilities, resources) {
-    if (resources.length === 0) {
-      return [];
-    }
-    return resources.filter((entry) => entry.resourceType === "MedicationStatement").map((entry) => ({
-      resource: entry,
-      extension: templateUtilities.narrativeLinkExtension(entry)
-    }));
-  }
   /**
    * Render HTML table for combined MedicationRequest and MedicationStatement resources
    * @param templateUtilities - Instance of TemplateUtilities for utility functions
@@ -2185,7 +2167,6 @@ var MedicationSummaryTemplate = class _MedicationSummaryTemplate {
         </thead>
         <tbody>`;
     for (const medication of medications) {
-      const narrativeLinkId = templateUtilities.narrativeLinkId(medication.extension);
       let type;
       let medicationName;
       let sig;
@@ -2232,9 +2213,9 @@ var MedicationSummaryTemplate = class _MedicationSummaryTemplate {
         }
       }
       html += `
-        <tr${narrativeLinkId ? ` id="${narrativeLinkId}"` : ""}>
+        <tr>
           <td>${type}</td>
-          <td>${medicationName}<ul></ul></td>
+          <td>${templateUtilities.capitalizeFirstLetter(medicationName)}</td>
           <td>${codeSystemDisplay}</td>
           <td>${sig}</td>
           <td>${dispenseQuantity}</td>
@@ -2277,6 +2258,7 @@ var ImmunizationsTemplate = class _ImmunizationsTemplate {
     let isSummaryCreated = false;
     let html = `
       <div>
+      <p>This list includes all vaccinations, sorted by occurrence date (most recent first).</p>
         <table>
           <thead>
             <tr>
@@ -2315,7 +2297,7 @@ var ImmunizationsTemplate = class _ImmunizationsTemplate {
           isSummaryCreated = true;
           html += `
               <tr>
-                <td>${data["immunization"] ?? ""}</td>
+                <td>${templateUtilities.capitalizeFirstLetter(data["immunization"] ?? "")}</td>
                 <td>${data["codeSystem"] ?? ""}</td>
                 <td>${data["status"] ?? ""}</td>
                 <td>${templateUtilities.renderTime(data["occurrenceDateTime"], timezone) ?? ""}</td>
@@ -2359,8 +2341,8 @@ var ImmunizationsTemplate = class _ImmunizationsTemplate {
       for (const resourceItem of immunizations) {
         const imm = resourceItem;
         html += `
-          <tr id="${templateUtilities.narrativeLinkId(imm)}">
-            <td>${templateUtilities.renderTextAsHtml(templateUtilities.codeableConceptDisplay(imm.vaccineCode))}</td>
+          <tr>
+            <td>${templateUtilities.capitalizeFirstLetter(templateUtilities.renderTextAsHtml(templateUtilities.codeableConceptDisplay(imm.vaccineCode)))}</td>
             <td>${templateUtilities.codeableConceptCoding(imm.vaccineCode)}</td>
             <td>${imm.status || ""}</td>
             <td>${templateUtilities.concatDoseNumber(imm.protocolApplied)}</td>
@@ -2399,7 +2381,8 @@ var ProblemListTemplate = class _ProblemListTemplate {
   // eslint-disable-next-line @typescript-eslint/no-unused-vars
   static generateStaticNarrative(resources, timezone) {
     const templateUtilities = new TemplateUtilities(resources);
-    let html = ``;
+    let html = `<p>This list includes patient problems, sorted by recorded date (most recent first)</p>
+`;
     const activeConditions = resources.map((entry) => entry) || [];
     activeConditions.sort((a, b) => {
       if (!a.recordedDate && b.recordedDate) return -1;
@@ -2429,8 +2412,8 @@ var ProblemListTemplate = class _ProblemListTemplate {
         continue;
       }
       seenCodeAndSystems.add(codeAndSystem);
-      html += `<tr id="${templateUtilities.narrativeLinkId(cond)}">
-          <td class="Name">${conditionDisplay}</td>
+      html += `<tr>
+          <td class="Name">${templateUtilities.capitalizeFirstLetter(conditionDisplay)}</td>
           <td class="CodeSystem">${codeAndSystem}</td>
           <td class="OnsetDate">${templateUtilities.renderDate(cond.onsetDateTime)}</td>
           <td class="RecordedDate">${templateUtilities.renderDate(cond.recordedDate)}</td>
@@ -2463,7 +2446,9 @@ var VitalSignsTemplate = class _VitalSignsTemplate {
   generateSummaryNarrative(resources, timezone) {
     const templateUtilities = new TemplateUtilities(resources);
     let isSummaryCreated = false;
-    let html = `
+    let html = `<p>This list includes the latest vital signs, sorted by effective date (most recent first).</p>
+`;
+    html += `
       <div>
         <table>
           <thead>
@@ -2508,7 +2493,7 @@ var VitalSignsTemplate = class _VitalSignsTemplate {
         isSummaryCreated = true;
         html += `
           <tr>
-            <td>${data["Vital Name"] ?? ""}</td>
+            <td>${templateUtilities.capitalizeFirstLetter(data["Vital Name"] ?? "")}</td>
             <td>${data["codeSystem"] ?? ""}</td>
             <td>${templateUtilities.extractObservationSummaryValue(data, timezone) ?? ""}</td>
             <td>${templateUtilities.extractObservationSummaryEffectiveTime(data, timezone) ?? ""}</td>
@@ -2536,7 +2521,9 @@ var VitalSignsTemplate = class _VitalSignsTemplate {
       const dateB = b.effectiveDateTime || b.effectivePeriod?.start;
       return dateA && dateB ? new Date(dateB).getTime() - new Date(dateA).getTime() : 0;
     });
-    let html = `
+    let html = `<p>This list includes the latest vital signs, sorted by effective date (most recent first).</p>
+`;
+    html += `
       <table>
         <thead>
           <tr>
@@ -2554,8 +2541,8 @@ var VitalSignsTemplate = class _VitalSignsTemplate {
         <tbody>`;
     for (const obs of observations) {
       html += `
-          <tr id="${templateUtilities.narrativeLinkId(obs)}">
-            <td>${templateUtilities.renderTextAsHtml(templateUtilities.codeableConceptDisplay(obs.code, "display"))}</td>
+          <tr>
+            <td>${templateUtilities.capitalizeFirstLetter(templateUtilities.renderTextAsHtml(templateUtilities.codeableConceptDisplay(obs.code, "display")))}</td>
             <td>${templateUtilities.codeableConceptCoding(obs.code)}</td>
             <td>${templateUtilities.extractObservationValue(obs)}</td>
             <td>${templateUtilities.extractObservationValueUnit(obs)}</td>
@@ -2592,7 +2579,7 @@ var MedicalDevicesTemplate = class _MedicalDevicesTemplate {
    */
   static generateStaticNarrative(resources, timezone) {
     const templateUtilities = new TemplateUtilities(resources);
-    let html = `
+    let html = `<p>This list includes all DeviceUseStatement resources, sorted by recorded date (most recent first).</p>
       <table>
         <thead>
           <tr>
@@ -2608,10 +2595,12 @@ var MedicalDevicesTemplate = class _MedicalDevicesTemplate {
       const dateB = b.recordedOn;
       return typeof dateA === "string" && typeof dateB === "string" ? new Date(dateB).getTime() - new Date(dateA).getTime() : 0;
     });
+    let isDeviceAdded = false;
     for (const dus of deviceStatements) {
+      isDeviceAdded = true;
       html += `
-        <tr id="${templateUtilities.narrativeLinkId(dus)}">
-          <td>${templateUtilities.renderTextAsHtml(templateUtilities.renderDevice(dus.device))}</td>
+        <tr>
+          <td>${templateUtilities.capitalizeFirstLetter(templateUtilities.renderTextAsHtml(templateUtilities.renderDevice(dus.device)))}</td>
           <td>${templateUtilities.renderTextAsHtml(dus.status || "")}</td>
           <td>${templateUtilities.renderNotes(dus.note, timezone)}</td>
           <td>${templateUtilities.renderTextAsHtml(templateUtilities.renderRecorded(dus.recordedOn, timezone))}</td>
@@ -2620,7 +2609,7 @@ var MedicalDevicesTemplate = class _MedicalDevicesTemplate {
     html += `
         </tbody>
       </table>`;
-    return html;
+    return isDeviceAdded ? html : void 0;
   }
 };
 
@@ -2971,11 +2960,12 @@ var DiagnosticResultsTemplate = class _DiagnosticResultsTemplate {
         }
       }
     }
-    let html = `
-      <div>`;
+    let html = `<p>This section includes Observations from the last 2 years (one per lab name, using code mapping) and DiagnosticReports with status 'final' issued in the last 2 years. Both are sorted by date (most recent first). Older results are counted and noted below the tables.</p>
+`;
     let observationhtml = `
       <div>
         <h3>Observations</h3>
+      ${html}
         <table>
           <thead>
             <tr>
@@ -2991,6 +2981,7 @@ var DiagnosticResultsTemplate = class _DiagnosticResultsTemplate {
     let diagnosticReporthtml = `
       <div>
         <h3>Diagnostic Reports</h3>
+        ${html}
         <table>
           <thead>
             <tr>
@@ -3075,7 +3066,7 @@ var DiagnosticResultsTemplate = class _DiagnosticResultsTemplate {
                 this.formatSummaryObservationData(component);
                 observationhtml += `
                   <tr>
-                    <td>${componentCode}</td>
+                    <td>${templateUtilities.capitalizeFirstLetter(componentCode)}</td>
                     <td></td>
                     <td>${templateUtilities.renderTextAsHtml(component["formattedValue"]) ?? ""}</td>
                     <td>${templateUtilities.renderTextAsHtml(component["referenceRange"])?.trim() ?? ""}</td>
@@ -3092,7 +3083,7 @@ var DiagnosticResultsTemplate = class _DiagnosticResultsTemplate {
                 this.formatSummaryObservationData(data);
                 observationhtml += `
                   <tr>
-                    <td>${data["code"] ?? ""}</td>
+                    <td>${templateUtilities.capitalizeFirstLetter(data["code"] ?? "")}</td>
                     <td>${templateUtilities.codeableConceptCoding(sectionCodeableConcept)}</td>
                     <td>${templateUtilities.renderTextAsHtml(data["formattedValue"]) ?? ""}</td>
                     <td>${templateUtilities.renderTextAsHtml(data["referenceRange"])?.trim() ?? ""}</td>
@@ -3113,7 +3104,7 @@ var DiagnosticResultsTemplate = class _DiagnosticResultsTemplate {
               diagnosticReportAdded.add(reportName);
               diagnosticReporthtml += `
                     <tr>
-                      <td>${data["report"] ?? ""}</td>
+                      <td>${templateUtilities.capitalizeFirstLetter(data["report"] ?? "")}</td>
                       <td>${data["performer"] ?? ""}</td>
                       <td>${templateUtilities.renderTime(data["issued"], timezone) ?? ""}</td>
                         <td>${data["source"] ?? ""}</td>
@@ -3161,7 +3152,8 @@ var DiagnosticResultsTemplate = class _DiagnosticResultsTemplate {
     const currentDate = now || /* @__PURE__ */ new Date();
     const twoYearsAgo = new Date(currentDate);
     twoYearsAgo.setFullYear(currentDate.getFullYear() - 2);
-    let html = "";
+    let html = `<p>This section includes Observations from the last 2 years (one per lab name, using code mapping) and DiagnosticReports with status 'final' issued in the last 2 years. Both are sorted by date (most recent first). Older results are counted and noted below the tables.</p>
+`;
     let skippedObservations = 0;
     let skippedDiagnosticReports = 0;
     for (const resourceItem of resources) {
@@ -3312,8 +3304,8 @@ var DiagnosticResultsTemplate = class _DiagnosticResultsTemplate {
         observationAdded.add(obsCodeDisplay);
         observationAdded.add(obsCodeAndSystem);
         html += `
-          <tr id="${templateUtilities.narrativeLinkId(obs)}">
-            <td>${obsCodeDisplay}</td>
+          <tr>
+            <td>${templateUtilities.capitalizeFirstLetter(obsCodeDisplay)}</td>
             <td>${templateUtilities.codeableConceptCoding(obs.code)}</td>
             <td>${templateUtilities.extractObservationValue(obs)}</td>
             <td>${templateUtilities.concatReferenceRange(obs.referenceRange)}</td>
@@ -3361,8 +3353,8 @@ var DiagnosticResultsTemplate = class _DiagnosticResultsTemplate {
           resultCount = `${report.result.length} result${report.result.length !== 1 ? "s" : ""}`;
         }
         html += `
-          <tr id="${templateUtilities.narrativeLinkId(report)}">
-            <td>${reportName}</td>
+          <tr>
+            <td>${templateUtilities.capitalizeFirstLetter(reportName)}</td>
             <td>${codeAndSystem}</td>
             <td>${templateUtilities.firstFromCodeableConceptList(report.category)}</td>
             <td>${resultCount}</td>
@@ -3423,7 +3415,9 @@ var HistoryOfProceduresTemplate = class _HistoryOfProceduresTemplate {
   generateSummaryNarrative(resources, timezone) {
     const templateUtilities = new TemplateUtilities(resources);
     let isSummaryCreated = false;
-    let html = `
+    let html = `<p>This list includes all Procedure resources, sorted by performed date (most recent first).</p>
+`;
+    html += `
       <div>
         <table>
           <thead>
@@ -3462,7 +3456,7 @@ var HistoryOfProceduresTemplate = class _HistoryOfProceduresTemplate {
         isSummaryCreated = true;
         html += `
             <tr>
-              <td>${data["procedure"] ?? ""}</td>
+              <td>${templateUtilities.capitalizeFirstLetter(data["procedure"] ?? "")}</td>
                <td>${data["codeSystem"] ?? ""}</td>
               <td>${data["performer"] ?? ""}</td>
               <td>${templateUtilities.renderTime(data["date"], timezone) ?? ""}</td>
@@ -3484,7 +3478,9 @@ var HistoryOfProceduresTemplate = class _HistoryOfProceduresTemplate {
    */
   static generateStaticNarrative(resources, timezone) {
     const templateUtilities = new TemplateUtilities(resources);
-    let html = `
+    let html = `<p>This list includes all Procedure resources, sorted by performed date (most recent first).</p>
+`;
+    html += `
       <table>
         <thead>
           <tr>
@@ -3499,12 +3495,12 @@ var HistoryOfProceduresTemplate = class _HistoryOfProceduresTemplate {
     for (const resourceItem of resources) {
       const proc = resourceItem;
       html += `
-        <tr id="${templateUtilities.narrativeLinkId(proc)}">
-          <td>${templateUtilities.renderTextAsHtml(templateUtilities.codeableConceptDisplay(proc.code, "display"))}</td>
-           <td>${templateUtilities.codeableConceptCoding(proc.code)}</td>
+        <tr>
+          <td>${templateUtilities.capitalizeFirstLetter(templateUtilities.renderTextAsHtml(templateUtilities.codeableConceptDisplay(proc.code, "display")))}</td>
+          <td>${templateUtilities.codeableConceptCoding(proc.code)}</td>
           <td>${templateUtilities.renderNotes(proc.note, timezone)}</td>
-          <td>${proc.performedDateTime ? templateUtilities.renderTime(proc.performedDateTime, timezone) : proc.performedPeriod ? templateUtilities.renderPeriod(proc.performedPeriod, timezone) : ""}</td>
-            <td>${templateUtilities.getOwnerTag(proc)}</td>
+          <td>${templateUtilities.renderTime(proc.performedDateTime || proc.performedPeriod?.start, timezone)}</td>
+          <td>${templateUtilities.getOwnerTag(proc)}</td>
         </tr>`;
     }
     html += `
@@ -3539,7 +3535,9 @@ var SocialHistoryTemplate = class _SocialHistoryTemplate {
       const dateB = b.effectiveDateTime || b.effectivePeriod?.start;
       return dateA && dateB ? new Date(dateB).getTime() - new Date(dateA).getTime() : 0;
     });
-    let html = `
+    let html = `<p>This list includes all information about the patient's social history, sorted by effective date (most recent first).</p>
+`;
+    html += `
       <table>
         <thead>
           <tr>
@@ -3553,17 +3551,22 @@ var SocialHistoryTemplate = class _SocialHistoryTemplate {
           </tr>
         </thead>
         <tbody>`;
+    const addedObservations = /* @__PURE__ */ new Set();
     for (const obs of observations) {
-      html += `
-          <tr id="${templateUtilities.narrativeLinkId(obs)}">
-            <td>${templateUtilities.renderTextAsHtml(templateUtilities.codeableConceptDisplay(obs.code))}</td>
-            <td>${templateUtilities.codeableConceptCoding(obs.code)}</td>
-            <td>${templateUtilities.extractObservationValue(obs)}</td>
-            <td>${templateUtilities.extractObservationValueUnit(obs)}</td>
-            <td>${templateUtilities.renderNotes(obs.note, timezone)}</td>
-            <td>${obs.effectiveDateTime ? templateUtilities.renderTime(obs.effectiveDateTime, timezone) : obs.effectivePeriod ? templateUtilities.renderPeriod(obs.effectivePeriod, timezone) : ""}</td>
-            <td>${templateUtilities.getOwnerTag(obs)}</td>
-          </tr>`;
+      const obsName = templateUtilities.renderTextAsHtml(templateUtilities.codeableConceptDisplay(obs.code));
+      if (!addedObservations.has(obsName)) {
+        addedObservations.add(obsName);
+        html += `
+            <tr>
+              <td>${templateUtilities.capitalizeFirstLetter(obsName)}</td>
+              <td>${templateUtilities.codeableConceptCoding(obs.code)}</td>
+              <td>${templateUtilities.extractObservationValue(obs)}</td>
+              <td>${templateUtilities.extractObservationValueUnit(obs)}</td>
+              <td>${templateUtilities.renderNotes(obs.note, timezone)}</td>
+              <td>${obs.effectiveDateTime ? templateUtilities.renderTime(obs.effectiveDateTime, timezone) : obs.effectivePeriod ? templateUtilities.renderPeriod(obs.effectivePeriod, timezone) : ""}</td>
+              <td>${templateUtilities.getOwnerTag(obs)}</td>
+            </tr>`;
+      }
     }
     html += `
         </tbody>
@@ -3583,7 +3586,8 @@ var PastHistoryOfIllnessTemplate = class {
    */
   generateNarrative(resources, timezone, now) {
     const templateUtilities = new TemplateUtilities(resources);
-    let html = ``;
+    let html = `<p>This list includes past problems for the patient with a recorded date within the last 5 years, sorted by recorded date (most recent first).</p>
+`;
     const resolvedConditions = resources.map((entry) => entry) || [];
     const currentDate = now || /* @__PURE__ */ new Date();
     const fiveYearsAgo = new Date(currentDate);
@@ -3620,8 +3624,8 @@ var PastHistoryOfIllnessTemplate = class {
       const conditionCode = templateUtilities.renderTextAsHtml(templateUtilities.codeableConceptDisplay(cond.code));
       if (!addedConditionCodes.has(conditionCode)) {
         addedConditionCodes.add(conditionCode);
-        html += `<tr id="${templateUtilities.narrativeLinkId(cond)}">
-            <td class="Name">${conditionCode}</td>
+        html += `<tr>
+            <td class="Name">${templateUtilities.capitalizeFirstLetter(conditionCode)}</td>
             <td class="CodeSystem">${templateUtilities.codeableConceptCoding(cond.code)}</td>
             <td class="OnsetDate">${templateUtilities.renderDate(cond.onsetDateTime)}</td>
             <td class="RecordedDate">${templateUtilities.renderDate(cond.recordedDate)}</td>
@@ -3656,7 +3660,9 @@ var PlanOfCareTemplate = class {
       const endB = b.period?.end ? new Date(b.period?.end).getTime() : 0;
       return endB - endA;
     });
-    let html = `
+    let html = `<p>This list includes all CarePlan resources, sorted by planned end date (most recent first).</p>
+`;
+    html += `
       <table>
         <thead>
           <tr>
@@ -3671,8 +3677,8 @@ var PlanOfCareTemplate = class {
         <tbody>`;
     for (const cp of carePlans) {
       html += `
-          <tr id="${templateUtilities.narrativeLinkId(cp)}">
-            <td>${cp.description || cp.title || ""}</td>
+          <tr>
+            <td>${templateUtilities.capitalizeFirstLetter(cp.description || cp.title || "")}</td>
             <td>${cp.intent || ""}</td>
             <td>${templateUtilities.concat(cp.note, "text")}</td>
             <td>${cp.period?.start ? templateUtilities.renderTime(cp.period?.start, timezone) : ""}</td>
@@ -3694,7 +3700,9 @@ var PlanOfCareTemplate = class {
   generateSummaryNarrative(resources, timezone) {
     const templateUtilities = new TemplateUtilities(resources);
     let isSummaryCreated = false;
-    let html = `
+    let html = `<p>This list includes all CarePlan resources, sorted by planned end date (most recent first).</p>
+`;
+    html += `
       <div>
         <table>
           <thead>
@@ -3721,7 +3729,7 @@ var PlanOfCareTemplate = class {
         isSummaryCreated = true;
         html += `
             <tr>
-              <td>${data["CarePlan Name"] ?? ""}</td>
+              <td>${templateUtilities.capitalizeFirstLetter(data["CarePlan Name"] ?? "")}</td>
               <td>${templateUtilities.renderTime(data["created"], timezone) ?? ""}</td>
               <td>${templateUtilities.renderTime(data["period.start"], timezone) ?? ""}</td>
               <td>${templateUtilities.renderTime(data["period.end"], timezone) ?? ""}</td>
@@ -3756,7 +3764,7 @@ var FunctionalStatusTemplate = class _FunctionalStatusTemplate {
    */
   static generateStaticNarrative(resources, timezone) {
     const templateUtilities = new TemplateUtilities(resources);
-    let html = "";
+    let html = `<p>This section summarizes key observations and assessments related to the person's functional status and ability to perform daily activities.</p>`;
     let functionalObservations = resources.filter((r) => r.resourceType === "Observation").filter((r) => {
       const hasFunctionalLoinc = r.code?.coding?.some(
         (c) => c.system?.toLowerCase().includes("loinc") && c.code === "47420-5"
@@ -3786,8 +3794,8 @@ var FunctionalStatusTemplate = class _FunctionalStatusTemplate {
         const date = observation.effectiveDateTime ? templateUtilities.renderDate(observation.effectiveDateTime) : observation.issued ? templateUtilities.renderDate(observation.issued) : "";
         const interpretation = observation.interpretation ? templateUtilities.codeableConceptDisplay(observation.interpretation[0]) : "";
         const comments = observation.comment || observation.note?.map((n) => n.text).join("; ") || "";
-        html += `<tr id="${templateUtilities.narrativeLinkId(observation)}">
-          <td>${obsName}</td>
+        html += `<tr>
+          <td>${templateUtilities.capitalizeFirstLetter(obsName)}</td>
           <td>${value ?? ""}</td>
           <td>${date}</td>
           <td>${interpretation}</td>
@@ -3817,7 +3825,7 @@ var FunctionalStatusTemplate = class _FunctionalStatusTemplate {
           }
           findingsHtml += "</ul>";
         }
-        html += `<tr id="${templateUtilities.narrativeLinkId(impression)}">
+        html += `<tr>
           <td>${formattedDate}</td>
           <td>${impression.status || ""}</td>
           <td>${impression.description || ""}</td>
@@ -3880,7 +3888,8 @@ var PregnancyTemplate = class _PregnancyTemplate {
     if (!pregnancyStatusObs && !eddObs && historyObs.length === 0 && conditions.length === 0) {
       return `<p>No history of pregnancy found.</p>`;
     }
-    let html = `
+    let html = `<p>This list includes Observation and Condition resources relevant to pregnancy, sorted by date (most recent first).</p>`;
+    html += `
             <table>
               <thead>
                 <tr>
@@ -3892,10 +3901,10 @@ var PregnancyTemplate = class _PregnancyTemplate {
                 </tr>
               </thead>
               <tbody>`;
-    function renderRow({ id, result, comments, date, codeSystem, owner }) {
+    function renderRow({ result, comments, date, codeSystem, owner }) {
       html += `
-                <tr id="${id}">
-                  <td class="Result">${result}</td>
+                <tr>
+                  <td class="Result">${templateUtilities.capitalizeFirstLetter(result)}</td>
                   <td class="CodeSystem">${codeSystem}</td>
                   <td class="Comments">${comments}</td>
                   <td class="Date">${date}</td>
@@ -3926,9 +3935,9 @@ var PregnancyTemplate = class _PregnancyTemplate {
       if (!b.date) return -1;
       return new Date(b.date).getTime() - new Date(a.date).getTime();
     });
+    const addedRows = /* @__PURE__ */ new Set();
     for (const { resource, date, type } of rowResources) {
       let result = "", comments = "", dateStr = "", codeSystem = "";
-      const id = templateUtilities.narrativeLinkId(resource);
       if (type === "status") {
         result = templateUtilities.renderTextAsHtml(templateUtilities.extractPregnancyStatus(resource));
         comments = templateUtilities.renderNotes(resource.note, timezone);
@@ -3950,8 +3959,12 @@ var PregnancyTemplate = class _PregnancyTemplate {
         dateStr = date ? templateUtilities.renderTextAsHtml(templateUtilities.renderTime(date, timezone)) : "";
         codeSystem = templateUtilities.renderTextAsHtml(templateUtilities.codeableConceptCoding(resource.code));
       }
-      const owner = templateUtilities.getOwnerTag(resource);
-      renderRow({ id, result, comments, date: dateStr, codeSystem, owner });
+      const rowKey = `${result}|${codeSystem}`;
+      if (!addedRows.has(rowKey)) {
+        addedRows.add(rowKey);
+        const owner = templateUtilities.getOwnerTag(resource);
+        renderRow({ result, comments, date: dateStr, codeSystem, owner });
+      }
     }
     html += `
               </tbody>
@@ -3985,8 +3998,9 @@ var AdvanceDirectivesTemplate = class _AdvanceDirectivesTemplate {
   // eslint-disable-next-line @typescript-eslint/no-unused-vars
   static generateStaticNarrative(resources, timezone) {
     const templateUtilities = new TemplateUtilities(resources);
-    let html = `
-      <table>
+    let html = `<p>This list includes all Consent resources, sorted by date (most recent first).</p>
+`;
+    html += `<table>
         <thead>
           <tr>
             <th>Scope</th>
@@ -3999,8 +4013,8 @@ var AdvanceDirectivesTemplate = class _AdvanceDirectivesTemplate {
     for (const resourceItem of resources) {
       const consent = resourceItem;
       html += `
-        <tr id="${templateUtilities.narrativeLinkId(consent)}">
-          <td>${templateUtilities.renderTextAsHtml(templateUtilities.codeableConceptDisplay(consent.scope, "display"))}</td>
+        <tr>
+          <td>${templateUtilities.capitalizeFirstLetter(templateUtilities.renderTextAsHtml(templateUtilities.codeableConceptDisplay(consent.scope, "display")))}</td>
           <td>${consent.status || ""}</td>
           <td>${consent.provision?.action ? templateUtilities.concatCodeableConcept(consent.provision.action) : ""}</td>
           <td>${consent.dateTime || ""}</td>
@@ -4315,14 +4329,17 @@ var ComprehensiveIPSCompositionBuilder = class {
       const summaryIPSCompositionFilter = useSummaryCompositions ? IPSSectionResourceHelper.getSummaryIPSCompositionFilterForSection(sectionType) : void 0;
       const sectionIPSSummary = summaryIPSCompositionFilter ? resources.filter((resource) => summaryIPSCompositionFilter(resource)) : [];
       if (sectionIPSSummary.length > 0) {
+        console.log(`Using IPS summary composition for section: ${sectionType}`);
         await this.makeSectionFromSummaryAsync(sectionType, sectionIPSSummary, resources, timezone);
         continue;
       }
       const summaryCompositionFilter = useSummaryCompositions ? IPSSectionResourceHelper.getSummaryCompositionFilterForSection(sectionType) : void 0;
       const sectionSummary = summaryCompositionFilter ? resources.filter((resource) => summaryCompositionFilter(resource)) : [];
       if (sectionSummary.length > 0) {
+        console.log(`Using summary composition for section: ${sectionType}`);
         await this.makeSectionFromSummaryAsync(sectionType, sectionSummary, resources, timezone);
       } else {
+        console.log(`Using individual resources for section: ${sectionType}`);
         const sectionFilter = IPSSectionResourceHelper.getResourceFilterForSection(sectionType);
         const sectionResources = resources.filter((resource) => sectionFilter(resource));
         await this.makeSectionAsync(sectionType, sectionResources, timezone);

package/package.json

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