update

functions/src/healthSummary/generate.ts

@@ -341,7 +341,7 @@ class HealthSummaryPdfGenerator extends PdfGenerator {
             [
               this.texts.vitalsSection.bodyWeightTable.rowTitle,
               this.data.latestBodyWeight?.toFixed(0) ?? '---',
-              this.data.averageBodyWeight?.toFixed(0) ?? '---',
+              this.data.lastSevenDayAverageBodyWeight?.toFixed(0) ?? '---',
               this.data.bodyWeightRange?.toFixed(0) ?? '---',
             ].map((title) => this.cell(title)),
           ],

functions/src/models/healthSummaryData.ts

@@ -7,6 +7,7 @@
 //
 
 import {
+  advanceDateByDays,
   average,
   UserMedicationRecommendationType,
   type FHIRAppointment,
@@ -40,14 +41,24 @@ export class HealthSummaryData {
   recommendations: UserMedicationRecommendation[]
   vitals: HealthSummaryVitals
   symptomScores: SymptomScore[]
+  now: Date
 
   // Computed Properties - Body Weight
 
   get latestBodyWeight(): number | null {
     return this.vitals.bodyWeight.at(0)?.value ?? null
   }
 
-  get averageBodyWeight(): number | null {
+  get lastSevenDayAverageBodyWeight(): number | null {
+    const bodyWeightValues = this.vitals.bodyWeight
+      .filter(
+        (observation) => observation.date >= advanceDateByDays(this.now, -7),
+      )
+      .map((observation) => observation.value)
+    return average(bodyWeightValues) ?? null
+  }
+
+  get medianBodyWeight(): number | null {
     return (
       average(this.vitals.bodyWeight.map((observation) => observation.value)) ??
       null
@@ -136,12 +147,12 @@ export class HealthSummaryData {
   }
 
   get weightCategory(): HealthSummaryWeightCategory {
-    const averageWeight = this.averageBodyWeight
+    const medianWeight = this.medianBodyWeight
     const latestWeight = this.latestBodyWeight
-    if (averageWeight === null || latestWeight === null)
+    if (medianWeight === null || latestWeight === null)
       return HealthSummaryWeightCategory.MISSING
 
-    return latestWeight - averageWeight > 1 ?
+    return latestWeight - medianWeight >= 3 ?
         HealthSummaryWeightCategory.INCREASING
       : HealthSummaryWeightCategory.STABLE_OR_DECREASING
   }
@@ -156,6 +167,7 @@ export class HealthSummaryData {
     recommendations: UserMedicationRecommendation[]
     vitals: HealthSummaryVitals
     symptomScores: SymptomScore[]
+    now: Date
   }) {
     this.name = input.name
     this.dateOfBirth = input.dateOfBirth
@@ -164,5 +176,6 @@ export class HealthSummaryData {
     this.recommendations = input.recommendations
     this.vitals = input.vitals
     this.symptomScores = input.symptomScores
+    this.now = input.now
   }
 }

functions/src/services/healthSummary/databaseHealthSummaryService.test.ts

@@ -24,6 +24,7 @@ describe('HealthSummaryService', () => {
   it('should fetch health summary data', async () => {
     const actualData = await healthSummaryService.getHealthSummaryData(
       'mockUser',
+      new Date(2024, 2, 2, 12, 30),
       QuantityUnit.lbs,
     )
     console.log('actualData:', actualData.nextAppointment?.start.toString())

functions/src/services/healthSummary/databaseHealthSummaryService.ts

@@ -35,6 +35,7 @@ export class DefaultHealthSummaryService implements HealthSummaryService {
 
   async getHealthSummaryData(
     userId: string,
+    date: Date,
     weightUnit: QuantityUnit,
   ): Promise<HealthSummaryData> {
     const [
@@ -50,7 +51,7 @@ export class DefaultHealthSummaryService implements HealthSummaryService {
       this.patientService.getNextAppointment(userId),
       this.patientService.getMedicationRecommendations(userId),
       this.patientService.getSymptomScores(userId, { limit: 5 }),
-      this.getVitals(userId, advanceDateByDays(new Date(), -14), weightUnit),
+      this.getVitals(userId, advanceDateByDays(date, -14), weightUnit),
     ])
 
     const clinician =
@@ -66,6 +67,7 @@ export class DefaultHealthSummaryService implements HealthSummaryService {
       recommendations: recommendations.map((doc) => doc.content),
       vitals: vitals,
       symptomScores: symptomScores.map((doc) => doc.content),
+      now: date,
     })
   }