diff --git a/mappings_old/country/main_dashboard.waiting_registration.ktr b/mappings_old/country/main_dashboard.waiting_registration.ktr index c8bb38b..88e7bc0 100644 --- a/mappings_old/country/main_dashboard.waiting_registration.ktr +++ b/mappings_old/country/main_dashboard.waiting_registration.ktr @@ -865,7 +865,14 @@ recruit_data AS ( ) SELECT waiting_count, - ROUND(COALESCE((waiting_count::DECIMAL / NULLIF((SELECT COUNT(*) FROM public.recruits), 0) * 100), 0), 2) AS waiting_percent, + ROUND(COALESCE((waiting_count::DECIMAL / NULLIF((SELECT COUNT(*) + FROM public.recruits AS r + JOIN public.recruits_info AS ri + ON ri.recruit_id = r.id + WHERE r.vu_current_info ->> 'isMilitaryRegistered' = 'true' + AND r.current_recruitment_id IS NOT NULL + AND r.target_recruitment_id IS NOT NULL + ), 0) * 100), 0), 2) AS waiting_percent, male_count, female_count, '${REG_ID}' AS recruitment_id,