@imranq2/fhirpatientsummary 1.0.38 → 1.0.39

package/dist/index.cjs

@@ -199,6 +199,24 @@ var FUNCTIONAL_STATUS_ASSESSMENT_LOINC_CODES = {
   "55123-4": "Resident Believes Capable of Increased Independence",
   "45613-7": "Staff Believes Capable of Increased Independence"
 };
+var ADVANCED_DIRECTIVE_CATEGORY_CODES = {
+  acd: "Advance Directive",
+  dnr: "Do Not Resuscitate",
+  polst: "POLST",
+  hcd: "Health Care Directive"
+};
+var ADVANCED_DIRECTIVE_CATEGORY_SYSTEM = "http://terminology.hl7.org/CodeSystem/consentcategorycodes";
+var ADVANCED_DIRECTIVE_LOINC_CODES = {
+  "45473-6": "Advance healthcare directive Completed",
+  "45474-4": "Do not resuscitate",
+  "45475-1": "Do not hospitalize",
+  "45476-9": "Organ donation",
+  "45477-7": "Autopsy request",
+  "45478-5": "Feeding restrictions",
+  "45479-3": "Medication restrictions",
+  "45480-1": "Other treatment restrictions"
+};
+var LOINC_SYSTEM = "http://loinc.org";
 
 // src/structures/ips_section_constants.ts
 var VITAL_SIGNS_SUMMARY_COMPONENT_MAP = {
@@ -243,8 +261,7 @@ var IPSSectionResourceFilters = {
   // Only include active care plans
   ["PlanOfCareSection" /* CARE_PLAN */]: (resource) => resource.resourceType === "CarePlan" && resource.status === "active",
   // Only include active advance directives (Consent resources)
-  // TODO: disable this until we right logic to get these
-  ["AdvanceDirectivesSection" /* ADVANCE_DIRECTIVES */]: () => false
+  ["AdvanceDirectivesSection" /* ADVANCE_DIRECTIVES */]: (resource) => resource.resourceType === "Consent" && resource.status === "active" && resource.scope?.coding?.some((c) => codingMatches(c, "adr", "http://terminology.hl7.org/CodeSystem/consentscope"))
 };
 var IPSSectionSummaryCompositionFilter = {
   ["AllergyIntoleranceSection" /* ALLERGIES */]: (resource) => resource.resourceType === "Composition" && resource.type?.coding?.some((c) => codingMatches(c, "allergy_summary_document", IPS_SUMMARY_COMPOSITION_TYPE_SYSTEM)),
@@ -260,8 +277,10 @@ var IPSSectionSummaryCompositionFilter = {
 var IPSSectionSummaryIPSCompositionFilter = {
   ["Patient" /* PATIENT */]: (resource) => resource.resourceType === "Composition" && resource.type?.coding?.some((c) => codingMatches(c, "ips_patient_summary_document", IPS_SUMMARY_COMPOSITION_TYPE_SYSTEM)),
   ["VitalSignsSection" /* VITAL_SIGNS */]: (resource) => resource.resourceType === "Composition" && resource.type?.coding?.some((c) => codingMatches(c, "ips_vital_summary_document", IPS_SUMMARY_COMPOSITION_TYPE_SYSTEM)),
+  ["AdvanceDirectivesSection" /* ADVANCE_DIRECTIVES */]: (resource) => resource.resourceType === "Composition" && resource.type?.coding?.some((c) => codingMatches(c, "ips_advanced_directives_summary_document", IPS_SUMMARY_COMPOSITION_TYPE_SYSTEM)),
   ["SocialHistorySection" /* SOCIAL_HISTORY */]: (resource) => resource.resourceType === "Composition" && resource.type?.coding?.some((c) => codingMatches(c, "ips_social_history_summary_document", IPS_SUMMARY_COMPOSITION_TYPE_SYSTEM)),
-  ["FunctionalStatusSection" /* FUNCTIONAL_STATUS */]: (resource) => resource.resourceType === "Composition" && resource.type?.coding?.some((c) => codingMatches(c, ["ips_functional_status_condition_summary_document", "ips_functional_status_clinical_impression_summary_document"], IPS_SUMMARY_COMPOSITION_TYPE_SYSTEM))
+  ["FunctionalStatusSection" /* FUNCTIONAL_STATUS */]: (resource) => resource.resourceType === "Composition" && resource.type?.coding?.some((c) => codingMatches(c, ["ips_functional_status_condition_summary_document", "ips_functional_status_clinical_impression_summary_document"], IPS_SUMMARY_COMPOSITION_TYPE_SYSTEM)),
+  ["MedicalDeviceSection" /* MEDICAL_DEVICES */]: (resource) => resource.resourceType === "Composition" && resource.type?.coding?.some((c) => codingMatches(c, "ips_medical_device_summary_document", IPS_SUMMARY_COMPOSITION_TYPE_SYSTEM))
 };
 var IPSSectionResourceHelper = class {
   static getResourceFilterForSection(section) {
@@ -393,13 +412,26 @@ var TemplateUtilities = class {
     return code ? `${code} (${systemDisplay})` : "";
   }
   /**
-   * Renders a Device reference
+   * Resolves and returns a Device resource from a Device Reference.
+   * Returns null if the reference cannot be resolved or is not a Device.
+   * @param deviceRef - Reference to a Device resource
+   * @returns The resolved Device resource or null
+   */
+  getDeviceFromReference(deviceRef) {
+    if (!deviceRef) return null;
+    const device = this.resolveReference(deviceRef);
+    return device && device.resourceType === "Device" ? device : null;
+  }
+  /**
+   * Renders a Device name from a Device reference.
+   * Uses getDeviceFromReference to resolve the Device and returns a concatenated device.deviceName.
+   * Returns an empty string if no deviceName is available. The returned text is HTML-safe.
    * @param deviceRef - Reference to a Device resource
-   * @returns Formatted device description
+   * @returns Sanitized device name or empty string
    */
   renderDevice(deviceRef) {
-    const device = deviceRef && this.resolveReference(deviceRef);
-    if (device && device.resourceType === "Device" && device.deviceName && device.deviceName.length > 0) {
+    const device = this.getDeviceFromReference(deviceRef);
+    if (device && device.deviceName && device.deviceName.length > 0) {
       return this.safeConcat(device.deviceName, "name");
     }
     return "";
@@ -2815,11 +2847,64 @@ var MedicalDevicesTemplate = class _MedicalDevicesTemplate {
     return _MedicalDevicesTemplate.generateStaticNarrative(resources, timezone);
   }
   /**
-   * Internal static implementation that actually generates the narrative
-   * @param resources - FHIR resources array containing Device resources
+   * Generate HTML narrative for history of medical devices using summary
+   * @param resources - FHIR Composition resources
    * @param timezone - Optional timezone to use for date formatting (e.g., 'America/New_York', 'Europe/London')
    * @returns HTML string for rendering
    */
+  generateSummaryNarrative(resources, timezone) {
+    const templateUtilities = new TemplateUtilities(resources);
+    let isSummaryCreated = false;
+    let html = `<p>This list includes all information about the patient's medical devices history, sorted by recorded date (most recent first).</p>
+`;
+    html += `
+      <table>
+        <thead>
+          <tr>
+            <th>Device</th>
+            <th>Code (System)</th>
+            <th>Status</th>
+            <th>Comments</th>
+            <th>Date Recorded</th>
+            <th>Source</th>
+          </tr>
+        </thead>
+        <tbody>`;
+    for (const resourceItem of resources) {
+      for (const rowData of resourceItem.section ?? []) {
+        const sectionCodeableConcept = rowData.code;
+        const data = {};
+        data["codeSystem"] = templateUtilities.codeableConceptCoding(sectionCodeableConcept);
+        for (const columnData of rowData.section ?? []) {
+          const columnTitle = columnData.title;
+          if (columnTitle) {
+            data[columnTitle] = templateUtilities.renderTextAsHtml(columnData.text?.div ?? "");
+          }
+        }
+        if (data["Device Name"]?.toLowerCase() === "unknown") {
+          continue;
+        }
+        isSummaryCreated = true;
+        html += `
+          <tr>
+            <td>${templateUtilities.capitalizeFirstLetter(data["Device Name"] ?? "")}</td>
+            <td>${data["codeSystem"] ?? ""}</td>
+            <td>${templateUtilities.renderTextAsHtml(data["Status"] ?? "")}</td>
+            <td>${templateUtilities.renderTextAsHtml(data["Notes"] ?? "")}</td>
+            <td>${templateUtilities.renderTime(data["Recorded On"] ?? "", timezone)}</td>
+            <td>${data["Source"] ?? ""}</td>
+          </tr>`;
+      }
+    }
+    html += `
+          </tbody>
+        </table>`;
+    return isSummaryCreated ? html : void 0;
+  }
+  /**
+   * Internal static implementation that generates the narrative from DeviceUseStatement resources.
+   * The “Code (System)” column renders Device.type as "code (SystemDisplay)" using TemplateUtilities.codeableConceptCoding.
+   */
   static generateStaticNarrative(resources, timezone) {
     const templateUtilities = new TemplateUtilities(resources);
     let html = `<p>This list includes all DeviceUseStatement resources, sorted by recorded date (most recent first).</p>
@@ -2827,6 +2912,7 @@ var MedicalDevicesTemplate = class _MedicalDevicesTemplate {
         <thead>
           <tr>
             <th>Device</th>
+            <th>Code (System)</th>
             <th>Status</th>
             <th>Comments</th>
             <th>Date Recorded</th>
@@ -2839,26 +2925,32 @@ 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;
+    const devicesAdded = /* @__PURE__ */ new Set();
     for (const dus of deviceStatements) {
-      const deviceName = templateUtilities.renderTextAsHtml(templateUtilities.renderDevice(dus.device));
-      if (deviceName?.toLowerCase() === "unknown") {
+      const deviceName = templateUtilities.renderDevice(dus.device);
+      if (deviceName?.toLowerCase() === "unknown" || devicesAdded.has(deviceName)) {
+        continue;
+      }
+      const device = templateUtilities.getDeviceFromReference(dus.device);
+      const codeSystem = templateUtilities.codeableConceptCoding(device?.type);
+      if (!codeSystem) {
         continue;
       }
-      isDeviceAdded = true;
+      devicesAdded.add(deviceName);
       html += `
         <tr>
           <td>${templateUtilities.capitalizeFirstLetter(deviceName)}</td>
+          <td>${codeSystem}</td>
           <td>${templateUtilities.renderTextAsHtml(dus.status || "")}</td>
           <td>${templateUtilities.renderNotes(dus.note, timezone)}</td>
-          <td>${templateUtilities.renderTextAsHtml(templateUtilities.renderRecorded(dus.recordedOn, timezone))}</td>
+          <td>${templateUtilities.renderTime(dus.recordedOn, timezone)}</td>
           <td>${templateUtilities.getOwnerTag(dus)}</td>
         </tr>`;
     }
     html += `
         </tbody>
       </table>`;
-    return isDeviceAdded ? html : void 0;
+    return devicesAdded.size > 0 ? html : void 0;
   }
 };
 
@@ -4599,7 +4691,78 @@ var AdvanceDirectivesTemplate = class _AdvanceDirectivesTemplate {
       const dateB = new Date(b.dateTime || 0);
       return dateB.getTime() - dateA.getTime();
     });
-    return _AdvanceDirectivesTemplate.generateStaticNarrative(resources, timezone);
+    return _AdvanceDirectivesTemplate.generateStaticNarrative(
+      resources,
+      timezone
+    );
+  }
+  /**
+   * Generate HTML narrative for advance directives using summary
+   * @param resources - FHIR Composition resources
+   * @param timezone - Optional timezone to use for date formatting (e.g., 'America/New_York', 'Europe/London')
+   * @returns HTML string for rendering
+   */
+  generateSummaryNarrative(resources, timezone) {
+    const templateUtilities = new TemplateUtilities(resources);
+    let isSummaryCreated = false;
+    let html = `<p>This list includes all Consent resources, sorted by date (most recent first).</p>
+`;
+    html += `
+      <div>
+        <table>
+          <thead>
+            <tr>
+              <th>Directive</th>
+              <th>Code (System)</th>
+              <th>Action Controlled</th>
+              <th>Policy Rule</th>
+              <th>Date</th>
+              <th>Source</th>
+            </tr>
+          </thead>
+          <tbody>`;
+    for (const resourceItem of resources) {
+      for (const rowData of resourceItem.section ?? []) {
+        const sectionCodeableConcept = rowData.code;
+        const data = {};
+        data["codeSystem"] = templateUtilities.codeableConceptCoding(
+          sectionCodeableConcept
+        );
+        for (const columnData of rowData.section ?? []) {
+          const columnTitle = columnData.title;
+          if (columnTitle) {
+            if (columnTitle === "DateTime") {
+              data[columnTitle] = templateUtilities.renderTime(
+                columnData.text?.div ?? "",
+                timezone
+              );
+            } else {
+              data[columnTitle] = templateUtilities.renderTextAsHtml(
+                columnData.text?.div ?? ""
+              );
+            }
+          }
+        }
+        if (data["Advanced Directive Name"]?.toLowerCase() === "unknown") {
+          continue;
+        }
+        isSummaryCreated = true;
+        html += `
+          <tr>
+            <td>${templateUtilities.capitalizeFirstLetter(data["Advanced Directive Name"] ?? "")}</td>
+            <td>${data["codeSystem"] ?? ""}</td>
+            <td>${data["Provision Action"] ?? ""}</td>
+            <td>${data["Policy Rule"] ?? ""}</td>
+            <td>${data["DateTime"] ?? ""}</td>
+            <td>${data["Source"] ?? ""}</td>
+          </tr>`;
+      }
+    }
+    html += `
+          </tbody>
+        </table>
+      </div>`;
+    return isSummaryCreated ? html : void 0;
   }
   /**
    * Internal static implementation that actually generates the narrative
@@ -4607,7 +4770,6 @@ var AdvanceDirectivesTemplate = class _AdvanceDirectivesTemplate {
    * @param timezone - Optional timezone to use for date formatting (e.g., 'America/New_York', 'Europe/London')
    * @returns HTML string for rendering
    */
-  // eslint-disable-next-line @typescript-eslint/no-unused-vars
   static generateStaticNarrative(resources, timezone) {
     const templateUtilities = new TemplateUtilities(resources);
     let html = `<p>This list includes all Consent resources, sorted by date (most recent first).</p>
@@ -4615,35 +4777,57 @@ var AdvanceDirectivesTemplate = class _AdvanceDirectivesTemplate {
     html += `<table>
         <thead>
           <tr>
-            <th>Scope</th>
-            <th>Status</th>
+            <th>Directive</th>
+            <th>Code (System)</th>
             <th>Action Controlled</th>
+            <th>Policy Rule</th>
             <th>Date</th>
             <th>Source</th>
           </tr>
         </thead>
         <tbody>`;
-    let isConsentAdded = false;
+    const consentAdded = /* @__PURE__ */ new Set();
     for (const resourceItem of resources) {
       const consent = resourceItem;
-      const consentScope = templateUtilities.capitalizeFirstLetter(templateUtilities.renderTextAsHtml(templateUtilities.codeableConceptDisplay(consent.scope, "display")));
-      if (!consentScope || consentScope.toLowerCase() === "unknown") {
+      let consentDirective = {};
+      for (const category of consent.category || []) {
+        for (const coding of category.coding || []) {
+          if (coding.system === ADVANCED_DIRECTIVE_CATEGORY_SYSTEM && coding.code && coding.code in ADVANCED_DIRECTIVE_CATEGORY_CODES) {
+            consentDirective = {
+              name: ADVANCED_DIRECTIVE_CATEGORY_CODES[coding.code],
+              system: coding.system,
+              code: coding.code
+            };
+            break;
+          } else if (coding.system === LOINC_SYSTEM && coding.code && coding.code in ADVANCED_DIRECTIVE_LOINC_CODES) {
+            consentDirective = {
+              name: ADVANCED_DIRECTIVE_LOINC_CODES[coding.code],
+              system: coding.system,
+              code: coding.code
+            };
+            break;
+          }
+        }
+      }
+      if (!consentDirective.name || !consentDirective.code || !consentDirective.system || consentDirective.name.toLowerCase() === "unknown" || consentAdded.has(consentDirective.name)) {
         continue;
       }
-      isConsentAdded = true;
+      consentAdded.add(consentDirective.name);
+      const consentCodeSystem = `${consentDirective.code} (${codingSystemDisplayNames_default[consentDirective.system] || consentDirective.system})`;
       html += `
         <tr>
-          <td>${consentScope}</td>
-          <td>${consent.status || ""}</td>
+          <td>${consentDirective.name}</td>
+          <td>${consentCodeSystem || ""}</td>
           <td>${consent.provision?.action ? templateUtilities.concatCodeableConcept(consent.provision.action) : ""}</td>
-          <td>${consent.dateTime || ""}</td>
+          <td>${consent.policyRule ? templateUtilities.formatCodeableConceptValue(consent.policyRule) : ""}</td>
+          <td>${templateUtilities.renderTime(consent.dateTime, timezone) || ""}</td>
           <td>${templateUtilities.getOwnerTag(consent)}</td>
         </tr>`;
     }
     html += `
         </tbody>
       </table>`;
-    return isConsentAdded ? html : void 0;
+    return consentAdded.size > 0 ? html : void 0;
   }
 };
 

package/dist/index.js

@@ -171,6 +171,24 @@ var FUNCTIONAL_STATUS_ASSESSMENT_LOINC_CODES = {
   "55123-4": "Resident Believes Capable of Increased Independence",
   "45613-7": "Staff Believes Capable of Increased Independence"
 };
+var ADVANCED_DIRECTIVE_CATEGORY_CODES = {
+  acd: "Advance Directive",
+  dnr: "Do Not Resuscitate",
+  polst: "POLST",
+  hcd: "Health Care Directive"
+};
+var ADVANCED_DIRECTIVE_CATEGORY_SYSTEM = "http://terminology.hl7.org/CodeSystem/consentcategorycodes";
+var ADVANCED_DIRECTIVE_LOINC_CODES = {
+  "45473-6": "Advance healthcare directive Completed",
+  "45474-4": "Do not resuscitate",
+  "45475-1": "Do not hospitalize",
+  "45476-9": "Organ donation",
+  "45477-7": "Autopsy request",
+  "45478-5": "Feeding restrictions",
+  "45479-3": "Medication restrictions",
+  "45480-1": "Other treatment restrictions"
+};
+var LOINC_SYSTEM = "http://loinc.org";
 
 // src/structures/ips_section_constants.ts
 var VITAL_SIGNS_SUMMARY_COMPONENT_MAP = {
@@ -215,8 +233,7 @@ var IPSSectionResourceFilters = {
   // Only include active care plans
   ["PlanOfCareSection" /* CARE_PLAN */]: (resource) => resource.resourceType === "CarePlan" && resource.status === "active",
   // Only include active advance directives (Consent resources)
-  // TODO: disable this until we right logic to get these
-  ["AdvanceDirectivesSection" /* ADVANCE_DIRECTIVES */]: () => false
+  ["AdvanceDirectivesSection" /* ADVANCE_DIRECTIVES */]: (resource) => resource.resourceType === "Consent" && resource.status === "active" && resource.scope?.coding?.some((c) => codingMatches(c, "adr", "http://terminology.hl7.org/CodeSystem/consentscope"))
 };
 var IPSSectionSummaryCompositionFilter = {
   ["AllergyIntoleranceSection" /* ALLERGIES */]: (resource) => resource.resourceType === "Composition" && resource.type?.coding?.some((c) => codingMatches(c, "allergy_summary_document", IPS_SUMMARY_COMPOSITION_TYPE_SYSTEM)),
@@ -232,8 +249,10 @@ var IPSSectionSummaryCompositionFilter = {
 var IPSSectionSummaryIPSCompositionFilter = {
   ["Patient" /* PATIENT */]: (resource) => resource.resourceType === "Composition" && resource.type?.coding?.some((c) => codingMatches(c, "ips_patient_summary_document", IPS_SUMMARY_COMPOSITION_TYPE_SYSTEM)),
   ["VitalSignsSection" /* VITAL_SIGNS */]: (resource) => resource.resourceType === "Composition" && resource.type?.coding?.some((c) => codingMatches(c, "ips_vital_summary_document", IPS_SUMMARY_COMPOSITION_TYPE_SYSTEM)),
+  ["AdvanceDirectivesSection" /* ADVANCE_DIRECTIVES */]: (resource) => resource.resourceType === "Composition" && resource.type?.coding?.some((c) => codingMatches(c, "ips_advanced_directives_summary_document", IPS_SUMMARY_COMPOSITION_TYPE_SYSTEM)),
   ["SocialHistorySection" /* SOCIAL_HISTORY */]: (resource) => resource.resourceType === "Composition" && resource.type?.coding?.some((c) => codingMatches(c, "ips_social_history_summary_document", IPS_SUMMARY_COMPOSITION_TYPE_SYSTEM)),
-  ["FunctionalStatusSection" /* FUNCTIONAL_STATUS */]: (resource) => resource.resourceType === "Composition" && resource.type?.coding?.some((c) => codingMatches(c, ["ips_functional_status_condition_summary_document", "ips_functional_status_clinical_impression_summary_document"], IPS_SUMMARY_COMPOSITION_TYPE_SYSTEM))
+  ["FunctionalStatusSection" /* FUNCTIONAL_STATUS */]: (resource) => resource.resourceType === "Composition" && resource.type?.coding?.some((c) => codingMatches(c, ["ips_functional_status_condition_summary_document", "ips_functional_status_clinical_impression_summary_document"], IPS_SUMMARY_COMPOSITION_TYPE_SYSTEM)),
+  ["MedicalDeviceSection" /* MEDICAL_DEVICES */]: (resource) => resource.resourceType === "Composition" && resource.type?.coding?.some((c) => codingMatches(c, "ips_medical_device_summary_document", IPS_SUMMARY_COMPOSITION_TYPE_SYSTEM))
 };
 var IPSSectionResourceHelper = class {
   static getResourceFilterForSection(section) {
@@ -365,13 +384,26 @@ var TemplateUtilities = class {
     return code ? `${code} (${systemDisplay})` : "";
   }
   /**
-   * Renders a Device reference
+   * Resolves and returns a Device resource from a Device Reference.
+   * Returns null if the reference cannot be resolved or is not a Device.
+   * @param deviceRef - Reference to a Device resource
+   * @returns The resolved Device resource or null
+   */
+  getDeviceFromReference(deviceRef) {
+    if (!deviceRef) return null;
+    const device = this.resolveReference(deviceRef);
+    return device && device.resourceType === "Device" ? device : null;
+  }
+  /**
+   * Renders a Device name from a Device reference.
+   * Uses getDeviceFromReference to resolve the Device and returns a concatenated device.deviceName.
+   * Returns an empty string if no deviceName is available. The returned text is HTML-safe.
    * @param deviceRef - Reference to a Device resource
-   * @returns Formatted device description
+   * @returns Sanitized device name or empty string
    */
   renderDevice(deviceRef) {
-    const device = deviceRef && this.resolveReference(deviceRef);
-    if (device && device.resourceType === "Device" && device.deviceName && device.deviceName.length > 0) {
+    const device = this.getDeviceFromReference(deviceRef);
+    if (device && device.deviceName && device.deviceName.length > 0) {
       return this.safeConcat(device.deviceName, "name");
     }
     return "";
@@ -2787,11 +2819,64 @@ var MedicalDevicesTemplate = class _MedicalDevicesTemplate {
     return _MedicalDevicesTemplate.generateStaticNarrative(resources, timezone);
   }
   /**
-   * Internal static implementation that actually generates the narrative
-   * @param resources - FHIR resources array containing Device resources
+   * Generate HTML narrative for history of medical devices using summary
+   * @param resources - FHIR Composition resources
    * @param timezone - Optional timezone to use for date formatting (e.g., 'America/New_York', 'Europe/London')
    * @returns HTML string for rendering
    */
+  generateSummaryNarrative(resources, timezone) {
+    const templateUtilities = new TemplateUtilities(resources);
+    let isSummaryCreated = false;
+    let html = `<p>This list includes all information about the patient's medical devices history, sorted by recorded date (most recent first).</p>
+`;
+    html += `
+      <table>
+        <thead>
+          <tr>
+            <th>Device</th>
+            <th>Code (System)</th>
+            <th>Status</th>
+            <th>Comments</th>
+            <th>Date Recorded</th>
+            <th>Source</th>
+          </tr>
+        </thead>
+        <tbody>`;
+    for (const resourceItem of resources) {
+      for (const rowData of resourceItem.section ?? []) {
+        const sectionCodeableConcept = rowData.code;
+        const data = {};
+        data["codeSystem"] = templateUtilities.codeableConceptCoding(sectionCodeableConcept);
+        for (const columnData of rowData.section ?? []) {
+          const columnTitle = columnData.title;
+          if (columnTitle) {
+            data[columnTitle] = templateUtilities.renderTextAsHtml(columnData.text?.div ?? "");
+          }
+        }
+        if (data["Device Name"]?.toLowerCase() === "unknown") {
+          continue;
+        }
+        isSummaryCreated = true;
+        html += `
+          <tr>
+            <td>${templateUtilities.capitalizeFirstLetter(data["Device Name"] ?? "")}</td>
+            <td>${data["codeSystem"] ?? ""}</td>
+            <td>${templateUtilities.renderTextAsHtml(data["Status"] ?? "")}</td>
+            <td>${templateUtilities.renderTextAsHtml(data["Notes"] ?? "")}</td>
+            <td>${templateUtilities.renderTime(data["Recorded On"] ?? "", timezone)}</td>
+            <td>${data["Source"] ?? ""}</td>
+          </tr>`;
+      }
+    }
+    html += `
+          </tbody>
+        </table>`;
+    return isSummaryCreated ? html : void 0;
+  }
+  /**
+   * Internal static implementation that generates the narrative from DeviceUseStatement resources.
+   * The “Code (System)” column renders Device.type as "code (SystemDisplay)" using TemplateUtilities.codeableConceptCoding.
+   */
   static generateStaticNarrative(resources, timezone) {
     const templateUtilities = new TemplateUtilities(resources);
     let html = `<p>This list includes all DeviceUseStatement resources, sorted by recorded date (most recent first).</p>
@@ -2799,6 +2884,7 @@ var MedicalDevicesTemplate = class _MedicalDevicesTemplate {
         <thead>
           <tr>
             <th>Device</th>
+            <th>Code (System)</th>
             <th>Status</th>
             <th>Comments</th>
             <th>Date Recorded</th>
@@ -2811,26 +2897,32 @@ 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;
+    const devicesAdded = /* @__PURE__ */ new Set();
     for (const dus of deviceStatements) {
-      const deviceName = templateUtilities.renderTextAsHtml(templateUtilities.renderDevice(dus.device));
-      if (deviceName?.toLowerCase() === "unknown") {
+      const deviceName = templateUtilities.renderDevice(dus.device);
+      if (deviceName?.toLowerCase() === "unknown" || devicesAdded.has(deviceName)) {
+        continue;
+      }
+      const device = templateUtilities.getDeviceFromReference(dus.device);
+      const codeSystem = templateUtilities.codeableConceptCoding(device?.type);
+      if (!codeSystem) {
         continue;
       }
-      isDeviceAdded = true;
+      devicesAdded.add(deviceName);
       html += `
         <tr>
           <td>${templateUtilities.capitalizeFirstLetter(deviceName)}</td>
+          <td>${codeSystem}</td>
           <td>${templateUtilities.renderTextAsHtml(dus.status || "")}</td>
           <td>${templateUtilities.renderNotes(dus.note, timezone)}</td>
-          <td>${templateUtilities.renderTextAsHtml(templateUtilities.renderRecorded(dus.recordedOn, timezone))}</td>
+          <td>${templateUtilities.renderTime(dus.recordedOn, timezone)}</td>
           <td>${templateUtilities.getOwnerTag(dus)}</td>
         </tr>`;
     }
     html += `
         </tbody>
       </table>`;
-    return isDeviceAdded ? html : void 0;
+    return devicesAdded.size > 0 ? html : void 0;
   }
 };
 
@@ -4571,7 +4663,78 @@ var AdvanceDirectivesTemplate = class _AdvanceDirectivesTemplate {
       const dateB = new Date(b.dateTime || 0);
       return dateB.getTime() - dateA.getTime();
     });
-    return _AdvanceDirectivesTemplate.generateStaticNarrative(resources, timezone);
+    return _AdvanceDirectivesTemplate.generateStaticNarrative(
+      resources,
+      timezone
+    );
+  }
+  /**
+   * Generate HTML narrative for advance directives using summary
+   * @param resources - FHIR Composition resources
+   * @param timezone - Optional timezone to use for date formatting (e.g., 'America/New_York', 'Europe/London')
+   * @returns HTML string for rendering
+   */
+  generateSummaryNarrative(resources, timezone) {
+    const templateUtilities = new TemplateUtilities(resources);
+    let isSummaryCreated = false;
+    let html = `<p>This list includes all Consent resources, sorted by date (most recent first).</p>
+`;
+    html += `
+      <div>
+        <table>
+          <thead>
+            <tr>
+              <th>Directive</th>
+              <th>Code (System)</th>
+              <th>Action Controlled</th>
+              <th>Policy Rule</th>
+              <th>Date</th>
+              <th>Source</th>
+            </tr>
+          </thead>
+          <tbody>`;
+    for (const resourceItem of resources) {
+      for (const rowData of resourceItem.section ?? []) {
+        const sectionCodeableConcept = rowData.code;
+        const data = {};
+        data["codeSystem"] = templateUtilities.codeableConceptCoding(
+          sectionCodeableConcept
+        );
+        for (const columnData of rowData.section ?? []) {
+          const columnTitle = columnData.title;
+          if (columnTitle) {
+            if (columnTitle === "DateTime") {
+              data[columnTitle] = templateUtilities.renderTime(
+                columnData.text?.div ?? "",
+                timezone
+              );
+            } else {
+              data[columnTitle] = templateUtilities.renderTextAsHtml(
+                columnData.text?.div ?? ""
+              );
+            }
+          }
+        }
+        if (data["Advanced Directive Name"]?.toLowerCase() === "unknown") {
+          continue;
+        }
+        isSummaryCreated = true;
+        html += `
+          <tr>
+            <td>${templateUtilities.capitalizeFirstLetter(data["Advanced Directive Name"] ?? "")}</td>
+            <td>${data["codeSystem"] ?? ""}</td>
+            <td>${data["Provision Action"] ?? ""}</td>
+            <td>${data["Policy Rule"] ?? ""}</td>
+            <td>${data["DateTime"] ?? ""}</td>
+            <td>${data["Source"] ?? ""}</td>
+          </tr>`;
+      }
+    }
+    html += `
+          </tbody>
+        </table>
+      </div>`;
+    return isSummaryCreated ? html : void 0;
   }
   /**
    * Internal static implementation that actually generates the narrative
@@ -4579,7 +4742,6 @@ var AdvanceDirectivesTemplate = class _AdvanceDirectivesTemplate {
    * @param timezone - Optional timezone to use for date formatting (e.g., 'America/New_York', 'Europe/London')
    * @returns HTML string for rendering
    */
-  // eslint-disable-next-line @typescript-eslint/no-unused-vars
   static generateStaticNarrative(resources, timezone) {
     const templateUtilities = new TemplateUtilities(resources);
     let html = `<p>This list includes all Consent resources, sorted by date (most recent first).</p>
@@ -4587,35 +4749,57 @@ var AdvanceDirectivesTemplate = class _AdvanceDirectivesTemplate {
     html += `<table>
         <thead>
           <tr>
-            <th>Scope</th>
-            <th>Status</th>
+            <th>Directive</th>
+            <th>Code (System)</th>
             <th>Action Controlled</th>
+            <th>Policy Rule</th>
             <th>Date</th>
             <th>Source</th>
           </tr>
         </thead>
         <tbody>`;
-    let isConsentAdded = false;
+    const consentAdded = /* @__PURE__ */ new Set();
     for (const resourceItem of resources) {
       const consent = resourceItem;
-      const consentScope = templateUtilities.capitalizeFirstLetter(templateUtilities.renderTextAsHtml(templateUtilities.codeableConceptDisplay(consent.scope, "display")));
-      if (!consentScope || consentScope.toLowerCase() === "unknown") {
+      let consentDirective = {};
+      for (const category of consent.category || []) {
+        for (const coding of category.coding || []) {
+          if (coding.system === ADVANCED_DIRECTIVE_CATEGORY_SYSTEM && coding.code && coding.code in ADVANCED_DIRECTIVE_CATEGORY_CODES) {
+            consentDirective = {
+              name: ADVANCED_DIRECTIVE_CATEGORY_CODES[coding.code],
+              system: coding.system,
+              code: coding.code
+            };
+            break;
+          } else if (coding.system === LOINC_SYSTEM && coding.code && coding.code in ADVANCED_DIRECTIVE_LOINC_CODES) {
+            consentDirective = {
+              name: ADVANCED_DIRECTIVE_LOINC_CODES[coding.code],
+              system: coding.system,
+              code: coding.code
+            };
+            break;
+          }
+        }
+      }
+      if (!consentDirective.name || !consentDirective.code || !consentDirective.system || consentDirective.name.toLowerCase() === "unknown" || consentAdded.has(consentDirective.name)) {
         continue;
       }
-      isConsentAdded = true;
+      consentAdded.add(consentDirective.name);
+      const consentCodeSystem = `${consentDirective.code} (${codingSystemDisplayNames_default[consentDirective.system] || consentDirective.system})`;
       html += `
         <tr>
-          <td>${consentScope}</td>
-          <td>${consent.status || ""}</td>
+          <td>${consentDirective.name}</td>
+          <td>${consentCodeSystem || ""}</td>
           <td>${consent.provision?.action ? templateUtilities.concatCodeableConcept(consent.provision.action) : ""}</td>
-          <td>${consent.dateTime || ""}</td>
+          <td>${consent.policyRule ? templateUtilities.formatCodeableConceptValue(consent.policyRule) : ""}</td>
+          <td>${templateUtilities.renderTime(consent.dateTime, timezone) || ""}</td>
           <td>${templateUtilities.getOwnerTag(consent)}</td>
         </tr>`;
     }
     html += `
         </tbody>
       </table>`;
-    return isConsentAdded ? html : void 0;
+    return consentAdded.size > 0 ? html : void 0;
   }
 };
 

package/package.json

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