Add comment for interval object acceptance & DOB/DOD logic

Signed-off-by: Courtney Gosselin <[email protected]>
CanDIG · Feb 28, 2024 · 6a3a40d · 6a3a40d
1 parent 2995124
commit 6a3a40d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/src/views/clinicalGenomic/useClinicalPatientData.js b/src/views/clinicalGenomic/useClinicalPatientData.js
@@ -30,7 +30,7 @@ function useClinicalPatientData(patientId, programId) {
                         value === '' ||
                         key === ''
                     ) &&
-                    (!(typeof obj[key] === 'object') || (typeof obj[key] === 'object' && 'month_interval' in obj[key]))
+                    (!(typeof obj[key] === 'object') || (typeof obj[key] === 'object' && 'month_interval' in obj[key])) // Accept interval date objects remove all other objects
             )
         );
     }

diff --git a/src/views/clinicalGenomic/widgets/clinicalData.js b/src/views/clinicalGenomic/widgets/clinicalData.js
@@ -37,6 +37,8 @@ function ClinicalView() {
                         const ageInMonths = patient.date_of_death.month_interval - patient.date_of_birth.month_interval;
                         patient.date_of_death = Math.floor(ageInMonths / 12);
                         patient.date_of_birth = Math.floor(-patient.date_of_birth.month_interval / 12);
+                    } else if (patient.date_of_birth && patient.deceased) {
+                        patient.date_of_birth = Math.floor(-patient.date_of_birth.month_interval / 12);
                     } else {
                         delete patient.date_of_birth;
                         delete patient.date_of_death;