diff --git a/v1_apache-hop dash mapping/predictive_metrics/data_collection.hpl b/v1_apache-hop dash mapping/predictive_metrics/data_collection.hpl index 167c31c..068b5da 100644 --- a/v1_apache-hop dash mapping/predictive_metrics/data_collection.hpl +++ b/v1_apache-hop dash mapping/predictive_metrics/data_collection.hpl @@ -93,7 +93,7 @@ SELECT COALESCE(COUNT(r.id) FILTER ( WHERE r.military_registration_date >= ys.year_date AND r.military_registration_date < ys.year_date + INTERVAL '1 year' - AND DATE_PART('year', AGE(r.system_create_date, r.birth_date)) < 18 + AND DATE_PART('year', AGE(r.military_registration_date, r.birth_date)) < 18 ), 0) AS reaching_17_age, COALESCE(COUNT(r.id) FILTER ( WHERE r.military_registration_date >= ys.year_date