@imranq2/fhirpatientsummary 1.0.37 → 1.0.38

package/dist/index.cjs

@@ -138,6 +138,67 @@ var ESSENTIAL_LAB_PANELS = {
   "80235-8": "Cardiac Markers Panel",
   "69738-3": "CBC with Auto Differential"
 };
+var FUNCTIONAL_STATUS_SNOMED_CODES = {
+  "118233009": "Core Functional Status",
+  "364644000": "Core Functional Status",
+  "160245001": "Core Functional Status",
+  "21134002": "Disability & Impairment",
+  "2655002": "Disability & Impairment",
+  "2219003": "Disability & Impairment",
+  "962000": "Disability & Impairment",
+  "3089009": "Disability & Impairment",
+  "4197006": "Disability & Impairment",
+  "284545001": "Activities of Daily Living",
+  "719930002": "Activities of Daily Living",
+  "301438001": "Activities of Daily Living",
+  "282145008": "Mobility & Movement",
+  "165245003": "Mobility & Movement",
+  "713458007": "Mobility & Movement"
+};
+var FUNCTIONAL_STATUS_ASSESSMENT_LOINC_CODES = {
+  "54522-8": "Functional Status Panel",
+  "54523-6": "ADL Assistance",
+  "45588-1": "Bed Mobility",
+  "45589-9": "Bed Mobility",
+  "45590-7": "Transfer",
+  "45591-5": "Transfer",
+  "45592-3": "Walk in room",
+  "45593-1": "Walk in room",
+  "45594-9": "Walk in corridor",
+  "45595-6": "Walk in corridor",
+  "45596-4": "Locomotion on unit",
+  "45597-2": "Locomotion on unit",
+  "45598-0": "Locomotion off unit",
+  "45599-8": "Locomotion off unit",
+  "45600-4": "Dressing",
+  "45601-2": "Dressing",
+  "45602-0": "Eating",
+  "45603-8": "Eating",
+  "45604-6": "Toilet use",
+  "45605-3": "Toilet use",
+  "45606-1": "Personal hygiene",
+  "45607-9": "Personal hygiene",
+  "46008-9": "Bathing",
+  "45608-7": "Bathing",
+  "45609-5": "Bathing",
+  "54524-4": "Balance during Transitions and Walking",
+  "54749-7": "Moving from Seated to Standing",
+  "54750-5": "Walking with Assistive Device",
+  "54751-3": "Turning Around While Walking",
+  "54753-9": "Surface-to-Surface Transfer",
+  "54525-1": "Functional Limitation in Range of Motion",
+  "54754-7": "Upper Extremity ROM",
+  "54755-4": "Lower Extremity ROM",
+  "54526-9": "Mobility Devices",
+  "54756-2": "Cane/Crutch",
+  "54757-0": "Walker",
+  "54758-8": "Wheelchair",
+  "54759-6": "Limb Prosthesis",
+  "54760-4": "No Mobility Devices",
+  "54527-7": "Functional Rehabilitation Potential",
+  "55123-4": "Resident Believes Capable of Increased Independence",
+  "45613-7": "Staff Believes Capable of Increased Independence"
+};
 
 // src/structures/ips_section_constants.ts
 var VITAL_SIGNS_SUMMARY_COMPONENT_MAP = {
@@ -173,11 +234,9 @@ var IPSSectionResourceFilters = {
   ["SocialHistorySection" /* SOCIAL_HISTORY */]: (resource) => resource.resourceType === "Observation" && codeableConceptMatches(resource.code, Object.keys(SOCIAL_HISTORY_LOINC_CODES), "http://loinc.org"),
   // Only include pregnancy history Observations or relevant Conditions
   ["HistoryOfPregnancySection" /* PREGNANCY_HISTORY */]: (resource) => resource.resourceType === "Observation" && (codeableConceptMatches(resource.code, Object.keys(PREGNANCY_LOINC_CODES.PREGNANCY_STATUS), "http://loinc.org") || codeableConceptMatches(resource.valueCodeableConcept, Object.keys(PREGNANCY_LOINC_CODES.PREGNANCY_OUTCOME), "http://loinc.org") || codingMatches(resource.code?.coding?.[0], PREGNANCY_SNOMED_CODES, "http://snomed.info/sct") || codingMatches(resource.valueCodeableConcept?.coding?.[0], PREGNANCY_SNOMED_CODES, "http://snomed.info/sct")) || resource.resourceType === "Condition" && (codeableConceptMatches(resource.code, Object.keys(PREGNANCY_LOINC_CODES.PREGNANCY_STATUS), "http://loinc.org") || codeableConceptMatches(resource.code, Object.keys(PREGNANCY_LOINC_CODES.PREGNANCY_OUTCOME), "http://loinc.org") || codingMatches(resource.code?.coding?.[0], PREGNANCY_SNOMED_CODES, "http://snomed.info/sct")),
-  // Only include Observations with LOINC 47420-5, category 'functional-status', or category display containing 'functional', and completed ClinicalImpressions
-  ["FunctionalStatusSection" /* FUNCTIONAL_STATUS */]: (resource) => resource.resourceType === "Observation" && (codeableConceptMatches(resource.code, "47420-5", "http://loinc.org") || resource.category?.some(
-    (cat) => cat.coding?.some(
-      (c) => c.code === "functional-status" && c.system === "http://terminology.hl7.org/CodeSystem/observation-category" || typeof c.display === "string" && c.display.toLowerCase().includes("functional")
-    )
+  // Only include Condition with Functional Status LOINC and SNOMED codes, category code 'problem-list-item', and completed ClinicalImpressions
+  ["FunctionalStatusSection" /* FUNCTIONAL_STATUS */]: (resource) => resource.resourceType === "Condition" && ((codeableConceptMatches(resource.code, Object.keys(FUNCTIONAL_STATUS_ASSESSMENT_LOINC_CODES), "http://loinc.org") || codeableConceptMatches(resource.code, Object.keys(FUNCTIONAL_STATUS_SNOMED_CODES), "http://snomed.info/sct")) && resource.clinicalStatus?.coding?.some((c) => c.code === "active") && resource.category?.some(
+    (cat) => cat.coding?.some((c) => c.code === "problem-list-item")
   )) || resource.resourceType === "ClinicalImpression" && resource.status === "completed",
   // Only include resolved medical history Conditions
   ["HistoryOfPastIllnessSection" /* MEDICAL_HISTORY */]: (resource) => resource.resourceType === "Condition" && resource.clinicalStatus?.coding?.some((c) => ["inactive", "resolved"].includes(c.code)),
@@ -4103,7 +4162,7 @@ var PlanOfCareTemplate = class {
 var FunctionalStatusTemplate = class _FunctionalStatusTemplate {
   /**
    * Generate HTML narrative for Functional Status
-   * @param resources - FHIR resources array containing Observation resources
+   * @param resources - FHIR resources array containing Condition and ClinicalImpression resources
    * @param timezone - Optional timezone to use for date formatting (e.g., 'America/New_York', 'Europe/London')
    * @returns HTML string for rendering
    */
@@ -4143,8 +4202,8 @@ var FunctionalStatusTemplate = class _FunctionalStatusTemplate {
         <thead>
           <tr>
             <th>Name</th>
-            <th>Date</th>
             <th>Code (System)</th>
+            <th>Date</th>
             <th>Description</th>
             <th>Summary</th>
             <th>Source</th>
@@ -4210,8 +4269,8 @@ var FunctionalStatusTemplate = class _FunctionalStatusTemplate {
             clinicalImpressionsHtml += `
                 <tr>
                   <td>${templateUtilities.capitalizeFirstLetter(name)}</td>
-                  <td>${date ?? ""}</td>
                   <td>${templateUtilities.codeableConceptCoding(sectionCodeableConcept)}</td>
+                  <td>${date ?? ""}</td>
                   <td>${data["Description"] ?? ""}</td>
                   <td>${data["Summary"] ?? ""}</td>
                   <td>${data["Source"] ?? ""}</td>
@@ -4240,92 +4299,156 @@ var FunctionalStatusTemplate = class _FunctionalStatusTemplate {
   }
   /**
    * Internal static implementation that actually generates the narrative
-   * @param resources - FHIR resources array containing Observation resources
+   * @param resources - FHIR resources array containing Condition and ClinicalImpression resources
    * @param timezone - Optional timezone to use for date formatting (e.g., 'America/New_York', 'Europe/London')
    * @returns HTML string for rendering
    */
   static generateStaticNarrative(resources, timezone) {
     const templateUtilities = new TemplateUtilities(resources);
-    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"
-      );
-      const hasFunctionalCategory = r.category?.some(
-        (cat) => cat.coding?.some(
-          (c) => c.code === "functional-status" || c.display?.toLowerCase().includes("functional")
-        )
-      );
-      return hasFunctionalLoinc || hasFunctionalCategory;
-    });
-    functionalObservations = functionalObservations.sort((a, b) => {
-      const getObsDate = (obs) => obs.effectiveDateTime ? new Date(obs.effectiveDateTime).getTime() : obs.issued ? new Date(obs.issued).getTime() : 0;
-      return getObsDate(b) - getObsDate(a);
-    });
-    let clinicalImpressions = resources.filter((r) => r.resourceType === "ClinicalImpression").filter((r) => r.status === "completed");
-    clinicalImpressions = clinicalImpressions.sort((a, b) => {
-      const getImpressionDate = (ci) => ci.effectiveDateTime ? new Date(ci.effectiveDateTime).getTime() : ci.effectivePeriod?.end ? new Date(ci.effectivePeriod.end).getTime() : ci.date ? new Date(ci.date).getTime() : 0;
-      return getImpressionDate(b) - getImpressionDate(a);
+    let html = `<div>
+      <p>This section summarizes key conditions and assessments related to the person's functional status and ability to perform daily activities.</p>`;
+    let conditionHtml = `
+    <div>
+      <h3>Conditions</h3>
+      <table>
+        <thead>
+          <tr>
+            <th>Problem</th>
+            <th>Code (System)</th>
+            <th>Onset Date</th>
+            <th>Recorded Date</th>
+            <th>Source</th>
+          </tr>
+        </thead>
+        <tbody>`;
+    let clinicalImpressionsHtml = `
+    <div>
+      <h3>Clinical Impressions</h3>
+      <table>
+        <thead>
+          <tr>
+            <th>Name</th>
+            <th>Code (System)</th>
+            <th>Date</th>
+            <th>Description</th>
+            <th>Summary</th>
+            <th>Source</th>
+          </tr>
+        </thead>
+        <tbody>`;
+    const conditions = resources.filter((entry) => entry.resourceType === "Condition").map((entry) => entry);
+    conditions.sort((a, b) => {
+      const dateA = a.recordedDate ? new Date(a.recordedDate).getTime() : 0;
+      const dateB = b.recordedDate ? new Date(b.recordedDate).getTime() : 0;
+      return dateB - dateA;
     });
-    if (functionalObservations.length > 0) {
-      html += `<table><thead><tr><th>Observation</th><th>Value</th><th>Date</th><th>Interpretation</th><th>Comments</th><th>Source</th></tr></thead><tbody>`;
-      for (const obs of functionalObservations) {
-        const observation = obs;
-        const obsName = templateUtilities.codeableConceptDisplay(observation.code);
-        if (obsName?.toLowerCase() === "unknown") {
-          continue;
+    const addedConditions = /* @__PURE__ */ new Set();
+    for (const cond of conditions) {
+      const functionalStatusName = this.getFunctionalStatusNameFromCode(cond.code);
+      const problem = templateUtilities.codeableConceptDisplay(cond.code) || functionalStatusName;
+      const codeAndSystem = templateUtilities.codeableConceptCoding(cond.code);
+      if (!codeAndSystem || !problem || !functionalStatusName || addedConditions.has(functionalStatusName)) {
+        continue;
+      }
+      if (problem?.toLowerCase() === "unknown") {
+        continue;
+      }
+      addedConditions.add(functionalStatusName);
+      let date = cond.onsetDateTime ? templateUtilities.renderTime(cond.onsetDateTime, timezone) : "";
+      if (!date && cond.onsetPeriod?.start) {
+        date = templateUtilities.renderTime(
+          cond.onsetPeriod?.start,
+          timezone
+        );
+        if (cond.onsetPeriod?.end) {
+          date += " - " + templateUtilities.renderTime(cond.onsetPeriod?.end, timezone);
         }
-        const value = templateUtilities.extractObservationValue(observation);
-        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>
-          <td>${templateUtilities.capitalizeFirstLetter(obsName)}</td>
-          <td>${value ?? ""}</td>
+      }
+      conditionHtml += `<tr>
+          <td>${templateUtilities.capitalizeFirstLetter(problem)}</td>
+          <td>${codeAndSystem}</td>
           <td>${date}</td>
-          <td>${interpretation}</td>
-          <td>${comments}</td>
-          <td>${templateUtilities.getOwnerTag(observation)}</td>
+          <td>${templateUtilities.renderTime(cond.recordedDate, timezone)}</td>
+          <td>${templateUtilities.getOwnerTag(cond)}</td>
         </tr>`;
+    }
+    const clinicalImpressions = resources.filter((entry) => entry.resourceType === "ClinicalImpression").map((entry) => entry);
+    clinicalImpressions.sort((a, b) => {
+      const dateA = this.getClinicalImpressionEffectiveDate(a);
+      const dateB = this.getClinicalImpressionEffectiveDate(b);
+      return dateB && dateA ? dateB.getTime() - dateA.getTime() : 0;
+    });
+    const addedClinicalImpressions = /* @__PURE__ */ new Set();
+    for (const impression of clinicalImpressions) {
+      const name = templateUtilities.codeableConceptDisplay(impression.code);
+      const codeAndSystem = templateUtilities.codeableConceptCoding(impression.code);
+      if (!codeAndSystem || addedClinicalImpressions.has(name)) {
+        continue;
       }
-      html += `</tbody></table>`;
-    }
-    if (clinicalImpressions.length > 0) {
-      html += `<table><thead><tr><th>Date</th><th>Status</th><th>Description</th><th>Summary</th><th>Findings</th><th>Source</th></tr></thead><tbody>`;
-      for (const impression of clinicalImpressions) {
-        let formattedDate = "";
-        if (impression.effectiveDateTime) {
-          formattedDate = templateUtilities.renderTime(impression.effectiveDateTime, timezone);
-        } else if (impression.effectivePeriod) {
-          formattedDate = templateUtilities.renderPeriod(impression.effectivePeriod, timezone);
-        } else if (impression.date) {
-          formattedDate = templateUtilities.renderDate(impression.date);
-        }
-        let findingsHtml = "";
-        if (impression.finding && impression.finding.length > 0) {
-          findingsHtml = "<ul>";
-          for (const finding of impression.finding) {
-            const findingText = finding.itemCodeableConcept ? templateUtilities.codeableConceptDisplay(finding.itemCodeableConcept) : finding.itemReference ? templateUtilities.renderReference(finding.itemReference) : "";
-            const cause = finding.basis || "";
-            findingsHtml += `<li>${findingText}${cause ? ` - ${cause}` : ""}</li>`;
-          }
-          findingsHtml += "</ul>";
+      if (!name || name?.toLowerCase() === "unknown") {
+        continue;
+      }
+      addedClinicalImpressions.add(name);
+      let date = impression.effectiveDateTime ? templateUtilities.renderTime(impression.effectiveDateTime, timezone) : "";
+      if (!date && impression.effectivePeriod?.start) {
+        date = templateUtilities.renderTime(
+          impression.effectivePeriod?.start,
+          timezone
+        );
+        if (impression.effectivePeriod?.end) {
+          date += " - " + templateUtilities.renderTime(impression.effectivePeriod?.end, timezone);
         }
-        html += `<tr>
-          <td>${formattedDate}</td>
-          <td>${impression.status || ""}</td>
+      }
+      clinicalImpressionsHtml += `<tr>
+          <td>${templateUtilities.capitalizeFirstLetter(name)}</td>
+          <td>${codeAndSystem}</td>
+          <td>${date}</td>
           <td>${impression.description || ""}</td>
           <td>${impression.summary || ""}</td>
-          <td>${findingsHtml}</td>
           <td>${templateUtilities.getOwnerTag(impression)}</td>
         </tr>`;
+    }
+    if (addedConditions.size > 0) {
+      html += conditionHtml;
+      html += `
+          </tbody>
+        </table>
+        </div>`;
+    }
+    if (addedClinicalImpressions.size > 0) {
+      html += clinicalImpressionsHtml;
+      html += `
+          </tbody>
+        </table>
+        </div>`;
+    }
+    html += `
+    </div>`;
+    return addedConditions.size > 0 || addedClinicalImpressions.size > 0 ? html : void 0;
+  }
+  static getFunctionalStatusNameFromCode(cc) {
+    if (!cc) return "";
+    for (const coding of cc.coding || []) {
+      let functionalStatusName = FUNCTIONAL_STATUS_SNOMED_CODES[coding.code];
+      if (functionalStatusName) {
+        return functionalStatusName;
+      }
+      functionalStatusName = FUNCTIONAL_STATUS_ASSESSMENT_LOINC_CODES[coding.code];
+      if (functionalStatusName) {
+        return functionalStatusName;
       }
-      html += `</tbody></table>`;
     }
-    if (functionalObservations.length === 0 && clinicalImpressions.length === 0) {
-      html += `<p>No functional status information available.</p>`;
+  }
+  static getClinicalImpressionEffectiveDate(impression) {
+    if (impression.effectiveDateTime) {
+      return new Date(impression.effectiveDateTime);
+    } else if (impression.effectivePeriod) {
+      if (impression.effectivePeriod.start) {
+        return new Date(impression.effectivePeriod.start);
+      } else if (impression.effectivePeriod.end) {
+        return new Date(impression.effectivePeriod.end);
+      }
     }
-    return html;
   }
 };
 

package/dist/index.js

@@ -110,6 +110,67 @@ var ESSENTIAL_LAB_PANELS = {
   "80235-8": "Cardiac Markers Panel",
   "69738-3": "CBC with Auto Differential"
 };
+var FUNCTIONAL_STATUS_SNOMED_CODES = {
+  "118233009": "Core Functional Status",
+  "364644000": "Core Functional Status",
+  "160245001": "Core Functional Status",
+  "21134002": "Disability & Impairment",
+  "2655002": "Disability & Impairment",
+  "2219003": "Disability & Impairment",
+  "962000": "Disability & Impairment",
+  "3089009": "Disability & Impairment",
+  "4197006": "Disability & Impairment",
+  "284545001": "Activities of Daily Living",
+  "719930002": "Activities of Daily Living",
+  "301438001": "Activities of Daily Living",
+  "282145008": "Mobility & Movement",
+  "165245003": "Mobility & Movement",
+  "713458007": "Mobility & Movement"
+};
+var FUNCTIONAL_STATUS_ASSESSMENT_LOINC_CODES = {
+  "54522-8": "Functional Status Panel",
+  "54523-6": "ADL Assistance",
+  "45588-1": "Bed Mobility",
+  "45589-9": "Bed Mobility",
+  "45590-7": "Transfer",
+  "45591-5": "Transfer",
+  "45592-3": "Walk in room",
+  "45593-1": "Walk in room",
+  "45594-9": "Walk in corridor",
+  "45595-6": "Walk in corridor",
+  "45596-4": "Locomotion on unit",
+  "45597-2": "Locomotion on unit",
+  "45598-0": "Locomotion off unit",
+  "45599-8": "Locomotion off unit",
+  "45600-4": "Dressing",
+  "45601-2": "Dressing",
+  "45602-0": "Eating",
+  "45603-8": "Eating",
+  "45604-6": "Toilet use",
+  "45605-3": "Toilet use",
+  "45606-1": "Personal hygiene",
+  "45607-9": "Personal hygiene",
+  "46008-9": "Bathing",
+  "45608-7": "Bathing",
+  "45609-5": "Bathing",
+  "54524-4": "Balance during Transitions and Walking",
+  "54749-7": "Moving from Seated to Standing",
+  "54750-5": "Walking with Assistive Device",
+  "54751-3": "Turning Around While Walking",
+  "54753-9": "Surface-to-Surface Transfer",
+  "54525-1": "Functional Limitation in Range of Motion",
+  "54754-7": "Upper Extremity ROM",
+  "54755-4": "Lower Extremity ROM",
+  "54526-9": "Mobility Devices",
+  "54756-2": "Cane/Crutch",
+  "54757-0": "Walker",
+  "54758-8": "Wheelchair",
+  "54759-6": "Limb Prosthesis",
+  "54760-4": "No Mobility Devices",
+  "54527-7": "Functional Rehabilitation Potential",
+  "55123-4": "Resident Believes Capable of Increased Independence",
+  "45613-7": "Staff Believes Capable of Increased Independence"
+};
 
 // src/structures/ips_section_constants.ts
 var VITAL_SIGNS_SUMMARY_COMPONENT_MAP = {
@@ -145,11 +206,9 @@ var IPSSectionResourceFilters = {
   ["SocialHistorySection" /* SOCIAL_HISTORY */]: (resource) => resource.resourceType === "Observation" && codeableConceptMatches(resource.code, Object.keys(SOCIAL_HISTORY_LOINC_CODES), "http://loinc.org"),
   // Only include pregnancy history Observations or relevant Conditions
   ["HistoryOfPregnancySection" /* PREGNANCY_HISTORY */]: (resource) => resource.resourceType === "Observation" && (codeableConceptMatches(resource.code, Object.keys(PREGNANCY_LOINC_CODES.PREGNANCY_STATUS), "http://loinc.org") || codeableConceptMatches(resource.valueCodeableConcept, Object.keys(PREGNANCY_LOINC_CODES.PREGNANCY_OUTCOME), "http://loinc.org") || codingMatches(resource.code?.coding?.[0], PREGNANCY_SNOMED_CODES, "http://snomed.info/sct") || codingMatches(resource.valueCodeableConcept?.coding?.[0], PREGNANCY_SNOMED_CODES, "http://snomed.info/sct")) || resource.resourceType === "Condition" && (codeableConceptMatches(resource.code, Object.keys(PREGNANCY_LOINC_CODES.PREGNANCY_STATUS), "http://loinc.org") || codeableConceptMatches(resource.code, Object.keys(PREGNANCY_LOINC_CODES.PREGNANCY_OUTCOME), "http://loinc.org") || codingMatches(resource.code?.coding?.[0], PREGNANCY_SNOMED_CODES, "http://snomed.info/sct")),
-  // Only include Observations with LOINC 47420-5, category 'functional-status', or category display containing 'functional', and completed ClinicalImpressions
-  ["FunctionalStatusSection" /* FUNCTIONAL_STATUS */]: (resource) => resource.resourceType === "Observation" && (codeableConceptMatches(resource.code, "47420-5", "http://loinc.org") || resource.category?.some(
-    (cat) => cat.coding?.some(
-      (c) => c.code === "functional-status" && c.system === "http://terminology.hl7.org/CodeSystem/observation-category" || typeof c.display === "string" && c.display.toLowerCase().includes("functional")
-    )
+  // Only include Condition with Functional Status LOINC and SNOMED codes, category code 'problem-list-item', and completed ClinicalImpressions
+  ["FunctionalStatusSection" /* FUNCTIONAL_STATUS */]: (resource) => resource.resourceType === "Condition" && ((codeableConceptMatches(resource.code, Object.keys(FUNCTIONAL_STATUS_ASSESSMENT_LOINC_CODES), "http://loinc.org") || codeableConceptMatches(resource.code, Object.keys(FUNCTIONAL_STATUS_SNOMED_CODES), "http://snomed.info/sct")) && resource.clinicalStatus?.coding?.some((c) => c.code === "active") && resource.category?.some(
+    (cat) => cat.coding?.some((c) => c.code === "problem-list-item")
   )) || resource.resourceType === "ClinicalImpression" && resource.status === "completed",
   // Only include resolved medical history Conditions
   ["HistoryOfPastIllnessSection" /* MEDICAL_HISTORY */]: (resource) => resource.resourceType === "Condition" && resource.clinicalStatus?.coding?.some((c) => ["inactive", "resolved"].includes(c.code)),
@@ -4075,7 +4134,7 @@ var PlanOfCareTemplate = class {
 var FunctionalStatusTemplate = class _FunctionalStatusTemplate {
   /**
    * Generate HTML narrative for Functional Status
-   * @param resources - FHIR resources array containing Observation resources
+   * @param resources - FHIR resources array containing Condition and ClinicalImpression resources
    * @param timezone - Optional timezone to use for date formatting (e.g., 'America/New_York', 'Europe/London')
    * @returns HTML string for rendering
    */
@@ -4115,8 +4174,8 @@ var FunctionalStatusTemplate = class _FunctionalStatusTemplate {
         <thead>
           <tr>
             <th>Name</th>
-            <th>Date</th>
             <th>Code (System)</th>
+            <th>Date</th>
             <th>Description</th>
             <th>Summary</th>
             <th>Source</th>
@@ -4182,8 +4241,8 @@ var FunctionalStatusTemplate = class _FunctionalStatusTemplate {
             clinicalImpressionsHtml += `
                 <tr>
                   <td>${templateUtilities.capitalizeFirstLetter(name)}</td>
-                  <td>${date ?? ""}</td>
                   <td>${templateUtilities.codeableConceptCoding(sectionCodeableConcept)}</td>
+                  <td>${date ?? ""}</td>
                   <td>${data["Description"] ?? ""}</td>
                   <td>${data["Summary"] ?? ""}</td>
                   <td>${data["Source"] ?? ""}</td>
@@ -4212,92 +4271,156 @@ var FunctionalStatusTemplate = class _FunctionalStatusTemplate {
   }
   /**
    * Internal static implementation that actually generates the narrative
-   * @param resources - FHIR resources array containing Observation resources
+   * @param resources - FHIR resources array containing Condition and ClinicalImpression resources
    * @param timezone - Optional timezone to use for date formatting (e.g., 'America/New_York', 'Europe/London')
    * @returns HTML string for rendering
    */
   static generateStaticNarrative(resources, timezone) {
     const templateUtilities = new TemplateUtilities(resources);
-    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"
-      );
-      const hasFunctionalCategory = r.category?.some(
-        (cat) => cat.coding?.some(
-          (c) => c.code === "functional-status" || c.display?.toLowerCase().includes("functional")
-        )
-      );
-      return hasFunctionalLoinc || hasFunctionalCategory;
-    });
-    functionalObservations = functionalObservations.sort((a, b) => {
-      const getObsDate = (obs) => obs.effectiveDateTime ? new Date(obs.effectiveDateTime).getTime() : obs.issued ? new Date(obs.issued).getTime() : 0;
-      return getObsDate(b) - getObsDate(a);
-    });
-    let clinicalImpressions = resources.filter((r) => r.resourceType === "ClinicalImpression").filter((r) => r.status === "completed");
-    clinicalImpressions = clinicalImpressions.sort((a, b) => {
-      const getImpressionDate = (ci) => ci.effectiveDateTime ? new Date(ci.effectiveDateTime).getTime() : ci.effectivePeriod?.end ? new Date(ci.effectivePeriod.end).getTime() : ci.date ? new Date(ci.date).getTime() : 0;
-      return getImpressionDate(b) - getImpressionDate(a);
+    let html = `<div>
+      <p>This section summarizes key conditions and assessments related to the person's functional status and ability to perform daily activities.</p>`;
+    let conditionHtml = `
+    <div>
+      <h3>Conditions</h3>
+      <table>
+        <thead>
+          <tr>
+            <th>Problem</th>
+            <th>Code (System)</th>
+            <th>Onset Date</th>
+            <th>Recorded Date</th>
+            <th>Source</th>
+          </tr>
+        </thead>
+        <tbody>`;
+    let clinicalImpressionsHtml = `
+    <div>
+      <h3>Clinical Impressions</h3>
+      <table>
+        <thead>
+          <tr>
+            <th>Name</th>
+            <th>Code (System)</th>
+            <th>Date</th>
+            <th>Description</th>
+            <th>Summary</th>
+            <th>Source</th>
+          </tr>
+        </thead>
+        <tbody>`;
+    const conditions = resources.filter((entry) => entry.resourceType === "Condition").map((entry) => entry);
+    conditions.sort((a, b) => {
+      const dateA = a.recordedDate ? new Date(a.recordedDate).getTime() : 0;
+      const dateB = b.recordedDate ? new Date(b.recordedDate).getTime() : 0;
+      return dateB - dateA;
     });
-    if (functionalObservations.length > 0) {
-      html += `<table><thead><tr><th>Observation</th><th>Value</th><th>Date</th><th>Interpretation</th><th>Comments</th><th>Source</th></tr></thead><tbody>`;
-      for (const obs of functionalObservations) {
-        const observation = obs;
-        const obsName = templateUtilities.codeableConceptDisplay(observation.code);
-        if (obsName?.toLowerCase() === "unknown") {
-          continue;
+    const addedConditions = /* @__PURE__ */ new Set();
+    for (const cond of conditions) {
+      const functionalStatusName = this.getFunctionalStatusNameFromCode(cond.code);
+      const problem = templateUtilities.codeableConceptDisplay(cond.code) || functionalStatusName;
+      const codeAndSystem = templateUtilities.codeableConceptCoding(cond.code);
+      if (!codeAndSystem || !problem || !functionalStatusName || addedConditions.has(functionalStatusName)) {
+        continue;
+      }
+      if (problem?.toLowerCase() === "unknown") {
+        continue;
+      }
+      addedConditions.add(functionalStatusName);
+      let date = cond.onsetDateTime ? templateUtilities.renderTime(cond.onsetDateTime, timezone) : "";
+      if (!date && cond.onsetPeriod?.start) {
+        date = templateUtilities.renderTime(
+          cond.onsetPeriod?.start,
+          timezone
+        );
+        if (cond.onsetPeriod?.end) {
+          date += " - " + templateUtilities.renderTime(cond.onsetPeriod?.end, timezone);
         }
-        const value = templateUtilities.extractObservationValue(observation);
-        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>
-          <td>${templateUtilities.capitalizeFirstLetter(obsName)}</td>
-          <td>${value ?? ""}</td>
+      }
+      conditionHtml += `<tr>
+          <td>${templateUtilities.capitalizeFirstLetter(problem)}</td>
+          <td>${codeAndSystem}</td>
           <td>${date}</td>
-          <td>${interpretation}</td>
-          <td>${comments}</td>
-          <td>${templateUtilities.getOwnerTag(observation)}</td>
+          <td>${templateUtilities.renderTime(cond.recordedDate, timezone)}</td>
+          <td>${templateUtilities.getOwnerTag(cond)}</td>
         </tr>`;
+    }
+    const clinicalImpressions = resources.filter((entry) => entry.resourceType === "ClinicalImpression").map((entry) => entry);
+    clinicalImpressions.sort((a, b) => {
+      const dateA = this.getClinicalImpressionEffectiveDate(a);
+      const dateB = this.getClinicalImpressionEffectiveDate(b);
+      return dateB && dateA ? dateB.getTime() - dateA.getTime() : 0;
+    });
+    const addedClinicalImpressions = /* @__PURE__ */ new Set();
+    for (const impression of clinicalImpressions) {
+      const name = templateUtilities.codeableConceptDisplay(impression.code);
+      const codeAndSystem = templateUtilities.codeableConceptCoding(impression.code);
+      if (!codeAndSystem || addedClinicalImpressions.has(name)) {
+        continue;
       }
-      html += `</tbody></table>`;
-    }
-    if (clinicalImpressions.length > 0) {
-      html += `<table><thead><tr><th>Date</th><th>Status</th><th>Description</th><th>Summary</th><th>Findings</th><th>Source</th></tr></thead><tbody>`;
-      for (const impression of clinicalImpressions) {
-        let formattedDate = "";
-        if (impression.effectiveDateTime) {
-          formattedDate = templateUtilities.renderTime(impression.effectiveDateTime, timezone);
-        } else if (impression.effectivePeriod) {
-          formattedDate = templateUtilities.renderPeriod(impression.effectivePeriod, timezone);
-        } else if (impression.date) {
-          formattedDate = templateUtilities.renderDate(impression.date);
-        }
-        let findingsHtml = "";
-        if (impression.finding && impression.finding.length > 0) {
-          findingsHtml = "<ul>";
-          for (const finding of impression.finding) {
-            const findingText = finding.itemCodeableConcept ? templateUtilities.codeableConceptDisplay(finding.itemCodeableConcept) : finding.itemReference ? templateUtilities.renderReference(finding.itemReference) : "";
-            const cause = finding.basis || "";
-            findingsHtml += `<li>${findingText}${cause ? ` - ${cause}` : ""}</li>`;
-          }
-          findingsHtml += "</ul>";
+      if (!name || name?.toLowerCase() === "unknown") {
+        continue;
+      }
+      addedClinicalImpressions.add(name);
+      let date = impression.effectiveDateTime ? templateUtilities.renderTime(impression.effectiveDateTime, timezone) : "";
+      if (!date && impression.effectivePeriod?.start) {
+        date = templateUtilities.renderTime(
+          impression.effectivePeriod?.start,
+          timezone
+        );
+        if (impression.effectivePeriod?.end) {
+          date += " - " + templateUtilities.renderTime(impression.effectivePeriod?.end, timezone);
         }
-        html += `<tr>
-          <td>${formattedDate}</td>
-          <td>${impression.status || ""}</td>
+      }
+      clinicalImpressionsHtml += `<tr>
+          <td>${templateUtilities.capitalizeFirstLetter(name)}</td>
+          <td>${codeAndSystem}</td>
+          <td>${date}</td>
           <td>${impression.description || ""}</td>
           <td>${impression.summary || ""}</td>
-          <td>${findingsHtml}</td>
           <td>${templateUtilities.getOwnerTag(impression)}</td>
         </tr>`;
+    }
+    if (addedConditions.size > 0) {
+      html += conditionHtml;
+      html += `
+          </tbody>
+        </table>
+        </div>`;
+    }
+    if (addedClinicalImpressions.size > 0) {
+      html += clinicalImpressionsHtml;
+      html += `
+          </tbody>
+        </table>
+        </div>`;
+    }
+    html += `
+    </div>`;
+    return addedConditions.size > 0 || addedClinicalImpressions.size > 0 ? html : void 0;
+  }
+  static getFunctionalStatusNameFromCode(cc) {
+    if (!cc) return "";
+    for (const coding of cc.coding || []) {
+      let functionalStatusName = FUNCTIONAL_STATUS_SNOMED_CODES[coding.code];
+      if (functionalStatusName) {
+        return functionalStatusName;
+      }
+      functionalStatusName = FUNCTIONAL_STATUS_ASSESSMENT_LOINC_CODES[coding.code];
+      if (functionalStatusName) {
+        return functionalStatusName;
       }
-      html += `</tbody></table>`;
     }
-    if (functionalObservations.length === 0 && clinicalImpressions.length === 0) {
-      html += `<p>No functional status information available.</p>`;
+  }
+  static getClinicalImpressionEffectiveDate(impression) {
+    if (impression.effectiveDateTime) {
+      return new Date(impression.effectiveDateTime);
+    } else if (impression.effectivePeriod) {
+      if (impression.effectivePeriod.start) {
+        return new Date(impression.effectivePeriod.start);
+      } else if (impression.effectivePeriod.end) {
+        return new Date(impression.effectivePeriod.end);
+      }
     }
-    return html;
   }
 };
 

package/package.json

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