@imranq2/fhirpatientsummary 1.0.31 → 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
@@ -1814,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>
@@ -1932,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>
@@ -2050,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>
@@ -2097,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);
@@ -2106,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;
@@ -2166,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
@@ -2219,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;
@@ -2266,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>
@@ -2350,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>
@@ -2395,7 +2370,7 @@ var ImmunizationsTemplate = class _ImmunizationsTemplate {
         const imm = resourceItem;
         html += `
           <tr>
-            <td>${templateUtilities.renderTextAsHtml(templateUtilities.codeableConceptDisplay(imm.vaccineCode))}</td>
+            <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>
@@ -2466,7 +2441,7 @@ var ProblemListTemplate = class _ProblemListTemplate {
       }
       seenCodeAndSystems.add(codeAndSystem);
       html += `<tr>
-          <td class="Name">${conditionDisplay}</td>
+          <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>
@@ -2546,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>
@@ -2595,7 +2570,7 @@ var VitalSignsTemplate = class _VitalSignsTemplate {
     for (const obs of observations) {
       html += `
           <tr>
-            <td>${templateUtilities.renderTextAsHtml(templateUtilities.codeableConceptDisplay(obs.code, "display"))}</td>
+            <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>
@@ -2648,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>
-          <td>${templateUtilities.renderTextAsHtml(templateUtilities.renderDevice(dus.device))}</td>
+          <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>
@@ -2660,7 +2637,7 @@ var MedicalDevicesTemplate = class _MedicalDevicesTemplate {
     html += `
         </tbody>
       </table>`;
-    return html;
+    return isDeviceAdded ? html : void 0;
   }
 };
 
@@ -3117,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>
@@ -3134,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>
@@ -3155,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>
@@ -3355,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>
@@ -3404,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>
@@ -3507,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>
@@ -3547,7 +3524,7 @@ var HistoryOfProceduresTemplate = class _HistoryOfProceduresTemplate {
       const proc = resourceItem;
       html += `
         <tr>
-          <td>${templateUtilities.renderTextAsHtml(templateUtilities.codeableConceptDisplay(proc.code, "display"))}</td>
+          <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>${templateUtilities.renderTime(proc.performedDateTime || proc.performedPeriod?.start, timezone)}</td>
@@ -3602,17 +3579,22 @@ var SocialHistoryTemplate = class _SocialHistoryTemplate {
           </tr>
         </thead>
         <tbody>`;
+    const addedObservations = /* @__PURE__ */ new Set();
     for (const obs of observations) {
-      html += `
-          <tr>
-            <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>
@@ -3671,7 +3653,7 @@ var PastHistoryOfIllnessTemplate = class {
       if (!addedConditionCodes.has(conditionCode)) {
         addedConditionCodes.add(conditionCode);
         html += `<tr>
-            <td class="Name">${conditionCode}</td>
+            <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>
@@ -3723,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>
@@ -3775,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>
@@ -3840,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>
@@ -3871,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>
@@ -3947,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>
@@ -3981,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);
@@ -4005,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>
@@ -4056,7 +4042,7 @@ var AdvanceDirectivesTemplate = class _AdvanceDirectivesTemplate {
       const consent = resourceItem;
       html += `
         <tr>
-          <td>${templateUtilities.renderTextAsHtml(templateUtilities.codeableConceptDisplay(consent.scope, "display"))}</td>
+          <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>
@@ -4371,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
@@ -1786,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>
@@ -1904,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>
@@ -2022,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>
@@ -2069,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);
@@ -2078,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;
@@ -2138,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
@@ -2191,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;
@@ -2238,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>
@@ -2322,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>
@@ -2367,7 +2342,7 @@ var ImmunizationsTemplate = class _ImmunizationsTemplate {
         const imm = resourceItem;
         html += `
           <tr>
-            <td>${templateUtilities.renderTextAsHtml(templateUtilities.codeableConceptDisplay(imm.vaccineCode))}</td>
+            <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>
@@ -2438,7 +2413,7 @@ var ProblemListTemplate = class _ProblemListTemplate {
       }
       seenCodeAndSystems.add(codeAndSystem);
       html += `<tr>
-          <td class="Name">${conditionDisplay}</td>
+          <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>
@@ -2518,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>
@@ -2567,7 +2542,7 @@ var VitalSignsTemplate = class _VitalSignsTemplate {
     for (const obs of observations) {
       html += `
           <tr>
-            <td>${templateUtilities.renderTextAsHtml(templateUtilities.codeableConceptDisplay(obs.code, "display"))}</td>
+            <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,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>
-          <td>${templateUtilities.renderTextAsHtml(templateUtilities.renderDevice(dus.device))}</td>
+          <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>
@@ -2632,7 +2609,7 @@ var MedicalDevicesTemplate = class _MedicalDevicesTemplate {
     html += `
         </tbody>
       </table>`;
-    return html;
+    return isDeviceAdded ? html : void 0;
   }
 };
 
@@ -3089,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>
@@ -3106,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>
@@ -3127,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>
@@ -3327,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>
@@ -3376,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>
@@ -3479,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>
@@ -3519,7 +3496,7 @@ var HistoryOfProceduresTemplate = class _HistoryOfProceduresTemplate {
       const proc = resourceItem;
       html += `
         <tr>
-          <td>${templateUtilities.renderTextAsHtml(templateUtilities.codeableConceptDisplay(proc.code, "display"))}</td>
+          <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>${templateUtilities.renderTime(proc.performedDateTime || proc.performedPeriod?.start, timezone)}</td>
@@ -3574,17 +3551,22 @@ var SocialHistoryTemplate = class _SocialHistoryTemplate {
           </tr>
         </thead>
         <tbody>`;
+    const addedObservations = /* @__PURE__ */ new Set();
     for (const obs of observations) {
-      html += `
-          <tr>
-            <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>
@@ -3643,7 +3625,7 @@ var PastHistoryOfIllnessTemplate = class {
       if (!addedConditionCodes.has(conditionCode)) {
         addedConditionCodes.add(conditionCode);
         html += `<tr>
-            <td class="Name">${conditionCode}</td>
+            <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>
@@ -3695,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>
@@ -3747,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>
@@ -3812,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>
@@ -3843,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>
@@ -3919,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>
@@ -3953,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);
@@ -3977,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>
@@ -4028,7 +4014,7 @@ var AdvanceDirectivesTemplate = class _AdvanceDirectivesTemplate {
       const consent = resourceItem;
       html += `
         <tr>
-          <td>${templateUtilities.renderTextAsHtml(templateUtilities.codeableConceptDisplay(consent.scope, "display"))}</td>
+          <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 +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.31",
+  "version": "1.0.32",
   "description": "A template for creating npm packages using TypeScript and VSCode",
   "main": "./dist/index.js",
   "module": "./dist/index.mjs",