@imranq2/fhirpatientsummary 1.0.13 → 1.0.14

package/dist/index.cjs

@@ -830,7 +830,7 @@ var PatientTemplate = class _PatientTemplate {
             <li><strong>Gender:</strong>${patient.gender ? this.capitalize(patient.gender) : ""}</li>
             <li><strong>Date of Birth:</strong>${patient.birthDate || ""}</li>
             <li><strong>Identifier(s):</strong>${this.renderIdentifiers(patient)}</li>
-            <li><strong>Telecom:</strong>${this.renderTelecom(patient)}</li>
+            <li><strong>Telecom:</strong><ul>${this.renderTelecom(patient)}</ul></li>
             <li><strong>Address(es):</strong>${this.renderAddresses(patient)}</li>
             <li><strong>Marital Status:</strong> ${patient.maritalStatus?.text || ""}</li>
             <li><strong>Deceased:</strong>${this.renderDeceased(patient)}</li>
@@ -850,10 +850,14 @@ var PatientTemplate = class _PatientTemplate {
     if (!patient.name || patient.name.length === 0) {
       return "";
     }
-    return patient.name.map((name) => {
-      const nameText = name.text || ((name.given || []).join(" ") + " " + (name.family || "")).trim();
-      return `<ul><li>${nameText}</li></ul>`;
-    }).join("");
+    const uniqueNames = /* @__PURE__ */ new Set();
+    patient.name.forEach((name) => {
+      if (name.use !== "old") {
+        const nameText = name.text || ((name.given || []).join(" ") + " " + (name.family || "")).trim();
+        uniqueNames.add(nameText);
+      }
+    });
+    return Array.from(uniqueNames).map((nameText) => `<ul><li>${nameText}</li></ul>`).join("");
   }
   /**
    * Renders patient identifiers as HTML list items
@@ -871,19 +875,38 @@ var PatientTemplate = class _PatientTemplate {
     }).join("");
   }
   /**
-   * Renders patient telecom information as HTML list items
+   * Renders patient telecom information grouped by system
    * @param patient - Patient resource
-   * @returns HTML string of list items
+   * @returns HTML string grouped by system
    */
   static renderTelecom(patient) {
     if (!patient.telecom || patient.telecom.length === 0) {
       return "";
     }
-    return patient.telecom.map((telecom) => {
-      const system = telecom.system ? this.capitalize(telecom.system) : "";
-      const value = telecom.value || "";
-      const use = telecom.use ? ` (${telecom.use})` : "";
-      return `<ul><li>${system}: ${value}${use}</li></ul>`;
+    const systemPriority = ["email", "phone", "pager", "sms", "fax", "url", "other"];
+    const telecomBySystem = /* @__PURE__ */ new Map();
+    patient.telecom.forEach((telecom) => {
+      if (telecom.system && telecom.value) {
+        const system = telecom.system.toLowerCase();
+        if (!telecomBySystem.has(system)) {
+          telecomBySystem.set(system, /* @__PURE__ */ new Set());
+        }
+        telecomBySystem.get(system).add(telecom.value);
+      }
+    });
+    return Array.from(telecomBySystem.entries()).sort(([systemA], [systemB]) => {
+      const priorityA = systemPriority.indexOf(systemA);
+      const priorityB = systemPriority.indexOf(systemB);
+      if (priorityA !== -1 && priorityB !== -1) {
+        return priorityA - priorityB;
+      }
+      if (priorityA !== -1) return -1;
+      if (priorityB !== -1) return 1;
+      return systemA.localeCompare(systemB);
+    }).map(([system, values]) => {
+      const systemLabel = this.capitalize(system);
+      const valueList = Array.from(values).map((value) => `<li>${value}</li>`).join("");
+      return `<li><strong>${systemLabel}:</strong><ul>${valueList}</ul></li>`;
     }).join("");
   }
   /**
@@ -895,10 +918,14 @@ var PatientTemplate = class _PatientTemplate {
     if (!patient.address || patient.address.length === 0) {
       return "";
     }
-    return patient.address.map((address) => {
+    const uniqueAddresses = /* @__PURE__ */ new Set();
+    patient.address.forEach((address) => {
       const addressText = address.text || ((address.line || []).join(", ") + ", " + (address.city || "") + ", " + (address.country || "")).trim();
-      return `<ul><li>${addressText}</li></ul>`;
-    }).join("");
+      if (addressText) {
+        uniqueAddresses.add(addressText);
+      }
+    });
+    return Array.from(uniqueAddresses).map((addressText) => `<ul><li>${addressText}</li></ul>`).join("");
   }
   /**
    * Renders patient deceased status
@@ -1642,7 +1669,7 @@ var DiagnosticResultsTemplate = class _DiagnosticResultsTemplate {
    */
   static renderObservations(templateUtilities, observations, timezone) {
     let html = `
-      <h5>Observations</h5>
+      <h3>Observations</h3>
       <table>
         <thead>
           <tr>
@@ -1682,7 +1709,7 @@ var DiagnosticResultsTemplate = class _DiagnosticResultsTemplate {
    */
   static renderDiagnosticReports(templateUtilities, reports, timezone) {
     let html = `
-      <h5>Diagnostic Reports</h5>
+      <h3>Diagnostic Reports</h3>
       <table>
         <thead>
           <tr>

package/dist/index.js

@@ -802,7 +802,7 @@ var PatientTemplate = class _PatientTemplate {
             <li><strong>Gender:</strong>${patient.gender ? this.capitalize(patient.gender) : ""}</li>
             <li><strong>Date of Birth:</strong>${patient.birthDate || ""}</li>
             <li><strong>Identifier(s):</strong>${this.renderIdentifiers(patient)}</li>
-            <li><strong>Telecom:</strong>${this.renderTelecom(patient)}</li>
+            <li><strong>Telecom:</strong><ul>${this.renderTelecom(patient)}</ul></li>
             <li><strong>Address(es):</strong>${this.renderAddresses(patient)}</li>
             <li><strong>Marital Status:</strong> ${patient.maritalStatus?.text || ""}</li>
             <li><strong>Deceased:</strong>${this.renderDeceased(patient)}</li>
@@ -822,10 +822,14 @@ var PatientTemplate = class _PatientTemplate {
     if (!patient.name || patient.name.length === 0) {
       return "";
     }
-    return patient.name.map((name) => {
-      const nameText = name.text || ((name.given || []).join(" ") + " " + (name.family || "")).trim();
-      return `<ul><li>${nameText}</li></ul>`;
-    }).join("");
+    const uniqueNames = /* @__PURE__ */ new Set();
+    patient.name.forEach((name) => {
+      if (name.use !== "old") {
+        const nameText = name.text || ((name.given || []).join(" ") + " " + (name.family || "")).trim();
+        uniqueNames.add(nameText);
+      }
+    });
+    return Array.from(uniqueNames).map((nameText) => `<ul><li>${nameText}</li></ul>`).join("");
   }
   /**
    * Renders patient identifiers as HTML list items
@@ -843,19 +847,38 @@ var PatientTemplate = class _PatientTemplate {
     }).join("");
   }
   /**
-   * Renders patient telecom information as HTML list items
+   * Renders patient telecom information grouped by system
    * @param patient - Patient resource
-   * @returns HTML string of list items
+   * @returns HTML string grouped by system
    */
   static renderTelecom(patient) {
     if (!patient.telecom || patient.telecom.length === 0) {
       return "";
     }
-    return patient.telecom.map((telecom) => {
-      const system = telecom.system ? this.capitalize(telecom.system) : "";
-      const value = telecom.value || "";
-      const use = telecom.use ? ` (${telecom.use})` : "";
-      return `<ul><li>${system}: ${value}${use}</li></ul>`;
+    const systemPriority = ["email", "phone", "pager", "sms", "fax", "url", "other"];
+    const telecomBySystem = /* @__PURE__ */ new Map();
+    patient.telecom.forEach((telecom) => {
+      if (telecom.system && telecom.value) {
+        const system = telecom.system.toLowerCase();
+        if (!telecomBySystem.has(system)) {
+          telecomBySystem.set(system, /* @__PURE__ */ new Set());
+        }
+        telecomBySystem.get(system).add(telecom.value);
+      }
+    });
+    return Array.from(telecomBySystem.entries()).sort(([systemA], [systemB]) => {
+      const priorityA = systemPriority.indexOf(systemA);
+      const priorityB = systemPriority.indexOf(systemB);
+      if (priorityA !== -1 && priorityB !== -1) {
+        return priorityA - priorityB;
+      }
+      if (priorityA !== -1) return -1;
+      if (priorityB !== -1) return 1;
+      return systemA.localeCompare(systemB);
+    }).map(([system, values]) => {
+      const systemLabel = this.capitalize(system);
+      const valueList = Array.from(values).map((value) => `<li>${value}</li>`).join("");
+      return `<li><strong>${systemLabel}:</strong><ul>${valueList}</ul></li>`;
     }).join("");
   }
   /**
@@ -867,10 +890,14 @@ var PatientTemplate = class _PatientTemplate {
     if (!patient.address || patient.address.length === 0) {
       return "";
     }
-    return patient.address.map((address) => {
+    const uniqueAddresses = /* @__PURE__ */ new Set();
+    patient.address.forEach((address) => {
       const addressText = address.text || ((address.line || []).join(", ") + ", " + (address.city || "") + ", " + (address.country || "")).trim();
-      return `<ul><li>${addressText}</li></ul>`;
-    }).join("");
+      if (addressText) {
+        uniqueAddresses.add(addressText);
+      }
+    });
+    return Array.from(uniqueAddresses).map((addressText) => `<ul><li>${addressText}</li></ul>`).join("");
   }
   /**
    * Renders patient deceased status
@@ -1614,7 +1641,7 @@ var DiagnosticResultsTemplate = class _DiagnosticResultsTemplate {
    */
   static renderObservations(templateUtilities, observations, timezone) {
     let html = `
-      <h5>Observations</h5>
+      <h3>Observations</h3>
       <table>
         <thead>
           <tr>
@@ -1654,7 +1681,7 @@ var DiagnosticResultsTemplate = class _DiagnosticResultsTemplate {
    */
   static renderDiagnosticReports(templateUtilities, reports, timezone) {
     let html = `
-      <h5>Diagnostic Reports</h5>
+      <h3>Diagnostic Reports</h3>
       <table>
         <thead>
           <tr>

package/package.json

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