Update handling of SNPRC 'Other' status

Author: bbimber

mcc/resources/queries/mcc/aggregatedDemographics.sql

@@ -39,7 +39,7 @@ LEFT JOIN (SELECT
                    o."medical_history::observation" as medical_history,
     FROM "/data/Colonies/SNPRC/".study.mostRecentObservationsPivoted o
 ) o ON (o.Id = d.Id)
-WHERE (d.excludeFromCensus IS NULL or d.excludeFromCensus = false)
+WHERE (d.excludeFromCensus IS NULL or d.excludeFromCensus = false) and d.calculated_status NOT IN ('Unknown', 'Other')
 
 UNION ALL
 

mcc/resources/queries/study/demographics.js

@@ -34,6 +34,9 @@ function onUpsert(helper, scriptErrors, row, oldRow){
     if (row.calculated_status === 'alive') {
         row.calculated_status = 'Alive';
     }
+    else if (row.calculated_status === 'Other') {
+        row.calculated_status = 'Unknown';
+    }
 
     if (row.death) {
         row.calculated_status = 'Dead';