gix age and gender display

uwcirg · Oct 30, 2024 · 87c951a · 87c951a
1 parent 6ede57b
commit 87c951a
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 17 deletions.
diff --git a/src/server/Model/Cohort/DemographicAggregator.cs b/src/server/Model/Cohort/DemographicAggregator.cs
@@ -112,8 +112,8 @@ public class DemographicAggregator
 
         readonly Dictionary<string,int> Religion = new Dictionary<string, int>();
         readonly Dictionary<string,int> Sex = new Dictionary<string, int>();
-        readonly Dictionary<string,int> Gender = new Dictionary<string, int>();
-        readonly Dictionary<string,int> Age = new Dictionary<string, int>();
+        readonly SortedDictionary<string,int> Gender = new SortedDictionary<string, int>();
+        readonly SortedDictionary<string,int> Age = new SortedDictionary<string, int>();
         readonly Dictionary<string,int> Race = new Dictionary<string, int>();
 
         readonly NihRaceEthnicityBuckets NihRaceEthnicity = new NihRaceEthnicityBuckets();
@@ -467,7 +467,7 @@ void RecordRace(PatientDemographic patient)
             Race.Add(race, 1);
         }
 
-        readonly static string[] adultAgeBuckets = { "0-19", "20-29", "30-39", "40-49", "50-59", "60-69", ">=70"};
+        readonly static string[] adultAgeBuckets = { "<20", "20-29", "30-39", "40-49", "50-59", "60-69", "70+"};
         void RecordAge(PatientDemographic patient)
         {
             if (String.IsNullOrEmpty(patient.Age?.ToString()))

diff --git a/src/server/Model/Cohort/DemographicStatistics.cs b/src/server/Model/Cohort/DemographicStatistics.cs
@@ -15,8 +15,8 @@ public class DemographicStatistics
         public VariableBucketSet LanguageByHeritageData { get; set; }
         public Dictionary<string,int> ReligionData { get; set; }
         public Dictionary<string,int> SexData { get; set; }
-        public Dictionary<string,int> GenderData { get; set; }
-        public Dictionary<string,int> AgeData { get; set; }
+        public SortedDictionary<string,int> GenderData { get; set; }
+        public SortedDictionary<string,int> AgeData { get; set; }
         public Dictionary<string,int> RaceData { get; set; }
         public NihRaceEthnicityBuckets NihRaceEthnicityData { get; set; }
     }

diff --git a/src/ui-client/src/components/Visualize/Age.tsx b/src/ui-client/src/components/Visualize/Age.tsx
@@ -52,15 +52,7 @@ export class Age extends React.PureComponent<Props, State> {
     const w = width > this.maxWidth ? this.maxWidth : width;
 
     if (!counts) return <div style={{margin: "24px"}}>No data available</div>;
-    const sorted = Object.entries(counts)
-      .sort((a, b) => {
-        const arrA = a[0].split("-");
-        const arrB = b[0].split("-");
-        const a1 = parseInt(!isNaN(parseInt(arrA[0]))?arrA[0]: arrA[1]);
-        const b1 = parseInt(!isNaN(parseInt(arrB[0]))?arrB[0]: arrB[1]);
-        return a1 - b1;
-      });
-    let data = sorted
+    let data = Object.entries(counts)
       .map(([key, value]) => ({ key, value }))
       .sort((a, b) => (a.value > b.value ? 0 : 1));
     const len = data.length;

diff --git a/src/ui-client/src/components/Visualize/Gender.tsx b/src/ui-client/src/components/Visualize/Gender.tsx
@@ -52,9 +52,7 @@ export class Gender extends React.PureComponent<Props, State> {
     const w = width > this.maxWidth ? this.maxWidth : width;
 
     if (!counts) return <div style={{margin: "24px"}}>No data available</div>;
-    const sorted = Object.entries(counts)
-      .sort((a, b) => a[0].localeCompare(b[0]));
-    let data = sorted
+    let data = Object.entries(counts)
       .map(([key, value]) => ({ key, value }))
       .sort((a, b) => (a.value > b.value ? 0 : 1));
     const len = data.length;