Fix various patient export rounding related issues. (#258)

Author: lostlevels

export/export.go

@@ -51,21 +51,21 @@ func (e *exporter) ToCSVRow(p *patients.ExportedPatient) []string {
 		fmtDataSourceStatus(p.TwiistDataSource, e.params.ReportDate),
 		fmtDataSourceLastDataDate(p.TwiistDataSource),
 		ptime(p.CgmLastDataDate, "2006-01-02"),
-		ppct(p.CgmActiveWearTime, 0),
+		ppctunrounded(p.CgmActiveWearTime),
 		pint(p.CgmDaysWithData),
 		pint(p.CgmHoursWithData),
 		ptomgdl(p.CgmAverageGlucose),
 		pfloat(p.CgmGmi, 2),
 		fmtPreferredUnits(p.CgmStdDev, e.clinic.PreferredBgUnits, 1),
 		ppct(p.CgmCV, 0),
-		ppct(p.CgmTimeInLevel2Hypo, 0),
-		ppct(p.CgmTimeInLevel1Hypo, 0),
-		ppct(p.CgmTimeInTarget, 0),
+		ppctunrounded(p.CgmTimeInLevel2Hypo),
+		ppctunrounded(p.CgmTimeInLevel1Hypo),
+		ppctunrounded(p.CgmTimeInTarget),
 		ppct(p.CgmTimeInLevel1Hyper, 0),
 		ppct(p.CgmTimeInLevel2Hyper, 0),
 		ptime(p.BgmLastDataDate, "2006-01-02"),
 		ptomgdl(p.BgmAverageGlucose),
-		pfloat(p.BgmReadingsPerDay, 0),
+		pfloattrunc(p.BgmReadingsPerDay),
 		pint(p.BgmTotalReadings),
 		pint(p.BgmLowEvents),
 		pint(p.BgmHighEvents),
@@ -251,17 +251,6 @@ func fmtClinicTime(t time.Time, clinic *clinics.Clinic) string {
 	return t.In(loc).Format(timeFormat)
 }
 
-func fmtClinicDate(t time.Time, clinic *clinics.Clinic) string {
-	if clinic.Timezone == nil || *clinic.Timezone == "" {
-		return t.Format(time.DateOnly)
-	}
-	loc, err := time.LoadLocation(*clinic.Timezone)
-	if err != nil {
-		return t.Format(time.DateOnly)
-	}
-	return t.In(loc).Format(time.DateOnly)
-}
-
 func fmtBool(b bool, valIfTrue string, valIfFalse string) string {
 	if b {
 		return valIfTrue
@@ -316,17 +305,18 @@ func periodToDays(period string) (days int, err error) {
 	return days, nil
 }
 
-func fmtFloat(f float64, precision int) string {
+// FmtFloat returns a number as a string with precision digits to the right of the decimal point after banker's rounding.
+func FmtFloat(f float64, precision int) string {
 	shift := math.Pow(10, float64(precision))
-	return fmt.Sprintf("%v", math.RoundToEven(f*shift*100)/shift)
+	return fmt.Sprintf("%v", math.RoundToEven(f*shift)/shift)
 }
 
 func fmtPreferredUnits(valMmolL *float64, preferredBgUnits string, precision int) string {
 	if valMmolL == nil {
 		return ""
 	}
 	if strings.ToLower(preferredBgUnits) == "mg/dl" {
-		return fmtFloat(toMgDl(*valMmolL), precision)
+		return FmtFloat(toMgDl(*valMmolL), precision)
 	}
-	return fmtFloat(*valMmolL, precision)
+	return FmtFloat(*valMmolL, precision)
 }

export/export_test.go

@@ -14,55 +14,82 @@ import (
 )
 
 var _ = Describe("Export", func() {
+	Describe("Format and conversion functions", func() {
+		DescribeTable("FmtFloat",
+			func(val float64, precision int, expected string) {
+				formatted := export.FmtFloat(val, precision)
+				Expect(formatted).To(Equal(expected))
+			},
+			Entry("0 precision", 2.45, 0, "2"),
+			Entry("0 precision round to even downwards", 2.5, 0, "2"),
+			Entry("0 precision round to even upwards", 3.5, 0, "4"),
+			Entry("1 precision round upwards", 3.67, 1, "3.7"),
+			Entry("1 precision round downwards", 3.44, 1, "3.4"),
+			Entry("1 precision round to even upwards", 3.35, 1, "3.4"),
+			Entry("1 precision round to even download", 8.65, 1, "8.6"),
+		)
+	})
+
 	Describe("ToCSVRow", func() {
-		It("matches expected columns", func() {
-			clinicianID := "a578d15f-73b6-4e25-9295-95707fca3520"
-			patientTagID := "6a5794ac4762b6efdb48aaaa"
-			patientTagOID, _ := primitive.ObjectIDFromHex(patientTagID)
-			clinicID := "6a5794ac4762b6efdb48aaab"
-			clinicOID, _ := primitive.ObjectIDFromHex(clinicID)
-			patientID := "7ce10e4c-8930-4770-8323-c8305db09c61"
-			reportDate := time.Date(2026, time.July, 13, 19, 0, 0, 0, time.UTC)
+		var clinicianID string
+		var patientTagID string
+		var patientTagOID primitive.ObjectID
+		var clinicID string
+		var clinicOID primitive.ObjectID
+		var patientID string
+		var reportDate time.Time
+		var inactiveDataSource patients.DataSource
+		var expiredDataSource patients.DataSource
+		var connectedDataSource patients.DataSource
+		var patientTags []clinics.PatientTag
+		var cs []*clinicians.Clinician
+		var params patients.ExportParams
+		var patient *patients.ExportedPatient
+
+		BeforeEach(func() {
+			clinicianID = "a578d15f-73b6-4e25-9295-95707fca3520"
+			patientTagID = "6a5794ac4762b6efdb48aaaa"
+			patientTagOID, _ = primitive.ObjectIDFromHex(patientTagID)
+			clinicID = "6a5794ac4762b6efdb48aaab"
+			clinicOID, _ = primitive.ObjectIDFromHex(clinicID)
+			patientID = "7ce10e4c-8930-4770-8323-c8305db09c61"
+			reportDate = time.Date(2026, time.July, 13, 19, 0, 0, 0, time.UTC)
 
-			inactiveDataSource := patients.DataSource{
+			inactiveDataSource = patients.DataSource{
 				ProviderName:   "dexcom",
 				State:          "connected",
 				LatestDataTime: timep(time.Date(2026, time.July, 9, 0, 0, 0, 0, time.UTC)),
 			}
-			expiredDataSource := patients.DataSource{
+			expiredDataSource = patients.DataSource{
 				ExpirationTime: timep(time.Date(2025, time.January, 2, 3, 0, 0, 0, time.UTC)),
 				ProviderName:   "abbott",
 				State:          "pending",
 			}
-			connectedDataSource := patients.DataSource{
+			connectedDataSource = patients.DataSource{
 				ProviderName:   "twiist",
 				State:          "connected",
 				LatestDataTime: timep(time.Date(2026, time.July, 12, 20, 0, 0, 0, time.UTC)),
 			}
-			patientTags := []clinics.PatientTag{
+			patientTags = []clinics.PatientTag{
 				{
 					Id:       &patientTagOID,
 					Name:     "Some Tag",
 					Patients: 1,
 				},
 			}
-			cs := []*clinicians.Clinician{
+			cs = []*clinicians.Clinician{
 				{
 					UserId: &clinicianID,
 					Name:   strp("Some Clinician"),
 				},
 			}
-			clinic := &clinics.Clinic{
-				Id:          &clinicOID,
-				PatientTags: patientTags,
-			}
-			params := patients.ExportParams{
+			params = patients.ExportParams{
 				Period:              "1d",
 				ExporterClinicianID: clinicianID,
 				WorkspaceID:         clinicID,
 				ReportDate:          reportDate,
 			}
-			patient := &patients.ExportedPatient{
+			patient = &patients.ExportedPatient{
 				FullName:         strp("Some Patient"),
 				UserId:           &patientID,
 				MRN:              strp("123456789"),
@@ -85,6 +112,7 @@ var _ = Describe("Export", func() {
 				CgmDaysWithData:     intp(13),
 				CgmHoursWithData:    intp(238),
 				CgmAverageGlucose:   floatp(5.131),
+				CgmStdDev:           floatp(2.3),
 				CgmTimeInLevel2Hypo: floatp(0.02134),
 				CgmTimeInLevel1Hypo: floatp(0.06013),
 				CgmTimeInTarget:     floatp(0.82333),
@@ -95,7 +123,14 @@ var _ = Describe("Export", func() {
 				BgmLowEvents:        intp(3),
 				BgmHighEvents:       intp(1),
 			}
+		})
 
+		It("matches preferred units of mmol/L", func() {
+			clinic := &clinics.Clinic{
+				Id:               &clinicOID,
+				PatientTags:      patientTags,
+				PreferredBgUnits: "mmol/L",
+			}
 			e, err := export.NewPatientExportClinic(clinic, cs, nil, params)
 			Expect(err).ToNot(HaveOccurred())
 			row := e.ToCSVRow(patient)
@@ -118,25 +153,76 @@ var _ = Describe("Export", func() {
 				"",
 				"connected",
 				"2026-07-12",
-				"2026-07-13",
-				"71",
-				"13",
-				"238",
-				"92",
-				"",
-				"",
-				"",
-				"2",
-				"6",
-				"82",
+				"2026-07-13",         // cgm last data date
+				"71.428",             // cgm active wear time
+				"13",                 // cgm days w/ data
+				"238",                // cgm hours w/ data
+				"92",                 // avg glucose mg/dL
+				"",                   // cgm gmi %
+				"2.3",                // cgm stdev in clnic preferred units
+				"",                   // cbm cv %
+				"2.1340000000000003", // time in level 2 hypo %
+				"6.013",              //  time in level 1 hypo %
+				"82.333",             // cgm time in target %
+				"",                   // cgm time in level 1 hyper %
+				"",                   //  cgm time in level 2 hyper %
+				"2026-07-10",         // bgm last data date
+				"112",                // bgm avg glucose mg/dL
+				"2",                  // bgm readings / day
+				"5",                  // bgm total readings
+				"3",                  // bgm # low events
+				"1",                  // bgm # high events
+			}
+			Expect(row).To(Equal(expectedRow))
+		})
+
+		It("matches preferred units of mg/dL", func() {
+			clinic := &clinics.Clinic{
+				Id:               &clinicOID,
+				PatientTags:      patientTags,
+				PreferredBgUnits: "mg/dL",
+			}
+			e, err := export.NewPatientExportClinic(clinic, cs, nil, params)
+			Expect(err).ToNot(HaveOccurred())
+			row := e.ToCSVRow(patient)
+			expectedRow := []string{
+				"Some Patient",
+				patientID,
+				"123456789",
+				"2000-01-02",
+				"patient@tidepool.org",
+				"Claimed",
+				"2003-04-05",
+				"Some Clinician",
+				"Site1,Site2",
+				`Some Tag,`,
 				"",
+				"type1",
+				"inactive",
+				"2026-07-09",
+				"expired",
 				"",
-				"2026-07-10",
-				"112",
-				"2",
-				"5",
-				"3",
-				"1",
+				"connected",
+				"2026-07-12",
+				"2026-07-13",         // cgm last data date
+				"71.428",             // cgm active wear time
+				"13",                 // cgm days w/ data
+				"238",                // cgm hours w/ data
+				"92",                 // avg glucose mg/dL
+				"",                   // cgm gmi %
+				"41.4",               // cgm stdev in clnic preferred units
+				"",                   // cbm cv %
+				"2.1340000000000003", // time in level 2 hypo %
+				"6.013",              //  time in level 1 hypo %
+				"82.333",             // cgm time in target %
+				"",                   // cgm time in level 1 hyper %
+				"",                   //  cgm time in level 2 hyper %
+				"2026-07-10",         // bgm last data date
+				"112",                // bgm avg glucose mg/dL
+				"2",                  // bgm readings / day
+				"5",                  // bgm total readings
+				"3",                  // bgm # low events
+				"1",                  // bgm # high events
 			}
 			Expect(row).To(Equal(expectedRow))
 		})

export/pointer.go

@@ -19,6 +19,20 @@ func pfloat(f *float64, precision int) string {
 	return fmt.Sprintf("%v", math.RoundToEven(*f*shift)/shift)
 }
 
+func pfloattrunc(f *float64) string {
+	if f == nil {
+		return ""
+	}
+	return fmt.Sprintf("%v", int(*f))
+}
+
+func ppctunrounded(f *float64) string {
+	if f == nil {
+		return ""
+	}
+	return fmt.Sprintf("%v", *f*100)
+}
+
 func pint(i *int) string {
 	if i == nil {
 		return ""
@@ -34,6 +48,7 @@ func ptomgdl(valMmolL *float64) string {
 	return pfloat(&val, 0)
 }
 
+// ppct takes a number ≤ 1.0 and returns a number as a string ≤ 100 with precision digits to the right of the decimal point after banker's rounding.
 func ppct(f *float64, precision int) string {
 	if f == nil {
 		return ""
@@ -48,12 +63,6 @@ func ptime(t *time.Time, layout string) string {
 	}
 	return t.Format(layout)
 }
-func ptimed(t *time.Time, layout, defaultVal string) string {
-	if t == nil || t.IsZero() {
-		return defaultVal
-	}
-	return t.Format(layout)
-}
 
 func pstr(p *string) string {
 	if p == nil {
@@ -70,10 +79,6 @@ func pstrd(p *string, defaultVal string) string {
 	return *p
 }
 
-func strp(s string) *string {
-	return &s
-}
-
 func toMgDl(valMmolL float64) float64 {
 	intValue := int(valMmolL*MmolLToMgdLConversionFactor*MmolLToMgdLPrecisionFactor + 0.5)
 	return float64(intValue) / MmolLToMgdLPrecisionFactor

patients/repository/repository.go

@@ -1146,8 +1146,8 @@ func (r *repository) ListExportedPatients(ctx context.Context, params patients.E
 				},
 			},
 			"bgmTotalReadings": bgmPathPrefix + ".totalRecords",
-			"bgmLowEvents":     bgmPathPrefix + ".timeInLowRecords",
-			"bgmHighEvents":    bgmPathPrefix + ".timeInHighRecords",
+			"bgmLowEvents":     bgmPathPrefix + ".timeInVeryLowRecords",  // BGM Low Events are a count of readings below 54 mg/dL hence using the very low threshold count
+			"bgmHighEvents":    bgmPathPrefix + ".timeInVeryHighRecords", // BGM High Events are a count of readings above 250 mg/dL.
 		}},
 	}