diff --git a/v1_apache-hop dash mapping/mil_com/total_registered.child_minor(m_c).hpl b/v1_apache-hop dash mapping/mil_com/total_registered.child_minor(m_c).hpl index 9f80eff..eddf0f3 100644 --- a/v1_apache-hop dash mapping/mil_com/total_registered.child_minor(m_c).hpl +++ b/v1_apache-hop dash mapping/mil_com/total_registered.child_minor(m_c).hpl @@ -531,10 +531,10 @@ gender_and_recruitment_data AS ( ROUND(COUNT(r.id) FILTER (WHERE COALESCE(children_under_18, 0) = 3) * 100.0 / NULLIF(COUNT(r.id), 0), 2) AS three_children_percent, ROUND(COUNT(r.id) FILTER (WHERE COALESCE(children_under_18, 0) >= 4) * 100.0 / NULLIF(COUNT(r.id), 0), 2) AS four_or_more_children_percent FROM - public.recruits r - LEFT JOIN children_count cc + children_count сс + JOIN public.recruits r ON r.id = cc.recruit_id - WHERE r.vu_current_info->>'isMilitaryRegistered' = 'true' + AND r.vu_current_info->>'isMilitaryRegistered' = 'true' AND r.current_recruitment_id IS NOT NULL GROUP BY r.gender,