From 8789f83bace4697e438a538f55d99b5e1f7c752d Mon Sep 17 00:00:00 2001
From: Ruhanga <41738040+Ruhanga@users.noreply.github.com>
Date: Fri, 28 Jun 2024 15:47:36 +0300
Subject: [PATCH] KH-501: Changes resulting from QA to fix NCD Monitoring
 reports (#358)

---
 ...ml => Appointment_status_tracking_59.yaml} |   0
 ...istribution_of_visits_per_Province_2.yaml} |   0
 ...dicators_8.yaml => CCS_Indicators_28.yaml} |   0
 ...ml => CCS_Missed_Referrals_Report_29.yaml} |   0
 ...unt_of_visits_grouped_by_district_30.yaml} |   0
 ...VD_risk_factor_level_-_cumulative_50.yaml} |   0
 ..._67.yaml => CVD_risk_factor_level_60.yaml} |   0
 ...Cervical_Cancer_Screen_Indicators_22.yaml} |   0
 ...vical_Cancer_Screening_HC_Raw_Data_16.yaml | 142 +++
 ...rvical_Cancer_Screening_HC_Raw_Data_6.yaml | 134 ---
 ...ical_Cancer_Screening_RH_Raw_Data_67.yaml} |   0
 ...plication_of_DM__HBP_-_cumulative_69.yaml} |   0
 ...2.yaml => Complication_of_DM__HBP_27.yaml} |   0
 ...lative_60.yaml => DM_-_cumulative_11.yaml} |   0
 .../assets/charts/{DM_56.yaml => DM_35.yaml}  |   0
 ...yaml => DM_Follow-up_-_cumulative_44.yaml} |   0
 ...Follow-up_70.yaml => DM_Follow-up_15.yaml} |   0
 ....yaml => DM_with_HBP_-_cumulative_42.yaml} |   0
 ...M_with_HBP_49.yaml => DM_with_HBP_34.yaml} |   0
 ...M_with_HBP_Follow-up_-_cumulative_54.yaml} |   0
 ..._64.yaml => DM_with_HBP_Follow-up_51.yaml} |   0
 ...Death_NCD_EMR_Report_-_Cumulative_53.yaml} |   0
 ...rt_18.yaml => Death_NCD_EMR_Report_3.yaml} |   0
 ...19.yaml => Diagnosis_-_cumulative_32.yaml} |   0
 .../{Diagnosis_21.yaml => Diagnosis_63.yaml}  |   0
 ...ve_62.yaml => Dropout_-_cumulative_7.yaml} |   0
 .../{Dropout_63.yaml => Dropout_57.yaml}      |   0
 .../{Drugs_Use_24.yaml => Drugs_Use_9.yaml}   |   0
 ...low-up_NCD_EMR_Report_-_Cumulative_5.yaml} |   0
 ....yaml => Follow-up_NCD_EMR_Report_43.yaml} |   0
 ...w_up_CVD_risk_factor_-_cumulative_17.yaml} |   0
 ...yaml => Follow_up_CVD_risk_factor_62.yaml} |   0
 ...ative_55.yaml => HBP_-_cumulative_23.yaml} |   0
 .../assets/charts/{HBP_54.yaml => HBP_8.yaml} |   0
 ...aml => HBP_Follow-up_-_cumulative_12.yaml} |   0
 ...ollow-up_50.yaml => HBP_Follow-up_33.yaml} |   0
 ...CS_Report_7.yaml => HC_CCS_Report_66.yaml} |   0
 ...aml => HC_NCD_OPD_Register_Report_48.yaml} |   0
 ...ow-up_NCD_EMR_Report_-_Cumulative_70.yaml} |   0
 ... => Loss_Follow-up_NCD_EMR_Report_10.yaml} |   0
 ...n_and_Diabetes_management_program_36.yaml} |   0
 .../{Management_30.yaml => Management_1.yaml} |   0
 ...{Management_35.yaml => Management_18.yaml} |   0
 ...ta_11.yaml => NCD_HC_EMR_Raw_Data_47.yaml} |   0
 ...ollow-up_Cases_From_The_Beginning_13.yaml} |   0
 ...ow-up_Cases_Within_Reporting_Range_4.yaml} |   0
 ...D_HIS_New_Cases_From_The_Beginning_31.yaml | 966 ++++++++++++++++++
 ...D_HIS_New_Cases_From_The_Beginning_46.yaml | 911 -----------------
 ...S_New_Cases_Within_Reporting_Range_40.yaml | 964 +++++++++++++++++
 ...S_New_Cases_Within_Reporting_Range_42.yaml | 910 -----------------
 ...icators_26.yaml => NCD_Indicators_21.yaml} |   0
 ...=> NCD_Missed_Appointments_Report_25.yaml} |   0
 ...ml => NCD_Missed_Referrals_Report_37.yaml} |   0
 ...ta_39.yaml => NCD_RH_EMR_Raw_Data_38.yaml} |   0
 ...ber_of_CCS_Screening_-_Cumulative_56.yaml} |   0
 ...3.yaml => Number_of_CCS_Screening_71.yaml} |   0
 ...ment_type_72.yaml => Payment_type_24.yaml} |   0
 ..._start_to_the_end_of_the_selected_14.yaml} |   0
 ...S_Report_41.yaml => RH_CSS_Report_26.yaml} |   0
 ...aml => RH_NCD_OPD_Register_Report_46.yaml} |   0
 ..._22.yaml => Register_-_cumulative_55.yaml} |   0
 .../{Register_23.yaml => Register_39.yaml}    |   0
 ...h_at_least_a_4_weeks_prescription_41.yaml} |   1 +
 ..._NCD_screening_for_the_first_time_49.yaml} |   0
 ..._CCS_screening_for_the_first_time_58.yaml} |   1 +
 ...nd_were_VIA_positive_and_referred_19.yaml} |   1 +
 ...reast_Examination_by_Health_Staff_20.yaml} |   0
 ...e_start_to_the_end_of_the_selected_6.yaml} |   0
 ...d_66.yaml => VHSG_selected_period_68.yaml} |   0
 ...l => VIA__of_women_per_VIA_result_45.yaml} |   0
 ... => VIA__of_women_with_VIA_tested_65.yaml} |   0
 ..._Educated_with_Breast_Examination_52.yaml} |   0
 ...7.yaml => of_Women_per_Visit_Type_64.yaml} |   0
 ...8.yaml => of_women_per_visit_type_61.yaml} |   0
 ..._Referral_Status_Report_Dashboard_17.yaml} |  27 +-
 ...eening_Appointment_Status_Tracking_4.yaml} |  45 +-
 ...ical_Cancer_Screening_HC_Raw_Data_11.yaml} |  38 +-
 ...ical_Cancer_Screening_RH_Raw_Data_20.yaml} |   2 +-
 ...rvical_Cancer_Screening_for_Women_15.yaml} |   8 +-
 ... => Disbursement_Report_Dashboard_10.yaml} | 135 +--
 .../{Drugs_use_5.yaml => Drugs_use_18.yaml}   |   2 +-
 ...6.yaml => HC_CCS_Report_Dashboard_19.yaml} |  63 +-
 ..._NCD_OPD_Register_Report_Dashboard_8.yaml} |  21 +-
 ...Monitoring_CCS__Management_Program_9.yaml} |   2 +-
 ...on_and_Diabetes_management_program_5.yaml} |   2 +-
 ...ta_15.yaml => NCD_HC_EMR_Raw_Data_21.yaml} |   2 +-
 ...eport_1.yaml => NCD_HC_EMR_report_16.yaml} |  94 +-
 ...9.yaml => NCD_HIS_Report_Dashboard_6.yaml} | 149 +--
 ...ssed_Appointments_Report_Dashboard_2.yaml} |  29 +-
 ...ata_14.yaml => NCD_RH_EMR_Raw_Data_1.yaml} |   2 +-
 ...eport_2.yaml => NCD_RH_EMR_Report_12.yaml} |  48 +-
 ..._Referral_Status_Report_Dashboard_13.yaml} |  27 +-
 ...1.yaml => RH_CCS_Report_Dashboard_14.yaml} |  27 +-
 ..._NCD_OPD_Register_Report_Dashboard_3.yaml} |  29 +-
 ...east_Educated_and_Examinated_Women_7.yaml} |   8 +-
 ...Cervical_Cancer_Screening_HC_Raw_Data.yaml |  14 +-
 ...Cervical_Cancer_Screening_RH_Raw_Data.yaml |  52 +-
 .../Cervical_Cancer_Screening_for_Women.yaml  |  52 +-
 .../Analytics/NCD_HC_EMR_Raw_Data.yaml        |   2 +-
 .../Analytics/NCD_RH_EMR_Raw_Data.yaml        |  44 +-
 100 files changed, 2628 insertions(+), 2326 deletions(-)
 rename base/configs/superset/assets/charts/{Appointment_status_tracking_40.yaml => Appointment_status_tracking_59.yaml} (100%)
 rename base/configs/superset/assets/charts/{CCS_Distribution_of_visits_per_Province_43.yaml => CCS_Distribution_of_visits_per_Province_2.yaml} (100%)
 rename base/configs/superset/assets/charts/{CCS_Indicators_8.yaml => CCS_Indicators_28.yaml} (100%)
 rename base/configs/superset/assets/charts/{CCS_Missed_Referrals_Report_25.yaml => CCS_Missed_Referrals_Report_29.yaml} (100%)
 rename base/configs/superset/assets/charts/{CCS_Monthly_total_count_of_visits_grouped_by_district_3.yaml => CCS_Monthly_total_count_of_visits_grouped_by_district_30.yaml} (100%)
 rename base/configs/superset/assets/charts/{CVD_risk_factor_level_-_cumulative_52.yaml => CVD_risk_factor_level_-_cumulative_50.yaml} (100%)
 rename base/configs/superset/assets/charts/{CVD_risk_factor_level_67.yaml => CVD_risk_factor_level_60.yaml} (100%)
 rename base/configs/superset/assets/charts/{Cervical_Cancer_Screen_Indicators_31.yaml => Cervical_Cancer_Screen_Indicators_22.yaml} (100%)
 create mode 100644 base/configs/superset/assets/charts/Cervical_Cancer_Screening_HC_Raw_Data_16.yaml
 delete mode 100644 base/configs/superset/assets/charts/Cervical_Cancer_Screening_HC_Raw_Data_6.yaml
 rename base/configs/superset/assets/charts/{Cervical_Cancer_Screening_RH_Raw_Data_45.yaml => Cervical_Cancer_Screening_RH_Raw_Data_67.yaml} (100%)
 rename base/configs/superset/assets/charts/{Complication_of_DM__HBP_-_cumulative_15.yaml => Complication_of_DM__HBP_-_cumulative_69.yaml} (100%)
 rename base/configs/superset/assets/charts/{Complication_of_DM__HBP_12.yaml => Complication_of_DM__HBP_27.yaml} (100%)
 rename base/configs/superset/assets/charts/{DM_-_cumulative_60.yaml => DM_-_cumulative_11.yaml} (100%)
 rename base/configs/superset/assets/charts/{DM_56.yaml => DM_35.yaml} (100%)
 rename base/configs/superset/assets/charts/{DM_Follow-up_-_cumulative_51.yaml => DM_Follow-up_-_cumulative_44.yaml} (100%)
 rename base/configs/superset/assets/charts/{DM_Follow-up_70.yaml => DM_Follow-up_15.yaml} (100%)
 rename base/configs/superset/assets/charts/{DM_with_HBP_-_cumulative_69.yaml => DM_with_HBP_-_cumulative_42.yaml} (100%)
 rename base/configs/superset/assets/charts/{DM_with_HBP_49.yaml => DM_with_HBP_34.yaml} (100%)
 rename base/configs/superset/assets/charts/{DM_with_HBP_Follow-up_-_cumulative_65.yaml => DM_with_HBP_Follow-up_-_cumulative_54.yaml} (100%)
 rename base/configs/superset/assets/charts/{DM_with_HBP_Follow-up_64.yaml => DM_with_HBP_Follow-up_51.yaml} (100%)
 rename base/configs/superset/assets/charts/{Death_NCD_EMR_Report_-_Cumulative_16.yaml => Death_NCD_EMR_Report_-_Cumulative_53.yaml} (100%)
 rename base/configs/superset/assets/charts/{Death_NCD_EMR_Report_18.yaml => Death_NCD_EMR_Report_3.yaml} (100%)
 rename base/configs/superset/assets/charts/{Diagnosis_-_cumulative_19.yaml => Diagnosis_-_cumulative_32.yaml} (100%)
 rename base/configs/superset/assets/charts/{Diagnosis_21.yaml => Diagnosis_63.yaml} (100%)
 rename base/configs/superset/assets/charts/{Dropout_-_cumulative_62.yaml => Dropout_-_cumulative_7.yaml} (100%)
 rename base/configs/superset/assets/charts/{Dropout_63.yaml => Dropout_57.yaml} (100%)
 rename base/configs/superset/assets/charts/{Drugs_Use_24.yaml => Drugs_Use_9.yaml} (100%)
 rename base/configs/superset/assets/charts/{Follow-up_NCD_EMR_Report_-_Cumulative_17.yaml => Follow-up_NCD_EMR_Report_-_Cumulative_5.yaml} (100%)
 rename base/configs/superset/assets/charts/{Follow-up_NCD_EMR_Report_14.yaml => Follow-up_NCD_EMR_Report_43.yaml} (100%)
 rename base/configs/superset/assets/charts/{Follow_up_CVD_risk_factor_-_cumulative_58.yaml => Follow_up_CVD_risk_factor_-_cumulative_17.yaml} (100%)
 rename base/configs/superset/assets/charts/{Follow_up_CVD_risk_factor_71.yaml => Follow_up_CVD_risk_factor_62.yaml} (100%)
 rename base/configs/superset/assets/charts/{HBP_-_cumulative_55.yaml => HBP_-_cumulative_23.yaml} (100%)
 rename base/configs/superset/assets/charts/{HBP_54.yaml => HBP_8.yaml} (100%)
 rename base/configs/superset/assets/charts/{HBP_Follow-up_-_cumulative_68.yaml => HBP_Follow-up_-_cumulative_12.yaml} (100%)
 rename base/configs/superset/assets/charts/{HBP_Follow-up_50.yaml => HBP_Follow-up_33.yaml} (100%)
 rename base/configs/superset/assets/charts/{HC_CCS_Report_7.yaml => HC_CCS_Report_66.yaml} (100%)
 rename base/configs/superset/assets/charts/{HC_NCD_OPD_Register_Report_44.yaml => HC_NCD_OPD_Register_Report_48.yaml} (100%)
 rename base/configs/superset/assets/charts/{Loss_Follow-up_NCD_EMR_Report_-_Cumulative_20.yaml => Loss_Follow-up_NCD_EMR_Report_-_Cumulative_70.yaml} (100%)
 rename base/configs/superset/assets/charts/{Loss_Follow-up_NCD_EMR_Report_13.yaml => Loss_Follow-up_NCD_EMR_Report_10.yaml} (100%)
 rename base/configs/superset/assets/charts/{ME_Annual_Indicators_for_Hypertension_and_Diabetes_management_program_9.yaml => ME_Annual_Indicators_for_Hypertension_and_Diabetes_management_program_36.yaml} (100%)
 rename base/configs/superset/assets/charts/{Management_30.yaml => Management_1.yaml} (100%)
 rename base/configs/superset/assets/charts/{Management_35.yaml => Management_18.yaml} (100%)
 rename base/configs/superset/assets/charts/{NCD_HC_EMR_Raw_Data_11.yaml => NCD_HC_EMR_Raw_Data_47.yaml} (100%)
 rename base/configs/superset/assets/charts/{NCD_HIS_Follow-up_Cases_From_The_Beginning_33.yaml => NCD_HIS_Follow-up_Cases_From_The_Beginning_13.yaml} (100%)
 rename base/configs/superset/assets/charts/{NCD_HIS_Follow-up_Cases_Within_Reporting_Range_5.yaml => NCD_HIS_Follow-up_Cases_Within_Reporting_Range_4.yaml} (100%)
 create mode 100644 base/configs/superset/assets/charts/NCD_HIS_New_Cases_From_The_Beginning_31.yaml
 delete mode 100644 base/configs/superset/assets/charts/NCD_HIS_New_Cases_From_The_Beginning_46.yaml
 create mode 100644 base/configs/superset/assets/charts/NCD_HIS_New_Cases_Within_Reporting_Range_40.yaml
 delete mode 100644 base/configs/superset/assets/charts/NCD_HIS_New_Cases_Within_Reporting_Range_42.yaml
 rename base/configs/superset/assets/charts/{NCD_Indicators_26.yaml => NCD_Indicators_21.yaml} (100%)
 rename base/configs/superset/assets/charts/{NCD_Missed_Appointments_Report_34.yaml => NCD_Missed_Appointments_Report_25.yaml} (100%)
 rename base/configs/superset/assets/charts/{NCD_Missed_Referrals_Report_2.yaml => NCD_Missed_Referrals_Report_37.yaml} (100%)
 rename base/configs/superset/assets/charts/{NCD_RH_EMR_Raw_Data_39.yaml => NCD_RH_EMR_Raw_Data_38.yaml} (100%)
 rename base/configs/superset/assets/charts/{Number_of_CCS_Screening_-_Cumulative_61.yaml => Number_of_CCS_Screening_-_Cumulative_56.yaml} (100%)
 rename base/configs/superset/assets/charts/{Number_of_CCS_Screening_53.yaml => Number_of_CCS_Screening_71.yaml} (100%)
 rename base/configs/superset/assets/charts/{Payment_type_72.yaml => Payment_type_24.yaml} (100%)
 rename base/configs/superset/assets/charts/{Payment_type_from_the_start_to_the_end_of_the_selected_59.yaml => Payment_type_from_the_start_to_the_end_of_the_selected_14.yaml} (100%)
 rename base/configs/superset/assets/charts/{RH_CSS_Report_41.yaml => RH_CSS_Report_26.yaml} (100%)
 rename base/configs/superset/assets/charts/{RH_NCD_OPD_Register_Report_10.yaml => RH_NCD_OPD_Register_Report_46.yaml} (100%)
 rename base/configs/superset/assets/charts/{Register_-_cumulative_22.yaml => Register_-_cumulative_55.yaml} (100%)
 rename base/configs/superset/assets/charts/{Register_23.yaml => Register_39.yaml} (100%)
 rename base/configs/superset/assets/charts/{Registered_patients_aged_40_and_above_have_had_their_NCD_screening_for_the_first_time_with_a_follow-up_date_and_diagnosed_with_Hypertension__Diabetes_and_were_given_medication_with_at_least_a_4_weeks_prescription_4.yaml => Registered_patients_aged_40_and_above_have_had_their_NCD_screening_for_the_first_time_with_a_follow-up_date_and_diagnosed_with_Hypertension__Diabetes_and_were_given_medication_with_at_least_a_4_weeks_prescription_41.yaml} (99%)
 rename base/configs/superset/assets/charts/{Registered_patients_aged_40_and_above_that_have_had_their_NCD_screening_for_the_first_time_1.yaml => Registered_patients_aged_40_and_above_that_have_had_their_NCD_screening_for_the_first_time_49.yaml} (100%)
 rename base/configs/superset/assets/charts/{Registered_women_aged_30_to_49_years_that_have_had_their_CCS_screening_for_the_first_time_48.yaml => Registered_women_aged_30_to_49_years_that_have_had_their_CCS_screening_for_the_first_time_58.yaml} (99%)
 rename base/configs/superset/assets/charts/{Registered_women_aged_30_to_49_years_that_have_had_their_CCS_screening_for_the_first_time_and_were_VIA_positive_and_referred_47.yaml => Registered_women_aged_30_to_49_years_that_have_had_their_CCS_screening_for_the_first_time_and_were_VIA_positive_and_referred_19.yaml} (99%)
 rename base/configs/superset/assets/charts/{Result_of_Breast_Examination_by_Health_Staff_29.yaml => Result_of_Breast_Examination_by_Health_Staff_20.yaml} (100%)
 rename base/configs/superset/assets/charts/{VHSG_From_the_start_to_the_end_of_the_selected_57.yaml => VHSG_From_the_start_to_the_end_of_the_selected_6.yaml} (100%)
 rename base/configs/superset/assets/charts/{VHSG_selected_period_66.yaml => VHSG_selected_period_68.yaml} (100%)
 rename base/configs/superset/assets/charts/{VIA__of_women_per_VIA_result_36.yaml => VIA__of_women_per_VIA_result_45.yaml} (100%)
 rename base/configs/superset/assets/charts/{VIA__of_women_with_VIA_tested_37.yaml => VIA__of_women_with_VIA_tested_65.yaml} (100%)
 rename base/configs/superset/assets/charts/{of_Women_Educated_with_Breast_Examination_28.yaml => of_Women_Educated_with_Breast_Examination_52.yaml} (100%)
 rename base/configs/superset/assets/charts/{of_Women_per_Visit_Type_27.yaml => of_Women_per_Visit_Type_64.yaml} (100%)
 rename base/configs/superset/assets/charts/{of_women_per_visit_type_38.yaml => of_women_per_visit_type_61.yaml} (100%)
 rename base/configs/superset/assets/dashboards/{CCS_Referral_Status_Report_Dashboard_7.yaml => CCS_Referral_Status_Report_Dashboard_17.yaml} (91%)
 rename base/configs/superset/assets/dashboards/{Cervical_Cancer_Screening_Appointment_Status_Tracking_17.yaml => Cervical_Cancer_Screening_Appointment_Status_Tracking_4.yaml} (78%)
 rename base/configs/superset/assets/dashboards/{Cervical_Cancer_Screening_HC_Raw_Data_18.yaml => Cervical_Cancer_Screening_HC_Raw_Data_11.yaml} (90%)
 rename base/configs/superset/assets/dashboards/{Cervical_Cancer_Screening_RH_Raw_Data_3.yaml => Cervical_Cancer_Screening_RH_Raw_Data_20.yaml} (99%)
 rename base/configs/superset/assets/dashboards/{Cervical_Cancer_Screening_for_Women_4.yaml => Cervical_Cancer_Screening_for_Women_15.yaml} (98%)
 rename base/configs/superset/assets/dashboards/{Disbursement_Report_Dashboard_13.yaml => Disbursement_Report_Dashboard_10.yaml} (90%)
 rename base/configs/superset/assets/dashboards/{Drugs_use_5.yaml => Drugs_use_18.yaml} (99%)
 rename base/configs/superset/assets/dashboards/{HC_CCS_Report_Dashboard_6.yaml => HC_CCS_Report_Dashboard_19.yaml} (93%)
 rename base/configs/superset/assets/dashboards/{HC_NCD_OPD_Register_Report_Dashboard_19.yaml => HC_NCD_OPD_Register_Report_Dashboard_8.yaml} (95%)
 rename base/configs/superset/assets/dashboards/{Indicators_for_Monitoring_CCS__Management_Program_11.yaml => Indicators_for_Monitoring_CCS__Management_Program_9.yaml} (99%)
 rename base/configs/superset/assets/dashboards/{Indicators_for_annual_monitoring_and_evaluation_Hypertension_and_Diabetes_management_program_12.yaml => Indicators_for_annual_monitoring_and_evaluation_Hypertension_and_Diabetes_management_program_5.yaml} (99%)
 rename base/configs/superset/assets/dashboards/{NCD_HC_EMR_Raw_Data_15.yaml => NCD_HC_EMR_Raw_Data_21.yaml} (99%)
 rename base/configs/superset/assets/dashboards/{NCD_HC_EMR_report_1.yaml => NCD_HC_EMR_report_16.yaml} (98%)
 rename base/configs/superset/assets/dashboards/{NCD_HIS_Report_Dashboard_9.yaml => NCD_HIS_Report_Dashboard_6.yaml} (85%)
 rename base/configs/superset/assets/dashboards/{NCD_Missed_Appointments_Report_Dashboard_20.yaml => NCD_Missed_Appointments_Report_Dashboard_2.yaml} (90%)
 rename base/configs/superset/assets/dashboards/{NCD_RH_EMR_Raw_Data_14.yaml => NCD_RH_EMR_Raw_Data_1.yaml} (99%)
 rename base/configs/superset/assets/dashboards/{NCD_RH_EMR_Report_2.yaml => NCD_RH_EMR_Report_12.yaml} (97%)
 rename base/configs/superset/assets/dashboards/{NCD_Referral_Status_Report_Dashboard_8.yaml => NCD_Referral_Status_Report_Dashboard_13.yaml} (91%)
 rename base/configs/superset/assets/dashboards/{RH_CCS_Report_Dashboard_21.yaml => RH_CCS_Report_Dashboard_14.yaml} (91%)
 rename base/configs/superset/assets/dashboards/{RH_NCD_OPD_Register_Report_Dashboard_10.yaml => RH_NCD_OPD_Register_Report_Dashboard_3.yaml} (90%)
 rename base/configs/superset/assets/dashboards/{Self-breast_Educated_and_Examinated_Women_16.yaml => Self-breast_Educated_and_Examinated_Women_7.yaml} (99%)

diff --git a/base/configs/superset/assets/charts/Appointment_status_tracking_40.yaml b/base/configs/superset/assets/charts/Appointment_status_tracking_59.yaml
similarity index 100%
rename from base/configs/superset/assets/charts/Appointment_status_tracking_40.yaml
rename to base/configs/superset/assets/charts/Appointment_status_tracking_59.yaml
diff --git a/base/configs/superset/assets/charts/CCS_Distribution_of_visits_per_Province_43.yaml b/base/configs/superset/assets/charts/CCS_Distribution_of_visits_per_Province_2.yaml
similarity index 100%
rename from base/configs/superset/assets/charts/CCS_Distribution_of_visits_per_Province_43.yaml
rename to base/configs/superset/assets/charts/CCS_Distribution_of_visits_per_Province_2.yaml
diff --git a/base/configs/superset/assets/charts/CCS_Indicators_8.yaml b/base/configs/superset/assets/charts/CCS_Indicators_28.yaml
similarity index 100%
rename from base/configs/superset/assets/charts/CCS_Indicators_8.yaml
rename to base/configs/superset/assets/charts/CCS_Indicators_28.yaml
diff --git a/base/configs/superset/assets/charts/CCS_Missed_Referrals_Report_25.yaml b/base/configs/superset/assets/charts/CCS_Missed_Referrals_Report_29.yaml
similarity index 100%
rename from base/configs/superset/assets/charts/CCS_Missed_Referrals_Report_25.yaml
rename to base/configs/superset/assets/charts/CCS_Missed_Referrals_Report_29.yaml
diff --git a/base/configs/superset/assets/charts/CCS_Monthly_total_count_of_visits_grouped_by_district_3.yaml b/base/configs/superset/assets/charts/CCS_Monthly_total_count_of_visits_grouped_by_district_30.yaml
similarity index 100%
rename from base/configs/superset/assets/charts/CCS_Monthly_total_count_of_visits_grouped_by_district_3.yaml
rename to base/configs/superset/assets/charts/CCS_Monthly_total_count_of_visits_grouped_by_district_30.yaml
diff --git a/base/configs/superset/assets/charts/CVD_risk_factor_level_-_cumulative_52.yaml b/base/configs/superset/assets/charts/CVD_risk_factor_level_-_cumulative_50.yaml
similarity index 100%
rename from base/configs/superset/assets/charts/CVD_risk_factor_level_-_cumulative_52.yaml
rename to base/configs/superset/assets/charts/CVD_risk_factor_level_-_cumulative_50.yaml
diff --git a/base/configs/superset/assets/charts/CVD_risk_factor_level_67.yaml b/base/configs/superset/assets/charts/CVD_risk_factor_level_60.yaml
similarity index 100%
rename from base/configs/superset/assets/charts/CVD_risk_factor_level_67.yaml
rename to base/configs/superset/assets/charts/CVD_risk_factor_level_60.yaml
diff --git a/base/configs/superset/assets/charts/Cervical_Cancer_Screen_Indicators_31.yaml b/base/configs/superset/assets/charts/Cervical_Cancer_Screen_Indicators_22.yaml
similarity index 100%
rename from base/configs/superset/assets/charts/Cervical_Cancer_Screen_Indicators_31.yaml
rename to base/configs/superset/assets/charts/Cervical_Cancer_Screen_Indicators_22.yaml
diff --git a/base/configs/superset/assets/charts/Cervical_Cancer_Screening_HC_Raw_Data_16.yaml b/base/configs/superset/assets/charts/Cervical_Cancer_Screening_HC_Raw_Data_16.yaml
new file mode 100644
index 00000000..6e3bdb1b
--- /dev/null
+++ b/base/configs/superset/assets/charts/Cervical_Cancer_Screening_HC_Raw_Data_16.yaml
@@ -0,0 +1,142 @@
+slice_name: Cervical Cancer Screening HC Raw Data
+description: null
+certified_by: null
+certification_details: null
+viz_type: table
+params:
+  datasource: 33__table
+  viz_type: table
+  slice_id: 16
+  query_mode: raw
+  groupby: []
+  time_grain_sqla: P1D
+  temporal_columns_lookup:
+    birthdate: true
+    visit_end_time: true
+    visit_end_date: true
+    visit_start_date: true
+    visit_start_time: true
+    visit_date: true
+  all_columns:
+  - client_id
+  - client_name
+  - gender
+  - age
+  - birthdate
+  - id_poor
+  - national_id
+  - pmrs_id
+  - covid_vaccination_id
+  - nssf
+  - ssn
+  - passport_no
+  - other_identifiers
+  - province
+  - district
+  - commune
+  - village
+  - occupation
+  - place_of_birth
+  - ethnicity
+  - marital_status
+  - education
+  - visit_start_date
+  - visit_start_time_text
+  - visit_end_date
+  - visit_end_time_text
+  - has_referral_letter
+  - payment_type
+  - visit_district
+  - visit_hf_code
+  - visit_hf_name
+  - referred_from
+  - visit_province
+  - hpv_test_result
+  - is_screen_for_css
+  - cytology_test_result
+  - address_zone
+  - sex_debut
+  - test_type
+  - number_of_pregnancies
+  - number_of_deliveries
+  - number_of_miscarriages
+  - previous_pregnant
+  - treatment
+  - smoked
+  - corticosteroid_use
+  - corticosteroid_use_duration
+  - has_multiple_sex_partners
+  - partner_has_multiple_sex_partners
+  - history_stis
+  - via_test_result
+  - current_stis
+  - has_hiv
+  - has_current_stis
+  - hiv_treatment
+  - coc_use_for_more_than_5_yrs
+  - type_of_cancer
+  - has_history_stis
+  - vulva_exam
+  - vagina_exam
+  - cervix_exam
+  - family_history_cancer
+  - bleeding_after_sex
+  - other_physical_exam
+  - uterus_text
+  - cervix_text
+  - vaginal_rectal_text
+  - is_educated_for_css
+  - hpv_result
+  - vulva_text
+  - scj_visibility
+  - hpv_virus_type
+  - number_of_quadrants
+  - rectum_text
+  - via_test_results
+  - cc_reason_for_referral
+  - cc_treatment_options
+  - aceto_white_ecto_cervix
+  - cc_appointment_date
+  - is_educated_for_bs
+  - cc_reason_for_appointment
+  - sign_of_breast
+  - bc_reason_for_referral
+  - bc_treatment
+  - bc_appointment_date
+  - bc_reason_for_appointment
+  - rf_hf_code
+  - rf_hf_province
+  - rf_hf_district
+  - rf_hf_name
+  - fallopian_text
+  percent_metrics: []
+  adhoc_filters:
+  - clause: WHERE
+    subject: visit_date
+    operator: TEMPORAL_RANGE
+    comparator: Last year
+    expressionType: SIMPLE
+  order_by_cols:
+  - '["visit_date", false]'
+  row_limit: 5000
+  server_page_length: 10
+  order_desc: true
+  table_timestamp_format: smart_date
+  page_length: 200
+  show_cell_bars: false
+  color_pn: true
+  allow_rearrange_columns: true
+  column_config:
+    visit_start_time:
+      d3TimeFormat: '%H:%M:%S'
+  conditional_formatting: []
+  extra_form_data: {}
+  dashboards:
+  - 11
+query_context: '{"datasource":{"id":33,"type":"table"},"force":false,"queries":[{"filters":[{"col":"visit_date","op":"TEMPORAL_RANGE","val":"Last
+  year"}],"extras":{"time_grain_sqla":"P1D","having":"","where":""},"applied_time_extras":{},"columns":["client_id","client_name","gender","age","birthdate","id_poor","national_id","pmrs_id","covid_vaccination_id","nssf","ssn","passport_no","other_identifiers","province","district","commune","village","occupation","place_of_birth","ethnicity","marital_status","education","visit_start_date","visit_start_time_text","visit_end_date","visit_end_time_text","has_referral_letter","payment_type","visit_district","visit_hf_code","visit_hf_name","referred_from","visit_province","hpv_test_result","is_screen_for_css","cytology_test_result","address_zone","sex_debut","test_type","number_of_pregnancies","number_of_deliveries","number_of_miscarriages","previous_pregnant","treatment","smoked","corticosteroid_use","corticosteroid_use_duration","has_multiple_sex_partners","partner_has_multiple_sex_partners","history_stis","via_test_result","current_stis","has_hiv","has_current_stis","hiv_treatment","coc_use_for_more_than_5_yrs","type_of_cancer","has_history_stis","vulva_exam","vagina_exam","cervix_exam","family_history_cancer","bleeding_after_sex","other_physical_exam","uterus_text","cervix_text","vaginal_rectal_text","is_educated_for_css","hpv_result","vulva_text","scj_visibility","hpv_virus_type","number_of_quadrants","rectum_text","via_test_results","cc_reason_for_referral","cc_treatment_options","aceto_white_ecto_cervix","cc_appointment_date","is_educated_for_bs","cc_reason_for_appointment","sign_of_breast","bc_reason_for_referral","bc_treatment","bc_appointment_date","bc_reason_for_appointment","rf_hf_code","rf_hf_province","rf_hf_district","rf_hf_name","fallopian_text"],"orderby":[["visit_date",false]],"annotation_layers":[],"row_limit":5000,"series_limit":0,"order_desc":true,"url_params":{},"custom_params":{},"custom_form_data":{},"post_processing":[]}],"form_data":{"datasource":"33__table","viz_type":"table","slice_id":16,"query_mode":"raw","groupby":[],"time_grain_sqla":"P1D","temporal_columns_lookup":{"birthdate":true,"visit_end_time":true,"visit_end_date":true,"visit_start_date":true,"visit_start_time":true,"visit_date":true},"all_columns":["client_id","client_name","gender","age","birthdate","id_poor","national_id","pmrs_id","covid_vaccination_id","nssf","ssn","passport_no","other_identifiers","province","district","commune","village","occupation","place_of_birth","ethnicity","marital_status","education","visit_start_date","visit_start_time_text","visit_end_date","visit_end_time_text","has_referral_letter","payment_type","visit_district","visit_hf_code","visit_hf_name","referred_from","visit_province","hpv_test_result","is_screen_for_css","cytology_test_result","address_zone","sex_debut","test_type","number_of_pregnancies","number_of_deliveries","number_of_miscarriages","previous_pregnant","treatment","smoked","corticosteroid_use","corticosteroid_use_duration","has_multiple_sex_partners","partner_has_multiple_sex_partners","history_stis","via_test_result","current_stis","has_hiv","has_current_stis","hiv_treatment","coc_use_for_more_than_5_yrs","type_of_cancer","has_history_stis","vulva_exam","vagina_exam","cervix_exam","family_history_cancer","bleeding_after_sex","other_physical_exam","uterus_text","cervix_text","vaginal_rectal_text","is_educated_for_css","hpv_result","vulva_text","scj_visibility","hpv_virus_type","number_of_quadrants","rectum_text","via_test_results","cc_reason_for_referral","cc_treatment_options","aceto_white_ecto_cervix","cc_appointment_date","is_educated_for_bs","cc_reason_for_appointment","sign_of_breast","bc_reason_for_referral","bc_treatment","bc_appointment_date","bc_reason_for_appointment","rf_hf_code","rf_hf_province","rf_hf_district","rf_hf_name","fallopian_text"],"percent_metrics":[],"adhoc_filters":[{"clause":"WHERE","subject":"visit_date","operator":"TEMPORAL_RANGE","comparator":"Last
+  year","expressionType":"SIMPLE"}],"order_by_cols":["[\"visit_date\", false]"],"row_limit":5000,"server_page_length":10,"order_desc":true,"table_timestamp_format":"smart_date","page_length":200,"show_cell_bars":false,"color_pn":true,"allow_rearrange_columns":true,"column_config":{"visit_start_time":{"d3TimeFormat":"%H:%M:%S"}},"conditional_formatting":[],"extra_form_data":{},"dashboards":[11],"force":false,"result_format":"json","result_type":"full","include_time":false},"result_format":"json","result_type":"full"}'
+cache_timeout: null
+uuid: a133510d-1fd5-405c-8db9-0ad187e7c73c
+version: 1.0.0
+dataset_uuid: 5457e2a2-5943-4b14-8a0e-878c7ba4bc8f
diff --git a/base/configs/superset/assets/charts/Cervical_Cancer_Screening_HC_Raw_Data_6.yaml b/base/configs/superset/assets/charts/Cervical_Cancer_Screening_HC_Raw_Data_6.yaml
deleted file mode 100644
index 51c579c1..00000000
--- a/base/configs/superset/assets/charts/Cervical_Cancer_Screening_HC_Raw_Data_6.yaml
+++ /dev/null
@@ -1,134 +0,0 @@
-slice_name: Cervical Cancer Screening HC Raw Data
-description: null
-certified_by: null
-certification_details: null
-viz_type: table
-params:
-  datasource: 14__table
-  viz_type: table
-  slice_id: 32
-  granularity_sqla: visit_date
-  time_grain_sqla: P1D
-  time_range: Last year
-  query_mode: raw
-  groupby: []
-  all_columns:
-  - client_id
-  - client_name
-  - gender
-  - age
-  - birthdate
-  - id_poor
-  - national_id
-  - pmrs_id
-  - covid_vaccination_id
-  - nssf
-  - ssn
-  - passport_no
-  - other_identifiers
-  - province
-  - district
-  - commune
-  - village
-  - occupation
-  - place_of_birth
-  - ethnicity
-  - marital_status
-  - visit_start_date
-  - visit_start_time_text
-  - education
-  - visit_end_date
-  - visit_end_time
-  - referred_from
-  - has_referral_letter
-  - payment_type
-  - visit_district
-  - visit_hf_code
-  - visit_hf_name
-  - is_screen_for_css
-  - visit_province
-  - hpv_test_result
-  - cytology_test_result
-  - address_zone
-  - sex_debut
-  - test_type
-  - previous_pregnant
-  - number_of_pregnancies
-  - number_of_deliveries
-  - number_of_miscarriages
-  - treatment
-  - smoked
-  - corticosteroid_use
-  - corticosteroid_use_duration
-  - via_test_result
-  - has_multiple_sex_partners
-  - partner_has_multiple_sex_partners
-  - history_stis
-  - has_history_stis
-  - current_stis
-  - has_hiv
-  - has_current_stis
-  - hiv_treatment
-  - coc_use_for_more_than_5_yrs
-  - type_of_cancer
-  - vulva_exam
-  - vagina_exam
-  - cervix_exam
-  - family_history_cancer
-  - bleeding_after_sex
-  - other_physical_exam
-  - cervix_text
-  - uterus_text
-  - vaginal_rectal_text
-  - is_educated_for_css
-  - hpv_result
-  - vulva_text
-  - scj_visibility
-  - hpv_virus_type
-  - number_of_quadrants
-  - rectum_text
-  - via_test_results
-  - cc_reason_for_referral
-  - aceto_white_ecto_cervix
-  - cc_treatment_options
-  - cc_appointment_date
-  - is_educated_for_bs
-  - cc_reason_for_appointment
-  - sign_of_breast
-  - bc_treatment
-  - bc_reason_for_referral
-  - bc_appointment_date
-  - bc_reason_for_appointment
-  - rf_hf_code
-  - rf_hf_province
-  - rf_hf_district
-  - rf_hf_name
-  - fallopian_text
-  percent_metrics: []
-  adhoc_filters: []
-  order_by_cols:
-  - '["visit_date", false]'
-  row_limit: 5000
-  server_page_length: 10
-  order_desc: true
-  table_timestamp_format: smart_date
-  page_length: 200
-  show_cell_bars: false
-  color_pn: true
-  allow_rearrange_columns: true
-  column_config:
-    visit_start_time:
-      d3TimeFormat: '%H:%M:%S'
-  conditional_formatting: []
-  extra_form_data: {}
-  dashboards:
-  - 8
-  annotation_layers: []
-query_context: '{"datasource":{"id":14,"type":"table"},"force":false,"queries":[{"time_range":"Last
-  year","granularity":"visit_date","filters":[],"extras":{"time_grain_sqla":"P1D","having":"","where":""},"applied_time_extras":{},"columns":["client_id","client_name","gender","age","birthdate","id_poor","national_id","pmrs_id","covid_vaccination_id","nssf","ssn","passport_no","other_identifiers","province","district","commune","village","occupation","place_of_birth","ethnicity","marital_status","visit_start_date","visit_start_time_text","education","visit_end_date","visit_end_time","referred_from","has_referral_letter","payment_type","visit_district","visit_hf_code","visit_hf_name","is_screen_for_css","visit_province","hpv_test_result","cytology_test_result","address_zone","sex_debut","test_type","previous_pregnant","number_of_pregnancies","number_of_deliveries","number_of_miscarriages","treatment","smoked","corticosteroid_use","corticosteroid_use_duration","via_test_result","has_multiple_sex_partners","partner_has_multiple_sex_partners","history_stis","has_history_stis","current_stis","has_hiv","has_current_stis","hiv_treatment","coc_use_for_more_than_5_yrs","type_of_cancer","vulva_exam","vagina_exam","cervix_exam","family_history_cancer","bleeding_after_sex","other_physical_exam","cervix_text","uterus_text","vaginal_rectal_text","is_educated_for_css","hpv_result","vulva_text","scj_visibility","hpv_virus_type","number_of_quadrants","rectum_text","via_test_results","cc_reason_for_referral","aceto_white_ecto_cervix","cc_treatment_options","cc_appointment_date","is_educated_for_bs","cc_reason_for_appointment","sign_of_breast","bc_treatment","bc_reason_for_referral","bc_appointment_date","bc_reason_for_appointment","rf_hf_code","rf_hf_province","rf_hf_district","rf_hf_name","fallopian_text"],"orderby":[["visit_date",false]],"annotation_layers":[],"row_limit":5000,"series_limit":0,"order_desc":true,"url_params":{},"custom_params":{},"custom_form_data":{},"post_processing":[]}],"form_data":{"datasource":"14__table","viz_type":"table","slice_id":32,"granularity_sqla":"visit_date","time_grain_sqla":"P1D","time_range":"Last
-  year","query_mode":"raw","groupby":[],"all_columns":["client_id","client_name","gender","age","birthdate","id_poor","national_id","pmrs_id","covid_vaccination_id","nssf","ssn","passport_no","other_identifiers","province","district","commune","village","occupation","place_of_birth","ethnicity","marital_status","visit_start_date","visit_start_time_text","education","visit_end_date","visit_end_time","referred_from","has_referral_letter","payment_type","visit_district","visit_hf_code","visit_hf_name","is_screen_for_css","visit_province","hpv_test_result","cytology_test_result","address_zone","sex_debut","test_type","previous_pregnant","number_of_pregnancies","number_of_deliveries","number_of_miscarriages","treatment","smoked","corticosteroid_use","corticosteroid_use_duration","via_test_result","has_multiple_sex_partners","partner_has_multiple_sex_partners","history_stis","has_history_stis","current_stis","has_hiv","has_current_stis","hiv_treatment","coc_use_for_more_than_5_yrs","type_of_cancer","vulva_exam","vagina_exam","cervix_exam","family_history_cancer","bleeding_after_sex","other_physical_exam","cervix_text","uterus_text","vaginal_rectal_text","is_educated_for_css","hpv_result","vulva_text","scj_visibility","hpv_virus_type","number_of_quadrants","rectum_text","via_test_results","cc_reason_for_referral","aceto_white_ecto_cervix","cc_treatment_options","cc_appointment_date","is_educated_for_bs","cc_reason_for_appointment","sign_of_breast","bc_treatment","bc_reason_for_referral","bc_appointment_date","bc_reason_for_appointment","rf_hf_code","rf_hf_province","rf_hf_district","rf_hf_name","fallopian_text"],"percent_metrics":[],"adhoc_filters":[],"order_by_cols":["[\"visit_date\",
-  false]"],"row_limit":5000,"server_page_length":10,"include_time":false,"order_desc":true,"table_timestamp_format":"smart_date","page_length":200,"show_cell_bars":false,"color_pn":true,"allow_rearrange_columns":true,"column_config":{"visit_start_time":{"d3TimeFormat":"%H:%M:%S"}},"conditional_formatting":[],"extra_form_data":{},"dashboards":[8],"force":false,"result_format":"json","result_type":"full"},"result_format":"json","result_type":"full"}'
-cache_timeout: null
-uuid: a133510d-1fd5-405c-8db9-0ad187e7c73c
-version: 1.0.0
-dataset_uuid: 5457e2a2-5943-4b14-8a0e-878c7ba4bc8f
diff --git a/base/configs/superset/assets/charts/Cervical_Cancer_Screening_RH_Raw_Data_45.yaml b/base/configs/superset/assets/charts/Cervical_Cancer_Screening_RH_Raw_Data_67.yaml
similarity index 100%
rename from base/configs/superset/assets/charts/Cervical_Cancer_Screening_RH_Raw_Data_45.yaml
rename to base/configs/superset/assets/charts/Cervical_Cancer_Screening_RH_Raw_Data_67.yaml
diff --git a/base/configs/superset/assets/charts/Complication_of_DM__HBP_-_cumulative_15.yaml b/base/configs/superset/assets/charts/Complication_of_DM__HBP_-_cumulative_69.yaml
similarity index 100%
rename from base/configs/superset/assets/charts/Complication_of_DM__HBP_-_cumulative_15.yaml
rename to base/configs/superset/assets/charts/Complication_of_DM__HBP_-_cumulative_69.yaml
diff --git a/base/configs/superset/assets/charts/Complication_of_DM__HBP_12.yaml b/base/configs/superset/assets/charts/Complication_of_DM__HBP_27.yaml
similarity index 100%
rename from base/configs/superset/assets/charts/Complication_of_DM__HBP_12.yaml
rename to base/configs/superset/assets/charts/Complication_of_DM__HBP_27.yaml
diff --git a/base/configs/superset/assets/charts/DM_-_cumulative_60.yaml b/base/configs/superset/assets/charts/DM_-_cumulative_11.yaml
similarity index 100%
rename from base/configs/superset/assets/charts/DM_-_cumulative_60.yaml
rename to base/configs/superset/assets/charts/DM_-_cumulative_11.yaml
diff --git a/base/configs/superset/assets/charts/DM_56.yaml b/base/configs/superset/assets/charts/DM_35.yaml
similarity index 100%
rename from base/configs/superset/assets/charts/DM_56.yaml
rename to base/configs/superset/assets/charts/DM_35.yaml
diff --git a/base/configs/superset/assets/charts/DM_Follow-up_-_cumulative_51.yaml b/base/configs/superset/assets/charts/DM_Follow-up_-_cumulative_44.yaml
similarity index 100%
rename from base/configs/superset/assets/charts/DM_Follow-up_-_cumulative_51.yaml
rename to base/configs/superset/assets/charts/DM_Follow-up_-_cumulative_44.yaml
diff --git a/base/configs/superset/assets/charts/DM_Follow-up_70.yaml b/base/configs/superset/assets/charts/DM_Follow-up_15.yaml
similarity index 100%
rename from base/configs/superset/assets/charts/DM_Follow-up_70.yaml
rename to base/configs/superset/assets/charts/DM_Follow-up_15.yaml
diff --git a/base/configs/superset/assets/charts/DM_with_HBP_-_cumulative_69.yaml b/base/configs/superset/assets/charts/DM_with_HBP_-_cumulative_42.yaml
similarity index 100%
rename from base/configs/superset/assets/charts/DM_with_HBP_-_cumulative_69.yaml
rename to base/configs/superset/assets/charts/DM_with_HBP_-_cumulative_42.yaml
diff --git a/base/configs/superset/assets/charts/DM_with_HBP_49.yaml b/base/configs/superset/assets/charts/DM_with_HBP_34.yaml
similarity index 100%
rename from base/configs/superset/assets/charts/DM_with_HBP_49.yaml
rename to base/configs/superset/assets/charts/DM_with_HBP_34.yaml
diff --git a/base/configs/superset/assets/charts/DM_with_HBP_Follow-up_-_cumulative_65.yaml b/base/configs/superset/assets/charts/DM_with_HBP_Follow-up_-_cumulative_54.yaml
similarity index 100%
rename from base/configs/superset/assets/charts/DM_with_HBP_Follow-up_-_cumulative_65.yaml
rename to base/configs/superset/assets/charts/DM_with_HBP_Follow-up_-_cumulative_54.yaml
diff --git a/base/configs/superset/assets/charts/DM_with_HBP_Follow-up_64.yaml b/base/configs/superset/assets/charts/DM_with_HBP_Follow-up_51.yaml
similarity index 100%
rename from base/configs/superset/assets/charts/DM_with_HBP_Follow-up_64.yaml
rename to base/configs/superset/assets/charts/DM_with_HBP_Follow-up_51.yaml
diff --git a/base/configs/superset/assets/charts/Death_NCD_EMR_Report_-_Cumulative_16.yaml b/base/configs/superset/assets/charts/Death_NCD_EMR_Report_-_Cumulative_53.yaml
similarity index 100%
rename from base/configs/superset/assets/charts/Death_NCD_EMR_Report_-_Cumulative_16.yaml
rename to base/configs/superset/assets/charts/Death_NCD_EMR_Report_-_Cumulative_53.yaml
diff --git a/base/configs/superset/assets/charts/Death_NCD_EMR_Report_18.yaml b/base/configs/superset/assets/charts/Death_NCD_EMR_Report_3.yaml
similarity index 100%
rename from base/configs/superset/assets/charts/Death_NCD_EMR_Report_18.yaml
rename to base/configs/superset/assets/charts/Death_NCD_EMR_Report_3.yaml
diff --git a/base/configs/superset/assets/charts/Diagnosis_-_cumulative_19.yaml b/base/configs/superset/assets/charts/Diagnosis_-_cumulative_32.yaml
similarity index 100%
rename from base/configs/superset/assets/charts/Diagnosis_-_cumulative_19.yaml
rename to base/configs/superset/assets/charts/Diagnosis_-_cumulative_32.yaml
diff --git a/base/configs/superset/assets/charts/Diagnosis_21.yaml b/base/configs/superset/assets/charts/Diagnosis_63.yaml
similarity index 100%
rename from base/configs/superset/assets/charts/Diagnosis_21.yaml
rename to base/configs/superset/assets/charts/Diagnosis_63.yaml
diff --git a/base/configs/superset/assets/charts/Dropout_-_cumulative_62.yaml b/base/configs/superset/assets/charts/Dropout_-_cumulative_7.yaml
similarity index 100%
rename from base/configs/superset/assets/charts/Dropout_-_cumulative_62.yaml
rename to base/configs/superset/assets/charts/Dropout_-_cumulative_7.yaml
diff --git a/base/configs/superset/assets/charts/Dropout_63.yaml b/base/configs/superset/assets/charts/Dropout_57.yaml
similarity index 100%
rename from base/configs/superset/assets/charts/Dropout_63.yaml
rename to base/configs/superset/assets/charts/Dropout_57.yaml
diff --git a/base/configs/superset/assets/charts/Drugs_Use_24.yaml b/base/configs/superset/assets/charts/Drugs_Use_9.yaml
similarity index 100%
rename from base/configs/superset/assets/charts/Drugs_Use_24.yaml
rename to base/configs/superset/assets/charts/Drugs_Use_9.yaml
diff --git a/base/configs/superset/assets/charts/Follow-up_NCD_EMR_Report_-_Cumulative_17.yaml b/base/configs/superset/assets/charts/Follow-up_NCD_EMR_Report_-_Cumulative_5.yaml
similarity index 100%
rename from base/configs/superset/assets/charts/Follow-up_NCD_EMR_Report_-_Cumulative_17.yaml
rename to base/configs/superset/assets/charts/Follow-up_NCD_EMR_Report_-_Cumulative_5.yaml
diff --git a/base/configs/superset/assets/charts/Follow-up_NCD_EMR_Report_14.yaml b/base/configs/superset/assets/charts/Follow-up_NCD_EMR_Report_43.yaml
similarity index 100%
rename from base/configs/superset/assets/charts/Follow-up_NCD_EMR_Report_14.yaml
rename to base/configs/superset/assets/charts/Follow-up_NCD_EMR_Report_43.yaml
diff --git a/base/configs/superset/assets/charts/Follow_up_CVD_risk_factor_-_cumulative_58.yaml b/base/configs/superset/assets/charts/Follow_up_CVD_risk_factor_-_cumulative_17.yaml
similarity index 100%
rename from base/configs/superset/assets/charts/Follow_up_CVD_risk_factor_-_cumulative_58.yaml
rename to base/configs/superset/assets/charts/Follow_up_CVD_risk_factor_-_cumulative_17.yaml
diff --git a/base/configs/superset/assets/charts/Follow_up_CVD_risk_factor_71.yaml b/base/configs/superset/assets/charts/Follow_up_CVD_risk_factor_62.yaml
similarity index 100%
rename from base/configs/superset/assets/charts/Follow_up_CVD_risk_factor_71.yaml
rename to base/configs/superset/assets/charts/Follow_up_CVD_risk_factor_62.yaml
diff --git a/base/configs/superset/assets/charts/HBP_-_cumulative_55.yaml b/base/configs/superset/assets/charts/HBP_-_cumulative_23.yaml
similarity index 100%
rename from base/configs/superset/assets/charts/HBP_-_cumulative_55.yaml
rename to base/configs/superset/assets/charts/HBP_-_cumulative_23.yaml
diff --git a/base/configs/superset/assets/charts/HBP_54.yaml b/base/configs/superset/assets/charts/HBP_8.yaml
similarity index 100%
rename from base/configs/superset/assets/charts/HBP_54.yaml
rename to base/configs/superset/assets/charts/HBP_8.yaml
diff --git a/base/configs/superset/assets/charts/HBP_Follow-up_-_cumulative_68.yaml b/base/configs/superset/assets/charts/HBP_Follow-up_-_cumulative_12.yaml
similarity index 100%
rename from base/configs/superset/assets/charts/HBP_Follow-up_-_cumulative_68.yaml
rename to base/configs/superset/assets/charts/HBP_Follow-up_-_cumulative_12.yaml
diff --git a/base/configs/superset/assets/charts/HBP_Follow-up_50.yaml b/base/configs/superset/assets/charts/HBP_Follow-up_33.yaml
similarity index 100%
rename from base/configs/superset/assets/charts/HBP_Follow-up_50.yaml
rename to base/configs/superset/assets/charts/HBP_Follow-up_33.yaml
diff --git a/base/configs/superset/assets/charts/HC_CCS_Report_7.yaml b/base/configs/superset/assets/charts/HC_CCS_Report_66.yaml
similarity index 100%
rename from base/configs/superset/assets/charts/HC_CCS_Report_7.yaml
rename to base/configs/superset/assets/charts/HC_CCS_Report_66.yaml
diff --git a/base/configs/superset/assets/charts/HC_NCD_OPD_Register_Report_44.yaml b/base/configs/superset/assets/charts/HC_NCD_OPD_Register_Report_48.yaml
similarity index 100%
rename from base/configs/superset/assets/charts/HC_NCD_OPD_Register_Report_44.yaml
rename to base/configs/superset/assets/charts/HC_NCD_OPD_Register_Report_48.yaml
diff --git a/base/configs/superset/assets/charts/Loss_Follow-up_NCD_EMR_Report_-_Cumulative_20.yaml b/base/configs/superset/assets/charts/Loss_Follow-up_NCD_EMR_Report_-_Cumulative_70.yaml
similarity index 100%
rename from base/configs/superset/assets/charts/Loss_Follow-up_NCD_EMR_Report_-_Cumulative_20.yaml
rename to base/configs/superset/assets/charts/Loss_Follow-up_NCD_EMR_Report_-_Cumulative_70.yaml
diff --git a/base/configs/superset/assets/charts/Loss_Follow-up_NCD_EMR_Report_13.yaml b/base/configs/superset/assets/charts/Loss_Follow-up_NCD_EMR_Report_10.yaml
similarity index 100%
rename from base/configs/superset/assets/charts/Loss_Follow-up_NCD_EMR_Report_13.yaml
rename to base/configs/superset/assets/charts/Loss_Follow-up_NCD_EMR_Report_10.yaml
diff --git a/base/configs/superset/assets/charts/ME_Annual_Indicators_for_Hypertension_and_Diabetes_management_program_9.yaml b/base/configs/superset/assets/charts/ME_Annual_Indicators_for_Hypertension_and_Diabetes_management_program_36.yaml
similarity index 100%
rename from base/configs/superset/assets/charts/ME_Annual_Indicators_for_Hypertension_and_Diabetes_management_program_9.yaml
rename to base/configs/superset/assets/charts/ME_Annual_Indicators_for_Hypertension_and_Diabetes_management_program_36.yaml
diff --git a/base/configs/superset/assets/charts/Management_30.yaml b/base/configs/superset/assets/charts/Management_1.yaml
similarity index 100%
rename from base/configs/superset/assets/charts/Management_30.yaml
rename to base/configs/superset/assets/charts/Management_1.yaml
diff --git a/base/configs/superset/assets/charts/Management_35.yaml b/base/configs/superset/assets/charts/Management_18.yaml
similarity index 100%
rename from base/configs/superset/assets/charts/Management_35.yaml
rename to base/configs/superset/assets/charts/Management_18.yaml
diff --git a/base/configs/superset/assets/charts/NCD_HC_EMR_Raw_Data_11.yaml b/base/configs/superset/assets/charts/NCD_HC_EMR_Raw_Data_47.yaml
similarity index 100%
rename from base/configs/superset/assets/charts/NCD_HC_EMR_Raw_Data_11.yaml
rename to base/configs/superset/assets/charts/NCD_HC_EMR_Raw_Data_47.yaml
diff --git a/base/configs/superset/assets/charts/NCD_HIS_Follow-up_Cases_From_The_Beginning_33.yaml b/base/configs/superset/assets/charts/NCD_HIS_Follow-up_Cases_From_The_Beginning_13.yaml
similarity index 100%
rename from base/configs/superset/assets/charts/NCD_HIS_Follow-up_Cases_From_The_Beginning_33.yaml
rename to base/configs/superset/assets/charts/NCD_HIS_Follow-up_Cases_From_The_Beginning_13.yaml
diff --git a/base/configs/superset/assets/charts/NCD_HIS_Follow-up_Cases_Within_Reporting_Range_5.yaml b/base/configs/superset/assets/charts/NCD_HIS_Follow-up_Cases_Within_Reporting_Range_4.yaml
similarity index 100%
rename from base/configs/superset/assets/charts/NCD_HIS_Follow-up_Cases_Within_Reporting_Range_5.yaml
rename to base/configs/superset/assets/charts/NCD_HIS_Follow-up_Cases_Within_Reporting_Range_4.yaml
diff --git a/base/configs/superset/assets/charts/NCD_HIS_New_Cases_From_The_Beginning_31.yaml b/base/configs/superset/assets/charts/NCD_HIS_New_Cases_From_The_Beginning_31.yaml
new file mode 100644
index 00000000..3aafd83b
--- /dev/null
+++ b/base/configs/superset/assets/charts/NCD_HIS_New_Cases_From_The_Beginning_31.yaml
@@ -0,0 +1,966 @@
+slice_name: NCD HIS New Cases From The Beginning
+description: null
+certified_by: null
+certification_details: null
+viz_type: table
+params:
+  datasource: 18__table
+  viz_type: table
+  slice_id: 31
+  query_mode: aggregate
+  groupby:
+  - diagnosis
+  time_grain_sqla: P1D
+  temporal_columns_lookup:
+    visit_date: true
+  metrics:
+  - expressionType: SIMPLE
+    column:
+      advanced_data_type: null
+      certification_details: null
+      certified_by: null
+      column_name: ml28d
+      description: null
+      expression: null
+      filterable: true
+      groupby: true
+      id: 630
+      is_certified: false
+      is_dttm: false
+      python_date_format: null
+      type: INTEGER
+      type_generic: 0
+      verbose_name: "0-28 \u1790\u17D2\u1784\u17C3 - \u1794\u17D2\u179A (0-28 day\
+        \ - M)"
+      warning_markdown: null
+    aggregate: SUM
+    sqlExpression: null
+    datasourceWarning: false
+    hasCustomLabel: true
+    label: ml28d
+    optionName: metric_k5ulvn1e85_ebfrsgpjae5
+  - expressionType: SIMPLE
+    column:
+      advanced_data_type: null
+      certification_details: null
+      certified_by: null
+      column_name: fl28d
+      description: null
+      expression: null
+      filterable: true
+      groupby: true
+      id: 629
+      is_certified: false
+      is_dttm: false
+      python_date_format: null
+      type: INTEGER
+      type_generic: 0
+      verbose_name: "0-28 \u1790\u17D2\u1784\u17C3 - \u179F\u17D2\u179A (0-28 days\
+        \ - F)"
+      warning_markdown: null
+    aggregate: SUM
+    sqlExpression: null
+    datasourceWarning: false
+    hasCustomLabel: true
+    label: fl28d
+    optionName: metric_8n3gpfy30y_horxf7jjgou
+  - expressionType: SIMPLE
+    column:
+      advanced_data_type: null
+      certification_details: null
+      certified_by: null
+      column_name: ml12m
+      description: null
+      expression: null
+      filterable: true
+      groupby: true
+      id: 628
+      is_certified: false
+      is_dttm: false
+      python_date_format: null
+      type: INTEGER
+      type_generic: 0
+      verbose_name: "29 \u1790\u17D2\u1784\u17C3-11 \u1781\u17C2 - \u1794\u17D2\u179A\
+        \ (29 days - 11 months - M)"
+      warning_markdown: null
+    aggregate: SUM
+    sqlExpression: null
+    datasourceWarning: false
+    hasCustomLabel: true
+    label: ml12m
+    optionName: metric_eie6bn2a3wm_5iocmsnpbn4
+  - expressionType: SIMPLE
+    column:
+      advanced_data_type: null
+      certification_details: null
+      certified_by: null
+      column_name: fl12m
+      description: null
+      expression: null
+      filterable: true
+      groupby: true
+      id: 627
+      is_certified: false
+      is_dttm: false
+      python_date_format: null
+      type: INTEGER
+      type_generic: 0
+      verbose_name: "29 \u1790\u17D2\u1784\u17C3-11 \u1781\u17C2 - \u179F\u17D2\u179A\
+        \ (29 days - 11 months - F)"
+      warning_markdown: null
+    aggregate: SUM
+    sqlExpression: null
+    datasourceWarning: false
+    hasCustomLabel: true
+    label: fl12m
+    optionName: metric_mnhtbd0kpi_iyo4gn0ige
+  - expressionType: SIMPLE
+    column:
+      advanced_data_type: null
+      certification_details: null
+      certified_by: null
+      column_name: ml4
+      description: null
+      expression: null
+      filterable: true
+      groupby: true
+      id: 636
+      is_certified: false
+      is_dttm: false
+      python_date_format: null
+      type: INTEGER
+      type_generic: 0
+      verbose_name: "1-4 \u1786\u17D2\u1793\u17B6\u17C6 - \u1794\u17D2\u179A (1-4\
+        \ years - M)"
+      warning_markdown: null
+    aggregate: SUM
+    sqlExpression: null
+    datasourceWarning: false
+    hasCustomLabel: true
+    label: ml4
+    optionName: metric_pl7orurnh4c_rzpk99qryg
+  - expressionType: SIMPLE
+    column:
+      advanced_data_type: null
+      certification_details: null
+      certified_by: null
+      column_name: fl4
+      description: null
+      expression: null
+      filterable: true
+      groupby: true
+      id: 635
+      is_certified: false
+      is_dttm: false
+      python_date_format: null
+      type: INTEGER
+      type_generic: 0
+      verbose_name: "1-4 \u1786\u17D2\u1793\u17B6\u17C6 - \u179F\u17D2\u179A (1-4\
+        \ years - F)"
+      warning_markdown: null
+    aggregate: SUM
+    sqlExpression: null
+    datasourceWarning: false
+    hasCustomLabel: true
+    label: fl4
+    optionName: metric_2mlu966k4gr_ywv91gb8nao
+  - expressionType: SIMPLE
+    column:
+      advanced_data_type: null
+      certification_details: null
+      certified_by: null
+      column_name: ml13
+      description: null
+      expression: null
+      filterable: true
+      groupby: true
+      id: 634
+      is_certified: false
+      is_dttm: false
+      python_date_format: null
+      type: INTEGER
+      type_generic: 0
+      verbose_name: "5-13 \u1786\u17D2\u1793\u17B6\u17C6 - \u1794\u17D2\u179A (5-13\
+        \ years - M)"
+      warning_markdown: null
+    aggregate: SUM
+    sqlExpression: null
+    datasourceWarning: false
+    hasCustomLabel: true
+    label: ml13
+    optionName: metric_j3ru1ecf2g8_bfdkb851m7s
+  - expressionType: SIMPLE
+    column:
+      advanced_data_type: null
+      certification_details: null
+      certified_by: null
+      column_name: fl13
+      description: null
+      expression: null
+      filterable: true
+      groupby: true
+      id: 633
+      is_certified: false
+      is_dttm: false
+      python_date_format: null
+      type: INTEGER
+      type_generic: 0
+      verbose_name: "5-13 \u1786\u17D2\u1793\u17B6\u17C6 - \u179F\u17D2\u179A (5-13\
+        \ years - F)"
+      warning_markdown: null
+    aggregate: SUM
+    sqlExpression: null
+    datasourceWarning: false
+    hasCustomLabel: true
+    label: fl13
+    optionName: metric_hxgpvn00z6_ctxp490daut
+  - expressionType: SIMPLE
+    column:
+      advanced_data_type: null
+      certification_details: null
+      certified_by: null
+      column_name: ml24
+      description: null
+      expression: null
+      filterable: true
+      groupby: true
+      id: 638
+      is_certified: false
+      is_dttm: false
+      python_date_format: null
+      type: INTEGER
+      type_generic: 0
+      verbose_name: "6-24 \u1786\u17D2\u1793\u17B6\u17C6 - \u1794\u17D2\u179A (6-24\
+        \ years - M)"
+      warning_markdown: null
+    aggregate: SUM
+    sqlExpression: null
+    datasourceWarning: false
+    hasCustomLabel: true
+    label: ml24
+    optionName: metric_k6rddvlsx5k_sfeigx5qls
+  - expressionType: SIMPLE
+    column:
+      advanced_data_type: null
+      certification_details: null
+      certified_by: null
+      column_name: fl24
+      description: null
+      expression: null
+      filterable: true
+      groupby: true
+      id: 637
+      is_certified: false
+      is_dttm: false
+      python_date_format: null
+      type: INTEGER
+      type_generic: 0
+      verbose_name: "6-24 \u1786\u17D2\u1793\u17B6\u17C6 - \u179F\u17D2\u179A (6-24\
+        \ years - F)"
+      warning_markdown: null
+    aggregate: SUM
+    sqlExpression: null
+    datasourceWarning: false
+    hasCustomLabel: true
+    label: fl24
+    optionName: metric_jsrzh9q8v9c_ezenfjbf2lg
+  - expressionType: SIMPLE
+    column:
+      advanced_data_type: null
+      certification_details: null
+      certified_by: null
+      column_name: ml49
+      description: null
+      expression: null
+      filterable: true
+      groupby: true
+      id: 640
+      is_certified: false
+      is_dttm: false
+      python_date_format: null
+      type: INTEGER
+      type_generic: 0
+      verbose_name: "25-49 \u1786\u17D2\u1793\u17B6\u17C6 - \u1794\u17D2\u179A (25-49\
+        \ years - M)"
+      warning_markdown: null
+    aggregate: SUM
+    sqlExpression: null
+    datasourceWarning: false
+    hasCustomLabel: true
+    label: ml49
+    optionName: metric_n332wf61bpr_9g8jb4cki7j
+  - expressionType: SIMPLE
+    column:
+      advanced_data_type: null
+      certification_details: null
+      certified_by: null
+      column_name: fl49
+      description: null
+      expression: null
+      filterable: true
+      groupby: true
+      id: 639
+      is_certified: false
+      is_dttm: false
+      python_date_format: null
+      type: INTEGER
+      type_generic: 0
+      verbose_name: "25-49 \u1786\u17D2\u1793\u17B6\u17C6 - \u179F\u17D2\u179A (25-49\
+        \ years - F)"
+      warning_markdown: null
+    aggregate: SUM
+    sqlExpression: null
+    datasourceWarning: false
+    hasCustomLabel: true
+    label: fl49
+    optionName: metric_jsrht3bu8fb_tw3dzzvhsne
+  - expressionType: SIMPLE
+    column:
+      advanced_data_type: null
+      certification_details: null
+      certified_by: null
+      column_name: ml64
+      description: null
+      expression: null
+      filterable: true
+      groupby: true
+      id: 632
+      is_certified: false
+      is_dttm: false
+      python_date_format: null
+      type: INTEGER
+      type_generic: 0
+      verbose_name: "50-64 \u1786\u17D2\u1793\u17B6\u17C6 - \u1794\u17D2\u179A (50-64\
+        \ years - M)"
+      warning_markdown: null
+    aggregate: SUM
+    sqlExpression: null
+    datasourceWarning: false
+    hasCustomLabel: true
+    label: ml64
+    optionName: metric_lrn32y2wmu_aklop31mnb
+  - expressionType: SIMPLE
+    column:
+      advanced_data_type: null
+      certification_details: null
+      certified_by: null
+      column_name: fl64
+      description: null
+      expression: null
+      filterable: true
+      groupby: true
+      id: 631
+      is_certified: false
+      is_dttm: false
+      python_date_format: null
+      type: INTEGER
+      type_generic: 0
+      verbose_name: "50-64 \u1786\u17D2\u1793\u17B6\u17C6 - \u179F\u17D2\u179A (50-64\
+        \ years - F)"
+      warning_markdown: null
+    aggregate: SUM
+    sqlExpression: null
+    datasourceWarning: false
+    hasCustomLabel: true
+    label: fl64
+    optionName: metric_cv01gowyxe_89cv9hwik9
+  - expressionType: SIMPLE
+    column:
+      advanced_data_type: null
+      certification_details: null
+      certified_by: null
+      column_name: mg64
+      description: null
+      expression: null
+      filterable: true
+      groupby: true
+      id: 642
+      is_certified: false
+      is_dttm: false
+      python_date_format: null
+      type: INTEGER
+      type_generic: 0
+      verbose_name: ">=65 \u1786\u17D2\u1793\u17B6\u17C6 - \u1794\u17D2\u179A (>=65\
+        \ years - M)"
+      warning_markdown: null
+    aggregate: SUM
+    sqlExpression: null
+    datasourceWarning: false
+    hasCustomLabel: true
+    label: mg64
+    optionName: metric_t0df5nrf3x_2ost0re44bh
+  - expressionType: SIMPLE
+    column:
+      advanced_data_type: null
+      certification_details: null
+      certified_by: null
+      column_name: fg64
+      description: null
+      expression: null
+      filterable: true
+      groupby: true
+      id: 641
+      is_certified: false
+      is_dttm: false
+      python_date_format: null
+      type: INTEGER
+      type_generic: 0
+      verbose_name: ">=65 \u1786\u17D2\u1793\u17B6\u17C6 - \u179F\u17D2\u179A (>=65\
+        \ years - F)"
+      warning_markdown: null
+    aggregate: SUM
+    sqlExpression: null
+    datasourceWarning: false
+    hasCustomLabel: true
+    label: fg64
+    optionName: metric_07rvu3ful3qh_x0ibud3b7yl
+  - expressionType: SQL
+    sqlExpression: SUM(ml28d) + SUM(ml12m) + SUM(ml4) + SUM(ml13) + SUM(ml24) + SUM(ml49)
+      + SUM(ml64) + SUM(mg64)
+    column: null
+    aggregate: null
+    datasourceWarning: false
+    hasCustomLabel: true
+    label: "\"\u179F\u179A\u17BB\u1794 - \u1794\u17D2\u179A (Total - M)"
+    optionName: metric_e4vmnh8h3sw_ozuz5zyjph
+  - expressionType: SQL
+    sqlExpression: SUM(fl28d) + SUM(fl12m) + SUM(fl4) + SUM(fl13) + SUM(fl24) + SUM(fl49)
+      + SUM(fl64) + SUM(fg64)
+    column: null
+    aggregate: null
+    datasourceWarning: false
+    hasCustomLabel: true
+    label: "\u179F\u179A\u17BB\u1794 - \u179F\u17D2\u179A (Total - F)"
+    optionName: metric_shyuwaaqm1h_ips8tbsf6d
+  all_columns: []
+  percent_metrics: []
+  adhoc_filters:
+  - clause: WHERE
+    subject: visit_date
+    operator: TEMPORAL_RANGE
+    comparator: '7 years ago : now'
+    expressionType: SIMPLE
+  order_by_cols: []
+  row_limit: 10000
+  server_page_length: 10
+  order_desc: false
+  show_totals: true
+  table_timestamp_format: smart_date
+  include_search: true
+  show_cell_bars: false
+  color_pn: true
+  column_config:
+    fg64:
+      d3NumberFormat: ~g
+      d3SmallNumberFormat: ~g
+      showCellBars: false
+    fl13:
+      d3NumberFormat: ~g
+      d3SmallNumberFormat: ~g
+      showCellBars: false
+    fl24:
+      d3NumberFormat: ~g
+      d3SmallNumberFormat: ~g
+      showCellBars: false
+    fl28d:
+      colorPositiveNegative: false
+      d3NumberFormat: ~g
+      d3SmallNumberFormat: ~g
+      showCellBars: false
+    fl4:
+      d3NumberFormat: ~g
+      d3SmallNumberFormat: ~g
+      showCellBars: false
+    fl49:
+      d3NumberFormat: ~g
+      d3SmallNumberFormat: ~g
+      showCellBars: false
+    fl64:
+      d3NumberFormat: ~g
+      d3SmallNumberFormat: ~g
+      showCellBars: false
+    mg64:
+      d3NumberFormat: ~g
+      d3SmallNumberFormat: ~g
+      showCellBars: false
+    ml12m:
+      d3NumberFormat: ~g
+      d3SmallNumberFormat: ~g
+      showCellBars: false
+    ml13:
+      d3NumberFormat: ~g
+      d3SmallNumberFormat: ~g
+      showCellBars: false
+    ml24:
+      d3NumberFormat: ~g
+      d3SmallNumberFormat: ~g
+      showCellBars: false
+    ml28d:
+      d3NumberFormat: ~g
+      d3SmallNumberFormat: ~g
+      showCellBars: false
+    ml4:
+      d3NumberFormat: ~g
+      d3SmallNumberFormat: ~g
+      showCellBars: false
+    ml49:
+      d3NumberFormat: ~g
+      d3SmallNumberFormat: ~g
+      showCellBars: false
+    ml64:
+      d3NumberFormat: ~g
+      d3SmallNumberFormat: ~g
+      showCellBars: false
+    "\u179F\u179A\u17BB\u1794 - \u179F\u17D2\u179A (Total - F)":
+      d3NumberFormat: ~g
+      d3SmallNumberFormat: ~g
+      showCellBars: false
+    fl12m:
+      showCellBars: false
+    "\"\u179F\u179A\u17BB\u1794 - \u1794\u17D2\u179A (Total - M)":
+      d3NumberFormat: ~g
+  conditional_formatting: []
+  extra_form_data: {}
+  dashboards:
+  - 6
+query_context: "{\"datasource\":{\"id\":18,\"type\":\"table\"},\"force\":false,\"\
+  queries\":[{\"filters\":[{\"col\":\"visit_date\",\"op\":\"TEMPORAL_RANGE\",\"val\"\
+  :\"7 years ago : now\"}],\"extras\":{\"time_grain_sqla\":\"P1D\",\"having\":\"\"\
+  ,\"where\":\"\"},\"applied_time_extras\":{},\"columns\":[\"diagnosis\"],\"metrics\"\
+  :[{\"expressionType\":\"SIMPLE\",\"column\":{\"advanced_data_type\":null,\"certification_details\"\
+  :null,\"certified_by\":null,\"column_name\":\"ml28d\",\"description\":null,\"expression\"\
+  :null,\"filterable\":true,\"groupby\":true,\"id\":630,\"is_certified\":false,\"\
+  is_dttm\":false,\"python_date_format\":null,\"type\":\"INTEGER\",\"type_generic\"\
+  :0,\"verbose_name\":\"0-28 \u1790\u17D2\u1784\u17C3 - \u1794\u17D2\u179A (0-28 day\
+  \ - M)\",\"warning_markdown\":null},\"aggregate\":\"SUM\",\"sqlExpression\":null,\"\
+  datasourceWarning\":false,\"hasCustomLabel\":true,\"label\":\"ml28d\",\"optionName\"\
+  :\"metric_k5ulvn1e85_ebfrsgpjae5\"},{\"expressionType\":\"SIMPLE\",\"column\":{\"\
+  advanced_data_type\":null,\"certification_details\":null,\"certified_by\":null,\"\
+  column_name\":\"fl28d\",\"description\":null,\"expression\":null,\"filterable\"\
+  :true,\"groupby\":true,\"id\":629,\"is_certified\":false,\"is_dttm\":false,\"python_date_format\"\
+  :null,\"type\":\"INTEGER\",\"type_generic\":0,\"verbose_name\":\"0-28 \u1790\u17D2\
+  \u1784\u17C3 - \u179F\u17D2\u179A (0-28 days - F)\",\"warning_markdown\":null},\"\
+  aggregate\":\"SUM\",\"sqlExpression\":null,\"datasourceWarning\":false,\"hasCustomLabel\"\
+  :true,\"label\":\"fl28d\",\"optionName\":\"metric_8n3gpfy30y_horxf7jjgou\"},{\"\
+  expressionType\":\"SIMPLE\",\"column\":{\"advanced_data_type\":null,\"certification_details\"\
+  :null,\"certified_by\":null,\"column_name\":\"ml12m\",\"description\":null,\"expression\"\
+  :null,\"filterable\":true,\"groupby\":true,\"id\":628,\"is_certified\":false,\"\
+  is_dttm\":false,\"python_date_format\":null,\"type\":\"INTEGER\",\"type_generic\"\
+  :0,\"verbose_name\":\"29 \u1790\u17D2\u1784\u17C3-11 \u1781\u17C2 - \u1794\u17D2\
+  \u179A (29 days - 11 months - M)\",\"warning_markdown\":null},\"aggregate\":\"SUM\"\
+  ,\"sqlExpression\":null,\"datasourceWarning\":false,\"hasCustomLabel\":true,\"label\"\
+  :\"ml12m\",\"optionName\":\"metric_eie6bn2a3wm_5iocmsnpbn4\"},{\"expressionType\"\
+  :\"SIMPLE\",\"column\":{\"advanced_data_type\":null,\"certification_details\":null,\"\
+  certified_by\":null,\"column_name\":\"fl12m\",\"description\":null,\"expression\"\
+  :null,\"filterable\":true,\"groupby\":true,\"id\":627,\"is_certified\":false,\"\
+  is_dttm\":false,\"python_date_format\":null,\"type\":\"INTEGER\",\"type_generic\"\
+  :0,\"verbose_name\":\"29 \u1790\u17D2\u1784\u17C3-11 \u1781\u17C2 - \u179F\u17D2\
+  \u179A (29 days - 11 months - F)\",\"warning_markdown\":null},\"aggregate\":\"SUM\"\
+  ,\"sqlExpression\":null,\"datasourceWarning\":false,\"hasCustomLabel\":true,\"label\"\
+  :\"fl12m\",\"optionName\":\"metric_mnhtbd0kpi_iyo4gn0ige\"},{\"expressionType\"\
+  :\"SIMPLE\",\"column\":{\"advanced_data_type\":null,\"certification_details\":null,\"\
+  certified_by\":null,\"column_name\":\"ml4\",\"description\":null,\"expression\"\
+  :null,\"filterable\":true,\"groupby\":true,\"id\":636,\"is_certified\":false,\"\
+  is_dttm\":false,\"python_date_format\":null,\"type\":\"INTEGER\",\"type_generic\"\
+  :0,\"verbose_name\":\"1-4 \u1786\u17D2\u1793\u17B6\u17C6 - \u1794\u17D2\u179A (1-4\
+  \ years - M)\",\"warning_markdown\":null},\"aggregate\":\"SUM\",\"sqlExpression\"\
+  :null,\"datasourceWarning\":false,\"hasCustomLabel\":true,\"label\":\"ml4\",\"optionName\"\
+  :\"metric_pl7orurnh4c_rzpk99qryg\"},{\"expressionType\":\"SIMPLE\",\"column\":{\"\
+  advanced_data_type\":null,\"certification_details\":null,\"certified_by\":null,\"\
+  column_name\":\"fl4\",\"description\":null,\"expression\":null,\"filterable\":true,\"\
+  groupby\":true,\"id\":635,\"is_certified\":false,\"is_dttm\":false,\"python_date_format\"\
+  :null,\"type\":\"INTEGER\",\"type_generic\":0,\"verbose_name\":\"1-4 \u1786\u17D2\
+  \u1793\u17B6\u17C6 - \u179F\u17D2\u179A (1-4 years - F)\",\"warning_markdown\":null},\"\
+  aggregate\":\"SUM\",\"sqlExpression\":null,\"datasourceWarning\":false,\"hasCustomLabel\"\
+  :true,\"label\":\"fl4\",\"optionName\":\"metric_2mlu966k4gr_ywv91gb8nao\"},{\"expressionType\"\
+  :\"SIMPLE\",\"column\":{\"advanced_data_type\":null,\"certification_details\":null,\"\
+  certified_by\":null,\"column_name\":\"ml13\",\"description\":null,\"expression\"\
+  :null,\"filterable\":true,\"groupby\":true,\"id\":634,\"is_certified\":false,\"\
+  is_dttm\":false,\"python_date_format\":null,\"type\":\"INTEGER\",\"type_generic\"\
+  :0,\"verbose_name\":\"5-13 \u1786\u17D2\u1793\u17B6\u17C6 - \u1794\u17D2\u179A (5-13\
+  \ years - M)\",\"warning_markdown\":null},\"aggregate\":\"SUM\",\"sqlExpression\"\
+  :null,\"datasourceWarning\":false,\"hasCustomLabel\":true,\"label\":\"ml13\",\"\
+  optionName\":\"metric_j3ru1ecf2g8_bfdkb851m7s\"},{\"expressionType\":\"SIMPLE\"\
+  ,\"column\":{\"advanced_data_type\":null,\"certification_details\":null,\"certified_by\"\
+  :null,\"column_name\":\"fl13\",\"description\":null,\"expression\":null,\"filterable\"\
+  :true,\"groupby\":true,\"id\":633,\"is_certified\":false,\"is_dttm\":false,\"python_date_format\"\
+  :null,\"type\":\"INTEGER\",\"type_generic\":0,\"verbose_name\":\"5-13 \u1786\u17D2\
+  \u1793\u17B6\u17C6 - \u179F\u17D2\u179A (5-13 years - F)\",\"warning_markdown\"\
+  :null},\"aggregate\":\"SUM\",\"sqlExpression\":null,\"datasourceWarning\":false,\"\
+  hasCustomLabel\":true,\"label\":\"fl13\",\"optionName\":\"metric_hxgpvn00z6_ctxp490daut\"\
+  },{\"expressionType\":\"SIMPLE\",\"column\":{\"advanced_data_type\":null,\"certification_details\"\
+  :null,\"certified_by\":null,\"column_name\":\"ml24\",\"description\":null,\"expression\"\
+  :null,\"filterable\":true,\"groupby\":true,\"id\":638,\"is_certified\":false,\"\
+  is_dttm\":false,\"python_date_format\":null,\"type\":\"INTEGER\",\"type_generic\"\
+  :0,\"verbose_name\":\"6-24 \u1786\u17D2\u1793\u17B6\u17C6 - \u1794\u17D2\u179A (6-24\
+  \ years - M)\",\"warning_markdown\":null},\"aggregate\":\"SUM\",\"sqlExpression\"\
+  :null,\"datasourceWarning\":false,\"hasCustomLabel\":true,\"label\":\"ml24\",\"\
+  optionName\":\"metric_k6rddvlsx5k_sfeigx5qls\"},{\"expressionType\":\"SIMPLE\",\"\
+  column\":{\"advanced_data_type\":null,\"certification_details\":null,\"certified_by\"\
+  :null,\"column_name\":\"fl24\",\"description\":null,\"expression\":null,\"filterable\"\
+  :true,\"groupby\":true,\"id\":637,\"is_certified\":false,\"is_dttm\":false,\"python_date_format\"\
+  :null,\"type\":\"INTEGER\",\"type_generic\":0,\"verbose_name\":\"6-24 \u1786\u17D2\
+  \u1793\u17B6\u17C6 - \u179F\u17D2\u179A (6-24 years - F)\",\"warning_markdown\"\
+  :null},\"aggregate\":\"SUM\",\"sqlExpression\":null,\"datasourceWarning\":false,\"\
+  hasCustomLabel\":true,\"label\":\"fl24\",\"optionName\":\"metric_jsrzh9q8v9c_ezenfjbf2lg\"\
+  },{\"expressionType\":\"SIMPLE\",\"column\":{\"advanced_data_type\":null,\"certification_details\"\
+  :null,\"certified_by\":null,\"column_name\":\"ml49\",\"description\":null,\"expression\"\
+  :null,\"filterable\":true,\"groupby\":true,\"id\":640,\"is_certified\":false,\"\
+  is_dttm\":false,\"python_date_format\":null,\"type\":\"INTEGER\",\"type_generic\"\
+  :0,\"verbose_name\":\"25-49 \u1786\u17D2\u1793\u17B6\u17C6 - \u1794\u17D2\u179A\
+  \ (25-49 years - M)\",\"warning_markdown\":null},\"aggregate\":\"SUM\",\"sqlExpression\"\
+  :null,\"datasourceWarning\":false,\"hasCustomLabel\":true,\"label\":\"ml49\",\"\
+  optionName\":\"metric_n332wf61bpr_9g8jb4cki7j\"},{\"expressionType\":\"SIMPLE\"\
+  ,\"column\":{\"advanced_data_type\":null,\"certification_details\":null,\"certified_by\"\
+  :null,\"column_name\":\"fl49\",\"description\":null,\"expression\":null,\"filterable\"\
+  :true,\"groupby\":true,\"id\":639,\"is_certified\":false,\"is_dttm\":false,\"python_date_format\"\
+  :null,\"type\":\"INTEGER\",\"type_generic\":0,\"verbose_name\":\"25-49 \u1786\u17D2\
+  \u1793\u17B6\u17C6 - \u179F\u17D2\u179A (25-49 years - F)\",\"warning_markdown\"\
+  :null},\"aggregate\":\"SUM\",\"sqlExpression\":null,\"datasourceWarning\":false,\"\
+  hasCustomLabel\":true,\"label\":\"fl49\",\"optionName\":\"metric_jsrht3bu8fb_tw3dzzvhsne\"\
+  },{\"expressionType\":\"SIMPLE\",\"column\":{\"advanced_data_type\":null,\"certification_details\"\
+  :null,\"certified_by\":null,\"column_name\":\"ml64\",\"description\":null,\"expression\"\
+  :null,\"filterable\":true,\"groupby\":true,\"id\":632,\"is_certified\":false,\"\
+  is_dttm\":false,\"python_date_format\":null,\"type\":\"INTEGER\",\"type_generic\"\
+  :0,\"verbose_name\":\"50-64 \u1786\u17D2\u1793\u17B6\u17C6 - \u1794\u17D2\u179A\
+  \ (50-64 years - M)\",\"warning_markdown\":null},\"aggregate\":\"SUM\",\"sqlExpression\"\
+  :null,\"datasourceWarning\":false,\"hasCustomLabel\":true,\"label\":\"ml64\",\"\
+  optionName\":\"metric_lrn32y2wmu_aklop31mnb\"},{\"expressionType\":\"SIMPLE\",\"\
+  column\":{\"advanced_data_type\":null,\"certification_details\":null,\"certified_by\"\
+  :null,\"column_name\":\"fl64\",\"description\":null,\"expression\":null,\"filterable\"\
+  :true,\"groupby\":true,\"id\":631,\"is_certified\":false,\"is_dttm\":false,\"python_date_format\"\
+  :null,\"type\":\"INTEGER\",\"type_generic\":0,\"verbose_name\":\"50-64 \u1786\u17D2\
+  \u1793\u17B6\u17C6 - \u179F\u17D2\u179A (50-64 years - F)\",\"warning_markdown\"\
+  :null},\"aggregate\":\"SUM\",\"sqlExpression\":null,\"datasourceWarning\":false,\"\
+  hasCustomLabel\":true,\"label\":\"fl64\",\"optionName\":\"metric_cv01gowyxe_89cv9hwik9\"\
+  },{\"expressionType\":\"SIMPLE\",\"column\":{\"advanced_data_type\":null,\"certification_details\"\
+  :null,\"certified_by\":null,\"column_name\":\"mg64\",\"description\":null,\"expression\"\
+  :null,\"filterable\":true,\"groupby\":true,\"id\":642,\"is_certified\":false,\"\
+  is_dttm\":false,\"python_date_format\":null,\"type\":\"INTEGER\",\"type_generic\"\
+  :0,\"verbose_name\":\">=65 \u1786\u17D2\u1793\u17B6\u17C6 - \u1794\u17D2\u179A (>=65\
+  \ years - M)\",\"warning_markdown\":null},\"aggregate\":\"SUM\",\"sqlExpression\"\
+  :null,\"datasourceWarning\":false,\"hasCustomLabel\":true,\"label\":\"mg64\",\"\
+  optionName\":\"metric_t0df5nrf3x_2ost0re44bh\"},{\"expressionType\":\"SIMPLE\",\"\
+  column\":{\"advanced_data_type\":null,\"certification_details\":null,\"certified_by\"\
+  :null,\"column_name\":\"fg64\",\"description\":null,\"expression\":null,\"filterable\"\
+  :true,\"groupby\":true,\"id\":641,\"is_certified\":false,\"is_dttm\":false,\"python_date_format\"\
+  :null,\"type\":\"INTEGER\",\"type_generic\":0,\"verbose_name\":\">=65 \u1786\u17D2\
+  \u1793\u17B6\u17C6 - \u179F\u17D2\u179A (>=65 years - F)\",\"warning_markdown\"\
+  :null},\"aggregate\":\"SUM\",\"sqlExpression\":null,\"datasourceWarning\":false,\"\
+  hasCustomLabel\":true,\"label\":\"fg64\",\"optionName\":\"metric_07rvu3ful3qh_x0ibud3b7yl\"\
+  },{\"expressionType\":\"SQL\",\"sqlExpression\":\"SUM(ml28d) + SUM(ml12m) + SUM(ml4)\
+  \ + SUM(ml13) + SUM(ml24) + SUM(ml49) + SUM(ml64) + SUM(mg64)\",\"column\":null,\"\
+  aggregate\":null,\"datasourceWarning\":false,\"hasCustomLabel\":true,\"label\":\"\
+  \\\"\u179F\u179A\u17BB\u1794 - \u1794\u17D2\u179A (Total - M)\",\"optionName\":\"\
+  metric_e4vmnh8h3sw_ozuz5zyjph\"},{\"expressionType\":\"SQL\",\"sqlExpression\":\"\
+  SUM(fl28d) + SUM(fl12m) + SUM(fl4) + SUM(fl13) + SUM(fl24) + SUM(fl49) + SUM(fl64)\
+  \ + SUM(fg64)\",\"column\":null,\"aggregate\":null,\"datasourceWarning\":false,\"\
+  hasCustomLabel\":true,\"label\":\"\u179F\u179A\u17BB\u1794 - \u179F\u17D2\u179A\
+  \ (Total - F)\",\"optionName\":\"metric_shyuwaaqm1h_ips8tbsf6d\"}],\"orderby\":[[{\"\
+  expressionType\":\"SIMPLE\",\"column\":{\"advanced_data_type\":null,\"certification_details\"\
+  :null,\"certified_by\":null,\"column_name\":\"ml28d\",\"description\":null,\"expression\"\
+  :null,\"filterable\":true,\"groupby\":true,\"id\":630,\"is_certified\":false,\"\
+  is_dttm\":false,\"python_date_format\":null,\"type\":\"INTEGER\",\"type_generic\"\
+  :0,\"verbose_name\":\"0-28 \u1790\u17D2\u1784\u17C3 - \u1794\u17D2\u179A (0-28 day\
+  \ - M)\",\"warning_markdown\":null},\"aggregate\":\"SUM\",\"sqlExpression\":null,\"\
+  datasourceWarning\":false,\"hasCustomLabel\":true,\"label\":\"ml28d\",\"optionName\"\
+  :\"metric_k5ulvn1e85_ebfrsgpjae5\"},false]],\"annotation_layers\":[],\"row_limit\"\
+  :10000,\"series_limit\":0,\"order_desc\":false,\"url_params\":{},\"custom_params\"\
+  :{},\"custom_form_data\":{},\"post_processing\":[]},{\"filters\":[{\"col\":\"visit_date\"\
+  ,\"op\":\"TEMPORAL_RANGE\",\"val\":\"7 years ago : now\"}],\"extras\":{\"time_grain_sqla\"\
+  :\"P1D\",\"having\":\"\",\"where\":\"\"},\"applied_time_extras\":{},\"columns\"\
+  :[],\"metrics\":[{\"expressionType\":\"SIMPLE\",\"column\":{\"advanced_data_type\"\
+  :null,\"certification_details\":null,\"certified_by\":null,\"column_name\":\"ml28d\"\
+  ,\"description\":null,\"expression\":null,\"filterable\":true,\"groupby\":true,\"\
+  id\":630,\"is_certified\":false,\"is_dttm\":false,\"python_date_format\":null,\"\
+  type\":\"INTEGER\",\"type_generic\":0,\"verbose_name\":\"0-28 \u1790\u17D2\u1784\
+  \u17C3 - \u1794\u17D2\u179A (0-28 day - M)\",\"warning_markdown\":null},\"aggregate\"\
+  :\"SUM\",\"sqlExpression\":null,\"datasourceWarning\":false,\"hasCustomLabel\":true,\"\
+  label\":\"ml28d\",\"optionName\":\"metric_k5ulvn1e85_ebfrsgpjae5\"},{\"expressionType\"\
+  :\"SIMPLE\",\"column\":{\"advanced_data_type\":null,\"certification_details\":null,\"\
+  certified_by\":null,\"column_name\":\"fl28d\",\"description\":null,\"expression\"\
+  :null,\"filterable\":true,\"groupby\":true,\"id\":629,\"is_certified\":false,\"\
+  is_dttm\":false,\"python_date_format\":null,\"type\":\"INTEGER\",\"type_generic\"\
+  :0,\"verbose_name\":\"0-28 \u1790\u17D2\u1784\u17C3 - \u179F\u17D2\u179A (0-28 days\
+  \ - F)\",\"warning_markdown\":null},\"aggregate\":\"SUM\",\"sqlExpression\":null,\"\
+  datasourceWarning\":false,\"hasCustomLabel\":true,\"label\":\"fl28d\",\"optionName\"\
+  :\"metric_8n3gpfy30y_horxf7jjgou\"},{\"expressionType\":\"SIMPLE\",\"column\":{\"\
+  advanced_data_type\":null,\"certification_details\":null,\"certified_by\":null,\"\
+  column_name\":\"ml12m\",\"description\":null,\"expression\":null,\"filterable\"\
+  :true,\"groupby\":true,\"id\":628,\"is_certified\":false,\"is_dttm\":false,\"python_date_format\"\
+  :null,\"type\":\"INTEGER\",\"type_generic\":0,\"verbose_name\":\"29 \u1790\u17D2\
+  \u1784\u17C3-11 \u1781\u17C2 - \u1794\u17D2\u179A (29 days - 11 months - M)\",\"\
+  warning_markdown\":null},\"aggregate\":\"SUM\",\"sqlExpression\":null,\"datasourceWarning\"\
+  :false,\"hasCustomLabel\":true,\"label\":\"ml12m\",\"optionName\":\"metric_eie6bn2a3wm_5iocmsnpbn4\"\
+  },{\"expressionType\":\"SIMPLE\",\"column\":{\"advanced_data_type\":null,\"certification_details\"\
+  :null,\"certified_by\":null,\"column_name\":\"fl12m\",\"description\":null,\"expression\"\
+  :null,\"filterable\":true,\"groupby\":true,\"id\":627,\"is_certified\":false,\"\
+  is_dttm\":false,\"python_date_format\":null,\"type\":\"INTEGER\",\"type_generic\"\
+  :0,\"verbose_name\":\"29 \u1790\u17D2\u1784\u17C3-11 \u1781\u17C2 - \u179F\u17D2\
+  \u179A (29 days - 11 months - F)\",\"warning_markdown\":null},\"aggregate\":\"SUM\"\
+  ,\"sqlExpression\":null,\"datasourceWarning\":false,\"hasCustomLabel\":true,\"label\"\
+  :\"fl12m\",\"optionName\":\"metric_mnhtbd0kpi_iyo4gn0ige\"},{\"expressionType\"\
+  :\"SIMPLE\",\"column\":{\"advanced_data_type\":null,\"certification_details\":null,\"\
+  certified_by\":null,\"column_name\":\"ml4\",\"description\":null,\"expression\"\
+  :null,\"filterable\":true,\"groupby\":true,\"id\":636,\"is_certified\":false,\"\
+  is_dttm\":false,\"python_date_format\":null,\"type\":\"INTEGER\",\"type_generic\"\
+  :0,\"verbose_name\":\"1-4 \u1786\u17D2\u1793\u17B6\u17C6 - \u1794\u17D2\u179A (1-4\
+  \ years - M)\",\"warning_markdown\":null},\"aggregate\":\"SUM\",\"sqlExpression\"\
+  :null,\"datasourceWarning\":false,\"hasCustomLabel\":true,\"label\":\"ml4\",\"optionName\"\
+  :\"metric_pl7orurnh4c_rzpk99qryg\"},{\"expressionType\":\"SIMPLE\",\"column\":{\"\
+  advanced_data_type\":null,\"certification_details\":null,\"certified_by\":null,\"\
+  column_name\":\"fl4\",\"description\":null,\"expression\":null,\"filterable\":true,\"\
+  groupby\":true,\"id\":635,\"is_certified\":false,\"is_dttm\":false,\"python_date_format\"\
+  :null,\"type\":\"INTEGER\",\"type_generic\":0,\"verbose_name\":\"1-4 \u1786\u17D2\
+  \u1793\u17B6\u17C6 - \u179F\u17D2\u179A (1-4 years - F)\",\"warning_markdown\":null},\"\
+  aggregate\":\"SUM\",\"sqlExpression\":null,\"datasourceWarning\":false,\"hasCustomLabel\"\
+  :true,\"label\":\"fl4\",\"optionName\":\"metric_2mlu966k4gr_ywv91gb8nao\"},{\"expressionType\"\
+  :\"SIMPLE\",\"column\":{\"advanced_data_type\":null,\"certification_details\":null,\"\
+  certified_by\":null,\"column_name\":\"ml13\",\"description\":null,\"expression\"\
+  :null,\"filterable\":true,\"groupby\":true,\"id\":634,\"is_certified\":false,\"\
+  is_dttm\":false,\"python_date_format\":null,\"type\":\"INTEGER\",\"type_generic\"\
+  :0,\"verbose_name\":\"5-13 \u1786\u17D2\u1793\u17B6\u17C6 - \u1794\u17D2\u179A (5-13\
+  \ years - M)\",\"warning_markdown\":null},\"aggregate\":\"SUM\",\"sqlExpression\"\
+  :null,\"datasourceWarning\":false,\"hasCustomLabel\":true,\"label\":\"ml13\",\"\
+  optionName\":\"metric_j3ru1ecf2g8_bfdkb851m7s\"},{\"expressionType\":\"SIMPLE\"\
+  ,\"column\":{\"advanced_data_type\":null,\"certification_details\":null,\"certified_by\"\
+  :null,\"column_name\":\"fl13\",\"description\":null,\"expression\":null,\"filterable\"\
+  :true,\"groupby\":true,\"id\":633,\"is_certified\":false,\"is_dttm\":false,\"python_date_format\"\
+  :null,\"type\":\"INTEGER\",\"type_generic\":0,\"verbose_name\":\"5-13 \u1786\u17D2\
+  \u1793\u17B6\u17C6 - \u179F\u17D2\u179A (5-13 years - F)\",\"warning_markdown\"\
+  :null},\"aggregate\":\"SUM\",\"sqlExpression\":null,\"datasourceWarning\":false,\"\
+  hasCustomLabel\":true,\"label\":\"fl13\",\"optionName\":\"metric_hxgpvn00z6_ctxp490daut\"\
+  },{\"expressionType\":\"SIMPLE\",\"column\":{\"advanced_data_type\":null,\"certification_details\"\
+  :null,\"certified_by\":null,\"column_name\":\"ml24\",\"description\":null,\"expression\"\
+  :null,\"filterable\":true,\"groupby\":true,\"id\":638,\"is_certified\":false,\"\
+  is_dttm\":false,\"python_date_format\":null,\"type\":\"INTEGER\",\"type_generic\"\
+  :0,\"verbose_name\":\"6-24 \u1786\u17D2\u1793\u17B6\u17C6 - \u1794\u17D2\u179A (6-24\
+  \ years - M)\",\"warning_markdown\":null},\"aggregate\":\"SUM\",\"sqlExpression\"\
+  :null,\"datasourceWarning\":false,\"hasCustomLabel\":true,\"label\":\"ml24\",\"\
+  optionName\":\"metric_k6rddvlsx5k_sfeigx5qls\"},{\"expressionType\":\"SIMPLE\",\"\
+  column\":{\"advanced_data_type\":null,\"certification_details\":null,\"certified_by\"\
+  :null,\"column_name\":\"fl24\",\"description\":null,\"expression\":null,\"filterable\"\
+  :true,\"groupby\":true,\"id\":637,\"is_certified\":false,\"is_dttm\":false,\"python_date_format\"\
+  :null,\"type\":\"INTEGER\",\"type_generic\":0,\"verbose_name\":\"6-24 \u1786\u17D2\
+  \u1793\u17B6\u17C6 - \u179F\u17D2\u179A (6-24 years - F)\",\"warning_markdown\"\
+  :null},\"aggregate\":\"SUM\",\"sqlExpression\":null,\"datasourceWarning\":false,\"\
+  hasCustomLabel\":true,\"label\":\"fl24\",\"optionName\":\"metric_jsrzh9q8v9c_ezenfjbf2lg\"\
+  },{\"expressionType\":\"SIMPLE\",\"column\":{\"advanced_data_type\":null,\"certification_details\"\
+  :null,\"certified_by\":null,\"column_name\":\"ml49\",\"description\":null,\"expression\"\
+  :null,\"filterable\":true,\"groupby\":true,\"id\":640,\"is_certified\":false,\"\
+  is_dttm\":false,\"python_date_format\":null,\"type\":\"INTEGER\",\"type_generic\"\
+  :0,\"verbose_name\":\"25-49 \u1786\u17D2\u1793\u17B6\u17C6 - \u1794\u17D2\u179A\
+  \ (25-49 years - M)\",\"warning_markdown\":null},\"aggregate\":\"SUM\",\"sqlExpression\"\
+  :null,\"datasourceWarning\":false,\"hasCustomLabel\":true,\"label\":\"ml49\",\"\
+  optionName\":\"metric_n332wf61bpr_9g8jb4cki7j\"},{\"expressionType\":\"SIMPLE\"\
+  ,\"column\":{\"advanced_data_type\":null,\"certification_details\":null,\"certified_by\"\
+  :null,\"column_name\":\"fl49\",\"description\":null,\"expression\":null,\"filterable\"\
+  :true,\"groupby\":true,\"id\":639,\"is_certified\":false,\"is_dttm\":false,\"python_date_format\"\
+  :null,\"type\":\"INTEGER\",\"type_generic\":0,\"verbose_name\":\"25-49 \u1786\u17D2\
+  \u1793\u17B6\u17C6 - \u179F\u17D2\u179A (25-49 years - F)\",\"warning_markdown\"\
+  :null},\"aggregate\":\"SUM\",\"sqlExpression\":null,\"datasourceWarning\":false,\"\
+  hasCustomLabel\":true,\"label\":\"fl49\",\"optionName\":\"metric_jsrht3bu8fb_tw3dzzvhsne\"\
+  },{\"expressionType\":\"SIMPLE\",\"column\":{\"advanced_data_type\":null,\"certification_details\"\
+  :null,\"certified_by\":null,\"column_name\":\"ml64\",\"description\":null,\"expression\"\
+  :null,\"filterable\":true,\"groupby\":true,\"id\":632,\"is_certified\":false,\"\
+  is_dttm\":false,\"python_date_format\":null,\"type\":\"INTEGER\",\"type_generic\"\
+  :0,\"verbose_name\":\"50-64 \u1786\u17D2\u1793\u17B6\u17C6 - \u1794\u17D2\u179A\
+  \ (50-64 years - M)\",\"warning_markdown\":null},\"aggregate\":\"SUM\",\"sqlExpression\"\
+  :null,\"datasourceWarning\":false,\"hasCustomLabel\":true,\"label\":\"ml64\",\"\
+  optionName\":\"metric_lrn32y2wmu_aklop31mnb\"},{\"expressionType\":\"SIMPLE\",\"\
+  column\":{\"advanced_data_type\":null,\"certification_details\":null,\"certified_by\"\
+  :null,\"column_name\":\"fl64\",\"description\":null,\"expression\":null,\"filterable\"\
+  :true,\"groupby\":true,\"id\":631,\"is_certified\":false,\"is_dttm\":false,\"python_date_format\"\
+  :null,\"type\":\"INTEGER\",\"type_generic\":0,\"verbose_name\":\"50-64 \u1786\u17D2\
+  \u1793\u17B6\u17C6 - \u179F\u17D2\u179A (50-64 years - F)\",\"warning_markdown\"\
+  :null},\"aggregate\":\"SUM\",\"sqlExpression\":null,\"datasourceWarning\":false,\"\
+  hasCustomLabel\":true,\"label\":\"fl64\",\"optionName\":\"metric_cv01gowyxe_89cv9hwik9\"\
+  },{\"expressionType\":\"SIMPLE\",\"column\":{\"advanced_data_type\":null,\"certification_details\"\
+  :null,\"certified_by\":null,\"column_name\":\"mg64\",\"description\":null,\"expression\"\
+  :null,\"filterable\":true,\"groupby\":true,\"id\":642,\"is_certified\":false,\"\
+  is_dttm\":false,\"python_date_format\":null,\"type\":\"INTEGER\",\"type_generic\"\
+  :0,\"verbose_name\":\">=65 \u1786\u17D2\u1793\u17B6\u17C6 - \u1794\u17D2\u179A (>=65\
+  \ years - M)\",\"warning_markdown\":null},\"aggregate\":\"SUM\",\"sqlExpression\"\
+  :null,\"datasourceWarning\":false,\"hasCustomLabel\":true,\"label\":\"mg64\",\"\
+  optionName\":\"metric_t0df5nrf3x_2ost0re44bh\"},{\"expressionType\":\"SIMPLE\",\"\
+  column\":{\"advanced_data_type\":null,\"certification_details\":null,\"certified_by\"\
+  :null,\"column_name\":\"fg64\",\"description\":null,\"expression\":null,\"filterable\"\
+  :true,\"groupby\":true,\"id\":641,\"is_certified\":false,\"is_dttm\":false,\"python_date_format\"\
+  :null,\"type\":\"INTEGER\",\"type_generic\":0,\"verbose_name\":\">=65 \u1786\u17D2\
+  \u1793\u17B6\u17C6 - \u179F\u17D2\u179A (>=65 years - F)\",\"warning_markdown\"\
+  :null},\"aggregate\":\"SUM\",\"sqlExpression\":null,\"datasourceWarning\":false,\"\
+  hasCustomLabel\":true,\"label\":\"fg64\",\"optionName\":\"metric_07rvu3ful3qh_x0ibud3b7yl\"\
+  },{\"expressionType\":\"SQL\",\"sqlExpression\":\"SUM(ml28d) + SUM(ml12m) + SUM(ml4)\
+  \ + SUM(ml13) + SUM(ml24) + SUM(ml49) + SUM(ml64) + SUM(mg64)\",\"column\":null,\"\
+  aggregate\":null,\"datasourceWarning\":false,\"hasCustomLabel\":true,\"label\":\"\
+  \\\"\u179F\u179A\u17BB\u1794 - \u1794\u17D2\u179A (Total - M)\",\"optionName\":\"\
+  metric_e4vmnh8h3sw_ozuz5zyjph\"},{\"expressionType\":\"SQL\",\"sqlExpression\":\"\
+  SUM(fl28d) + SUM(fl12m) + SUM(fl4) + SUM(fl13) + SUM(fl24) + SUM(fl49) + SUM(fl64)\
+  \ + SUM(fg64)\",\"column\":null,\"aggregate\":null,\"datasourceWarning\":false,\"\
+  hasCustomLabel\":true,\"label\":\"\u179F\u179A\u17BB\u1794 - \u179F\u17D2\u179A\
+  \ (Total - F)\",\"optionName\":\"metric_shyuwaaqm1h_ips8tbsf6d\"}],\"annotation_layers\"\
+  :[],\"row_limit\":0,\"row_offset\":0,\"series_limit\":0,\"url_params\":{},\"custom_params\"\
+  :{},\"custom_form_data\":{},\"post_processing\":[]}],\"form_data\":{\"datasource\"\
+  :\"18__table\",\"viz_type\":\"table\",\"slice_id\":31,\"query_mode\":\"aggregate\"\
+  ,\"groupby\":[\"diagnosis\"],\"time_grain_sqla\":\"P1D\",\"temporal_columns_lookup\"\
+  :{\"visit_date\":true},\"metrics\":[{\"expressionType\":\"SIMPLE\",\"column\":{\"\
+  advanced_data_type\":null,\"certification_details\":null,\"certified_by\":null,\"\
+  column_name\":\"ml28d\",\"description\":null,\"expression\":null,\"filterable\"\
+  :true,\"groupby\":true,\"id\":630,\"is_certified\":false,\"is_dttm\":false,\"python_date_format\"\
+  :null,\"type\":\"INTEGER\",\"type_generic\":0,\"verbose_name\":\"0-28 \u1790\u17D2\
+  \u1784\u17C3 - \u1794\u17D2\u179A (0-28 day - M)\",\"warning_markdown\":null},\"\
+  aggregate\":\"SUM\",\"sqlExpression\":null,\"datasourceWarning\":false,\"hasCustomLabel\"\
+  :true,\"label\":\"ml28d\",\"optionName\":\"metric_k5ulvn1e85_ebfrsgpjae5\"},{\"\
+  expressionType\":\"SIMPLE\",\"column\":{\"advanced_data_type\":null,\"certification_details\"\
+  :null,\"certified_by\":null,\"column_name\":\"fl28d\",\"description\":null,\"expression\"\
+  :null,\"filterable\":true,\"groupby\":true,\"id\":629,\"is_certified\":false,\"\
+  is_dttm\":false,\"python_date_format\":null,\"type\":\"INTEGER\",\"type_generic\"\
+  :0,\"verbose_name\":\"0-28 \u1790\u17D2\u1784\u17C3 - \u179F\u17D2\u179A (0-28 days\
+  \ - F)\",\"warning_markdown\":null},\"aggregate\":\"SUM\",\"sqlExpression\":null,\"\
+  datasourceWarning\":false,\"hasCustomLabel\":true,\"label\":\"fl28d\",\"optionName\"\
+  :\"metric_8n3gpfy30y_horxf7jjgou\"},{\"expressionType\":\"SIMPLE\",\"column\":{\"\
+  advanced_data_type\":null,\"certification_details\":null,\"certified_by\":null,\"\
+  column_name\":\"ml12m\",\"description\":null,\"expression\":null,\"filterable\"\
+  :true,\"groupby\":true,\"id\":628,\"is_certified\":false,\"is_dttm\":false,\"python_date_format\"\
+  :null,\"type\":\"INTEGER\",\"type_generic\":0,\"verbose_name\":\"29 \u1790\u17D2\
+  \u1784\u17C3-11 \u1781\u17C2 - \u1794\u17D2\u179A (29 days - 11 months - M)\",\"\
+  warning_markdown\":null},\"aggregate\":\"SUM\",\"sqlExpression\":null,\"datasourceWarning\"\
+  :false,\"hasCustomLabel\":true,\"label\":\"ml12m\",\"optionName\":\"metric_eie6bn2a3wm_5iocmsnpbn4\"\
+  },{\"expressionType\":\"SIMPLE\",\"column\":{\"advanced_data_type\":null,\"certification_details\"\
+  :null,\"certified_by\":null,\"column_name\":\"fl12m\",\"description\":null,\"expression\"\
+  :null,\"filterable\":true,\"groupby\":true,\"id\":627,\"is_certified\":false,\"\
+  is_dttm\":false,\"python_date_format\":null,\"type\":\"INTEGER\",\"type_generic\"\
+  :0,\"verbose_name\":\"29 \u1790\u17D2\u1784\u17C3-11 \u1781\u17C2 - \u179F\u17D2\
+  \u179A (29 days - 11 months - F)\",\"warning_markdown\":null},\"aggregate\":\"SUM\"\
+  ,\"sqlExpression\":null,\"datasourceWarning\":false,\"hasCustomLabel\":true,\"label\"\
+  :\"fl12m\",\"optionName\":\"metric_mnhtbd0kpi_iyo4gn0ige\"},{\"expressionType\"\
+  :\"SIMPLE\",\"column\":{\"advanced_data_type\":null,\"certification_details\":null,\"\
+  certified_by\":null,\"column_name\":\"ml4\",\"description\":null,\"expression\"\
+  :null,\"filterable\":true,\"groupby\":true,\"id\":636,\"is_certified\":false,\"\
+  is_dttm\":false,\"python_date_format\":null,\"type\":\"INTEGER\",\"type_generic\"\
+  :0,\"verbose_name\":\"1-4 \u1786\u17D2\u1793\u17B6\u17C6 - \u1794\u17D2\u179A (1-4\
+  \ years - M)\",\"warning_markdown\":null},\"aggregate\":\"SUM\",\"sqlExpression\"\
+  :null,\"datasourceWarning\":false,\"hasCustomLabel\":true,\"label\":\"ml4\",\"optionName\"\
+  :\"metric_pl7orurnh4c_rzpk99qryg\"},{\"expressionType\":\"SIMPLE\",\"column\":{\"\
+  advanced_data_type\":null,\"certification_details\":null,\"certified_by\":null,\"\
+  column_name\":\"fl4\",\"description\":null,\"expression\":null,\"filterable\":true,\"\
+  groupby\":true,\"id\":635,\"is_certified\":false,\"is_dttm\":false,\"python_date_format\"\
+  :null,\"type\":\"INTEGER\",\"type_generic\":0,\"verbose_name\":\"1-4 \u1786\u17D2\
+  \u1793\u17B6\u17C6 - \u179F\u17D2\u179A (1-4 years - F)\",\"warning_markdown\":null},\"\
+  aggregate\":\"SUM\",\"sqlExpression\":null,\"datasourceWarning\":false,\"hasCustomLabel\"\
+  :true,\"label\":\"fl4\",\"optionName\":\"metric_2mlu966k4gr_ywv91gb8nao\"},{\"expressionType\"\
+  :\"SIMPLE\",\"column\":{\"advanced_data_type\":null,\"certification_details\":null,\"\
+  certified_by\":null,\"column_name\":\"ml13\",\"description\":null,\"expression\"\
+  :null,\"filterable\":true,\"groupby\":true,\"id\":634,\"is_certified\":false,\"\
+  is_dttm\":false,\"python_date_format\":null,\"type\":\"INTEGER\",\"type_generic\"\
+  :0,\"verbose_name\":\"5-13 \u1786\u17D2\u1793\u17B6\u17C6 - \u1794\u17D2\u179A (5-13\
+  \ years - M)\",\"warning_markdown\":null},\"aggregate\":\"SUM\",\"sqlExpression\"\
+  :null,\"datasourceWarning\":false,\"hasCustomLabel\":true,\"label\":\"ml13\",\"\
+  optionName\":\"metric_j3ru1ecf2g8_bfdkb851m7s\"},{\"expressionType\":\"SIMPLE\"\
+  ,\"column\":{\"advanced_data_type\":null,\"certification_details\":null,\"certified_by\"\
+  :null,\"column_name\":\"fl13\",\"description\":null,\"expression\":null,\"filterable\"\
+  :true,\"groupby\":true,\"id\":633,\"is_certified\":false,\"is_dttm\":false,\"python_date_format\"\
+  :null,\"type\":\"INTEGER\",\"type_generic\":0,\"verbose_name\":\"5-13 \u1786\u17D2\
+  \u1793\u17B6\u17C6 - \u179F\u17D2\u179A (5-13 years - F)\",\"warning_markdown\"\
+  :null},\"aggregate\":\"SUM\",\"sqlExpression\":null,\"datasourceWarning\":false,\"\
+  hasCustomLabel\":true,\"label\":\"fl13\",\"optionName\":\"metric_hxgpvn00z6_ctxp490daut\"\
+  },{\"expressionType\":\"SIMPLE\",\"column\":{\"advanced_data_type\":null,\"certification_details\"\
+  :null,\"certified_by\":null,\"column_name\":\"ml24\",\"description\":null,\"expression\"\
+  :null,\"filterable\":true,\"groupby\":true,\"id\":638,\"is_certified\":false,\"\
+  is_dttm\":false,\"python_date_format\":null,\"type\":\"INTEGER\",\"type_generic\"\
+  :0,\"verbose_name\":\"6-24 \u1786\u17D2\u1793\u17B6\u17C6 - \u1794\u17D2\u179A (6-24\
+  \ years - M)\",\"warning_markdown\":null},\"aggregate\":\"SUM\",\"sqlExpression\"\
+  :null,\"datasourceWarning\":false,\"hasCustomLabel\":true,\"label\":\"ml24\",\"\
+  optionName\":\"metric_k6rddvlsx5k_sfeigx5qls\"},{\"expressionType\":\"SIMPLE\",\"\
+  column\":{\"advanced_data_type\":null,\"certification_details\":null,\"certified_by\"\
+  :null,\"column_name\":\"fl24\",\"description\":null,\"expression\":null,\"filterable\"\
+  :true,\"groupby\":true,\"id\":637,\"is_certified\":false,\"is_dttm\":false,\"python_date_format\"\
+  :null,\"type\":\"INTEGER\",\"type_generic\":0,\"verbose_name\":\"6-24 \u1786\u17D2\
+  \u1793\u17B6\u17C6 - \u179F\u17D2\u179A (6-24 years - F)\",\"warning_markdown\"\
+  :null},\"aggregate\":\"SUM\",\"sqlExpression\":null,\"datasourceWarning\":false,\"\
+  hasCustomLabel\":true,\"label\":\"fl24\",\"optionName\":\"metric_jsrzh9q8v9c_ezenfjbf2lg\"\
+  },{\"expressionType\":\"SIMPLE\",\"column\":{\"advanced_data_type\":null,\"certification_details\"\
+  :null,\"certified_by\":null,\"column_name\":\"ml49\",\"description\":null,\"expression\"\
+  :null,\"filterable\":true,\"groupby\":true,\"id\":640,\"is_certified\":false,\"\
+  is_dttm\":false,\"python_date_format\":null,\"type\":\"INTEGER\",\"type_generic\"\
+  :0,\"verbose_name\":\"25-49 \u1786\u17D2\u1793\u17B6\u17C6 - \u1794\u17D2\u179A\
+  \ (25-49 years - M)\",\"warning_markdown\":null},\"aggregate\":\"SUM\",\"sqlExpression\"\
+  :null,\"datasourceWarning\":false,\"hasCustomLabel\":true,\"label\":\"ml49\",\"\
+  optionName\":\"metric_n332wf61bpr_9g8jb4cki7j\"},{\"expressionType\":\"SIMPLE\"\
+  ,\"column\":{\"advanced_data_type\":null,\"certification_details\":null,\"certified_by\"\
+  :null,\"column_name\":\"fl49\",\"description\":null,\"expression\":null,\"filterable\"\
+  :true,\"groupby\":true,\"id\":639,\"is_certified\":false,\"is_dttm\":false,\"python_date_format\"\
+  :null,\"type\":\"INTEGER\",\"type_generic\":0,\"verbose_name\":\"25-49 \u1786\u17D2\
+  \u1793\u17B6\u17C6 - \u179F\u17D2\u179A (25-49 years - F)\",\"warning_markdown\"\
+  :null},\"aggregate\":\"SUM\",\"sqlExpression\":null,\"datasourceWarning\":false,\"\
+  hasCustomLabel\":true,\"label\":\"fl49\",\"optionName\":\"metric_jsrht3bu8fb_tw3dzzvhsne\"\
+  },{\"expressionType\":\"SIMPLE\",\"column\":{\"advanced_data_type\":null,\"certification_details\"\
+  :null,\"certified_by\":null,\"column_name\":\"ml64\",\"description\":null,\"expression\"\
+  :null,\"filterable\":true,\"groupby\":true,\"id\":632,\"is_certified\":false,\"\
+  is_dttm\":false,\"python_date_format\":null,\"type\":\"INTEGER\",\"type_generic\"\
+  :0,\"verbose_name\":\"50-64 \u1786\u17D2\u1793\u17B6\u17C6 - \u1794\u17D2\u179A\
+  \ (50-64 years - M)\",\"warning_markdown\":null},\"aggregate\":\"SUM\",\"sqlExpression\"\
+  :null,\"datasourceWarning\":false,\"hasCustomLabel\":true,\"label\":\"ml64\",\"\
+  optionName\":\"metric_lrn32y2wmu_aklop31mnb\"},{\"expressionType\":\"SIMPLE\",\"\
+  column\":{\"advanced_data_type\":null,\"certification_details\":null,\"certified_by\"\
+  :null,\"column_name\":\"fl64\",\"description\":null,\"expression\":null,\"filterable\"\
+  :true,\"groupby\":true,\"id\":631,\"is_certified\":false,\"is_dttm\":false,\"python_date_format\"\
+  :null,\"type\":\"INTEGER\",\"type_generic\":0,\"verbose_name\":\"50-64 \u1786\u17D2\
+  \u1793\u17B6\u17C6 - \u179F\u17D2\u179A (50-64 years - F)\",\"warning_markdown\"\
+  :null},\"aggregate\":\"SUM\",\"sqlExpression\":null,\"datasourceWarning\":false,\"\
+  hasCustomLabel\":true,\"label\":\"fl64\",\"optionName\":\"metric_cv01gowyxe_89cv9hwik9\"\
+  },{\"expressionType\":\"SIMPLE\",\"column\":{\"advanced_data_type\":null,\"certification_details\"\
+  :null,\"certified_by\":null,\"column_name\":\"mg64\",\"description\":null,\"expression\"\
+  :null,\"filterable\":true,\"groupby\":true,\"id\":642,\"is_certified\":false,\"\
+  is_dttm\":false,\"python_date_format\":null,\"type\":\"INTEGER\",\"type_generic\"\
+  :0,\"verbose_name\":\">=65 \u1786\u17D2\u1793\u17B6\u17C6 - \u1794\u17D2\u179A (>=65\
+  \ years - M)\",\"warning_markdown\":null},\"aggregate\":\"SUM\",\"sqlExpression\"\
+  :null,\"datasourceWarning\":false,\"hasCustomLabel\":true,\"label\":\"mg64\",\"\
+  optionName\":\"metric_t0df5nrf3x_2ost0re44bh\"},{\"expressionType\":\"SIMPLE\",\"\
+  column\":{\"advanced_data_type\":null,\"certification_details\":null,\"certified_by\"\
+  :null,\"column_name\":\"fg64\",\"description\":null,\"expression\":null,\"filterable\"\
+  :true,\"groupby\":true,\"id\":641,\"is_certified\":false,\"is_dttm\":false,\"python_date_format\"\
+  :null,\"type\":\"INTEGER\",\"type_generic\":0,\"verbose_name\":\">=65 \u1786\u17D2\
+  \u1793\u17B6\u17C6 - \u179F\u17D2\u179A (>=65 years - F)\",\"warning_markdown\"\
+  :null},\"aggregate\":\"SUM\",\"sqlExpression\":null,\"datasourceWarning\":false,\"\
+  hasCustomLabel\":true,\"label\":\"fg64\",\"optionName\":\"metric_07rvu3ful3qh_x0ibud3b7yl\"\
+  },{\"expressionType\":\"SQL\",\"sqlExpression\":\"SUM(ml28d) + SUM(ml12m) + SUM(ml4)\
+  \ + SUM(ml13) + SUM(ml24) + SUM(ml49) + SUM(ml64) + SUM(mg64)\",\"column\":null,\"\
+  aggregate\":null,\"datasourceWarning\":false,\"hasCustomLabel\":true,\"label\":\"\
+  \\\"\u179F\u179A\u17BB\u1794 - \u1794\u17D2\u179A (Total - M)\",\"optionName\":\"\
+  metric_e4vmnh8h3sw_ozuz5zyjph\"},{\"expressionType\":\"SQL\",\"sqlExpression\":\"\
+  SUM(fl28d) + SUM(fl12m) + SUM(fl4) + SUM(fl13) + SUM(fl24) + SUM(fl49) + SUM(fl64)\
+  \ + SUM(fg64)\",\"column\":null,\"aggregate\":null,\"datasourceWarning\":false,\"\
+  hasCustomLabel\":true,\"label\":\"\u179F\u179A\u17BB\u1794 - \u179F\u17D2\u179A\
+  \ (Total - F)\",\"optionName\":\"metric_shyuwaaqm1h_ips8tbsf6d\"}],\"all_columns\"\
+  :[],\"percent_metrics\":[],\"adhoc_filters\":[{\"clause\":\"WHERE\",\"subject\"\
+  :\"visit_date\",\"operator\":\"TEMPORAL_RANGE\",\"comparator\":\"7 years ago : now\"\
+  ,\"expressionType\":\"SIMPLE\"}],\"order_by_cols\":[],\"row_limit\":10000,\"server_page_length\"\
+  :10,\"order_desc\":false,\"show_totals\":true,\"table_timestamp_format\":\"smart_date\"\
+  ,\"include_search\":true,\"show_cell_bars\":false,\"color_pn\":true,\"column_config\"\
+  :{\"fg64\":{\"d3NumberFormat\":\"~g\",\"d3SmallNumberFormat\":\"~g\",\"showCellBars\"\
+  :false},\"fl13\":{\"d3NumberFormat\":\"~g\",\"d3SmallNumberFormat\":\"~g\",\"showCellBars\"\
+  :false},\"fl24\":{\"d3NumberFormat\":\"~g\",\"d3SmallNumberFormat\":\"~g\",\"showCellBars\"\
+  :false},\"fl28d\":{\"colorPositiveNegative\":false,\"d3NumberFormat\":\"~g\",\"\
+  d3SmallNumberFormat\":\"~g\",\"showCellBars\":false},\"fl4\":{\"d3NumberFormat\"\
+  :\"~g\",\"d3SmallNumberFormat\":\"~g\",\"showCellBars\":false},\"fl49\":{\"d3NumberFormat\"\
+  :\"~g\",\"d3SmallNumberFormat\":\"~g\",\"showCellBars\":false},\"fl64\":{\"d3NumberFormat\"\
+  :\"~g\",\"d3SmallNumberFormat\":\"~g\",\"showCellBars\":false},\"mg64\":{\"d3NumberFormat\"\
+  :\"~g\",\"d3SmallNumberFormat\":\"~g\",\"showCellBars\":false},\"ml12m\":{\"d3NumberFormat\"\
+  :\"~g\",\"d3SmallNumberFormat\":\"~g\",\"showCellBars\":false},\"ml13\":{\"d3NumberFormat\"\
+  :\"~g\",\"d3SmallNumberFormat\":\"~g\",\"showCellBars\":false},\"ml24\":{\"d3NumberFormat\"\
+  :\"~g\",\"d3SmallNumberFormat\":\"~g\",\"showCellBars\":false},\"ml28d\":{\"d3NumberFormat\"\
+  :\"~g\",\"d3SmallNumberFormat\":\"~g\",\"showCellBars\":false},\"ml4\":{\"d3NumberFormat\"\
+  :\"~g\",\"d3SmallNumberFormat\":\"~g\",\"showCellBars\":false},\"ml49\":{\"d3NumberFormat\"\
+  :\"~g\",\"d3SmallNumberFormat\":\"~g\",\"showCellBars\":false},\"ml64\":{\"d3NumberFormat\"\
+  :\"~g\",\"d3SmallNumberFormat\":\"~g\",\"showCellBars\":false},\"\u179F\u179A\u17BB\
+  \u1794 - \u179F\u17D2\u179A (Total - F)\":{\"d3NumberFormat\":\"~g\",\"d3SmallNumberFormat\"\
+  :\"~g\",\"showCellBars\":false},\"fl12m\":{\"showCellBars\":false},\"\\\"\u179F\u179A\
+  \u17BB\u1794 - \u1794\u17D2\u179A (Total - M)\":{\"d3NumberFormat\":\"~g\"}},\"\
+  conditional_formatting\":[],\"extra_form_data\":{},\"dashboards\":[6],\"force\"\
+  :false,\"result_format\":\"json\",\"result_type\":\"full\"},\"result_format\":\"\
+  json\",\"result_type\":\"full\"}"
+cache_timeout: null
+uuid: edc6788b-ea27-457f-b3e7-1e272b7109ba
+version: 1.0.0
+dataset_uuid: 48365851-d1d2-451d-b2aa-18a5ffcdd72d
diff --git a/base/configs/superset/assets/charts/NCD_HIS_New_Cases_From_The_Beginning_46.yaml b/base/configs/superset/assets/charts/NCD_HIS_New_Cases_From_The_Beginning_46.yaml
deleted file mode 100644
index f957b696..00000000
--- a/base/configs/superset/assets/charts/NCD_HIS_New_Cases_From_The_Beginning_46.yaml
+++ /dev/null
@@ -1,911 +0,0 @@
-slice_name: NCD HIS New Cases From The Beginning
-description: null
-certified_by: null
-certification_details: null
-viz_type: table
-params:
-  datasource: 31__table
-  viz_type: table
-  slice_id: 144
-  granularity_sqla: visit_date
-  time_grain_sqla: P1D
-  time_range: '7 years ago : now'
-  query_mode: aggregate
-  groupby:
-  - diagnosis
-  metrics:
-  - aggregate: SUM
-    column:
-      advanced_data_type: null
-      certification_details: null
-      certified_by: null
-      column_name: ml28d
-      description: null
-      expression: null
-      filterable: true
-      groupby: true
-      id: 1008
-      is_certified: false
-      is_dttm: false
-      python_date_format: null
-      type: INTEGER
-      type_generic: 0
-      verbose_name: "0-28 \u1790\u17D2\u1784\u17C3 - \u1794\u17D2\u179A (0-28 day\
-        \ - M)"
-      warning_markdown: null
-    datasourceWarning: false
-    expressionType: SIMPLE
-    hasCustomLabel: true
-    label: ml28d
-    optionName: metric_k5ulvn1e85_ebfrsgpjae5
-    sqlExpression: null
-  - aggregate: SUM
-    column:
-      advanced_data_type: null
-      certification_details: null
-      certified_by: null
-      column_name: fl28d
-      description: null
-      expression: null
-      filterable: true
-      groupby: true
-      id: 1009
-      is_certified: false
-      is_dttm: false
-      python_date_format: null
-      type: INTEGER
-      type_generic: 0
-      verbose_name: "0-28 \u1790\u17D2\u1784\u17C3 - \u179F\u17D2\u179A (0-28 days\
-        \ - F)"
-      warning_markdown: null
-    datasourceWarning: false
-    expressionType: SIMPLE
-    hasCustomLabel: true
-    label: fl28d
-    optionName: metric_8n3gpfy30y_horxf7jjgou
-    sqlExpression: null
-  - aggregate: SUM
-    column:
-      advanced_data_type: null
-      certification_details: null
-      certified_by: null
-      column_name: ml12m
-      description: null
-      expression: null
-      filterable: true
-      groupby: true
-      id: 1010
-      is_certified: false
-      is_dttm: false
-      python_date_format: null
-      type: INTEGER
-      type_generic: 0
-      verbose_name: "29 \u1790\u17D2\u1784\u17C3-11 \u1781\u17C2 - \u1794\u17D2\u179A\
-        \ (29 days - 11 months - M)"
-      warning_markdown: null
-    datasourceWarning: false
-    expressionType: SIMPLE
-    hasCustomLabel: true
-    label: ml12m
-    optionName: metric_eie6bn2a3wm_5iocmsnpbn4
-    sqlExpression: null
-  - aggregate: SUM
-    column:
-      advanced_data_type: null
-      certification_details: null
-      certified_by: null
-      column_name: ml4
-      description: null
-      expression: null
-      filterable: true
-      groupby: true
-      id: 1012
-      is_certified: false
-      is_dttm: false
-      python_date_format: null
-      type: INTEGER
-      type_generic: 0
-      verbose_name: "1-4 \u1786\u17D2\u1793\u17B6\u17C6 - \u1794\u17D2\u179A (1-4\
-        \ years - M)"
-      warning_markdown: null
-    datasourceWarning: false
-    expressionType: SIMPLE
-    hasCustomLabel: true
-    label: ml4
-    optionName: metric_yadhl1wuaxe_274di2eq3ok
-    sqlExpression: null
-  - aggregate: SUM
-    column:
-      advanced_data_type: null
-      certification_details: null
-      certified_by: null
-      column_name: fl4
-      description: null
-      expression: null
-      filterable: true
-      groupby: true
-      id: 1013
-      is_certified: false
-      is_dttm: false
-      python_date_format: null
-      type: INTEGER
-      type_generic: 0
-      verbose_name: "1-4 \u1786\u17D2\u1793\u17B6\u17C6 - \u179F\u17D2\u179A (1-4\
-        \ years - F)"
-      warning_markdown: null
-    datasourceWarning: false
-    expressionType: SIMPLE
-    hasCustomLabel: true
-    label: fl4
-    optionName: metric_ymq9n2erg9d_hhcrnkdvmzh
-    sqlExpression: null
-  - aggregate: SUM
-    column:
-      advanced_data_type: null
-      certification_details: null
-      certified_by: null
-      column_name: ml13
-      description: null
-      expression: null
-      filterable: true
-      groupby: true
-      id: 1014
-      is_certified: false
-      is_dttm: false
-      python_date_format: null
-      type: INTEGER
-      type_generic: 0
-      verbose_name: "5-13 \u1786\u17D2\u1793\u17B6\u17C6 - \u1794\u17D2\u179A (5-13\
-        \ years - M)"
-      warning_markdown: null
-    datasourceWarning: false
-    expressionType: SIMPLE
-    hasCustomLabel: true
-    label: ml13
-    optionName: metric_rkhf4715a7n_hje7mft8u8b
-    sqlExpression: null
-  - aggregate: SUM
-    column:
-      advanced_data_type: null
-      certification_details: null
-      certified_by: null
-      column_name: fl13
-      description: null
-      expression: null
-      filterable: true
-      groupby: true
-      id: 1015
-      is_certified: false
-      is_dttm: false
-      python_date_format: null
-      type: INTEGER
-      type_generic: 0
-      verbose_name: "5-13 \u1786\u17D2\u1793\u17B6\u17C6 - \u179F\u17D2\u179A (5-13\
-        \ years - F)"
-      warning_markdown: null
-    datasourceWarning: false
-    expressionType: SIMPLE
-    hasCustomLabel: true
-    label: fl13
-    optionName: metric_hetx0c4d98u_akb5630plk5
-    sqlExpression: null
-  - aggregate: SUM
-    column:
-      advanced_data_type: null
-      certification_details: null
-      certified_by: null
-      column_name: ml24
-      description: null
-      expression: null
-      filterable: true
-      groupby: true
-      id: 1016
-      is_certified: false
-      is_dttm: false
-      python_date_format: null
-      type: INTEGER
-      type_generic: 0
-      verbose_name: "6-24 \u1786\u17D2\u1793\u17B6\u17C6 - \u1794\u17D2\u179A (6-24\
-        \ years - M)"
-      warning_markdown: null
-    datasourceWarning: false
-    expressionType: SIMPLE
-    hasCustomLabel: true
-    label: ml24
-    optionName: metric_upzon497jd_m4q2sy24ho
-    sqlExpression: null
-  - aggregate: SUM
-    column:
-      advanced_data_type: null
-      certification_details: null
-      certified_by: null
-      column_name: fl24
-      description: null
-      expression: null
-      filterable: true
-      groupby: true
-      id: 1017
-      is_certified: false
-      is_dttm: false
-      python_date_format: null
-      type: INTEGER
-      type_generic: 0
-      verbose_name: "6-24 \u1786\u17D2\u1793\u17B6\u17C6 - \u179F\u17D2\u179A (6-24\
-        \ years - F)"
-      warning_markdown: null
-    datasourceWarning: false
-    expressionType: SIMPLE
-    hasCustomLabel: true
-    label: fl24
-    optionName: metric_3ahinowa0co_wconc4twrm
-    sqlExpression: null
-  - aggregate: SUM
-    column:
-      advanced_data_type: null
-      certification_details: null
-      certified_by: null
-      column_name: ml49
-      description: null
-      expression: null
-      filterable: true
-      groupby: true
-      id: 1018
-      is_certified: false
-      is_dttm: false
-      python_date_format: null
-      type: INTEGER
-      type_generic: 0
-      verbose_name: "25-49 \u1786\u17D2\u1793\u17B6\u17C6 - \u1794\u17D2\u179A (25-49\
-        \ years - M)"
-      warning_markdown: null
-    datasourceWarning: false
-    expressionType: SIMPLE
-    hasCustomLabel: true
-    label: ml49
-    optionName: metric_hvu9txw0l09_roudzl9xuf
-    sqlExpression: null
-  - aggregate: SUM
-    column:
-      advanced_data_type: null
-      certification_details: null
-      certified_by: null
-      column_name: fl49
-      description: null
-      expression: null
-      filterable: true
-      groupby: true
-      id: 1019
-      is_certified: false
-      is_dttm: false
-      python_date_format: null
-      type: INTEGER
-      type_generic: 0
-      verbose_name: "25-49 \u1786\u17D2\u1793\u17B6\u17C6 - \u179F\u17D2\u179A (25-49\
-        \ years - F)"
-      warning_markdown: null
-    datasourceWarning: false
-    expressionType: SIMPLE
-    hasCustomLabel: true
-    label: fl49
-    optionName: metric_ej35w4iizs6_45r14cn4lmi
-    sqlExpression: null
-  - aggregate: SUM
-    column:
-      advanced_data_type: null
-      certification_details: null
-      certified_by: null
-      column_name: ml64
-      description: null
-      expression: null
-      filterable: true
-      groupby: true
-      id: 1020
-      is_certified: false
-      is_dttm: false
-      python_date_format: null
-      type: INTEGER
-      type_generic: 0
-      verbose_name: "50-64 \u1786\u17D2\u1793\u17B6\u17C6 - \u1794\u17D2\u179A (50-64\
-        \ years - M)"
-      warning_markdown: null
-    datasourceWarning: false
-    expressionType: SIMPLE
-    hasCustomLabel: true
-    label: ml64
-    optionName: metric_2kn0w4isb0i_fvbtjb54n0e
-    sqlExpression: null
-  - aggregate: SUM
-    column:
-      advanced_data_type: null
-      certification_details: null
-      certified_by: null
-      column_name: fl64
-      description: null
-      expression: null
-      filterable: true
-      groupby: true
-      id: 1021
-      is_certified: false
-      is_dttm: false
-      python_date_format: null
-      type: INTEGER
-      type_generic: 0
-      verbose_name: "50-64 \u1786\u17D2\u1793\u17B6\u17C6 - \u179F\u17D2\u179A (50-64\
-        \ years - F)"
-      warning_markdown: null
-    datasourceWarning: false
-    expressionType: SIMPLE
-    hasCustomLabel: true
-    label: fl64
-    optionName: metric_9zh1hcelxz_0i58yqrywmdn
-    sqlExpression: null
-  - aggregate: SUM
-    column:
-      advanced_data_type: null
-      certification_details: null
-      certified_by: null
-      column_name: mg64
-      description: null
-      expression: null
-      filterable: true
-      groupby: true
-      id: 1022
-      is_certified: false
-      is_dttm: false
-      python_date_format: null
-      type: INTEGER
-      type_generic: 0
-      verbose_name: ">=65 \u1786\u17D2\u1793\u17B6\u17C6 - \u1794\u17D2\u179A (>=65\
-        \ years - M)"
-      warning_markdown: null
-    datasourceWarning: false
-    expressionType: SIMPLE
-    hasCustomLabel: true
-    label: mg64
-    optionName: metric_vf77119z33b_0uxcz6tqzle
-    sqlExpression: null
-  - aggregate: SUM
-    column:
-      advanced_data_type: null
-      certification_details: null
-      certified_by: null
-      column_name: fg64
-      description: null
-      expression: null
-      filterable: true
-      groupby: true
-      id: 1023
-      is_certified: false
-      is_dttm: false
-      python_date_format: null
-      type: INTEGER
-      type_generic: 0
-      verbose_name: ">=65 \u1786\u17D2\u1793\u17B6\u17C6 - \u179F\u17D2\u179A (>=65\
-        \ years - F)"
-      warning_markdown: null
-    datasourceWarning: false
-    expressionType: SIMPLE
-    hasCustomLabel: true
-    label: fg64
-    optionName: metric_jat7hkqeimc_011p8qdetegr
-    sqlExpression: null
-  - aggregate: null
-    column: null
-    datasourceWarning: false
-    expressionType: SQL
-    hasCustomLabel: true
-    label: "\u179F\u179A\u17BB\u1794 - \u1794\u17D2\u179A (Total - M)"
-    optionName: metric_q84jwa2qttq_fwsun06q5a
-    sqlExpression: SUM(ml28d) + SUM(ml12m) + SUM(ml4) + SUM(ml13) + SUM(ml24) + SUM(ml49)
-      + SUM(ml64) + SUM(mg64)
-  - aggregate: null
-    column: null
-    datasourceWarning: false
-    expressionType: SQL
-    hasCustomLabel: true
-    label: "\u179F\u179A\u17BB\u1794 - \u179F\u17D2\u179A (Total - F)"
-    optionName: metric_4x7qz0kqgce_d7d521fcv0i
-    sqlExpression: SUM(fl28d) + SUM(fl12m) + SUM(fl4) + SUM(fl13) + SUM(fl24) + SUM(fl49)
-      + SUM(fl64) + SUM(fg64)
-  all_columns: []
-  percent_metrics: []
-  adhoc_filters: []
-  order_by_cols: []
-  row_limit: 10000
-  server_page_length: 10
-  order_desc: false
-  show_totals: true
-  table_timestamp_format: smart_date
-  include_search: true
-  show_cell_bars: true
-  color_pn: true
-  column_config:
-    fg64:
-      d3NumberFormat: ~g
-      d3SmallNumberFormat: ~g
-      showCellBars: false
-    fl13:
-      d3NumberFormat: ~g
-      d3SmallNumberFormat: ~g
-      showCellBars: false
-    fl24:
-      d3NumberFormat: ~g
-      d3SmallNumberFormat: ~g
-      showCellBars: false
-    fl28d:
-      colorPositiveNegative: false
-      d3NumberFormat: ~g
-      d3SmallNumberFormat: ~g
-      showCellBars: false
-    fl4:
-      d3NumberFormat: ~g
-      d3SmallNumberFormat: ~g
-      showCellBars: false
-    fl49:
-      d3NumberFormat: ~g
-      d3SmallNumberFormat: ~g
-      showCellBars: false
-    fl64:
-      d3NumberFormat: ~g
-      d3SmallNumberFormat: ~g
-      showCellBars: false
-    mg64:
-      d3NumberFormat: ~g
-      d3SmallNumberFormat: ~g
-      showCellBars: false
-    ml12m:
-      d3NumberFormat: ~g
-      d3SmallNumberFormat: ~g
-      showCellBars: false
-    ml13:
-      d3NumberFormat: ~g
-      d3SmallNumberFormat: ~g
-      showCellBars: false
-    ml24:
-      d3NumberFormat: ~g
-      d3SmallNumberFormat: ~g
-      showCellBars: false
-    ml28d:
-      d3NumberFormat: ~g
-      d3SmallNumberFormat: ~g
-      showCellBars: false
-    ml4:
-      d3NumberFormat: ~g
-      d3SmallNumberFormat: ~g
-      showCellBars: false
-    ml49:
-      d3NumberFormat: ~g
-      d3SmallNumberFormat: ~g
-      showCellBars: false
-    ml64:
-      d3NumberFormat: ~g
-      d3SmallNumberFormat: ~g
-      showCellBars: false
-    "\u179F\u179A\u17BB\u1794 - \u1794\u17D2\u179A (Total - M)":
-      d3NumberFormat: ~g
-      d3SmallNumberFormat: ~g
-      showCellBars: false
-    "\u179F\u179A\u17BB\u1794 - \u179F\u17D2\u179A (Total - F)":
-      d3NumberFormat: ~g
-      d3SmallNumberFormat: ~g
-      showCellBars: false
-  conditional_formatting: []
-  extra_form_data: {}
-  dashboards:
-  - 18
-  annotation_layers: []
-query_context: "{\"datasource\":{\"id\":31,\"type\":\"table\"},\"force\":false,\"\
-  queries\":[{\"time_range\":\"7 years ago : now\",\"granularity\":\"visit_date\"\
-  ,\"filters\":[],\"extras\":{\"time_grain_sqla\":\"P1D\",\"having\":\"\",\"where\"\
-  :\"\"},\"applied_time_extras\":{},\"columns\":[\"diagnosis\"],\"metrics\":[{\"aggregate\"\
-  :\"SUM\",\"column\":{\"advanced_data_type\":null,\"certification_details\":null,\"\
-  certified_by\":null,\"column_name\":\"ml28d\",\"description\":null,\"expression\"\
-  :null,\"filterable\":true,\"groupby\":true,\"id\":1008,\"is_certified\":false,\"\
-  is_dttm\":false,\"python_date_format\":null,\"type\":\"INTEGER\",\"type_generic\"\
-  :0,\"verbose_name\":\"0-28 \u1790\u17D2\u1784\u17C3 - \u1794\u17D2\u179A (0-28 day\
-  \ - M)\",\"warning_markdown\":null},\"datasourceWarning\":false,\"expressionType\"\
-  :\"SIMPLE\",\"hasCustomLabel\":true,\"label\":\"ml28d\",\"optionName\":\"metric_k5ulvn1e85_ebfrsgpjae5\"\
-  ,\"sqlExpression\":null},{\"aggregate\":\"SUM\",\"column\":{\"advanced_data_type\"\
-  :null,\"certification_details\":null,\"certified_by\":null,\"column_name\":\"fl28d\"\
-  ,\"description\":null,\"expression\":null,\"filterable\":true,\"groupby\":true,\"\
-  id\":1009,\"is_certified\":false,\"is_dttm\":false,\"python_date_format\":null,\"\
-  type\":\"INTEGER\",\"type_generic\":0,\"verbose_name\":\"0-28 \u1790\u17D2\u1784\
-  \u17C3 - \u179F\u17D2\u179A (0-28 days - F)\",\"warning_markdown\":null},\"datasourceWarning\"\
-  :false,\"expressionType\":\"SIMPLE\",\"hasCustomLabel\":true,\"label\":\"fl28d\"\
-  ,\"optionName\":\"metric_8n3gpfy30y_horxf7jjgou\",\"sqlExpression\":null},{\"aggregate\"\
-  :\"SUM\",\"column\":{\"advanced_data_type\":null,\"certification_details\":null,\"\
-  certified_by\":null,\"column_name\":\"ml12m\",\"description\":null,\"expression\"\
-  :null,\"filterable\":true,\"groupby\":true,\"id\":1010,\"is_certified\":false,\"\
-  is_dttm\":false,\"python_date_format\":null,\"type\":\"INTEGER\",\"type_generic\"\
-  :0,\"verbose_name\":\"29 \u1790\u17D2\u1784\u17C3-11 \u1781\u17C2 - \u1794\u17D2\
-  \u179A (29 days - 11 months - M)\",\"warning_markdown\":null},\"datasourceWarning\"\
-  :false,\"expressionType\":\"SIMPLE\",\"hasCustomLabel\":true,\"label\":\"ml12m\"\
-  ,\"optionName\":\"metric_eie6bn2a3wm_5iocmsnpbn4\",\"sqlExpression\":null},{\"aggregate\"\
-  :\"SUM\",\"column\":{\"advanced_data_type\":null,\"certification_details\":null,\"\
-  certified_by\":null,\"column_name\":\"ml4\",\"description\":null,\"expression\"\
-  :null,\"filterable\":true,\"groupby\":true,\"id\":1012,\"is_certified\":false,\"\
-  is_dttm\":false,\"python_date_format\":null,\"type\":\"INTEGER\",\"type_generic\"\
-  :0,\"verbose_name\":\"1-4 \u1786\u17D2\u1793\u17B6\u17C6 - \u1794\u17D2\u179A (1-4\
-  \ years - M)\",\"warning_markdown\":null},\"datasourceWarning\":false,\"expressionType\"\
-  :\"SIMPLE\",\"hasCustomLabel\":true,\"label\":\"ml4\",\"optionName\":\"metric_yadhl1wuaxe_274di2eq3ok\"\
-  ,\"sqlExpression\":null},{\"aggregate\":\"SUM\",\"column\":{\"advanced_data_type\"\
-  :null,\"certification_details\":null,\"certified_by\":null,\"column_name\":\"fl4\"\
-  ,\"description\":null,\"expression\":null,\"filterable\":true,\"groupby\":true,\"\
-  id\":1013,\"is_certified\":false,\"is_dttm\":false,\"python_date_format\":null,\"\
-  type\":\"INTEGER\",\"type_generic\":0,\"verbose_name\":\"1-4 \u1786\u17D2\u1793\u17B6\
-  \u17C6 - \u179F\u17D2\u179A (1-4 years - F)\",\"warning_markdown\":null},\"datasourceWarning\"\
-  :false,\"expressionType\":\"SIMPLE\",\"hasCustomLabel\":true,\"label\":\"fl4\",\"\
-  optionName\":\"metric_ymq9n2erg9d_hhcrnkdvmzh\",\"sqlExpression\":null},{\"aggregate\"\
-  :\"SUM\",\"column\":{\"advanced_data_type\":null,\"certification_details\":null,\"\
-  certified_by\":null,\"column_name\":\"ml13\",\"description\":null,\"expression\"\
-  :null,\"filterable\":true,\"groupby\":true,\"id\":1014,\"is_certified\":false,\"\
-  is_dttm\":false,\"python_date_format\":null,\"type\":\"INTEGER\",\"type_generic\"\
-  :0,\"verbose_name\":\"5-13 \u1786\u17D2\u1793\u17B6\u17C6 - \u1794\u17D2\u179A (5-13\
-  \ years - M)\",\"warning_markdown\":null},\"datasourceWarning\":false,\"expressionType\"\
-  :\"SIMPLE\",\"hasCustomLabel\":true,\"label\":\"ml13\",\"optionName\":\"metric_rkhf4715a7n_hje7mft8u8b\"\
-  ,\"sqlExpression\":null},{\"aggregate\":\"SUM\",\"column\":{\"advanced_data_type\"\
-  :null,\"certification_details\":null,\"certified_by\":null,\"column_name\":\"fl13\"\
-  ,\"description\":null,\"expression\":null,\"filterable\":true,\"groupby\":true,\"\
-  id\":1015,\"is_certified\":false,\"is_dttm\":false,\"python_date_format\":null,\"\
-  type\":\"INTEGER\",\"type_generic\":0,\"verbose_name\":\"5-13 \u1786\u17D2\u1793\
-  \u17B6\u17C6 - \u179F\u17D2\u179A (5-13 years - F)\",\"warning_markdown\":null},\"\
-  datasourceWarning\":false,\"expressionType\":\"SIMPLE\",\"hasCustomLabel\":true,\"\
-  label\":\"fl13\",\"optionName\":\"metric_hetx0c4d98u_akb5630plk5\",\"sqlExpression\"\
-  :null},{\"aggregate\":\"SUM\",\"column\":{\"advanced_data_type\":null,\"certification_details\"\
-  :null,\"certified_by\":null,\"column_name\":\"ml24\",\"description\":null,\"expression\"\
-  :null,\"filterable\":true,\"groupby\":true,\"id\":1016,\"is_certified\":false,\"\
-  is_dttm\":false,\"python_date_format\":null,\"type\":\"INTEGER\",\"type_generic\"\
-  :0,\"verbose_name\":\"6-24 \u1786\u17D2\u1793\u17B6\u17C6 - \u1794\u17D2\u179A (6-24\
-  \ years - M)\",\"warning_markdown\":null},\"datasourceWarning\":false,\"expressionType\"\
-  :\"SIMPLE\",\"hasCustomLabel\":true,\"label\":\"ml24\",\"optionName\":\"metric_upzon497jd_m4q2sy24ho\"\
-  ,\"sqlExpression\":null},{\"aggregate\":\"SUM\",\"column\":{\"advanced_data_type\"\
-  :null,\"certification_details\":null,\"certified_by\":null,\"column_name\":\"fl24\"\
-  ,\"description\":null,\"expression\":null,\"filterable\":true,\"groupby\":true,\"\
-  id\":1017,\"is_certified\":false,\"is_dttm\":false,\"python_date_format\":null,\"\
-  type\":\"INTEGER\",\"type_generic\":0,\"verbose_name\":\"6-24 \u1786\u17D2\u1793\
-  \u17B6\u17C6 - \u179F\u17D2\u179A (6-24 years - F)\",\"warning_markdown\":null},\"\
-  datasourceWarning\":false,\"expressionType\":\"SIMPLE\",\"hasCustomLabel\":true,\"\
-  label\":\"fl24\",\"optionName\":\"metric_3ahinowa0co_wconc4twrm\",\"sqlExpression\"\
-  :null},{\"aggregate\":\"SUM\",\"column\":{\"advanced_data_type\":null,\"certification_details\"\
-  :null,\"certified_by\":null,\"column_name\":\"ml49\",\"description\":null,\"expression\"\
-  :null,\"filterable\":true,\"groupby\":true,\"id\":1018,\"is_certified\":false,\"\
-  is_dttm\":false,\"python_date_format\":null,\"type\":\"INTEGER\",\"type_generic\"\
-  :0,\"verbose_name\":\"25-49 \u1786\u17D2\u1793\u17B6\u17C6 - \u1794\u17D2\u179A\
-  \ (25-49 years - M)\",\"warning_markdown\":null},\"datasourceWarning\":false,\"\
-  expressionType\":\"SIMPLE\",\"hasCustomLabel\":true,\"label\":\"ml49\",\"optionName\"\
-  :\"metric_hvu9txw0l09_roudzl9xuf\",\"sqlExpression\":null},{\"aggregate\":\"SUM\"\
-  ,\"column\":{\"advanced_data_type\":null,\"certification_details\":null,\"certified_by\"\
-  :null,\"column_name\":\"fl49\",\"description\":null,\"expression\":null,\"filterable\"\
-  :true,\"groupby\":true,\"id\":1019,\"is_certified\":false,\"is_dttm\":false,\"python_date_format\"\
-  :null,\"type\":\"INTEGER\",\"type_generic\":0,\"verbose_name\":\"25-49 \u1786\u17D2\
-  \u1793\u17B6\u17C6 - \u179F\u17D2\u179A (25-49 years - F)\",\"warning_markdown\"\
-  :null},\"datasourceWarning\":false,\"expressionType\":\"SIMPLE\",\"hasCustomLabel\"\
-  :true,\"label\":\"fl49\",\"optionName\":\"metric_ej35w4iizs6_45r14cn4lmi\",\"sqlExpression\"\
-  :null},{\"aggregate\":\"SUM\",\"column\":{\"advanced_data_type\":null,\"certification_details\"\
-  :null,\"certified_by\":null,\"column_name\":\"ml64\",\"description\":null,\"expression\"\
-  :null,\"filterable\":true,\"groupby\":true,\"id\":1020,\"is_certified\":false,\"\
-  is_dttm\":false,\"python_date_format\":null,\"type\":\"INTEGER\",\"type_generic\"\
-  :0,\"verbose_name\":\"50-64 \u1786\u17D2\u1793\u17B6\u17C6 - \u1794\u17D2\u179A\
-  \ (50-64 years - M)\",\"warning_markdown\":null},\"datasourceWarning\":false,\"\
-  expressionType\":\"SIMPLE\",\"hasCustomLabel\":true,\"label\":\"ml64\",\"optionName\"\
-  :\"metric_2kn0w4isb0i_fvbtjb54n0e\",\"sqlExpression\":null},{\"aggregate\":\"SUM\"\
-  ,\"column\":{\"advanced_data_type\":null,\"certification_details\":null,\"certified_by\"\
-  :null,\"column_name\":\"fl64\",\"description\":null,\"expression\":null,\"filterable\"\
-  :true,\"groupby\":true,\"id\":1021,\"is_certified\":false,\"is_dttm\":false,\"python_date_format\"\
-  :null,\"type\":\"INTEGER\",\"type_generic\":0,\"verbose_name\":\"50-64 \u1786\u17D2\
-  \u1793\u17B6\u17C6 - \u179F\u17D2\u179A (50-64 years - F)\",\"warning_markdown\"\
-  :null},\"datasourceWarning\":false,\"expressionType\":\"SIMPLE\",\"hasCustomLabel\"\
-  :true,\"label\":\"fl64\",\"optionName\":\"metric_9zh1hcelxz_0i58yqrywmdn\",\"sqlExpression\"\
-  :null},{\"aggregate\":\"SUM\",\"column\":{\"advanced_data_type\":null,\"certification_details\"\
-  :null,\"certified_by\":null,\"column_name\":\"mg64\",\"description\":null,\"expression\"\
-  :null,\"filterable\":true,\"groupby\":true,\"id\":1022,\"is_certified\":false,\"\
-  is_dttm\":false,\"python_date_format\":null,\"type\":\"INTEGER\",\"type_generic\"\
-  :0,\"verbose_name\":\">=65 \u1786\u17D2\u1793\u17B6\u17C6 - \u1794\u17D2\u179A (>=65\
-  \ years - M)\",\"warning_markdown\":null},\"datasourceWarning\":false,\"expressionType\"\
-  :\"SIMPLE\",\"hasCustomLabel\":true,\"label\":\"mg64\",\"optionName\":\"metric_vf77119z33b_0uxcz6tqzle\"\
-  ,\"sqlExpression\":null},{\"aggregate\":\"SUM\",\"column\":{\"advanced_data_type\"\
-  :null,\"certification_details\":null,\"certified_by\":null,\"column_name\":\"fg64\"\
-  ,\"description\":null,\"expression\":null,\"filterable\":true,\"groupby\":true,\"\
-  id\":1023,\"is_certified\":false,\"is_dttm\":false,\"python_date_format\":null,\"\
-  type\":\"INTEGER\",\"type_generic\":0,\"verbose_name\":\">=65 \u1786\u17D2\u1793\
-  \u17B6\u17C6 - \u179F\u17D2\u179A (>=65 years - F)\",\"warning_markdown\":null},\"\
-  datasourceWarning\":false,\"expressionType\":\"SIMPLE\",\"hasCustomLabel\":true,\"\
-  label\":\"fg64\",\"optionName\":\"metric_jat7hkqeimc_011p8qdetegr\",\"sqlExpression\"\
-  :null},{\"aggregate\":null,\"column\":null,\"datasourceWarning\":false,\"expressionType\"\
-  :\"SQL\",\"hasCustomLabel\":true,\"label\":\"\u179F\u179A\u17BB\u1794 - \u1794\u17D2\
-  \u179A (Total - M)\",\"optionName\":\"metric_q84jwa2qttq_fwsun06q5a\",\"sqlExpression\"\
-  :\"SUM(ml28d) + SUM(ml12m) + SUM(ml4) + SUM(ml13) + SUM(ml24) + SUM(ml49) + SUM(ml64)\
-  \ + SUM(mg64)\"},{\"aggregate\":null,\"column\":null,\"datasourceWarning\":false,\"\
-  expressionType\":\"SQL\",\"hasCustomLabel\":true,\"label\":\"\u179F\u179A\u17BB\u1794\
-  \ - \u179F\u17D2\u179A (Total - F)\",\"optionName\":\"metric_4x7qz0kqgce_d7d521fcv0i\"\
-  ,\"sqlExpression\":\"SUM(fl28d) + SUM(fl12m) + SUM(fl4) + SUM(fl13) + SUM(fl24)\
-  \ + SUM(fl49) + SUM(fl64) + SUM(fg64)\"}],\"orderby\":[[{\"aggregate\":\"SUM\",\"\
-  column\":{\"advanced_data_type\":null,\"certification_details\":null,\"certified_by\"\
-  :null,\"column_name\":\"ml28d\",\"description\":null,\"expression\":null,\"filterable\"\
-  :true,\"groupby\":true,\"id\":1008,\"is_certified\":false,\"is_dttm\":false,\"python_date_format\"\
-  :null,\"type\":\"INTEGER\",\"type_generic\":0,\"verbose_name\":\"0-28 \u1790\u17D2\
-  \u1784\u17C3 - \u1794\u17D2\u179A (0-28 day - M)\",\"warning_markdown\":null},\"\
-  datasourceWarning\":false,\"expressionType\":\"SIMPLE\",\"hasCustomLabel\":true,\"\
-  label\":\"ml28d\",\"optionName\":\"metric_k5ulvn1e85_ebfrsgpjae5\",\"sqlExpression\"\
-  :null},false]],\"annotation_layers\":[],\"row_limit\":10000,\"series_limit\":0,\"\
-  order_desc\":false,\"url_params\":{},\"custom_params\":{},\"custom_form_data\":{},\"\
-  post_processing\":[]},{\"time_range\":\"7 years ago : now\",\"granularity\":\"visit_date\"\
-  ,\"filters\":[],\"extras\":{\"time_grain_sqla\":\"P1D\",\"having\":\"\",\"where\"\
-  :\"\"},\"applied_time_extras\":{},\"columns\":[],\"metrics\":[{\"aggregate\":\"\
-  SUM\",\"column\":{\"advanced_data_type\":null,\"certification_details\":null,\"\
-  certified_by\":null,\"column_name\":\"ml28d\",\"description\":null,\"expression\"\
-  :null,\"filterable\":true,\"groupby\":true,\"id\":1008,\"is_certified\":false,\"\
-  is_dttm\":false,\"python_date_format\":null,\"type\":\"INTEGER\",\"type_generic\"\
-  :0,\"verbose_name\":\"0-28 \u1790\u17D2\u1784\u17C3 - \u1794\u17D2\u179A (0-28 day\
-  \ - M)\",\"warning_markdown\":null},\"datasourceWarning\":false,\"expressionType\"\
-  :\"SIMPLE\",\"hasCustomLabel\":true,\"label\":\"ml28d\",\"optionName\":\"metric_k5ulvn1e85_ebfrsgpjae5\"\
-  ,\"sqlExpression\":null},{\"aggregate\":\"SUM\",\"column\":{\"advanced_data_type\"\
-  :null,\"certification_details\":null,\"certified_by\":null,\"column_name\":\"fl28d\"\
-  ,\"description\":null,\"expression\":null,\"filterable\":true,\"groupby\":true,\"\
-  id\":1009,\"is_certified\":false,\"is_dttm\":false,\"python_date_format\":null,\"\
-  type\":\"INTEGER\",\"type_generic\":0,\"verbose_name\":\"0-28 \u1790\u17D2\u1784\
-  \u17C3 - \u179F\u17D2\u179A (0-28 days - F)\",\"warning_markdown\":null},\"datasourceWarning\"\
-  :false,\"expressionType\":\"SIMPLE\",\"hasCustomLabel\":true,\"label\":\"fl28d\"\
-  ,\"optionName\":\"metric_8n3gpfy30y_horxf7jjgou\",\"sqlExpression\":null},{\"aggregate\"\
-  :\"SUM\",\"column\":{\"advanced_data_type\":null,\"certification_details\":null,\"\
-  certified_by\":null,\"column_name\":\"ml12m\",\"description\":null,\"expression\"\
-  :null,\"filterable\":true,\"groupby\":true,\"id\":1010,\"is_certified\":false,\"\
-  is_dttm\":false,\"python_date_format\":null,\"type\":\"INTEGER\",\"type_generic\"\
-  :0,\"verbose_name\":\"29 \u1790\u17D2\u1784\u17C3-11 \u1781\u17C2 - \u1794\u17D2\
-  \u179A (29 days - 11 months - M)\",\"warning_markdown\":null},\"datasourceWarning\"\
-  :false,\"expressionType\":\"SIMPLE\",\"hasCustomLabel\":true,\"label\":\"ml12m\"\
-  ,\"optionName\":\"metric_eie6bn2a3wm_5iocmsnpbn4\",\"sqlExpression\":null},{\"aggregate\"\
-  :\"SUM\",\"column\":{\"advanced_data_type\":null,\"certification_details\":null,\"\
-  certified_by\":null,\"column_name\":\"ml4\",\"description\":null,\"expression\"\
-  :null,\"filterable\":true,\"groupby\":true,\"id\":1012,\"is_certified\":false,\"\
-  is_dttm\":false,\"python_date_format\":null,\"type\":\"INTEGER\",\"type_generic\"\
-  :0,\"verbose_name\":\"1-4 \u1786\u17D2\u1793\u17B6\u17C6 - \u1794\u17D2\u179A (1-4\
-  \ years - M)\",\"warning_markdown\":null},\"datasourceWarning\":false,\"expressionType\"\
-  :\"SIMPLE\",\"hasCustomLabel\":true,\"label\":\"ml4\",\"optionName\":\"metric_yadhl1wuaxe_274di2eq3ok\"\
-  ,\"sqlExpression\":null},{\"aggregate\":\"SUM\",\"column\":{\"advanced_data_type\"\
-  :null,\"certification_details\":null,\"certified_by\":null,\"column_name\":\"fl4\"\
-  ,\"description\":null,\"expression\":null,\"filterable\":true,\"groupby\":true,\"\
-  id\":1013,\"is_certified\":false,\"is_dttm\":false,\"python_date_format\":null,\"\
-  type\":\"INTEGER\",\"type_generic\":0,\"verbose_name\":\"1-4 \u1786\u17D2\u1793\u17B6\
-  \u17C6 - \u179F\u17D2\u179A (1-4 years - F)\",\"warning_markdown\":null},\"datasourceWarning\"\
-  :false,\"expressionType\":\"SIMPLE\",\"hasCustomLabel\":true,\"label\":\"fl4\",\"\
-  optionName\":\"metric_ymq9n2erg9d_hhcrnkdvmzh\",\"sqlExpression\":null},{\"aggregate\"\
-  :\"SUM\",\"column\":{\"advanced_data_type\":null,\"certification_details\":null,\"\
-  certified_by\":null,\"column_name\":\"ml13\",\"description\":null,\"expression\"\
-  :null,\"filterable\":true,\"groupby\":true,\"id\":1014,\"is_certified\":false,\"\
-  is_dttm\":false,\"python_date_format\":null,\"type\":\"INTEGER\",\"type_generic\"\
-  :0,\"verbose_name\":\"5-13 \u1786\u17D2\u1793\u17B6\u17C6 - \u1794\u17D2\u179A (5-13\
-  \ years - M)\",\"warning_markdown\":null},\"datasourceWarning\":false,\"expressionType\"\
-  :\"SIMPLE\",\"hasCustomLabel\":true,\"label\":\"ml13\",\"optionName\":\"metric_rkhf4715a7n_hje7mft8u8b\"\
-  ,\"sqlExpression\":null},{\"aggregate\":\"SUM\",\"column\":{\"advanced_data_type\"\
-  :null,\"certification_details\":null,\"certified_by\":null,\"column_name\":\"fl13\"\
-  ,\"description\":null,\"expression\":null,\"filterable\":true,\"groupby\":true,\"\
-  id\":1015,\"is_certified\":false,\"is_dttm\":false,\"python_date_format\":null,\"\
-  type\":\"INTEGER\",\"type_generic\":0,\"verbose_name\":\"5-13 \u1786\u17D2\u1793\
-  \u17B6\u17C6 - \u179F\u17D2\u179A (5-13 years - F)\",\"warning_markdown\":null},\"\
-  datasourceWarning\":false,\"expressionType\":\"SIMPLE\",\"hasCustomLabel\":true,\"\
-  label\":\"fl13\",\"optionName\":\"metric_hetx0c4d98u_akb5630plk5\",\"sqlExpression\"\
-  :null},{\"aggregate\":\"SUM\",\"column\":{\"advanced_data_type\":null,\"certification_details\"\
-  :null,\"certified_by\":null,\"column_name\":\"ml24\",\"description\":null,\"expression\"\
-  :null,\"filterable\":true,\"groupby\":true,\"id\":1016,\"is_certified\":false,\"\
-  is_dttm\":false,\"python_date_format\":null,\"type\":\"INTEGER\",\"type_generic\"\
-  :0,\"verbose_name\":\"6-24 \u1786\u17D2\u1793\u17B6\u17C6 - \u1794\u17D2\u179A (6-24\
-  \ years - M)\",\"warning_markdown\":null},\"datasourceWarning\":false,\"expressionType\"\
-  :\"SIMPLE\",\"hasCustomLabel\":true,\"label\":\"ml24\",\"optionName\":\"metric_upzon497jd_m4q2sy24ho\"\
-  ,\"sqlExpression\":null},{\"aggregate\":\"SUM\",\"column\":{\"advanced_data_type\"\
-  :null,\"certification_details\":null,\"certified_by\":null,\"column_name\":\"fl24\"\
-  ,\"description\":null,\"expression\":null,\"filterable\":true,\"groupby\":true,\"\
-  id\":1017,\"is_certified\":false,\"is_dttm\":false,\"python_date_format\":null,\"\
-  type\":\"INTEGER\",\"type_generic\":0,\"verbose_name\":\"6-24 \u1786\u17D2\u1793\
-  \u17B6\u17C6 - \u179F\u17D2\u179A (6-24 years - F)\",\"warning_markdown\":null},\"\
-  datasourceWarning\":false,\"expressionType\":\"SIMPLE\",\"hasCustomLabel\":true,\"\
-  label\":\"fl24\",\"optionName\":\"metric_3ahinowa0co_wconc4twrm\",\"sqlExpression\"\
-  :null},{\"aggregate\":\"SUM\",\"column\":{\"advanced_data_type\":null,\"certification_details\"\
-  :null,\"certified_by\":null,\"column_name\":\"ml49\",\"description\":null,\"expression\"\
-  :null,\"filterable\":true,\"groupby\":true,\"id\":1018,\"is_certified\":false,\"\
-  is_dttm\":false,\"python_date_format\":null,\"type\":\"INTEGER\",\"type_generic\"\
-  :0,\"verbose_name\":\"25-49 \u1786\u17D2\u1793\u17B6\u17C6 - \u1794\u17D2\u179A\
-  \ (25-49 years - M)\",\"warning_markdown\":null},\"datasourceWarning\":false,\"\
-  expressionType\":\"SIMPLE\",\"hasCustomLabel\":true,\"label\":\"ml49\",\"optionName\"\
-  :\"metric_hvu9txw0l09_roudzl9xuf\",\"sqlExpression\":null},{\"aggregate\":\"SUM\"\
-  ,\"column\":{\"advanced_data_type\":null,\"certification_details\":null,\"certified_by\"\
-  :null,\"column_name\":\"fl49\",\"description\":null,\"expression\":null,\"filterable\"\
-  :true,\"groupby\":true,\"id\":1019,\"is_certified\":false,\"is_dttm\":false,\"python_date_format\"\
-  :null,\"type\":\"INTEGER\",\"type_generic\":0,\"verbose_name\":\"25-49 \u1786\u17D2\
-  \u1793\u17B6\u17C6 - \u179F\u17D2\u179A (25-49 years - F)\",\"warning_markdown\"\
-  :null},\"datasourceWarning\":false,\"expressionType\":\"SIMPLE\",\"hasCustomLabel\"\
-  :true,\"label\":\"fl49\",\"optionName\":\"metric_ej35w4iizs6_45r14cn4lmi\",\"sqlExpression\"\
-  :null},{\"aggregate\":\"SUM\",\"column\":{\"advanced_data_type\":null,\"certification_details\"\
-  :null,\"certified_by\":null,\"column_name\":\"ml64\",\"description\":null,\"expression\"\
-  :null,\"filterable\":true,\"groupby\":true,\"id\":1020,\"is_certified\":false,\"\
-  is_dttm\":false,\"python_date_format\":null,\"type\":\"INTEGER\",\"type_generic\"\
-  :0,\"verbose_name\":\"50-64 \u1786\u17D2\u1793\u17B6\u17C6 - \u1794\u17D2\u179A\
-  \ (50-64 years - M)\",\"warning_markdown\":null},\"datasourceWarning\":false,\"\
-  expressionType\":\"SIMPLE\",\"hasCustomLabel\":true,\"label\":\"ml64\",\"optionName\"\
-  :\"metric_2kn0w4isb0i_fvbtjb54n0e\",\"sqlExpression\":null},{\"aggregate\":\"SUM\"\
-  ,\"column\":{\"advanced_data_type\":null,\"certification_details\":null,\"certified_by\"\
-  :null,\"column_name\":\"fl64\",\"description\":null,\"expression\":null,\"filterable\"\
-  :true,\"groupby\":true,\"id\":1021,\"is_certified\":false,\"is_dttm\":false,\"python_date_format\"\
-  :null,\"type\":\"INTEGER\",\"type_generic\":0,\"verbose_name\":\"50-64 \u1786\u17D2\
-  \u1793\u17B6\u17C6 - \u179F\u17D2\u179A (50-64 years - F)\",\"warning_markdown\"\
-  :null},\"datasourceWarning\":false,\"expressionType\":\"SIMPLE\",\"hasCustomLabel\"\
-  :true,\"label\":\"fl64\",\"optionName\":\"metric_9zh1hcelxz_0i58yqrywmdn\",\"sqlExpression\"\
-  :null},{\"aggregate\":\"SUM\",\"column\":{\"advanced_data_type\":null,\"certification_details\"\
-  :null,\"certified_by\":null,\"column_name\":\"mg64\",\"description\":null,\"expression\"\
-  :null,\"filterable\":true,\"groupby\":true,\"id\":1022,\"is_certified\":false,\"\
-  is_dttm\":false,\"python_date_format\":null,\"type\":\"INTEGER\",\"type_generic\"\
-  :0,\"verbose_name\":\">=65 \u1786\u17D2\u1793\u17B6\u17C6 - \u1794\u17D2\u179A (>=65\
-  \ years - M)\",\"warning_markdown\":null},\"datasourceWarning\":false,\"expressionType\"\
-  :\"SIMPLE\",\"hasCustomLabel\":true,\"label\":\"mg64\",\"optionName\":\"metric_vf77119z33b_0uxcz6tqzle\"\
-  ,\"sqlExpression\":null},{\"aggregate\":\"SUM\",\"column\":{\"advanced_data_type\"\
-  :null,\"certification_details\":null,\"certified_by\":null,\"column_name\":\"fg64\"\
-  ,\"description\":null,\"expression\":null,\"filterable\":true,\"groupby\":true,\"\
-  id\":1023,\"is_certified\":false,\"is_dttm\":false,\"python_date_format\":null,\"\
-  type\":\"INTEGER\",\"type_generic\":0,\"verbose_name\":\">=65 \u1786\u17D2\u1793\
-  \u17B6\u17C6 - \u179F\u17D2\u179A (>=65 years - F)\",\"warning_markdown\":null},\"\
-  datasourceWarning\":false,\"expressionType\":\"SIMPLE\",\"hasCustomLabel\":true,\"\
-  label\":\"fg64\",\"optionName\":\"metric_jat7hkqeimc_011p8qdetegr\",\"sqlExpression\"\
-  :null},{\"aggregate\":null,\"column\":null,\"datasourceWarning\":false,\"expressionType\"\
-  :\"SQL\",\"hasCustomLabel\":true,\"label\":\"\u179F\u179A\u17BB\u1794 - \u1794\u17D2\
-  \u179A (Total - M)\",\"optionName\":\"metric_q84jwa2qttq_fwsun06q5a\",\"sqlExpression\"\
-  :\"SUM(ml28d) + SUM(ml12m) + SUM(ml4) + SUM(ml13) + SUM(ml24) + SUM(ml49) + SUM(ml64)\
-  \ + SUM(mg64)\"},{\"aggregate\":null,\"column\":null,\"datasourceWarning\":false,\"\
-  expressionType\":\"SQL\",\"hasCustomLabel\":true,\"label\":\"\u179F\u179A\u17BB\u1794\
-  \ - \u179F\u17D2\u179A (Total - F)\",\"optionName\":\"metric_4x7qz0kqgce_d7d521fcv0i\"\
-  ,\"sqlExpression\":\"SUM(fl28d) + SUM(fl12m) + SUM(fl4) + SUM(fl13) + SUM(fl24)\
-  \ + SUM(fl49) + SUM(fl64) + SUM(fg64)\"}],\"annotation_layers\":[],\"row_limit\"\
-  :0,\"row_offset\":0,\"series_limit\":0,\"url_params\":{},\"custom_params\":{},\"\
-  custom_form_data\":{},\"post_processing\":[]}],\"form_data\":{\"datasource\":\"\
-  31__table\",\"viz_type\":\"table\",\"slice_id\":144,\"granularity_sqla\":\"visit_date\"\
-  ,\"time_grain_sqla\":\"P1D\",\"time_range\":\"7 years ago : now\",\"query_mode\"\
-  :\"aggregate\",\"groupby\":[\"diagnosis\"],\"metrics\":[{\"aggregate\":\"SUM\",\"\
-  column\":{\"advanced_data_type\":null,\"certification_details\":null,\"certified_by\"\
-  :null,\"column_name\":\"ml28d\",\"description\":null,\"expression\":null,\"filterable\"\
-  :true,\"groupby\":true,\"id\":1008,\"is_certified\":false,\"is_dttm\":false,\"python_date_format\"\
-  :null,\"type\":\"INTEGER\",\"type_generic\":0,\"verbose_name\":\"0-28 \u1790\u17D2\
-  \u1784\u17C3 - \u1794\u17D2\u179A (0-28 day - M)\",\"warning_markdown\":null},\"\
-  datasourceWarning\":false,\"expressionType\":\"SIMPLE\",\"hasCustomLabel\":true,\"\
-  label\":\"ml28d\",\"optionName\":\"metric_k5ulvn1e85_ebfrsgpjae5\",\"sqlExpression\"\
-  :null},{\"aggregate\":\"SUM\",\"column\":{\"advanced_data_type\":null,\"certification_details\"\
-  :null,\"certified_by\":null,\"column_name\":\"fl28d\",\"description\":null,\"expression\"\
-  :null,\"filterable\":true,\"groupby\":true,\"id\":1009,\"is_certified\":false,\"\
-  is_dttm\":false,\"python_date_format\":null,\"type\":\"INTEGER\",\"type_generic\"\
-  :0,\"verbose_name\":\"0-28 \u1790\u17D2\u1784\u17C3 - \u179F\u17D2\u179A (0-28 days\
-  \ - F)\",\"warning_markdown\":null},\"datasourceWarning\":false,\"expressionType\"\
-  :\"SIMPLE\",\"hasCustomLabel\":true,\"label\":\"fl28d\",\"optionName\":\"metric_8n3gpfy30y_horxf7jjgou\"\
-  ,\"sqlExpression\":null},{\"aggregate\":\"SUM\",\"column\":{\"advanced_data_type\"\
-  :null,\"certification_details\":null,\"certified_by\":null,\"column_name\":\"ml12m\"\
-  ,\"description\":null,\"expression\":null,\"filterable\":true,\"groupby\":true,\"\
-  id\":1010,\"is_certified\":false,\"is_dttm\":false,\"python_date_format\":null,\"\
-  type\":\"INTEGER\",\"type_generic\":0,\"verbose_name\":\"29 \u1790\u17D2\u1784\u17C3\
-  -11 \u1781\u17C2 - \u1794\u17D2\u179A (29 days - 11 months - M)\",\"warning_markdown\"\
-  :null},\"datasourceWarning\":false,\"expressionType\":\"SIMPLE\",\"hasCustomLabel\"\
-  :true,\"label\":\"ml12m\",\"optionName\":\"metric_eie6bn2a3wm_5iocmsnpbn4\",\"sqlExpression\"\
-  :null},{\"aggregate\":\"SUM\",\"column\":{\"advanced_data_type\":null,\"certification_details\"\
-  :null,\"certified_by\":null,\"column_name\":\"ml4\",\"description\":null,\"expression\"\
-  :null,\"filterable\":true,\"groupby\":true,\"id\":1012,\"is_certified\":false,\"\
-  is_dttm\":false,\"python_date_format\":null,\"type\":\"INTEGER\",\"type_generic\"\
-  :0,\"verbose_name\":\"1-4 \u1786\u17D2\u1793\u17B6\u17C6 - \u1794\u17D2\u179A (1-4\
-  \ years - M)\",\"warning_markdown\":null},\"datasourceWarning\":false,\"expressionType\"\
-  :\"SIMPLE\",\"hasCustomLabel\":true,\"label\":\"ml4\",\"optionName\":\"metric_yadhl1wuaxe_274di2eq3ok\"\
-  ,\"sqlExpression\":null},{\"aggregate\":\"SUM\",\"column\":{\"advanced_data_type\"\
-  :null,\"certification_details\":null,\"certified_by\":null,\"column_name\":\"fl4\"\
-  ,\"description\":null,\"expression\":null,\"filterable\":true,\"groupby\":true,\"\
-  id\":1013,\"is_certified\":false,\"is_dttm\":false,\"python_date_format\":null,\"\
-  type\":\"INTEGER\",\"type_generic\":0,\"verbose_name\":\"1-4 \u1786\u17D2\u1793\u17B6\
-  \u17C6 - \u179F\u17D2\u179A (1-4 years - F)\",\"warning_markdown\":null},\"datasourceWarning\"\
-  :false,\"expressionType\":\"SIMPLE\",\"hasCustomLabel\":true,\"label\":\"fl4\",\"\
-  optionName\":\"metric_ymq9n2erg9d_hhcrnkdvmzh\",\"sqlExpression\":null},{\"aggregate\"\
-  :\"SUM\",\"column\":{\"advanced_data_type\":null,\"certification_details\":null,\"\
-  certified_by\":null,\"column_name\":\"ml13\",\"description\":null,\"expression\"\
-  :null,\"filterable\":true,\"groupby\":true,\"id\":1014,\"is_certified\":false,\"\
-  is_dttm\":false,\"python_date_format\":null,\"type\":\"INTEGER\",\"type_generic\"\
-  :0,\"verbose_name\":\"5-13 \u1786\u17D2\u1793\u17B6\u17C6 - \u1794\u17D2\u179A (5-13\
-  \ years - M)\",\"warning_markdown\":null},\"datasourceWarning\":false,\"expressionType\"\
-  :\"SIMPLE\",\"hasCustomLabel\":true,\"label\":\"ml13\",\"optionName\":\"metric_rkhf4715a7n_hje7mft8u8b\"\
-  ,\"sqlExpression\":null},{\"aggregate\":\"SUM\",\"column\":{\"advanced_data_type\"\
-  :null,\"certification_details\":null,\"certified_by\":null,\"column_name\":\"fl13\"\
-  ,\"description\":null,\"expression\":null,\"filterable\":true,\"groupby\":true,\"\
-  id\":1015,\"is_certified\":false,\"is_dttm\":false,\"python_date_format\":null,\"\
-  type\":\"INTEGER\",\"type_generic\":0,\"verbose_name\":\"5-13 \u1786\u17D2\u1793\
-  \u17B6\u17C6 - \u179F\u17D2\u179A (5-13 years - F)\",\"warning_markdown\":null},\"\
-  datasourceWarning\":false,\"expressionType\":\"SIMPLE\",\"hasCustomLabel\":true,\"\
-  label\":\"fl13\",\"optionName\":\"metric_hetx0c4d98u_akb5630plk5\",\"sqlExpression\"\
-  :null},{\"aggregate\":\"SUM\",\"column\":{\"advanced_data_type\":null,\"certification_details\"\
-  :null,\"certified_by\":null,\"column_name\":\"ml24\",\"description\":null,\"expression\"\
-  :null,\"filterable\":true,\"groupby\":true,\"id\":1016,\"is_certified\":false,\"\
-  is_dttm\":false,\"python_date_format\":null,\"type\":\"INTEGER\",\"type_generic\"\
-  :0,\"verbose_name\":\"6-24 \u1786\u17D2\u1793\u17B6\u17C6 - \u1794\u17D2\u179A (6-24\
-  \ years - M)\",\"warning_markdown\":null},\"datasourceWarning\":false,\"expressionType\"\
-  :\"SIMPLE\",\"hasCustomLabel\":true,\"label\":\"ml24\",\"optionName\":\"metric_upzon497jd_m4q2sy24ho\"\
-  ,\"sqlExpression\":null},{\"aggregate\":\"SUM\",\"column\":{\"advanced_data_type\"\
-  :null,\"certification_details\":null,\"certified_by\":null,\"column_name\":\"fl24\"\
-  ,\"description\":null,\"expression\":null,\"filterable\":true,\"groupby\":true,\"\
-  id\":1017,\"is_certified\":false,\"is_dttm\":false,\"python_date_format\":null,\"\
-  type\":\"INTEGER\",\"type_generic\":0,\"verbose_name\":\"6-24 \u1786\u17D2\u1793\
-  \u17B6\u17C6 - \u179F\u17D2\u179A (6-24 years - F)\",\"warning_markdown\":null},\"\
-  datasourceWarning\":false,\"expressionType\":\"SIMPLE\",\"hasCustomLabel\":true,\"\
-  label\":\"fl24\",\"optionName\":\"metric_3ahinowa0co_wconc4twrm\",\"sqlExpression\"\
-  :null},{\"aggregate\":\"SUM\",\"column\":{\"advanced_data_type\":null,\"certification_details\"\
-  :null,\"certified_by\":null,\"column_name\":\"ml49\",\"description\":null,\"expression\"\
-  :null,\"filterable\":true,\"groupby\":true,\"id\":1018,\"is_certified\":false,\"\
-  is_dttm\":false,\"python_date_format\":null,\"type\":\"INTEGER\",\"type_generic\"\
-  :0,\"verbose_name\":\"25-49 \u1786\u17D2\u1793\u17B6\u17C6 - \u1794\u17D2\u179A\
-  \ (25-49 years - M)\",\"warning_markdown\":null},\"datasourceWarning\":false,\"\
-  expressionType\":\"SIMPLE\",\"hasCustomLabel\":true,\"label\":\"ml49\",\"optionName\"\
-  :\"metric_hvu9txw0l09_roudzl9xuf\",\"sqlExpression\":null},{\"aggregate\":\"SUM\"\
-  ,\"column\":{\"advanced_data_type\":null,\"certification_details\":null,\"certified_by\"\
-  :null,\"column_name\":\"fl49\",\"description\":null,\"expression\":null,\"filterable\"\
-  :true,\"groupby\":true,\"id\":1019,\"is_certified\":false,\"is_dttm\":false,\"python_date_format\"\
-  :null,\"type\":\"INTEGER\",\"type_generic\":0,\"verbose_name\":\"25-49 \u1786\u17D2\
-  \u1793\u17B6\u17C6 - \u179F\u17D2\u179A (25-49 years - F)\",\"warning_markdown\"\
-  :null},\"datasourceWarning\":false,\"expressionType\":\"SIMPLE\",\"hasCustomLabel\"\
-  :true,\"label\":\"fl49\",\"optionName\":\"metric_ej35w4iizs6_45r14cn4lmi\",\"sqlExpression\"\
-  :null},{\"aggregate\":\"SUM\",\"column\":{\"advanced_data_type\":null,\"certification_details\"\
-  :null,\"certified_by\":null,\"column_name\":\"ml64\",\"description\":null,\"expression\"\
-  :null,\"filterable\":true,\"groupby\":true,\"id\":1020,\"is_certified\":false,\"\
-  is_dttm\":false,\"python_date_format\":null,\"type\":\"INTEGER\",\"type_generic\"\
-  :0,\"verbose_name\":\"50-64 \u1786\u17D2\u1793\u17B6\u17C6 - \u1794\u17D2\u179A\
-  \ (50-64 years - M)\",\"warning_markdown\":null},\"datasourceWarning\":false,\"\
-  expressionType\":\"SIMPLE\",\"hasCustomLabel\":true,\"label\":\"ml64\",\"optionName\"\
-  :\"metric_2kn0w4isb0i_fvbtjb54n0e\",\"sqlExpression\":null},{\"aggregate\":\"SUM\"\
-  ,\"column\":{\"advanced_data_type\":null,\"certification_details\":null,\"certified_by\"\
-  :null,\"column_name\":\"fl64\",\"description\":null,\"expression\":null,\"filterable\"\
-  :true,\"groupby\":true,\"id\":1021,\"is_certified\":false,\"is_dttm\":false,\"python_date_format\"\
-  :null,\"type\":\"INTEGER\",\"type_generic\":0,\"verbose_name\":\"50-64 \u1786\u17D2\
-  \u1793\u17B6\u17C6 - \u179F\u17D2\u179A (50-64 years - F)\",\"warning_markdown\"\
-  :null},\"datasourceWarning\":false,\"expressionType\":\"SIMPLE\",\"hasCustomLabel\"\
-  :true,\"label\":\"fl64\",\"optionName\":\"metric_9zh1hcelxz_0i58yqrywmdn\",\"sqlExpression\"\
-  :null},{\"aggregate\":\"SUM\",\"column\":{\"advanced_data_type\":null,\"certification_details\"\
-  :null,\"certified_by\":null,\"column_name\":\"mg64\",\"description\":null,\"expression\"\
-  :null,\"filterable\":true,\"groupby\":true,\"id\":1022,\"is_certified\":false,\"\
-  is_dttm\":false,\"python_date_format\":null,\"type\":\"INTEGER\",\"type_generic\"\
-  :0,\"verbose_name\":\">=65 \u1786\u17D2\u1793\u17B6\u17C6 - \u1794\u17D2\u179A (>=65\
-  \ years - M)\",\"warning_markdown\":null},\"datasourceWarning\":false,\"expressionType\"\
-  :\"SIMPLE\",\"hasCustomLabel\":true,\"label\":\"mg64\",\"optionName\":\"metric_vf77119z33b_0uxcz6tqzle\"\
-  ,\"sqlExpression\":null},{\"aggregate\":\"SUM\",\"column\":{\"advanced_data_type\"\
-  :null,\"certification_details\":null,\"certified_by\":null,\"column_name\":\"fg64\"\
-  ,\"description\":null,\"expression\":null,\"filterable\":true,\"groupby\":true,\"\
-  id\":1023,\"is_certified\":false,\"is_dttm\":false,\"python_date_format\":null,\"\
-  type\":\"INTEGER\",\"type_generic\":0,\"verbose_name\":\">=65 \u1786\u17D2\u1793\
-  \u17B6\u17C6 - \u179F\u17D2\u179A (>=65 years - F)\",\"warning_markdown\":null},\"\
-  datasourceWarning\":false,\"expressionType\":\"SIMPLE\",\"hasCustomLabel\":true,\"\
-  label\":\"fg64\",\"optionName\":\"metric_jat7hkqeimc_011p8qdetegr\",\"sqlExpression\"\
-  :null},{\"aggregate\":null,\"column\":null,\"datasourceWarning\":false,\"expressionType\"\
-  :\"SQL\",\"hasCustomLabel\":true,\"label\":\"\u179F\u179A\u17BB\u1794 - \u1794\u17D2\
-  \u179A (Total - M)\",\"optionName\":\"metric_q84jwa2qttq_fwsun06q5a\",\"sqlExpression\"\
-  :\"SUM(ml28d) + SUM(ml12m) + SUM(ml4) + SUM(ml13) + SUM(ml24) + SUM(ml49) + SUM(ml64)\
-  \ + SUM(mg64)\"},{\"aggregate\":null,\"column\":null,\"datasourceWarning\":false,\"\
-  expressionType\":\"SQL\",\"hasCustomLabel\":true,\"label\":\"\u179F\u179A\u17BB\u1794\
-  \ - \u179F\u17D2\u179A (Total - F)\",\"optionName\":\"metric_4x7qz0kqgce_d7d521fcv0i\"\
-  ,\"sqlExpression\":\"SUM(fl28d) + SUM(fl12m) + SUM(fl4) + SUM(fl13) + SUM(fl24)\
-  \ + SUM(fl49) + SUM(fl64) + SUM(fg64)\"}],\"all_columns\":[],\"percent_metrics\"\
-  :[],\"adhoc_filters\":[],\"order_by_cols\":[],\"row_limit\":10000,\"server_page_length\"\
-  :10,\"order_desc\":false,\"show_totals\":true,\"table_timestamp_format\":\"smart_date\"\
-  ,\"include_search\":true,\"show_cell_bars\":true,\"color_pn\":true,\"column_config\"\
-  :{\"fg64\":{\"d3NumberFormat\":\"~g\",\"d3SmallNumberFormat\":\"~g\",\"showCellBars\"\
-  :false},\"fl13\":{\"d3NumberFormat\":\"~g\",\"d3SmallNumberFormat\":\"~g\",\"showCellBars\"\
-  :false},\"fl24\":{\"d3NumberFormat\":\"~g\",\"d3SmallNumberFormat\":\"~g\",\"showCellBars\"\
-  :false},\"fl28d\":{\"colorPositiveNegative\":false,\"d3NumberFormat\":\"~g\",\"\
-  d3SmallNumberFormat\":\"~g\",\"showCellBars\":false},\"fl4\":{\"d3NumberFormat\"\
-  :\"~g\",\"d3SmallNumberFormat\":\"~g\",\"showCellBars\":false},\"fl49\":{\"d3NumberFormat\"\
-  :\"~g\",\"d3SmallNumberFormat\":\"~g\",\"showCellBars\":false},\"fl64\":{\"d3NumberFormat\"\
-  :\"~g\",\"d3SmallNumberFormat\":\"~g\",\"showCellBars\":false},\"mg64\":{\"d3NumberFormat\"\
-  :\"~g\",\"d3SmallNumberFormat\":\"~g\",\"showCellBars\":false},\"ml12m\":{\"d3NumberFormat\"\
-  :\"~g\",\"d3SmallNumberFormat\":\"~g\",\"showCellBars\":false},\"ml13\":{\"d3NumberFormat\"\
-  :\"~g\",\"d3SmallNumberFormat\":\"~g\",\"showCellBars\":false},\"ml24\":{\"d3NumberFormat\"\
-  :\"~g\",\"d3SmallNumberFormat\":\"~g\",\"showCellBars\":false},\"ml28d\":{\"d3NumberFormat\"\
-  :\"~g\",\"d3SmallNumberFormat\":\"~g\",\"showCellBars\":false},\"ml4\":{\"d3NumberFormat\"\
-  :\"~g\",\"d3SmallNumberFormat\":\"~g\",\"showCellBars\":false},\"ml49\":{\"d3NumberFormat\"\
-  :\"~g\",\"d3SmallNumberFormat\":\"~g\",\"showCellBars\":false},\"ml64\":{\"d3NumberFormat\"\
-  :\"~g\",\"d3SmallNumberFormat\":\"~g\",\"showCellBars\":false},\"\u179F\u179A\u17BB\
-  \u1794 - \u1794\u17D2\u179A (Total - M)\":{\"d3NumberFormat\":\"~g\",\"d3SmallNumberFormat\"\
-  :\"~g\",\"showCellBars\":false},\"\u179F\u179A\u17BB\u1794 - \u179F\u17D2\u179A\
-  \ (Total - F)\":{\"d3NumberFormat\":\"~g\",\"d3SmallNumberFormat\":\"~g\",\"showCellBars\"\
-  :false}},\"conditional_formatting\":[],\"extra_form_data\":{},\"dashboards\":[18],\"\
-  force\":false,\"result_format\":\"json\",\"result_type\":\"full\"},\"result_format\"\
-  :\"json\",\"result_type\":\"full\"}"
-cache_timeout: null
-uuid: edc6788b-ea27-457f-b3e7-1e272b7109ba
-version: 1.0.0
-dataset_uuid: 48365851-d1d2-451d-b2aa-18a5ffcdd72d
diff --git a/base/configs/superset/assets/charts/NCD_HIS_New_Cases_Within_Reporting_Range_40.yaml b/base/configs/superset/assets/charts/NCD_HIS_New_Cases_Within_Reporting_Range_40.yaml
new file mode 100644
index 00000000..306bcf57
--- /dev/null
+++ b/base/configs/superset/assets/charts/NCD_HIS_New_Cases_Within_Reporting_Range_40.yaml
@@ -0,0 +1,964 @@
+slice_name: NCD HIS New Cases Within Reporting Range
+description: null
+certified_by: null
+certification_details: null
+viz_type: table
+params:
+  datasource: 18__table
+  viz_type: table
+  slice_id: 40
+  query_mode: aggregate
+  groupby:
+  - diagnosis
+  time_grain_sqla: P1D
+  temporal_columns_lookup:
+    visit_date: true
+  metrics:
+  - expressionType: SIMPLE
+    column:
+      advanced_data_type: null
+      certification_details: null
+      certified_by: null
+      column_name: ml28d
+      description: null
+      expression: null
+      filterable: true
+      groupby: true
+      id: 630
+      is_certified: false
+      is_dttm: false
+      python_date_format: null
+      type: INTEGER
+      type_generic: 0
+      verbose_name: "0-28 \u1790\u17D2\u1784\u17C3 - \u1794\u17D2\u179A (0-28 day\
+        \ - M)"
+      warning_markdown: null
+    aggregate: SUM
+    sqlExpression: null
+    datasourceWarning: false
+    hasCustomLabel: true
+    label: ml28d
+    optionName: metric_k5ulvn1e85_ebfrsgpjae5
+  - expressionType: SIMPLE
+    column:
+      advanced_data_type: null
+      certification_details: null
+      certified_by: null
+      column_name: fl28d
+      description: null
+      expression: null
+      filterable: true
+      groupby: true
+      id: 629
+      is_certified: false
+      is_dttm: false
+      python_date_format: null
+      type: INTEGER
+      type_generic: 0
+      verbose_name: "0-28 \u1790\u17D2\u1784\u17C3 - \u179F\u17D2\u179A (0-28 days\
+        \ - F)"
+      warning_markdown: null
+    aggregate: SUM
+    sqlExpression: null
+    datasourceWarning: false
+    hasCustomLabel: true
+    label: fl28d
+    optionName: metric_8n3gpfy30y_horxf7jjgou
+  - expressionType: SIMPLE
+    column:
+      advanced_data_type: null
+      certification_details: null
+      certified_by: null
+      column_name: ml12m
+      description: null
+      expression: null
+      filterable: true
+      groupby: true
+      id: 628
+      is_certified: false
+      is_dttm: false
+      python_date_format: null
+      type: INTEGER
+      type_generic: 0
+      verbose_name: "29 \u1790\u17D2\u1784\u17C3-11 \u1781\u17C2 - \u1794\u17D2\u179A\
+        \ (29 days - 11 months - M)"
+      warning_markdown: null
+    aggregate: SUM
+    sqlExpression: null
+    datasourceWarning: false
+    hasCustomLabel: true
+    label: ml12m
+    optionName: metric_eie6bn2a3wm_5iocmsnpbn4
+  - expressionType: SIMPLE
+    column:
+      advanced_data_type: null
+      certification_details: null
+      certified_by: null
+      column_name: fl12m
+      description: null
+      expression: null
+      filterable: true
+      groupby: true
+      id: 627
+      is_certified: false
+      is_dttm: false
+      python_date_format: null
+      type: INTEGER
+      type_generic: 0
+      verbose_name: "29 \u1790\u17D2\u1784\u17C3-11 \u1781\u17C2 - \u179F\u17D2\u179A\
+        \ (29 days - 11 months - F)"
+      warning_markdown: null
+    aggregate: SUM
+    sqlExpression: null
+    datasourceWarning: false
+    hasCustomLabel: true
+    label: fl12m
+    optionName: metric_70qbguisjal_jiqokv6vrf
+  - expressionType: SIMPLE
+    column:
+      advanced_data_type: null
+      certification_details: null
+      certified_by: null
+      column_name: ml4
+      description: null
+      expression: null
+      filterable: true
+      groupby: true
+      id: 636
+      is_certified: false
+      is_dttm: false
+      python_date_format: null
+      type: INTEGER
+      type_generic: 0
+      verbose_name: "1-4 \u1786\u17D2\u1793\u17B6\u17C6 - \u1794\u17D2\u179A (1-4\
+        \ years - M)"
+      warning_markdown: null
+    aggregate: SUM
+    sqlExpression: null
+    datasourceWarning: false
+    hasCustomLabel: true
+    label: ml4
+    optionName: metric_dv9wfd01cst_tgszs0q9wvp
+  - expressionType: SIMPLE
+    column:
+      advanced_data_type: null
+      certification_details: null
+      certified_by: null
+      column_name: fl4
+      description: null
+      expression: null
+      filterable: true
+      groupby: true
+      id: 635
+      is_certified: false
+      is_dttm: false
+      python_date_format: null
+      type: INTEGER
+      type_generic: 0
+      verbose_name: "1-4 \u1786\u17D2\u1793\u17B6\u17C6 - \u179F\u17D2\u179A (1-4\
+        \ years - F)"
+      warning_markdown: null
+    aggregate: SUM
+    sqlExpression: null
+    datasourceWarning: false
+    hasCustomLabel: true
+    label: fl4
+    optionName: metric_ncj5imjvo5r_xo7sev2c89h
+  - expressionType: SIMPLE
+    column:
+      advanced_data_type: null
+      certification_details: null
+      certified_by: null
+      column_name: ml13
+      description: null
+      expression: null
+      filterable: true
+      groupby: true
+      id: 634
+      is_certified: false
+      is_dttm: false
+      python_date_format: null
+      type: INTEGER
+      type_generic: 0
+      verbose_name: "5-13 \u1786\u17D2\u1793\u17B6\u17C6 - \u1794\u17D2\u179A (5-13\
+        \ years - M)"
+      warning_markdown: null
+    aggregate: SUM
+    sqlExpression: null
+    datasourceWarning: false
+    hasCustomLabel: true
+    label: ml13
+    optionName: metric_ce5qys7idfi_b2oyxnppq3i
+  - expressionType: SIMPLE
+    column:
+      advanced_data_type: null
+      certification_details: null
+      certified_by: null
+      column_name: fl13
+      description: null
+      expression: null
+      filterable: true
+      groupby: true
+      id: 633
+      is_certified: false
+      is_dttm: false
+      python_date_format: null
+      type: INTEGER
+      type_generic: 0
+      verbose_name: "5-13 \u1786\u17D2\u1793\u17B6\u17C6 - \u179F\u17D2\u179A (5-13\
+        \ years - F)"
+      warning_markdown: null
+    aggregate: SUM
+    sqlExpression: null
+    datasourceWarning: false
+    hasCustomLabel: true
+    label: fl13
+    optionName: metric_s0e1shwm5g8_0r47d9cbtc7
+  - expressionType: SIMPLE
+    column:
+      advanced_data_type: null
+      certification_details: null
+      certified_by: null
+      column_name: ml24
+      description: null
+      expression: null
+      filterable: true
+      groupby: true
+      id: 638
+      is_certified: false
+      is_dttm: false
+      python_date_format: null
+      type: INTEGER
+      type_generic: 0
+      verbose_name: "6-24 \u1786\u17D2\u1793\u17B6\u17C6 - \u1794\u17D2\u179A (6-24\
+        \ years - M)"
+      warning_markdown: null
+    aggregate: SUM
+    sqlExpression: null
+    datasourceWarning: false
+    hasCustomLabel: true
+    label: ml24
+    optionName: metric_nl2vfvunkii_wxku9ucxe4d
+  - expressionType: SIMPLE
+    column:
+      advanced_data_type: null
+      certification_details: null
+      certified_by: null
+      column_name: fl24
+      description: null
+      expression: null
+      filterable: true
+      groupby: true
+      id: 637
+      is_certified: false
+      is_dttm: false
+      python_date_format: null
+      type: INTEGER
+      type_generic: 0
+      verbose_name: "6-24 \u1786\u17D2\u1793\u17B6\u17C6 - \u179F\u17D2\u179A (6-24\
+        \ years - F)"
+      warning_markdown: null
+    aggregate: SUM
+    sqlExpression: null
+    datasourceWarning: false
+    hasCustomLabel: true
+    label: fl24
+    optionName: metric_k9elm6mwaif_erf4o7uxg0h
+  - expressionType: SIMPLE
+    column:
+      advanced_data_type: null
+      certification_details: null
+      certified_by: null
+      column_name: ml49
+      description: null
+      expression: null
+      filterable: true
+      groupby: true
+      id: 640
+      is_certified: false
+      is_dttm: false
+      python_date_format: null
+      type: INTEGER
+      type_generic: 0
+      verbose_name: "25-49 \u1786\u17D2\u1793\u17B6\u17C6 - \u1794\u17D2\u179A (25-49\
+        \ years - M)"
+      warning_markdown: null
+    aggregate: SUM
+    sqlExpression: null
+    datasourceWarning: false
+    hasCustomLabel: true
+    label: ml49
+    optionName: metric_7ukaxt54dsa_aw6rw5mguin
+  - expressionType: SIMPLE
+    column:
+      advanced_data_type: null
+      certification_details: null
+      certified_by: null
+      column_name: fl49
+      description: null
+      expression: null
+      filterable: true
+      groupby: true
+      id: 639
+      is_certified: false
+      is_dttm: false
+      python_date_format: null
+      type: INTEGER
+      type_generic: 0
+      verbose_name: "25-49 \u1786\u17D2\u1793\u17B6\u17C6 - \u179F\u17D2\u179A (25-49\
+        \ years - F)"
+      warning_markdown: null
+    aggregate: SUM
+    sqlExpression: null
+    datasourceWarning: false
+    hasCustomLabel: true
+    label: fl49
+    optionName: metric_53wgge154xe_pws7lga5k1m
+  - expressionType: SIMPLE
+    column:
+      advanced_data_type: null
+      certification_details: null
+      certified_by: null
+      column_name: ml64
+      description: null
+      expression: null
+      filterable: true
+      groupby: true
+      id: 632
+      is_certified: false
+      is_dttm: false
+      python_date_format: null
+      type: INTEGER
+      type_generic: 0
+      verbose_name: "50-64 \u1786\u17D2\u1793\u17B6\u17C6 - \u1794\u17D2\u179A (50-64\
+        \ years - M)"
+      warning_markdown: null
+    aggregate: SUM
+    sqlExpression: null
+    datasourceWarning: false
+    hasCustomLabel: true
+    label: ml64
+    optionName: metric_e3h1gmqt326_2o818xd7ezl
+  - expressionType: SIMPLE
+    column:
+      advanced_data_type: null
+      certification_details: null
+      certified_by: null
+      column_name: fl64
+      description: null
+      expression: null
+      filterable: true
+      groupby: true
+      id: 631
+      is_certified: false
+      is_dttm: false
+      python_date_format: null
+      type: INTEGER
+      type_generic: 0
+      verbose_name: "50-64 \u1786\u17D2\u1793\u17B6\u17C6 - \u179F\u17D2\u179A (50-64\
+        \ years - F)"
+      warning_markdown: null
+    aggregate: SUM
+    sqlExpression: null
+    datasourceWarning: false
+    hasCustomLabel: true
+    label: fl64
+    optionName: metric_y2bfgdcmdcl_4yag1xxoa7w
+  - expressionType: SIMPLE
+    column:
+      advanced_data_type: null
+      certification_details: null
+      certified_by: null
+      column_name: mg64
+      description: null
+      expression: null
+      filterable: true
+      groupby: true
+      id: 642
+      is_certified: false
+      is_dttm: false
+      python_date_format: null
+      type: INTEGER
+      type_generic: 0
+      verbose_name: ">=65 \u1786\u17D2\u1793\u17B6\u17C6 - \u1794\u17D2\u179A (>=65\
+        \ years - M)"
+      warning_markdown: null
+    aggregate: SUM
+    sqlExpression: null
+    datasourceWarning: false
+    hasCustomLabel: true
+    label: mg64
+    optionName: metric_iv0lnc8sz6p_a4h9yvt083h
+  - expressionType: SIMPLE
+    column:
+      advanced_data_type: null
+      certification_details: null
+      certified_by: null
+      column_name: fg64
+      description: null
+      expression: null
+      filterable: true
+      groupby: true
+      id: 641
+      is_certified: false
+      is_dttm: false
+      python_date_format: null
+      type: INTEGER
+      type_generic: 0
+      verbose_name: ">=65 \u1786\u17D2\u1793\u17B6\u17C6 - \u179F\u17D2\u179A (>=65\
+        \ years - F)"
+      warning_markdown: null
+    aggregate: SUM
+    sqlExpression: null
+    datasourceWarning: false
+    hasCustomLabel: true
+    label: fg64
+    optionName: metric_akif7ndicz_vfab8rtsyw8
+  - expressionType: SQL
+    sqlExpression: SUM(ml28d) + SUM(ml12m) + SUM(ml4) + SUM(ml13) + SUM(ml24) + SUM(ml49)
+      + SUM(ml64) + SUM(mg64)
+    column: null
+    aggregate: null
+    datasourceWarning: false
+    hasCustomLabel: true
+    label: "\u179F\u179A\u17BB\u1794 - \u1794\u17D2\u179A (Total - M)"
+    optionName: metric_4oel0hbf07n_iqb5ez6qswg
+  - expressionType: SQL
+    sqlExpression: SUM(fl28d) + SUM(fl12m) + SUM(fl4) + SUM(fl13) + SUM(fl24) + SUM(fl49)
+      + SUM(fl64) + SUM(fg64)
+    column: null
+    aggregate: null
+    datasourceWarning: false
+    hasCustomLabel: true
+    label: "\u179F\u179A\u17BB\u1794 - \u179F\u17D2\u179A (Total - F)"
+    optionName: metric_qwhzgcrykir_ikzefsk8h7l
+  all_columns: []
+  percent_metrics: []
+  adhoc_filters:
+  - clause: WHERE
+    subject: visit_date
+    operator: TEMPORAL_RANGE
+    comparator: 'DATEADD(DATETIME("now"), -1, year) : now'
+    expressionType: SIMPLE
+  order_by_cols: []
+  row_limit: 10000
+  server_page_length: 10
+  order_desc: false
+  show_totals: true
+  table_timestamp_format: smart_date
+  include_search: true
+  show_cell_bars: false
+  color_pn: true
+  column_config:
+    fg64:
+      d3NumberFormat: ~g
+      d3SmallNumberFormat: ~g
+      showCellBars: false
+    fl13:
+      d3NumberFormat: ~g
+      d3SmallNumberFormat: ~g
+      showCellBars: false
+    fl24:
+      d3NumberFormat: ~g
+      d3SmallNumberFormat: ~g
+      showCellBars: false
+    fl28d:
+      d3NumberFormat: ~g
+      d3SmallNumberFormat: ~g
+      showCellBars: false
+    fl4:
+      d3NumberFormat: ~g
+      d3SmallNumberFormat: ~g
+      showCellBars: false
+    fl49:
+      d3NumberFormat: ~g
+      d3SmallNumberFormat: ~g
+      showCellBars: false
+    fl64:
+      d3NumberFormat: ~g
+      d3SmallNumberFormat: ~g
+      showCellBars: false
+    mg64:
+      d3NumberFormat: ~g
+      d3SmallNumberFormat: ~g
+      showCellBars: false
+    ml12m:
+      d3NumberFormat: ~g
+      d3SmallNumberFormat: ~g
+      showCellBars: false
+    ml13:
+      d3NumberFormat: ~g
+      d3SmallNumberFormat: ~g
+      showCellBars: false
+    ml24:
+      d3NumberFormat: ~g
+      d3SmallNumberFormat: ~g
+      showCellBars: false
+    ml28d:
+      d3NumberFormat: ~g
+      d3SmallNumberFormat: ~g
+      showCellBars: false
+    ml4:
+      d3NumberFormat: ~g
+      d3SmallNumberFormat: ~g
+      showCellBars: false
+    ml49:
+      d3NumberFormat: ~g
+      d3SmallNumberFormat: ~g
+      showCellBars: false
+    ml64:
+      d3NumberFormat: ~g
+      d3SmallNumberFormat: ~g
+      showCellBars: false
+    "\u179F\u179A\u17BB\u1794 - \u1794\u17D2\u179A (Total - M)":
+      d3NumberFormat: ~g
+      d3SmallNumberFormat: ~g
+      showCellBars: false
+    "\u179F\u179A\u17BB\u1794 - \u179F\u17D2\u179A (Total - F)":
+      d3NumberFormat: ~g
+      d3SmallNumberFormat: ~g
+      showCellBars: false
+  conditional_formatting: []
+  extra_form_data: {}
+  dashboards:
+  - 6
+query_context: "{\"datasource\":{\"id\":18,\"type\":\"table\"},\"force\":false,\"\
+  queries\":[{\"filters\":[{\"col\":\"visit_date\",\"op\":\"TEMPORAL_RANGE\",\"val\"\
+  :\"DATEADD(DATETIME(\\\"now\\\"), -1, year) : now\"}],\"extras\":{\"time_grain_sqla\"\
+  :\"P1D\",\"having\":\"\",\"where\":\"\"},\"applied_time_extras\":{},\"columns\"\
+  :[\"diagnosis\"],\"metrics\":[{\"expressionType\":\"SIMPLE\",\"column\":{\"advanced_data_type\"\
+  :null,\"certification_details\":null,\"certified_by\":null,\"column_name\":\"ml28d\"\
+  ,\"description\":null,\"expression\":null,\"filterable\":true,\"groupby\":true,\"\
+  id\":630,\"is_certified\":false,\"is_dttm\":false,\"python_date_format\":null,\"\
+  type\":\"INTEGER\",\"type_generic\":0,\"verbose_name\":\"0-28 \u1790\u17D2\u1784\
+  \u17C3 - \u1794\u17D2\u179A (0-28 day - M)\",\"warning_markdown\":null},\"aggregate\"\
+  :\"SUM\",\"sqlExpression\":null,\"datasourceWarning\":false,\"hasCustomLabel\":true,\"\
+  label\":\"ml28d\",\"optionName\":\"metric_k5ulvn1e85_ebfrsgpjae5\"},{\"expressionType\"\
+  :\"SIMPLE\",\"column\":{\"advanced_data_type\":null,\"certification_details\":null,\"\
+  certified_by\":null,\"column_name\":\"fl28d\",\"description\":null,\"expression\"\
+  :null,\"filterable\":true,\"groupby\":true,\"id\":629,\"is_certified\":false,\"\
+  is_dttm\":false,\"python_date_format\":null,\"type\":\"INTEGER\",\"type_generic\"\
+  :0,\"verbose_name\":\"0-28 \u1790\u17D2\u1784\u17C3 - \u179F\u17D2\u179A (0-28 days\
+  \ - F)\",\"warning_markdown\":null},\"aggregate\":\"SUM\",\"sqlExpression\":null,\"\
+  datasourceWarning\":false,\"hasCustomLabel\":true,\"label\":\"fl28d\",\"optionName\"\
+  :\"metric_8n3gpfy30y_horxf7jjgou\"},{\"expressionType\":\"SIMPLE\",\"column\":{\"\
+  advanced_data_type\":null,\"certification_details\":null,\"certified_by\":null,\"\
+  column_name\":\"ml12m\",\"description\":null,\"expression\":null,\"filterable\"\
+  :true,\"groupby\":true,\"id\":628,\"is_certified\":false,\"is_dttm\":false,\"python_date_format\"\
+  :null,\"type\":\"INTEGER\",\"type_generic\":0,\"verbose_name\":\"29 \u1790\u17D2\
+  \u1784\u17C3-11 \u1781\u17C2 - \u1794\u17D2\u179A (29 days - 11 months - M)\",\"\
+  warning_markdown\":null},\"aggregate\":\"SUM\",\"sqlExpression\":null,\"datasourceWarning\"\
+  :false,\"hasCustomLabel\":true,\"label\":\"ml12m\",\"optionName\":\"metric_eie6bn2a3wm_5iocmsnpbn4\"\
+  },{\"expressionType\":\"SIMPLE\",\"column\":{\"advanced_data_type\":null,\"certification_details\"\
+  :null,\"certified_by\":null,\"column_name\":\"fl12m\",\"description\":null,\"expression\"\
+  :null,\"filterable\":true,\"groupby\":true,\"id\":627,\"is_certified\":false,\"\
+  is_dttm\":false,\"python_date_format\":null,\"type\":\"INTEGER\",\"type_generic\"\
+  :0,\"verbose_name\":\"29 \u1790\u17D2\u1784\u17C3-11 \u1781\u17C2 - \u179F\u17D2\
+  \u179A (29 days - 11 months - F)\",\"warning_markdown\":null},\"aggregate\":\"SUM\"\
+  ,\"sqlExpression\":null,\"datasourceWarning\":false,\"hasCustomLabel\":true,\"label\"\
+  :\"fl12m\",\"optionName\":\"metric_70qbguisjal_jiqokv6vrf\"},{\"expressionType\"\
+  :\"SIMPLE\",\"column\":{\"advanced_data_type\":null,\"certification_details\":null,\"\
+  certified_by\":null,\"column_name\":\"ml4\",\"description\":null,\"expression\"\
+  :null,\"filterable\":true,\"groupby\":true,\"id\":636,\"is_certified\":false,\"\
+  is_dttm\":false,\"python_date_format\":null,\"type\":\"INTEGER\",\"type_generic\"\
+  :0,\"verbose_name\":\"1-4 \u1786\u17D2\u1793\u17B6\u17C6 - \u1794\u17D2\u179A (1-4\
+  \ years - M)\",\"warning_markdown\":null},\"aggregate\":\"SUM\",\"sqlExpression\"\
+  :null,\"datasourceWarning\":false,\"hasCustomLabel\":true,\"label\":\"ml4\",\"optionName\"\
+  :\"metric_dv9wfd01cst_tgszs0q9wvp\"},{\"expressionType\":\"SIMPLE\",\"column\":{\"\
+  advanced_data_type\":null,\"certification_details\":null,\"certified_by\":null,\"\
+  column_name\":\"fl4\",\"description\":null,\"expression\":null,\"filterable\":true,\"\
+  groupby\":true,\"id\":635,\"is_certified\":false,\"is_dttm\":false,\"python_date_format\"\
+  :null,\"type\":\"INTEGER\",\"type_generic\":0,\"verbose_name\":\"1-4 \u1786\u17D2\
+  \u1793\u17B6\u17C6 - \u179F\u17D2\u179A (1-4 years - F)\",\"warning_markdown\":null},\"\
+  aggregate\":\"SUM\",\"sqlExpression\":null,\"datasourceWarning\":false,\"hasCustomLabel\"\
+  :true,\"label\":\"fl4\",\"optionName\":\"metric_ncj5imjvo5r_xo7sev2c89h\"},{\"expressionType\"\
+  :\"SIMPLE\",\"column\":{\"advanced_data_type\":null,\"certification_details\":null,\"\
+  certified_by\":null,\"column_name\":\"ml13\",\"description\":null,\"expression\"\
+  :null,\"filterable\":true,\"groupby\":true,\"id\":634,\"is_certified\":false,\"\
+  is_dttm\":false,\"python_date_format\":null,\"type\":\"INTEGER\",\"type_generic\"\
+  :0,\"verbose_name\":\"5-13 \u1786\u17D2\u1793\u17B6\u17C6 - \u1794\u17D2\u179A (5-13\
+  \ years - M)\",\"warning_markdown\":null},\"aggregate\":\"SUM\",\"sqlExpression\"\
+  :null,\"datasourceWarning\":false,\"hasCustomLabel\":true,\"label\":\"ml13\",\"\
+  optionName\":\"metric_ce5qys7idfi_b2oyxnppq3i\"},{\"expressionType\":\"SIMPLE\"\
+  ,\"column\":{\"advanced_data_type\":null,\"certification_details\":null,\"certified_by\"\
+  :null,\"column_name\":\"fl13\",\"description\":null,\"expression\":null,\"filterable\"\
+  :true,\"groupby\":true,\"id\":633,\"is_certified\":false,\"is_dttm\":false,\"python_date_format\"\
+  :null,\"type\":\"INTEGER\",\"type_generic\":0,\"verbose_name\":\"5-13 \u1786\u17D2\
+  \u1793\u17B6\u17C6 - \u179F\u17D2\u179A (5-13 years - F)\",\"warning_markdown\"\
+  :null},\"aggregate\":\"SUM\",\"sqlExpression\":null,\"datasourceWarning\":false,\"\
+  hasCustomLabel\":true,\"label\":\"fl13\",\"optionName\":\"metric_s0e1shwm5g8_0r47d9cbtc7\"\
+  },{\"expressionType\":\"SIMPLE\",\"column\":{\"advanced_data_type\":null,\"certification_details\"\
+  :null,\"certified_by\":null,\"column_name\":\"ml24\",\"description\":null,\"expression\"\
+  :null,\"filterable\":true,\"groupby\":true,\"id\":638,\"is_certified\":false,\"\
+  is_dttm\":false,\"python_date_format\":null,\"type\":\"INTEGER\",\"type_generic\"\
+  :0,\"verbose_name\":\"6-24 \u1786\u17D2\u1793\u17B6\u17C6 - \u1794\u17D2\u179A (6-24\
+  \ years - M)\",\"warning_markdown\":null},\"aggregate\":\"SUM\",\"sqlExpression\"\
+  :null,\"datasourceWarning\":false,\"hasCustomLabel\":true,\"label\":\"ml24\",\"\
+  optionName\":\"metric_nl2vfvunkii_wxku9ucxe4d\"},{\"expressionType\":\"SIMPLE\"\
+  ,\"column\":{\"advanced_data_type\":null,\"certification_details\":null,\"certified_by\"\
+  :null,\"column_name\":\"fl24\",\"description\":null,\"expression\":null,\"filterable\"\
+  :true,\"groupby\":true,\"id\":637,\"is_certified\":false,\"is_dttm\":false,\"python_date_format\"\
+  :null,\"type\":\"INTEGER\",\"type_generic\":0,\"verbose_name\":\"6-24 \u1786\u17D2\
+  \u1793\u17B6\u17C6 - \u179F\u17D2\u179A (6-24 years - F)\",\"warning_markdown\"\
+  :null},\"aggregate\":\"SUM\",\"sqlExpression\":null,\"datasourceWarning\":false,\"\
+  hasCustomLabel\":true,\"label\":\"fl24\",\"optionName\":\"metric_k9elm6mwaif_erf4o7uxg0h\"\
+  },{\"expressionType\":\"SIMPLE\",\"column\":{\"advanced_data_type\":null,\"certification_details\"\
+  :null,\"certified_by\":null,\"column_name\":\"ml49\",\"description\":null,\"expression\"\
+  :null,\"filterable\":true,\"groupby\":true,\"id\":640,\"is_certified\":false,\"\
+  is_dttm\":false,\"python_date_format\":null,\"type\":\"INTEGER\",\"type_generic\"\
+  :0,\"verbose_name\":\"25-49 \u1786\u17D2\u1793\u17B6\u17C6 - \u1794\u17D2\u179A\
+  \ (25-49 years - M)\",\"warning_markdown\":null},\"aggregate\":\"SUM\",\"sqlExpression\"\
+  :null,\"datasourceWarning\":false,\"hasCustomLabel\":true,\"label\":\"ml49\",\"\
+  optionName\":\"metric_7ukaxt54dsa_aw6rw5mguin\"},{\"expressionType\":\"SIMPLE\"\
+  ,\"column\":{\"advanced_data_type\":null,\"certification_details\":null,\"certified_by\"\
+  :null,\"column_name\":\"fl49\",\"description\":null,\"expression\":null,\"filterable\"\
+  :true,\"groupby\":true,\"id\":639,\"is_certified\":false,\"is_dttm\":false,\"python_date_format\"\
+  :null,\"type\":\"INTEGER\",\"type_generic\":0,\"verbose_name\":\"25-49 \u1786\u17D2\
+  \u1793\u17B6\u17C6 - \u179F\u17D2\u179A (25-49 years - F)\",\"warning_markdown\"\
+  :null},\"aggregate\":\"SUM\",\"sqlExpression\":null,\"datasourceWarning\":false,\"\
+  hasCustomLabel\":true,\"label\":\"fl49\",\"optionName\":\"metric_53wgge154xe_pws7lga5k1m\"\
+  },{\"expressionType\":\"SIMPLE\",\"column\":{\"advanced_data_type\":null,\"certification_details\"\
+  :null,\"certified_by\":null,\"column_name\":\"ml64\",\"description\":null,\"expression\"\
+  :null,\"filterable\":true,\"groupby\":true,\"id\":632,\"is_certified\":false,\"\
+  is_dttm\":false,\"python_date_format\":null,\"type\":\"INTEGER\",\"type_generic\"\
+  :0,\"verbose_name\":\"50-64 \u1786\u17D2\u1793\u17B6\u17C6 - \u1794\u17D2\u179A\
+  \ (50-64 years - M)\",\"warning_markdown\":null},\"aggregate\":\"SUM\",\"sqlExpression\"\
+  :null,\"datasourceWarning\":false,\"hasCustomLabel\":true,\"label\":\"ml64\",\"\
+  optionName\":\"metric_e3h1gmqt326_2o818xd7ezl\"},{\"expressionType\":\"SIMPLE\"\
+  ,\"column\":{\"advanced_data_type\":null,\"certification_details\":null,\"certified_by\"\
+  :null,\"column_name\":\"fl64\",\"description\":null,\"expression\":null,\"filterable\"\
+  :true,\"groupby\":true,\"id\":631,\"is_certified\":false,\"is_dttm\":false,\"python_date_format\"\
+  :null,\"type\":\"INTEGER\",\"type_generic\":0,\"verbose_name\":\"50-64 \u1786\u17D2\
+  \u1793\u17B6\u17C6 - \u179F\u17D2\u179A (50-64 years - F)\",\"warning_markdown\"\
+  :null},\"aggregate\":\"SUM\",\"sqlExpression\":null,\"datasourceWarning\":false,\"\
+  hasCustomLabel\":true,\"label\":\"fl64\",\"optionName\":\"metric_y2bfgdcmdcl_4yag1xxoa7w\"\
+  },{\"expressionType\":\"SIMPLE\",\"column\":{\"advanced_data_type\":null,\"certification_details\"\
+  :null,\"certified_by\":null,\"column_name\":\"mg64\",\"description\":null,\"expression\"\
+  :null,\"filterable\":true,\"groupby\":true,\"id\":642,\"is_certified\":false,\"\
+  is_dttm\":false,\"python_date_format\":null,\"type\":\"INTEGER\",\"type_generic\"\
+  :0,\"verbose_name\":\">=65 \u1786\u17D2\u1793\u17B6\u17C6 - \u1794\u17D2\u179A (>=65\
+  \ years - M)\",\"warning_markdown\":null},\"aggregate\":\"SUM\",\"sqlExpression\"\
+  :null,\"datasourceWarning\":false,\"hasCustomLabel\":true,\"label\":\"mg64\",\"\
+  optionName\":\"metric_iv0lnc8sz6p_a4h9yvt083h\"},{\"expressionType\":\"SIMPLE\"\
+  ,\"column\":{\"advanced_data_type\":null,\"certification_details\":null,\"certified_by\"\
+  :null,\"column_name\":\"fg64\",\"description\":null,\"expression\":null,\"filterable\"\
+  :true,\"groupby\":true,\"id\":641,\"is_certified\":false,\"is_dttm\":false,\"python_date_format\"\
+  :null,\"type\":\"INTEGER\",\"type_generic\":0,\"verbose_name\":\">=65 \u1786\u17D2\
+  \u1793\u17B6\u17C6 - \u179F\u17D2\u179A (>=65 years - F)\",\"warning_markdown\"\
+  :null},\"aggregate\":\"SUM\",\"sqlExpression\":null,\"datasourceWarning\":false,\"\
+  hasCustomLabel\":true,\"label\":\"fg64\",\"optionName\":\"metric_akif7ndicz_vfab8rtsyw8\"\
+  },{\"expressionType\":\"SQL\",\"sqlExpression\":\"SUM(ml28d) + SUM(ml12m) + SUM(ml4)\
+  \ + SUM(ml13) + SUM(ml24) + SUM(ml49) + SUM(ml64) + SUM(mg64)\",\"column\":null,\"\
+  aggregate\":null,\"datasourceWarning\":false,\"hasCustomLabel\":true,\"label\":\"\
+  \u179F\u179A\u17BB\u1794 - \u1794\u17D2\u179A (Total - M)\",\"optionName\":\"metric_4oel0hbf07n_iqb5ez6qswg\"\
+  },{\"expressionType\":\"SQL\",\"sqlExpression\":\"SUM(fl28d) + SUM(fl12m) + SUM(fl4)\
+  \ + SUM(fl13) + SUM(fl24) + SUM(fl49) + SUM(fl64) + SUM(fg64)\",\"column\":null,\"\
+  aggregate\":null,\"datasourceWarning\":false,\"hasCustomLabel\":true,\"label\":\"\
+  \u179F\u179A\u17BB\u1794 - \u179F\u17D2\u179A (Total - F)\",\"optionName\":\"metric_qwhzgcrykir_ikzefsk8h7l\"\
+  }],\"orderby\":[[{\"expressionType\":\"SIMPLE\",\"column\":{\"advanced_data_type\"\
+  :null,\"certification_details\":null,\"certified_by\":null,\"column_name\":\"ml28d\"\
+  ,\"description\":null,\"expression\":null,\"filterable\":true,\"groupby\":true,\"\
+  id\":630,\"is_certified\":false,\"is_dttm\":false,\"python_date_format\":null,\"\
+  type\":\"INTEGER\",\"type_generic\":0,\"verbose_name\":\"0-28 \u1790\u17D2\u1784\
+  \u17C3 - \u1794\u17D2\u179A (0-28 day - M)\",\"warning_markdown\":null},\"aggregate\"\
+  :\"SUM\",\"sqlExpression\":null,\"datasourceWarning\":false,\"hasCustomLabel\":true,\"\
+  label\":\"ml28d\",\"optionName\":\"metric_k5ulvn1e85_ebfrsgpjae5\"},false]],\"annotation_layers\"\
+  :[],\"row_limit\":10000,\"series_limit\":0,\"order_desc\":false,\"url_params\":{},\"\
+  custom_params\":{},\"custom_form_data\":{},\"post_processing\":[]},{\"filters\"\
+  :[{\"col\":\"visit_date\",\"op\":\"TEMPORAL_RANGE\",\"val\":\"DATEADD(DATETIME(\\\
+  \"now\\\"), -1, year) : now\"}],\"extras\":{\"time_grain_sqla\":\"P1D\",\"having\"\
+  :\"\",\"where\":\"\"},\"applied_time_extras\":{},\"columns\":[],\"metrics\":[{\"\
+  expressionType\":\"SIMPLE\",\"column\":{\"advanced_data_type\":null,\"certification_details\"\
+  :null,\"certified_by\":null,\"column_name\":\"ml28d\",\"description\":null,\"expression\"\
+  :null,\"filterable\":true,\"groupby\":true,\"id\":630,\"is_certified\":false,\"\
+  is_dttm\":false,\"python_date_format\":null,\"type\":\"INTEGER\",\"type_generic\"\
+  :0,\"verbose_name\":\"0-28 \u1790\u17D2\u1784\u17C3 - \u1794\u17D2\u179A (0-28 day\
+  \ - M)\",\"warning_markdown\":null},\"aggregate\":\"SUM\",\"sqlExpression\":null,\"\
+  datasourceWarning\":false,\"hasCustomLabel\":true,\"label\":\"ml28d\",\"optionName\"\
+  :\"metric_k5ulvn1e85_ebfrsgpjae5\"},{\"expressionType\":\"SIMPLE\",\"column\":{\"\
+  advanced_data_type\":null,\"certification_details\":null,\"certified_by\":null,\"\
+  column_name\":\"fl28d\",\"description\":null,\"expression\":null,\"filterable\"\
+  :true,\"groupby\":true,\"id\":629,\"is_certified\":false,\"is_dttm\":false,\"python_date_format\"\
+  :null,\"type\":\"INTEGER\",\"type_generic\":0,\"verbose_name\":\"0-28 \u1790\u17D2\
+  \u1784\u17C3 - \u179F\u17D2\u179A (0-28 days - F)\",\"warning_markdown\":null},\"\
+  aggregate\":\"SUM\",\"sqlExpression\":null,\"datasourceWarning\":false,\"hasCustomLabel\"\
+  :true,\"label\":\"fl28d\",\"optionName\":\"metric_8n3gpfy30y_horxf7jjgou\"},{\"\
+  expressionType\":\"SIMPLE\",\"column\":{\"advanced_data_type\":null,\"certification_details\"\
+  :null,\"certified_by\":null,\"column_name\":\"ml12m\",\"description\":null,\"expression\"\
+  :null,\"filterable\":true,\"groupby\":true,\"id\":628,\"is_certified\":false,\"\
+  is_dttm\":false,\"python_date_format\":null,\"type\":\"INTEGER\",\"type_generic\"\
+  :0,\"verbose_name\":\"29 \u1790\u17D2\u1784\u17C3-11 \u1781\u17C2 - \u1794\u17D2\
+  \u179A (29 days - 11 months - M)\",\"warning_markdown\":null},\"aggregate\":\"SUM\"\
+  ,\"sqlExpression\":null,\"datasourceWarning\":false,\"hasCustomLabel\":true,\"label\"\
+  :\"ml12m\",\"optionName\":\"metric_eie6bn2a3wm_5iocmsnpbn4\"},{\"expressionType\"\
+  :\"SIMPLE\",\"column\":{\"advanced_data_type\":null,\"certification_details\":null,\"\
+  certified_by\":null,\"column_name\":\"fl12m\",\"description\":null,\"expression\"\
+  :null,\"filterable\":true,\"groupby\":true,\"id\":627,\"is_certified\":false,\"\
+  is_dttm\":false,\"python_date_format\":null,\"type\":\"INTEGER\",\"type_generic\"\
+  :0,\"verbose_name\":\"29 \u1790\u17D2\u1784\u17C3-11 \u1781\u17C2 - \u179F\u17D2\
+  \u179A (29 days - 11 months - F)\",\"warning_markdown\":null},\"aggregate\":\"SUM\"\
+  ,\"sqlExpression\":null,\"datasourceWarning\":false,\"hasCustomLabel\":true,\"label\"\
+  :\"fl12m\",\"optionName\":\"metric_70qbguisjal_jiqokv6vrf\"},{\"expressionType\"\
+  :\"SIMPLE\",\"column\":{\"advanced_data_type\":null,\"certification_details\":null,\"\
+  certified_by\":null,\"column_name\":\"ml4\",\"description\":null,\"expression\"\
+  :null,\"filterable\":true,\"groupby\":true,\"id\":636,\"is_certified\":false,\"\
+  is_dttm\":false,\"python_date_format\":null,\"type\":\"INTEGER\",\"type_generic\"\
+  :0,\"verbose_name\":\"1-4 \u1786\u17D2\u1793\u17B6\u17C6 - \u1794\u17D2\u179A (1-4\
+  \ years - M)\",\"warning_markdown\":null},\"aggregate\":\"SUM\",\"sqlExpression\"\
+  :null,\"datasourceWarning\":false,\"hasCustomLabel\":true,\"label\":\"ml4\",\"optionName\"\
+  :\"metric_dv9wfd01cst_tgszs0q9wvp\"},{\"expressionType\":\"SIMPLE\",\"column\":{\"\
+  advanced_data_type\":null,\"certification_details\":null,\"certified_by\":null,\"\
+  column_name\":\"fl4\",\"description\":null,\"expression\":null,\"filterable\":true,\"\
+  groupby\":true,\"id\":635,\"is_certified\":false,\"is_dttm\":false,\"python_date_format\"\
+  :null,\"type\":\"INTEGER\",\"type_generic\":0,\"verbose_name\":\"1-4 \u1786\u17D2\
+  \u1793\u17B6\u17C6 - \u179F\u17D2\u179A (1-4 years - F)\",\"warning_markdown\":null},\"\
+  aggregate\":\"SUM\",\"sqlExpression\":null,\"datasourceWarning\":false,\"hasCustomLabel\"\
+  :true,\"label\":\"fl4\",\"optionName\":\"metric_ncj5imjvo5r_xo7sev2c89h\"},{\"expressionType\"\
+  :\"SIMPLE\",\"column\":{\"advanced_data_type\":null,\"certification_details\":null,\"\
+  certified_by\":null,\"column_name\":\"ml13\",\"description\":null,\"expression\"\
+  :null,\"filterable\":true,\"groupby\":true,\"id\":634,\"is_certified\":false,\"\
+  is_dttm\":false,\"python_date_format\":null,\"type\":\"INTEGER\",\"type_generic\"\
+  :0,\"verbose_name\":\"5-13 \u1786\u17D2\u1793\u17B6\u17C6 - \u1794\u17D2\u179A (5-13\
+  \ years - M)\",\"warning_markdown\":null},\"aggregate\":\"SUM\",\"sqlExpression\"\
+  :null,\"datasourceWarning\":false,\"hasCustomLabel\":true,\"label\":\"ml13\",\"\
+  optionName\":\"metric_ce5qys7idfi_b2oyxnppq3i\"},{\"expressionType\":\"SIMPLE\"\
+  ,\"column\":{\"advanced_data_type\":null,\"certification_details\":null,\"certified_by\"\
+  :null,\"column_name\":\"fl13\",\"description\":null,\"expression\":null,\"filterable\"\
+  :true,\"groupby\":true,\"id\":633,\"is_certified\":false,\"is_dttm\":false,\"python_date_format\"\
+  :null,\"type\":\"INTEGER\",\"type_generic\":0,\"verbose_name\":\"5-13 \u1786\u17D2\
+  \u1793\u17B6\u17C6 - \u179F\u17D2\u179A (5-13 years - F)\",\"warning_markdown\"\
+  :null},\"aggregate\":\"SUM\",\"sqlExpression\":null,\"datasourceWarning\":false,\"\
+  hasCustomLabel\":true,\"label\":\"fl13\",\"optionName\":\"metric_s0e1shwm5g8_0r47d9cbtc7\"\
+  },{\"expressionType\":\"SIMPLE\",\"column\":{\"advanced_data_type\":null,\"certification_details\"\
+  :null,\"certified_by\":null,\"column_name\":\"ml24\",\"description\":null,\"expression\"\
+  :null,\"filterable\":true,\"groupby\":true,\"id\":638,\"is_certified\":false,\"\
+  is_dttm\":false,\"python_date_format\":null,\"type\":\"INTEGER\",\"type_generic\"\
+  :0,\"verbose_name\":\"6-24 \u1786\u17D2\u1793\u17B6\u17C6 - \u1794\u17D2\u179A (6-24\
+  \ years - M)\",\"warning_markdown\":null},\"aggregate\":\"SUM\",\"sqlExpression\"\
+  :null,\"datasourceWarning\":false,\"hasCustomLabel\":true,\"label\":\"ml24\",\"\
+  optionName\":\"metric_nl2vfvunkii_wxku9ucxe4d\"},{\"expressionType\":\"SIMPLE\"\
+  ,\"column\":{\"advanced_data_type\":null,\"certification_details\":null,\"certified_by\"\
+  :null,\"column_name\":\"fl24\",\"description\":null,\"expression\":null,\"filterable\"\
+  :true,\"groupby\":true,\"id\":637,\"is_certified\":false,\"is_dttm\":false,\"python_date_format\"\
+  :null,\"type\":\"INTEGER\",\"type_generic\":0,\"verbose_name\":\"6-24 \u1786\u17D2\
+  \u1793\u17B6\u17C6 - \u179F\u17D2\u179A (6-24 years - F)\",\"warning_markdown\"\
+  :null},\"aggregate\":\"SUM\",\"sqlExpression\":null,\"datasourceWarning\":false,\"\
+  hasCustomLabel\":true,\"label\":\"fl24\",\"optionName\":\"metric_k9elm6mwaif_erf4o7uxg0h\"\
+  },{\"expressionType\":\"SIMPLE\",\"column\":{\"advanced_data_type\":null,\"certification_details\"\
+  :null,\"certified_by\":null,\"column_name\":\"ml49\",\"description\":null,\"expression\"\
+  :null,\"filterable\":true,\"groupby\":true,\"id\":640,\"is_certified\":false,\"\
+  is_dttm\":false,\"python_date_format\":null,\"type\":\"INTEGER\",\"type_generic\"\
+  :0,\"verbose_name\":\"25-49 \u1786\u17D2\u1793\u17B6\u17C6 - \u1794\u17D2\u179A\
+  \ (25-49 years - M)\",\"warning_markdown\":null},\"aggregate\":\"SUM\",\"sqlExpression\"\
+  :null,\"datasourceWarning\":false,\"hasCustomLabel\":true,\"label\":\"ml49\",\"\
+  optionName\":\"metric_7ukaxt54dsa_aw6rw5mguin\"},{\"expressionType\":\"SIMPLE\"\
+  ,\"column\":{\"advanced_data_type\":null,\"certification_details\":null,\"certified_by\"\
+  :null,\"column_name\":\"fl49\",\"description\":null,\"expression\":null,\"filterable\"\
+  :true,\"groupby\":true,\"id\":639,\"is_certified\":false,\"is_dttm\":false,\"python_date_format\"\
+  :null,\"type\":\"INTEGER\",\"type_generic\":0,\"verbose_name\":\"25-49 \u1786\u17D2\
+  \u1793\u17B6\u17C6 - \u179F\u17D2\u179A (25-49 years - F)\",\"warning_markdown\"\
+  :null},\"aggregate\":\"SUM\",\"sqlExpression\":null,\"datasourceWarning\":false,\"\
+  hasCustomLabel\":true,\"label\":\"fl49\",\"optionName\":\"metric_53wgge154xe_pws7lga5k1m\"\
+  },{\"expressionType\":\"SIMPLE\",\"column\":{\"advanced_data_type\":null,\"certification_details\"\
+  :null,\"certified_by\":null,\"column_name\":\"ml64\",\"description\":null,\"expression\"\
+  :null,\"filterable\":true,\"groupby\":true,\"id\":632,\"is_certified\":false,\"\
+  is_dttm\":false,\"python_date_format\":null,\"type\":\"INTEGER\",\"type_generic\"\
+  :0,\"verbose_name\":\"50-64 \u1786\u17D2\u1793\u17B6\u17C6 - \u1794\u17D2\u179A\
+  \ (50-64 years - M)\",\"warning_markdown\":null},\"aggregate\":\"SUM\",\"sqlExpression\"\
+  :null,\"datasourceWarning\":false,\"hasCustomLabel\":true,\"label\":\"ml64\",\"\
+  optionName\":\"metric_e3h1gmqt326_2o818xd7ezl\"},{\"expressionType\":\"SIMPLE\"\
+  ,\"column\":{\"advanced_data_type\":null,\"certification_details\":null,\"certified_by\"\
+  :null,\"column_name\":\"fl64\",\"description\":null,\"expression\":null,\"filterable\"\
+  :true,\"groupby\":true,\"id\":631,\"is_certified\":false,\"is_dttm\":false,\"python_date_format\"\
+  :null,\"type\":\"INTEGER\",\"type_generic\":0,\"verbose_name\":\"50-64 \u1786\u17D2\
+  \u1793\u17B6\u17C6 - \u179F\u17D2\u179A (50-64 years - F)\",\"warning_markdown\"\
+  :null},\"aggregate\":\"SUM\",\"sqlExpression\":null,\"datasourceWarning\":false,\"\
+  hasCustomLabel\":true,\"label\":\"fl64\",\"optionName\":\"metric_y2bfgdcmdcl_4yag1xxoa7w\"\
+  },{\"expressionType\":\"SIMPLE\",\"column\":{\"advanced_data_type\":null,\"certification_details\"\
+  :null,\"certified_by\":null,\"column_name\":\"mg64\",\"description\":null,\"expression\"\
+  :null,\"filterable\":true,\"groupby\":true,\"id\":642,\"is_certified\":false,\"\
+  is_dttm\":false,\"python_date_format\":null,\"type\":\"INTEGER\",\"type_generic\"\
+  :0,\"verbose_name\":\">=65 \u1786\u17D2\u1793\u17B6\u17C6 - \u1794\u17D2\u179A (>=65\
+  \ years - M)\",\"warning_markdown\":null},\"aggregate\":\"SUM\",\"sqlExpression\"\
+  :null,\"datasourceWarning\":false,\"hasCustomLabel\":true,\"label\":\"mg64\",\"\
+  optionName\":\"metric_iv0lnc8sz6p_a4h9yvt083h\"},{\"expressionType\":\"SIMPLE\"\
+  ,\"column\":{\"advanced_data_type\":null,\"certification_details\":null,\"certified_by\"\
+  :null,\"column_name\":\"fg64\",\"description\":null,\"expression\":null,\"filterable\"\
+  :true,\"groupby\":true,\"id\":641,\"is_certified\":false,\"is_dttm\":false,\"python_date_format\"\
+  :null,\"type\":\"INTEGER\",\"type_generic\":0,\"verbose_name\":\">=65 \u1786\u17D2\
+  \u1793\u17B6\u17C6 - \u179F\u17D2\u179A (>=65 years - F)\",\"warning_markdown\"\
+  :null},\"aggregate\":\"SUM\",\"sqlExpression\":null,\"datasourceWarning\":false,\"\
+  hasCustomLabel\":true,\"label\":\"fg64\",\"optionName\":\"metric_akif7ndicz_vfab8rtsyw8\"\
+  },{\"expressionType\":\"SQL\",\"sqlExpression\":\"SUM(ml28d) + SUM(ml12m) + SUM(ml4)\
+  \ + SUM(ml13) + SUM(ml24) + SUM(ml49) + SUM(ml64) + SUM(mg64)\",\"column\":null,\"\
+  aggregate\":null,\"datasourceWarning\":false,\"hasCustomLabel\":true,\"label\":\"\
+  \u179F\u179A\u17BB\u1794 - \u1794\u17D2\u179A (Total - M)\",\"optionName\":\"metric_4oel0hbf07n_iqb5ez6qswg\"\
+  },{\"expressionType\":\"SQL\",\"sqlExpression\":\"SUM(fl28d) + SUM(fl12m) + SUM(fl4)\
+  \ + SUM(fl13) + SUM(fl24) + SUM(fl49) + SUM(fl64) + SUM(fg64)\",\"column\":null,\"\
+  aggregate\":null,\"datasourceWarning\":false,\"hasCustomLabel\":true,\"label\":\"\
+  \u179F\u179A\u17BB\u1794 - \u179F\u17D2\u179A (Total - F)\",\"optionName\":\"metric_qwhzgcrykir_ikzefsk8h7l\"\
+  }],\"annotation_layers\":[],\"row_limit\":0,\"row_offset\":0,\"series_limit\":0,\"\
+  url_params\":{},\"custom_params\":{},\"custom_form_data\":{},\"post_processing\"\
+  :[]}],\"form_data\":{\"datasource\":\"18__table\",\"viz_type\":\"table\",\"slice_id\"\
+  :40,\"query_mode\":\"aggregate\",\"groupby\":[\"diagnosis\"],\"time_grain_sqla\"\
+  :\"P1D\",\"temporal_columns_lookup\":{\"visit_date\":true},\"metrics\":[{\"expressionType\"\
+  :\"SIMPLE\",\"column\":{\"advanced_data_type\":null,\"certification_details\":null,\"\
+  certified_by\":null,\"column_name\":\"ml28d\",\"description\":null,\"expression\"\
+  :null,\"filterable\":true,\"groupby\":true,\"id\":630,\"is_certified\":false,\"\
+  is_dttm\":false,\"python_date_format\":null,\"type\":\"INTEGER\",\"type_generic\"\
+  :0,\"verbose_name\":\"0-28 \u1790\u17D2\u1784\u17C3 - \u1794\u17D2\u179A (0-28 day\
+  \ - M)\",\"warning_markdown\":null},\"aggregate\":\"SUM\",\"sqlExpression\":null,\"\
+  datasourceWarning\":false,\"hasCustomLabel\":true,\"label\":\"ml28d\",\"optionName\"\
+  :\"metric_k5ulvn1e85_ebfrsgpjae5\"},{\"expressionType\":\"SIMPLE\",\"column\":{\"\
+  advanced_data_type\":null,\"certification_details\":null,\"certified_by\":null,\"\
+  column_name\":\"fl28d\",\"description\":null,\"expression\":null,\"filterable\"\
+  :true,\"groupby\":true,\"id\":629,\"is_certified\":false,\"is_dttm\":false,\"python_date_format\"\
+  :null,\"type\":\"INTEGER\",\"type_generic\":0,\"verbose_name\":\"0-28 \u1790\u17D2\
+  \u1784\u17C3 - \u179F\u17D2\u179A (0-28 days - F)\",\"warning_markdown\":null},\"\
+  aggregate\":\"SUM\",\"sqlExpression\":null,\"datasourceWarning\":false,\"hasCustomLabel\"\
+  :true,\"label\":\"fl28d\",\"optionName\":\"metric_8n3gpfy30y_horxf7jjgou\"},{\"\
+  expressionType\":\"SIMPLE\",\"column\":{\"advanced_data_type\":null,\"certification_details\"\
+  :null,\"certified_by\":null,\"column_name\":\"ml12m\",\"description\":null,\"expression\"\
+  :null,\"filterable\":true,\"groupby\":true,\"id\":628,\"is_certified\":false,\"\
+  is_dttm\":false,\"python_date_format\":null,\"type\":\"INTEGER\",\"type_generic\"\
+  :0,\"verbose_name\":\"29 \u1790\u17D2\u1784\u17C3-11 \u1781\u17C2 - \u1794\u17D2\
+  \u179A (29 days - 11 months - M)\",\"warning_markdown\":null},\"aggregate\":\"SUM\"\
+  ,\"sqlExpression\":null,\"datasourceWarning\":false,\"hasCustomLabel\":true,\"label\"\
+  :\"ml12m\",\"optionName\":\"metric_eie6bn2a3wm_5iocmsnpbn4\"},{\"expressionType\"\
+  :\"SIMPLE\",\"column\":{\"advanced_data_type\":null,\"certification_details\":null,\"\
+  certified_by\":null,\"column_name\":\"fl12m\",\"description\":null,\"expression\"\
+  :null,\"filterable\":true,\"groupby\":true,\"id\":627,\"is_certified\":false,\"\
+  is_dttm\":false,\"python_date_format\":null,\"type\":\"INTEGER\",\"type_generic\"\
+  :0,\"verbose_name\":\"29 \u1790\u17D2\u1784\u17C3-11 \u1781\u17C2 - \u179F\u17D2\
+  \u179A (29 days - 11 months - F)\",\"warning_markdown\":null},\"aggregate\":\"SUM\"\
+  ,\"sqlExpression\":null,\"datasourceWarning\":false,\"hasCustomLabel\":true,\"label\"\
+  :\"fl12m\",\"optionName\":\"metric_70qbguisjal_jiqokv6vrf\"},{\"expressionType\"\
+  :\"SIMPLE\",\"column\":{\"advanced_data_type\":null,\"certification_details\":null,\"\
+  certified_by\":null,\"column_name\":\"ml4\",\"description\":null,\"expression\"\
+  :null,\"filterable\":true,\"groupby\":true,\"id\":636,\"is_certified\":false,\"\
+  is_dttm\":false,\"python_date_format\":null,\"type\":\"INTEGER\",\"type_generic\"\
+  :0,\"verbose_name\":\"1-4 \u1786\u17D2\u1793\u17B6\u17C6 - \u1794\u17D2\u179A (1-4\
+  \ years - M)\",\"warning_markdown\":null},\"aggregate\":\"SUM\",\"sqlExpression\"\
+  :null,\"datasourceWarning\":false,\"hasCustomLabel\":true,\"label\":\"ml4\",\"optionName\"\
+  :\"metric_dv9wfd01cst_tgszs0q9wvp\"},{\"expressionType\":\"SIMPLE\",\"column\":{\"\
+  advanced_data_type\":null,\"certification_details\":null,\"certified_by\":null,\"\
+  column_name\":\"fl4\",\"description\":null,\"expression\":null,\"filterable\":true,\"\
+  groupby\":true,\"id\":635,\"is_certified\":false,\"is_dttm\":false,\"python_date_format\"\
+  :null,\"type\":\"INTEGER\",\"type_generic\":0,\"verbose_name\":\"1-4 \u1786\u17D2\
+  \u1793\u17B6\u17C6 - \u179F\u17D2\u179A (1-4 years - F)\",\"warning_markdown\":null},\"\
+  aggregate\":\"SUM\",\"sqlExpression\":null,\"datasourceWarning\":false,\"hasCustomLabel\"\
+  :true,\"label\":\"fl4\",\"optionName\":\"metric_ncj5imjvo5r_xo7sev2c89h\"},{\"expressionType\"\
+  :\"SIMPLE\",\"column\":{\"advanced_data_type\":null,\"certification_details\":null,\"\
+  certified_by\":null,\"column_name\":\"ml13\",\"description\":null,\"expression\"\
+  :null,\"filterable\":true,\"groupby\":true,\"id\":634,\"is_certified\":false,\"\
+  is_dttm\":false,\"python_date_format\":null,\"type\":\"INTEGER\",\"type_generic\"\
+  :0,\"verbose_name\":\"5-13 \u1786\u17D2\u1793\u17B6\u17C6 - \u1794\u17D2\u179A (5-13\
+  \ years - M)\",\"warning_markdown\":null},\"aggregate\":\"SUM\",\"sqlExpression\"\
+  :null,\"datasourceWarning\":false,\"hasCustomLabel\":true,\"label\":\"ml13\",\"\
+  optionName\":\"metric_ce5qys7idfi_b2oyxnppq3i\"},{\"expressionType\":\"SIMPLE\"\
+  ,\"column\":{\"advanced_data_type\":null,\"certification_details\":null,\"certified_by\"\
+  :null,\"column_name\":\"fl13\",\"description\":null,\"expression\":null,\"filterable\"\
+  :true,\"groupby\":true,\"id\":633,\"is_certified\":false,\"is_dttm\":false,\"python_date_format\"\
+  :null,\"type\":\"INTEGER\",\"type_generic\":0,\"verbose_name\":\"5-13 \u1786\u17D2\
+  \u1793\u17B6\u17C6 - \u179F\u17D2\u179A (5-13 years - F)\",\"warning_markdown\"\
+  :null},\"aggregate\":\"SUM\",\"sqlExpression\":null,\"datasourceWarning\":false,\"\
+  hasCustomLabel\":true,\"label\":\"fl13\",\"optionName\":\"metric_s0e1shwm5g8_0r47d9cbtc7\"\
+  },{\"expressionType\":\"SIMPLE\",\"column\":{\"advanced_data_type\":null,\"certification_details\"\
+  :null,\"certified_by\":null,\"column_name\":\"ml24\",\"description\":null,\"expression\"\
+  :null,\"filterable\":true,\"groupby\":true,\"id\":638,\"is_certified\":false,\"\
+  is_dttm\":false,\"python_date_format\":null,\"type\":\"INTEGER\",\"type_generic\"\
+  :0,\"verbose_name\":\"6-24 \u1786\u17D2\u1793\u17B6\u17C6 - \u1794\u17D2\u179A (6-24\
+  \ years - M)\",\"warning_markdown\":null},\"aggregate\":\"SUM\",\"sqlExpression\"\
+  :null,\"datasourceWarning\":false,\"hasCustomLabel\":true,\"label\":\"ml24\",\"\
+  optionName\":\"metric_nl2vfvunkii_wxku9ucxe4d\"},{\"expressionType\":\"SIMPLE\"\
+  ,\"column\":{\"advanced_data_type\":null,\"certification_details\":null,\"certified_by\"\
+  :null,\"column_name\":\"fl24\",\"description\":null,\"expression\":null,\"filterable\"\
+  :true,\"groupby\":true,\"id\":637,\"is_certified\":false,\"is_dttm\":false,\"python_date_format\"\
+  :null,\"type\":\"INTEGER\",\"type_generic\":0,\"verbose_name\":\"6-24 \u1786\u17D2\
+  \u1793\u17B6\u17C6 - \u179F\u17D2\u179A (6-24 years - F)\",\"warning_markdown\"\
+  :null},\"aggregate\":\"SUM\",\"sqlExpression\":null,\"datasourceWarning\":false,\"\
+  hasCustomLabel\":true,\"label\":\"fl24\",\"optionName\":\"metric_k9elm6mwaif_erf4o7uxg0h\"\
+  },{\"expressionType\":\"SIMPLE\",\"column\":{\"advanced_data_type\":null,\"certification_details\"\
+  :null,\"certified_by\":null,\"column_name\":\"ml49\",\"description\":null,\"expression\"\
+  :null,\"filterable\":true,\"groupby\":true,\"id\":640,\"is_certified\":false,\"\
+  is_dttm\":false,\"python_date_format\":null,\"type\":\"INTEGER\",\"type_generic\"\
+  :0,\"verbose_name\":\"25-49 \u1786\u17D2\u1793\u17B6\u17C6 - \u1794\u17D2\u179A\
+  \ (25-49 years - M)\",\"warning_markdown\":null},\"aggregate\":\"SUM\",\"sqlExpression\"\
+  :null,\"datasourceWarning\":false,\"hasCustomLabel\":true,\"label\":\"ml49\",\"\
+  optionName\":\"metric_7ukaxt54dsa_aw6rw5mguin\"},{\"expressionType\":\"SIMPLE\"\
+  ,\"column\":{\"advanced_data_type\":null,\"certification_details\":null,\"certified_by\"\
+  :null,\"column_name\":\"fl49\",\"description\":null,\"expression\":null,\"filterable\"\
+  :true,\"groupby\":true,\"id\":639,\"is_certified\":false,\"is_dttm\":false,\"python_date_format\"\
+  :null,\"type\":\"INTEGER\",\"type_generic\":0,\"verbose_name\":\"25-49 \u1786\u17D2\
+  \u1793\u17B6\u17C6 - \u179F\u17D2\u179A (25-49 years - F)\",\"warning_markdown\"\
+  :null},\"aggregate\":\"SUM\",\"sqlExpression\":null,\"datasourceWarning\":false,\"\
+  hasCustomLabel\":true,\"label\":\"fl49\",\"optionName\":\"metric_53wgge154xe_pws7lga5k1m\"\
+  },{\"expressionType\":\"SIMPLE\",\"column\":{\"advanced_data_type\":null,\"certification_details\"\
+  :null,\"certified_by\":null,\"column_name\":\"ml64\",\"description\":null,\"expression\"\
+  :null,\"filterable\":true,\"groupby\":true,\"id\":632,\"is_certified\":false,\"\
+  is_dttm\":false,\"python_date_format\":null,\"type\":\"INTEGER\",\"type_generic\"\
+  :0,\"verbose_name\":\"50-64 \u1786\u17D2\u1793\u17B6\u17C6 - \u1794\u17D2\u179A\
+  \ (50-64 years - M)\",\"warning_markdown\":null},\"aggregate\":\"SUM\",\"sqlExpression\"\
+  :null,\"datasourceWarning\":false,\"hasCustomLabel\":true,\"label\":\"ml64\",\"\
+  optionName\":\"metric_e3h1gmqt326_2o818xd7ezl\"},{\"expressionType\":\"SIMPLE\"\
+  ,\"column\":{\"advanced_data_type\":null,\"certification_details\":null,\"certified_by\"\
+  :null,\"column_name\":\"fl64\",\"description\":null,\"expression\":null,\"filterable\"\
+  :true,\"groupby\":true,\"id\":631,\"is_certified\":false,\"is_dttm\":false,\"python_date_format\"\
+  :null,\"type\":\"INTEGER\",\"type_generic\":0,\"verbose_name\":\"50-64 \u1786\u17D2\
+  \u1793\u17B6\u17C6 - \u179F\u17D2\u179A (50-64 years - F)\",\"warning_markdown\"\
+  :null},\"aggregate\":\"SUM\",\"sqlExpression\":null,\"datasourceWarning\":false,\"\
+  hasCustomLabel\":true,\"label\":\"fl64\",\"optionName\":\"metric_y2bfgdcmdcl_4yag1xxoa7w\"\
+  },{\"expressionType\":\"SIMPLE\",\"column\":{\"advanced_data_type\":null,\"certification_details\"\
+  :null,\"certified_by\":null,\"column_name\":\"mg64\",\"description\":null,\"expression\"\
+  :null,\"filterable\":true,\"groupby\":true,\"id\":642,\"is_certified\":false,\"\
+  is_dttm\":false,\"python_date_format\":null,\"type\":\"INTEGER\",\"type_generic\"\
+  :0,\"verbose_name\":\">=65 \u1786\u17D2\u1793\u17B6\u17C6 - \u1794\u17D2\u179A (>=65\
+  \ years - M)\",\"warning_markdown\":null},\"aggregate\":\"SUM\",\"sqlExpression\"\
+  :null,\"datasourceWarning\":false,\"hasCustomLabel\":true,\"label\":\"mg64\",\"\
+  optionName\":\"metric_iv0lnc8sz6p_a4h9yvt083h\"},{\"expressionType\":\"SIMPLE\"\
+  ,\"column\":{\"advanced_data_type\":null,\"certification_details\":null,\"certified_by\"\
+  :null,\"column_name\":\"fg64\",\"description\":null,\"expression\":null,\"filterable\"\
+  :true,\"groupby\":true,\"id\":641,\"is_certified\":false,\"is_dttm\":false,\"python_date_format\"\
+  :null,\"type\":\"INTEGER\",\"type_generic\":0,\"verbose_name\":\">=65 \u1786\u17D2\
+  \u1793\u17B6\u17C6 - \u179F\u17D2\u179A (>=65 years - F)\",\"warning_markdown\"\
+  :null},\"aggregate\":\"SUM\",\"sqlExpression\":null,\"datasourceWarning\":false,\"\
+  hasCustomLabel\":true,\"label\":\"fg64\",\"optionName\":\"metric_akif7ndicz_vfab8rtsyw8\"\
+  },{\"expressionType\":\"SQL\",\"sqlExpression\":\"SUM(ml28d) + SUM(ml12m) + SUM(ml4)\
+  \ + SUM(ml13) + SUM(ml24) + SUM(ml49) + SUM(ml64) + SUM(mg64)\",\"column\":null,\"\
+  aggregate\":null,\"datasourceWarning\":false,\"hasCustomLabel\":true,\"label\":\"\
+  \u179F\u179A\u17BB\u1794 - \u1794\u17D2\u179A (Total - M)\",\"optionName\":\"metric_4oel0hbf07n_iqb5ez6qswg\"\
+  },{\"expressionType\":\"SQL\",\"sqlExpression\":\"SUM(fl28d) + SUM(fl12m) + SUM(fl4)\
+  \ + SUM(fl13) + SUM(fl24) + SUM(fl49) + SUM(fl64) + SUM(fg64)\",\"column\":null,\"\
+  aggregate\":null,\"datasourceWarning\":false,\"hasCustomLabel\":true,\"label\":\"\
+  \u179F\u179A\u17BB\u1794 - \u179F\u17D2\u179A (Total - F)\",\"optionName\":\"metric_qwhzgcrykir_ikzefsk8h7l\"\
+  }],\"all_columns\":[],\"percent_metrics\":[],\"adhoc_filters\":[{\"clause\":\"WHERE\"\
+  ,\"subject\":\"visit_date\",\"operator\":\"TEMPORAL_RANGE\",\"comparator\":\"DATEADD(DATETIME(\\\
+  \"now\\\"), -1, year) : now\",\"expressionType\":\"SIMPLE\"}],\"order_by_cols\"\
+  :[],\"row_limit\":10000,\"server_page_length\":10,\"order_desc\":false,\"show_totals\"\
+  :true,\"table_timestamp_format\":\"smart_date\",\"include_search\":true,\"show_cell_bars\"\
+  :false,\"color_pn\":true,\"column_config\":{\"fg64\":{\"d3NumberFormat\":\"~g\"\
+  ,\"d3SmallNumberFormat\":\"~g\",\"showCellBars\":false},\"fl13\":{\"d3NumberFormat\"\
+  :\"~g\",\"d3SmallNumberFormat\":\"~g\",\"showCellBars\":false},\"fl24\":{\"d3NumberFormat\"\
+  :\"~g\",\"d3SmallNumberFormat\":\"~g\",\"showCellBars\":false},\"fl28d\":{\"d3NumberFormat\"\
+  :\"~g\",\"d3SmallNumberFormat\":\"~g\",\"showCellBars\":false},\"fl4\":{\"d3NumberFormat\"\
+  :\"~g\",\"d3SmallNumberFormat\":\"~g\",\"showCellBars\":false},\"fl49\":{\"d3NumberFormat\"\
+  :\"~g\",\"d3SmallNumberFormat\":\"~g\",\"showCellBars\":false},\"fl64\":{\"d3NumberFormat\"\
+  :\"~g\",\"d3SmallNumberFormat\":\"~g\",\"showCellBars\":false},\"mg64\":{\"d3NumberFormat\"\
+  :\"~g\",\"d3SmallNumberFormat\":\"~g\",\"showCellBars\":false},\"ml12m\":{\"d3NumberFormat\"\
+  :\"~g\",\"d3SmallNumberFormat\":\"~g\",\"showCellBars\":false},\"ml13\":{\"d3NumberFormat\"\
+  :\"~g\",\"d3SmallNumberFormat\":\"~g\",\"showCellBars\":false},\"ml24\":{\"d3NumberFormat\"\
+  :\"~g\",\"d3SmallNumberFormat\":\"~g\",\"showCellBars\":false},\"ml28d\":{\"d3NumberFormat\"\
+  :\"~g\",\"d3SmallNumberFormat\":\"~g\",\"showCellBars\":false},\"ml4\":{\"d3NumberFormat\"\
+  :\"~g\",\"d3SmallNumberFormat\":\"~g\",\"showCellBars\":false},\"ml49\":{\"d3NumberFormat\"\
+  :\"~g\",\"d3SmallNumberFormat\":\"~g\",\"showCellBars\":false},\"ml64\":{\"d3NumberFormat\"\
+  :\"~g\",\"d3SmallNumberFormat\":\"~g\",\"showCellBars\":false},\"\u179F\u179A\u17BB\
+  \u1794 - \u1794\u17D2\u179A (Total - M)\":{\"d3NumberFormat\":\"~g\",\"d3SmallNumberFormat\"\
+  :\"~g\",\"showCellBars\":false},\"\u179F\u179A\u17BB\u1794 - \u179F\u17D2\u179A\
+  \ (Total - F)\":{\"d3NumberFormat\":\"~g\",\"d3SmallNumberFormat\":\"~g\",\"showCellBars\"\
+  :false}},\"conditional_formatting\":[],\"extra_form_data\":{},\"dashboards\":[6],\"\
+  force\":false,\"result_format\":\"json\",\"result_type\":\"full\"},\"result_format\"\
+  :\"json\",\"result_type\":\"full\"}"
+cache_timeout: null
+uuid: b3599541-6658-4325-968b-82dd749af4ec
+version: 1.0.0
+dataset_uuid: 48365851-d1d2-451d-b2aa-18a5ffcdd72d
diff --git a/base/configs/superset/assets/charts/NCD_HIS_New_Cases_Within_Reporting_Range_42.yaml b/base/configs/superset/assets/charts/NCD_HIS_New_Cases_Within_Reporting_Range_42.yaml
deleted file mode 100644
index 3bd13969..00000000
--- a/base/configs/superset/assets/charts/NCD_HIS_New_Cases_Within_Reporting_Range_42.yaml
+++ /dev/null
@@ -1,910 +0,0 @@
-slice_name: NCD HIS New Cases Within Reporting Range
-description: null
-certified_by: null
-certification_details: null
-viz_type: table
-params:
-  datasource: 31__table
-  viz_type: table
-  slice_id: 143
-  granularity_sqla: visit_date
-  time_grain_sqla: P1D
-  time_range: 'DATEADD(DATETIME("now"), -1, year) : now'
-  query_mode: aggregate
-  groupby:
-  - diagnosis
-  metrics:
-  - aggregate: SUM
-    column:
-      advanced_data_type: null
-      certification_details: null
-      certified_by: null
-      column_name: ml28d
-      description: null
-      expression: null
-      filterable: true
-      groupby: true
-      id: 1008
-      is_certified: false
-      is_dttm: false
-      python_date_format: null
-      type: INTEGER
-      type_generic: 0
-      verbose_name: "0-28 \u1790\u17D2\u1784\u17C3 - \u1794\u17D2\u179A (0-28 day\
-        \ - M)"
-      warning_markdown: null
-    datasourceWarning: false
-    expressionType: SIMPLE
-    hasCustomLabel: true
-    label: ml28d
-    optionName: metric_k5ulvn1e85_ebfrsgpjae5
-    sqlExpression: null
-  - aggregate: SUM
-    column:
-      advanced_data_type: null
-      certification_details: null
-      certified_by: null
-      column_name: fl28d
-      description: null
-      expression: null
-      filterable: true
-      groupby: true
-      id: 1009
-      is_certified: false
-      is_dttm: false
-      python_date_format: null
-      type: INTEGER
-      type_generic: 0
-      verbose_name: "0-28 \u1790\u17D2\u1784\u17C3 - \u179F\u17D2\u179A (0-28 days\
-        \ - F)"
-      warning_markdown: null
-    datasourceWarning: false
-    expressionType: SIMPLE
-    hasCustomLabel: true
-    label: fl28d
-    optionName: metric_8n3gpfy30y_horxf7jjgou
-    sqlExpression: null
-  - aggregate: SUM
-    column:
-      advanced_data_type: null
-      certification_details: null
-      certified_by: null
-      column_name: ml12m
-      description: null
-      expression: null
-      filterable: true
-      groupby: true
-      id: 1010
-      is_certified: false
-      is_dttm: false
-      python_date_format: null
-      type: INTEGER
-      type_generic: 0
-      verbose_name: "29 \u1790\u17D2\u1784\u17C3-11 \u1781\u17C2 - \u1794\u17D2\u179A\
-        \ (29 days - 11 months - M)"
-      warning_markdown: null
-    datasourceWarning: false
-    expressionType: SIMPLE
-    hasCustomLabel: true
-    label: ml12m
-    optionName: metric_eie6bn2a3wm_5iocmsnpbn4
-    sqlExpression: null
-  - aggregate: SUM
-    column:
-      advanced_data_type: null
-      certification_details: null
-      certified_by: null
-      column_name: ml4
-      description: null
-      expression: null
-      filterable: true
-      groupby: true
-      id: 1012
-      is_certified: false
-      is_dttm: false
-      python_date_format: null
-      type: INTEGER
-      type_generic: 0
-      verbose_name: "1-4 \u1786\u17D2\u1793\u17B6\u17C6 - \u1794\u17D2\u179A (1-4\
-        \ years - M)"
-      warning_markdown: null
-    datasourceWarning: false
-    expressionType: SIMPLE
-    hasCustomLabel: true
-    label: ml4
-    optionName: metric_yadhl1wuaxe_274di2eq3ok
-    sqlExpression: null
-  - aggregate: SUM
-    column:
-      advanced_data_type: null
-      certification_details: null
-      certified_by: null
-      column_name: fl4
-      description: null
-      expression: null
-      filterable: true
-      groupby: true
-      id: 1013
-      is_certified: false
-      is_dttm: false
-      python_date_format: null
-      type: INTEGER
-      type_generic: 0
-      verbose_name: "1-4 \u1786\u17D2\u1793\u17B6\u17C6 - \u179F\u17D2\u179A (1-4\
-        \ years - F)"
-      warning_markdown: null
-    datasourceWarning: false
-    expressionType: SIMPLE
-    hasCustomLabel: true
-    label: fl4
-    optionName: metric_ujxemhzslv_rej623k4t9
-    sqlExpression: null
-  - aggregate: SUM
-    column:
-      advanced_data_type: null
-      certification_details: null
-      certified_by: null
-      column_name: ml13
-      description: null
-      expression: null
-      filterable: true
-      groupby: true
-      id: 1014
-      is_certified: false
-      is_dttm: false
-      python_date_format: null
-      type: INTEGER
-      type_generic: 0
-      verbose_name: "5-13 \u1786\u17D2\u1793\u17B6\u17C6 - \u1794\u17D2\u179A (5-13\
-        \ years - M)"
-      warning_markdown: null
-    datasourceWarning: false
-    expressionType: SIMPLE
-    hasCustomLabel: true
-    label: ml13
-    optionName: metric_rkhf4715a7n_hje7mft8u8b
-    sqlExpression: null
-  - aggregate: SUM
-    column:
-      advanced_data_type: null
-      certification_details: null
-      certified_by: null
-      column_name: fl13
-      description: null
-      expression: null
-      filterable: true
-      groupby: true
-      id: 1015
-      is_certified: false
-      is_dttm: false
-      python_date_format: null
-      type: INTEGER
-      type_generic: 0
-      verbose_name: "5-13 \u1786\u17D2\u1793\u17B6\u17C6 - \u179F\u17D2\u179A (5-13\
-        \ years - F)"
-      warning_markdown: null
-    datasourceWarning: false
-    expressionType: SIMPLE
-    hasCustomLabel: true
-    label: fl13
-    optionName: metric_hetx0c4d98u_akb5630plk5
-    sqlExpression: null
-  - aggregate: SUM
-    column:
-      advanced_data_type: null
-      certification_details: null
-      certified_by: null
-      column_name: ml24
-      description: null
-      expression: null
-      filterable: true
-      groupby: true
-      id: 1016
-      is_certified: false
-      is_dttm: false
-      python_date_format: null
-      type: INTEGER
-      type_generic: 0
-      verbose_name: "6-24 \u1786\u17D2\u1793\u17B6\u17C6 - \u1794\u17D2\u179A (6-24\
-        \ years - M)"
-      warning_markdown: null
-    datasourceWarning: false
-    expressionType: SIMPLE
-    hasCustomLabel: true
-    label: ml24
-    optionName: metric_upzon497jd_m4q2sy24ho
-    sqlExpression: null
-  - aggregate: SUM
-    column:
-      advanced_data_type: null
-      certification_details: null
-      certified_by: null
-      column_name: fl24
-      description: null
-      expression: null
-      filterable: true
-      groupby: true
-      id: 1017
-      is_certified: false
-      is_dttm: false
-      python_date_format: null
-      type: INTEGER
-      type_generic: 0
-      verbose_name: "6-24 \u1786\u17D2\u1793\u17B6\u17C6 - \u179F\u17D2\u179A (6-24\
-        \ years - F)"
-      warning_markdown: null
-    datasourceWarning: false
-    expressionType: SIMPLE
-    hasCustomLabel: true
-    label: fl24
-    optionName: metric_3ahinowa0co_wconc4twrm
-    sqlExpression: null
-  - aggregate: SUM
-    column:
-      advanced_data_type: null
-      certification_details: null
-      certified_by: null
-      column_name: ml49
-      description: null
-      expression: null
-      filterable: true
-      groupby: true
-      id: 1018
-      is_certified: false
-      is_dttm: false
-      python_date_format: null
-      type: INTEGER
-      type_generic: 0
-      verbose_name: "25-49 \u1786\u17D2\u1793\u17B6\u17C6 - \u1794\u17D2\u179A (25-49\
-        \ years - M)"
-      warning_markdown: null
-    datasourceWarning: false
-    expressionType: SIMPLE
-    hasCustomLabel: true
-    label: ml49
-    optionName: metric_hvu9txw0l09_roudzl9xuf
-    sqlExpression: null
-  - aggregate: SUM
-    column:
-      advanced_data_type: null
-      certification_details: null
-      certified_by: null
-      column_name: fl49
-      description: null
-      expression: null
-      filterable: true
-      groupby: true
-      id: 1019
-      is_certified: false
-      is_dttm: false
-      python_date_format: null
-      type: INTEGER
-      type_generic: 0
-      verbose_name: "25-49 \u1786\u17D2\u1793\u17B6\u17C6 - \u179F\u17D2\u179A (25-49\
-        \ years - F)"
-      warning_markdown: null
-    datasourceWarning: false
-    expressionType: SIMPLE
-    hasCustomLabel: true
-    label: fl49
-    optionName: metric_65ue2jt9rww_dma3t4fsom6
-    sqlExpression: null
-  - aggregate: SUM
-    column:
-      advanced_data_type: null
-      certification_details: null
-      certified_by: null
-      column_name: ml64
-      description: null
-      expression: null
-      filterable: true
-      groupby: true
-      id: 1020
-      is_certified: false
-      is_dttm: false
-      python_date_format: null
-      type: INTEGER
-      type_generic: 0
-      verbose_name: "50-64 \u1786\u17D2\u1793\u17B6\u17C6 - \u1794\u17D2\u179A (50-64\
-        \ years - M)"
-      warning_markdown: null
-    datasourceWarning: false
-    expressionType: SIMPLE
-    hasCustomLabel: true
-    label: ml64
-    optionName: metric_2kn0w4isb0i_fvbtjb54n0e
-    sqlExpression: null
-  - aggregate: SUM
-    column:
-      advanced_data_type: null
-      certification_details: null
-      certified_by: null
-      column_name: fl64
-      description: null
-      expression: null
-      filterable: true
-      groupby: true
-      id: 1021
-      is_certified: false
-      is_dttm: false
-      python_date_format: null
-      type: INTEGER
-      type_generic: 0
-      verbose_name: "50-64 \u1786\u17D2\u1793\u17B6\u17C6 - \u179F\u17D2\u179A (50-64\
-        \ years - F)"
-      warning_markdown: null
-    datasourceWarning: false
-    expressionType: SIMPLE
-    hasCustomLabel: true
-    label: fl64
-    optionName: metric_9zh1hcelxz_0i58yqrywmdn
-    sqlExpression: null
-  - aggregate: SUM
-    column:
-      advanced_data_type: null
-      certification_details: null
-      certified_by: null
-      column_name: mg64
-      description: null
-      expression: null
-      filterable: true
-      groupby: true
-      id: 1022
-      is_certified: false
-      is_dttm: false
-      python_date_format: null
-      type: INTEGER
-      type_generic: 0
-      verbose_name: ">=65 \u1786\u17D2\u1793\u17B6\u17C6 - \u1794\u17D2\u179A (>=65\
-        \ years - M)"
-      warning_markdown: null
-    datasourceWarning: false
-    expressionType: SIMPLE
-    hasCustomLabel: true
-    label: mg64
-    optionName: metric_vf77119z33b_0uxcz6tqzle
-    sqlExpression: null
-  - aggregate: SUM
-    column:
-      advanced_data_type: null
-      certification_details: null
-      certified_by: null
-      column_name: fg64
-      description: null
-      expression: null
-      filterable: true
-      groupby: true
-      id: 1023
-      is_certified: false
-      is_dttm: false
-      python_date_format: null
-      type: INTEGER
-      type_generic: 0
-      verbose_name: ">=65 \u1786\u17D2\u1793\u17B6\u17C6 - \u179F\u17D2\u179A (>=65\
-        \ years - F)"
-      warning_markdown: null
-    datasourceWarning: false
-    expressionType: SIMPLE
-    hasCustomLabel: true
-    label: fg64
-    optionName: metric_jat7hkqeimc_011p8qdetegr
-    sqlExpression: null
-  - aggregate: null
-    column: null
-    datasourceWarning: false
-    expressionType: SQL
-    hasCustomLabel: true
-    label: "\u179F\u179A\u17BB\u1794 - \u1794\u17D2\u179A (Total - M)"
-    optionName: metric_q84jwa2qttq_fwsun06q5a
-    sqlExpression: SUM(ml28d) + SUM(ml12m) + SUM(ml4) + SUM(ml13) + SUM(ml24) + SUM(ml49)
-      + SUM(ml64) + SUM(mg64)
-  - aggregate: null
-    column: null
-    datasourceWarning: false
-    expressionType: SQL
-    hasCustomLabel: true
-    label: "\u179F\u179A\u17BB\u1794 - \u179F\u17D2\u179A (Total - F)"
-    optionName: metric_3aql3e4v2lj_mlqfs3tafw
-    sqlExpression: SUM(fl28d) + SUM(fl12m) + SUM(fl4) + SUM(fl13) + SUM(fl24) + SUM(fl49)
-      + SUM(fl64) + SUM(fg64)
-  all_columns: []
-  percent_metrics: []
-  adhoc_filters: []
-  order_by_cols: []
-  row_limit: 10000
-  server_page_length: 10
-  order_desc: false
-  show_totals: true
-  table_timestamp_format: smart_date
-  include_search: true
-  show_cell_bars: true
-  color_pn: true
-  column_config:
-    fg64:
-      d3NumberFormat: ~g
-      d3SmallNumberFormat: ~g
-      showCellBars: false
-    fl13:
-      d3NumberFormat: ~g
-      d3SmallNumberFormat: ~g
-      showCellBars: false
-    fl24:
-      d3NumberFormat: ~g
-      d3SmallNumberFormat: ~g
-      showCellBars: false
-    fl28d:
-      d3NumberFormat: ~g
-      d3SmallNumberFormat: ~g
-      showCellBars: false
-    fl4:
-      d3NumberFormat: ~g
-      d3SmallNumberFormat: ~g
-      showCellBars: false
-    fl49:
-      d3NumberFormat: ~g
-      d3SmallNumberFormat: ~g
-      showCellBars: false
-    fl64:
-      d3NumberFormat: ~g
-      d3SmallNumberFormat: ~g
-      showCellBars: false
-    mg64:
-      d3NumberFormat: ~g
-      d3SmallNumberFormat: ~g
-      showCellBars: false
-    ml12m:
-      d3NumberFormat: ~g
-      d3SmallNumberFormat: ~g
-      showCellBars: false
-    ml13:
-      d3NumberFormat: ~g
-      d3SmallNumberFormat: ~g
-      showCellBars: false
-    ml24:
-      d3NumberFormat: ~g
-      d3SmallNumberFormat: ~g
-      showCellBars: false
-    ml28d:
-      d3NumberFormat: ~g
-      d3SmallNumberFormat: ~g
-      showCellBars: false
-    ml4:
-      d3NumberFormat: ~g
-      d3SmallNumberFormat: ~g
-      showCellBars: false
-    ml49:
-      d3NumberFormat: ~g
-      d3SmallNumberFormat: ~g
-      showCellBars: false
-    ml64:
-      d3NumberFormat: ~g
-      d3SmallNumberFormat: ~g
-      showCellBars: false
-    "\u179F\u179A\u17BB\u1794 - \u1794\u17D2\u179A (Total - M)":
-      d3NumberFormat: ~g
-      d3SmallNumberFormat: ~g
-      showCellBars: false
-    "\u179F\u179A\u17BB\u1794 - \u179F\u17D2\u179A (Total - F)":
-      d3NumberFormat: ~g
-      d3SmallNumberFormat: ~g
-      showCellBars: false
-  conditional_formatting: []
-  extra_form_data: {}
-  dashboards:
-  - 18
-  annotation_layers: []
-query_context: "{\"datasource\":{\"id\":31,\"type\":\"table\"},\"force\":false,\"\
-  queries\":[{\"time_range\":\"DATEADD(DATETIME(\\\"now\\\"), -1, year) : now\",\"\
-  granularity\":\"visit_date\",\"filters\":[],\"extras\":{\"time_grain_sqla\":\"P1D\"\
-  ,\"having\":\"\",\"where\":\"\"},\"applied_time_extras\":{},\"columns\":[\"diagnosis\"\
-  ],\"metrics\":[{\"aggregate\":\"SUM\",\"column\":{\"advanced_data_type\":null,\"\
-  certification_details\":null,\"certified_by\":null,\"column_name\":\"ml28d\",\"\
-  description\":null,\"expression\":null,\"filterable\":true,\"groupby\":true,\"id\"\
-  :1008,\"is_certified\":false,\"is_dttm\":false,\"python_date_format\":null,\"type\"\
-  :\"INTEGER\",\"type_generic\":0,\"verbose_name\":\"0-28 \u1790\u17D2\u1784\u17C3\
-  \ - \u1794\u17D2\u179A (0-28 day - M)\",\"warning_markdown\":null},\"datasourceWarning\"\
-  :false,\"expressionType\":\"SIMPLE\",\"hasCustomLabel\":true,\"label\":\"ml28d\"\
-  ,\"optionName\":\"metric_k5ulvn1e85_ebfrsgpjae5\",\"sqlExpression\":null},{\"aggregate\"\
-  :\"SUM\",\"column\":{\"advanced_data_type\":null,\"certification_details\":null,\"\
-  certified_by\":null,\"column_name\":\"fl28d\",\"description\":null,\"expression\"\
-  :null,\"filterable\":true,\"groupby\":true,\"id\":1009,\"is_certified\":false,\"\
-  is_dttm\":false,\"python_date_format\":null,\"type\":\"INTEGER\",\"type_generic\"\
-  :0,\"verbose_name\":\"0-28 \u1790\u17D2\u1784\u17C3 - \u179F\u17D2\u179A (0-28 days\
-  \ - F)\",\"warning_markdown\":null},\"datasourceWarning\":false,\"expressionType\"\
-  :\"SIMPLE\",\"hasCustomLabel\":true,\"label\":\"fl28d\",\"optionName\":\"metric_8n3gpfy30y_horxf7jjgou\"\
-  ,\"sqlExpression\":null},{\"aggregate\":\"SUM\",\"column\":{\"advanced_data_type\"\
-  :null,\"certification_details\":null,\"certified_by\":null,\"column_name\":\"ml12m\"\
-  ,\"description\":null,\"expression\":null,\"filterable\":true,\"groupby\":true,\"\
-  id\":1010,\"is_certified\":false,\"is_dttm\":false,\"python_date_format\":null,\"\
-  type\":\"INTEGER\",\"type_generic\":0,\"verbose_name\":\"29 \u1790\u17D2\u1784\u17C3\
-  -11 \u1781\u17C2 - \u1794\u17D2\u179A (29 days - 11 months - M)\",\"warning_markdown\"\
-  :null},\"datasourceWarning\":false,\"expressionType\":\"SIMPLE\",\"hasCustomLabel\"\
-  :true,\"label\":\"ml12m\",\"optionName\":\"metric_eie6bn2a3wm_5iocmsnpbn4\",\"sqlExpression\"\
-  :null},{\"aggregate\":\"SUM\",\"column\":{\"advanced_data_type\":null,\"certification_details\"\
-  :null,\"certified_by\":null,\"column_name\":\"ml4\",\"description\":null,\"expression\"\
-  :null,\"filterable\":true,\"groupby\":true,\"id\":1012,\"is_certified\":false,\"\
-  is_dttm\":false,\"python_date_format\":null,\"type\":\"INTEGER\",\"type_generic\"\
-  :0,\"verbose_name\":\"1-4 \u1786\u17D2\u1793\u17B6\u17C6 - \u1794\u17D2\u179A (1-4\
-  \ years - M)\",\"warning_markdown\":null},\"datasourceWarning\":false,\"expressionType\"\
-  :\"SIMPLE\",\"hasCustomLabel\":true,\"label\":\"ml4\",\"optionName\":\"metric_yadhl1wuaxe_274di2eq3ok\"\
-  ,\"sqlExpression\":null},{\"aggregate\":\"SUM\",\"column\":{\"advanced_data_type\"\
-  :null,\"certification_details\":null,\"certified_by\":null,\"column_name\":\"fl4\"\
-  ,\"description\":null,\"expression\":null,\"filterable\":true,\"groupby\":true,\"\
-  id\":1013,\"is_certified\":false,\"is_dttm\":false,\"python_date_format\":null,\"\
-  type\":\"INTEGER\",\"type_generic\":0,\"verbose_name\":\"1-4 \u1786\u17D2\u1793\u17B6\
-  \u17C6 - \u179F\u17D2\u179A (1-4 years - F)\",\"warning_markdown\":null},\"datasourceWarning\"\
-  :false,\"expressionType\":\"SIMPLE\",\"hasCustomLabel\":true,\"label\":\"fl4\",\"\
-  optionName\":\"metric_ujxemhzslv_rej623k4t9\",\"sqlExpression\":null},{\"aggregate\"\
-  :\"SUM\",\"column\":{\"advanced_data_type\":null,\"certification_details\":null,\"\
-  certified_by\":null,\"column_name\":\"ml13\",\"description\":null,\"expression\"\
-  :null,\"filterable\":true,\"groupby\":true,\"id\":1014,\"is_certified\":false,\"\
-  is_dttm\":false,\"python_date_format\":null,\"type\":\"INTEGER\",\"type_generic\"\
-  :0,\"verbose_name\":\"5-13 \u1786\u17D2\u1793\u17B6\u17C6 - \u1794\u17D2\u179A (5-13\
-  \ years - M)\",\"warning_markdown\":null},\"datasourceWarning\":false,\"expressionType\"\
-  :\"SIMPLE\",\"hasCustomLabel\":true,\"label\":\"ml13\",\"optionName\":\"metric_rkhf4715a7n_hje7mft8u8b\"\
-  ,\"sqlExpression\":null},{\"aggregate\":\"SUM\",\"column\":{\"advanced_data_type\"\
-  :null,\"certification_details\":null,\"certified_by\":null,\"column_name\":\"fl13\"\
-  ,\"description\":null,\"expression\":null,\"filterable\":true,\"groupby\":true,\"\
-  id\":1015,\"is_certified\":false,\"is_dttm\":false,\"python_date_format\":null,\"\
-  type\":\"INTEGER\",\"type_generic\":0,\"verbose_name\":\"5-13 \u1786\u17D2\u1793\
-  \u17B6\u17C6 - \u179F\u17D2\u179A (5-13 years - F)\",\"warning_markdown\":null},\"\
-  datasourceWarning\":false,\"expressionType\":\"SIMPLE\",\"hasCustomLabel\":true,\"\
-  label\":\"fl13\",\"optionName\":\"metric_hetx0c4d98u_akb5630plk5\",\"sqlExpression\"\
-  :null},{\"aggregate\":\"SUM\",\"column\":{\"advanced_data_type\":null,\"certification_details\"\
-  :null,\"certified_by\":null,\"column_name\":\"ml24\",\"description\":null,\"expression\"\
-  :null,\"filterable\":true,\"groupby\":true,\"id\":1016,\"is_certified\":false,\"\
-  is_dttm\":false,\"python_date_format\":null,\"type\":\"INTEGER\",\"type_generic\"\
-  :0,\"verbose_name\":\"6-24 \u1786\u17D2\u1793\u17B6\u17C6 - \u1794\u17D2\u179A (6-24\
-  \ years - M)\",\"warning_markdown\":null},\"datasourceWarning\":false,\"expressionType\"\
-  :\"SIMPLE\",\"hasCustomLabel\":true,\"label\":\"ml24\",\"optionName\":\"metric_upzon497jd_m4q2sy24ho\"\
-  ,\"sqlExpression\":null},{\"aggregate\":\"SUM\",\"column\":{\"advanced_data_type\"\
-  :null,\"certification_details\":null,\"certified_by\":null,\"column_name\":\"fl24\"\
-  ,\"description\":null,\"expression\":null,\"filterable\":true,\"groupby\":true,\"\
-  id\":1017,\"is_certified\":false,\"is_dttm\":false,\"python_date_format\":null,\"\
-  type\":\"INTEGER\",\"type_generic\":0,\"verbose_name\":\"6-24 \u1786\u17D2\u1793\
-  \u17B6\u17C6 - \u179F\u17D2\u179A (6-24 years - F)\",\"warning_markdown\":null},\"\
-  datasourceWarning\":false,\"expressionType\":\"SIMPLE\",\"hasCustomLabel\":true,\"\
-  label\":\"fl24\",\"optionName\":\"metric_3ahinowa0co_wconc4twrm\",\"sqlExpression\"\
-  :null},{\"aggregate\":\"SUM\",\"column\":{\"advanced_data_type\":null,\"certification_details\"\
-  :null,\"certified_by\":null,\"column_name\":\"ml49\",\"description\":null,\"expression\"\
-  :null,\"filterable\":true,\"groupby\":true,\"id\":1018,\"is_certified\":false,\"\
-  is_dttm\":false,\"python_date_format\":null,\"type\":\"INTEGER\",\"type_generic\"\
-  :0,\"verbose_name\":\"25-49 \u1786\u17D2\u1793\u17B6\u17C6 - \u1794\u17D2\u179A\
-  \ (25-49 years - M)\",\"warning_markdown\":null},\"datasourceWarning\":false,\"\
-  expressionType\":\"SIMPLE\",\"hasCustomLabel\":true,\"label\":\"ml49\",\"optionName\"\
-  :\"metric_hvu9txw0l09_roudzl9xuf\",\"sqlExpression\":null},{\"aggregate\":\"SUM\"\
-  ,\"column\":{\"advanced_data_type\":null,\"certification_details\":null,\"certified_by\"\
-  :null,\"column_name\":\"fl49\",\"description\":null,\"expression\":null,\"filterable\"\
-  :true,\"groupby\":true,\"id\":1019,\"is_certified\":false,\"is_dttm\":false,\"python_date_format\"\
-  :null,\"type\":\"INTEGER\",\"type_generic\":0,\"verbose_name\":\"25-49 \u1786\u17D2\
-  \u1793\u17B6\u17C6 - \u179F\u17D2\u179A (25-49 years - F)\",\"warning_markdown\"\
-  :null},\"datasourceWarning\":false,\"expressionType\":\"SIMPLE\",\"hasCustomLabel\"\
-  :true,\"label\":\"fl49\",\"optionName\":\"metric_65ue2jt9rww_dma3t4fsom6\",\"sqlExpression\"\
-  :null},{\"aggregate\":\"SUM\",\"column\":{\"advanced_data_type\":null,\"certification_details\"\
-  :null,\"certified_by\":null,\"column_name\":\"ml64\",\"description\":null,\"expression\"\
-  :null,\"filterable\":true,\"groupby\":true,\"id\":1020,\"is_certified\":false,\"\
-  is_dttm\":false,\"python_date_format\":null,\"type\":\"INTEGER\",\"type_generic\"\
-  :0,\"verbose_name\":\"50-64 \u1786\u17D2\u1793\u17B6\u17C6 - \u1794\u17D2\u179A\
-  \ (50-64 years - M)\",\"warning_markdown\":null},\"datasourceWarning\":false,\"\
-  expressionType\":\"SIMPLE\",\"hasCustomLabel\":true,\"label\":\"ml64\",\"optionName\"\
-  :\"metric_2kn0w4isb0i_fvbtjb54n0e\",\"sqlExpression\":null},{\"aggregate\":\"SUM\"\
-  ,\"column\":{\"advanced_data_type\":null,\"certification_details\":null,\"certified_by\"\
-  :null,\"column_name\":\"fl64\",\"description\":null,\"expression\":null,\"filterable\"\
-  :true,\"groupby\":true,\"id\":1021,\"is_certified\":false,\"is_dttm\":false,\"python_date_format\"\
-  :null,\"type\":\"INTEGER\",\"type_generic\":0,\"verbose_name\":\"50-64 \u1786\u17D2\
-  \u1793\u17B6\u17C6 - \u179F\u17D2\u179A (50-64 years - F)\",\"warning_markdown\"\
-  :null},\"datasourceWarning\":false,\"expressionType\":\"SIMPLE\",\"hasCustomLabel\"\
-  :true,\"label\":\"fl64\",\"optionName\":\"metric_9zh1hcelxz_0i58yqrywmdn\",\"sqlExpression\"\
-  :null},{\"aggregate\":\"SUM\",\"column\":{\"advanced_data_type\":null,\"certification_details\"\
-  :null,\"certified_by\":null,\"column_name\":\"mg64\",\"description\":null,\"expression\"\
-  :null,\"filterable\":true,\"groupby\":true,\"id\":1022,\"is_certified\":false,\"\
-  is_dttm\":false,\"python_date_format\":null,\"type\":\"INTEGER\",\"type_generic\"\
-  :0,\"verbose_name\":\">=65 \u1786\u17D2\u1793\u17B6\u17C6 - \u1794\u17D2\u179A (>=65\
-  \ years - M)\",\"warning_markdown\":null},\"datasourceWarning\":false,\"expressionType\"\
-  :\"SIMPLE\",\"hasCustomLabel\":true,\"label\":\"mg64\",\"optionName\":\"metric_vf77119z33b_0uxcz6tqzle\"\
-  ,\"sqlExpression\":null},{\"aggregate\":\"SUM\",\"column\":{\"advanced_data_type\"\
-  :null,\"certification_details\":null,\"certified_by\":null,\"column_name\":\"fg64\"\
-  ,\"description\":null,\"expression\":null,\"filterable\":true,\"groupby\":true,\"\
-  id\":1023,\"is_certified\":false,\"is_dttm\":false,\"python_date_format\":null,\"\
-  type\":\"INTEGER\",\"type_generic\":0,\"verbose_name\":\">=65 \u1786\u17D2\u1793\
-  \u17B6\u17C6 - \u179F\u17D2\u179A (>=65 years - F)\",\"warning_markdown\":null},\"\
-  datasourceWarning\":false,\"expressionType\":\"SIMPLE\",\"hasCustomLabel\":true,\"\
-  label\":\"fg64\",\"optionName\":\"metric_jat7hkqeimc_011p8qdetegr\",\"sqlExpression\"\
-  :null},{\"aggregate\":null,\"column\":null,\"datasourceWarning\":false,\"expressionType\"\
-  :\"SQL\",\"hasCustomLabel\":true,\"label\":\"\u179F\u179A\u17BB\u1794 - \u1794\u17D2\
-  \u179A (Total - M)\",\"optionName\":\"metric_q84jwa2qttq_fwsun06q5a\",\"sqlExpression\"\
-  :\"SUM(ml28d) + SUM(ml12m) + SUM(ml4) + SUM(ml13) + SUM(ml24) + SUM(ml49) + SUM(ml64)\
-  \ + SUM(mg64)\"},{\"aggregate\":null,\"column\":null,\"datasourceWarning\":false,\"\
-  expressionType\":\"SQL\",\"hasCustomLabel\":true,\"label\":\"\u179F\u179A\u17BB\u1794\
-  \ - \u179F\u17D2\u179A (Total - F)\",\"optionName\":\"metric_3aql3e4v2lj_mlqfs3tafw\"\
-  ,\"sqlExpression\":\"SUM(fl28d) + SUM(fl12m) + SUM(fl4) + SUM(fl13) + SUM(fl24)\
-  \ + SUM(fl49) + SUM(fl64) + SUM(fg64)\"}],\"orderby\":[[{\"aggregate\":\"SUM\",\"\
-  column\":{\"advanced_data_type\":null,\"certification_details\":null,\"certified_by\"\
-  :null,\"column_name\":\"ml28d\",\"description\":null,\"expression\":null,\"filterable\"\
-  :true,\"groupby\":true,\"id\":1008,\"is_certified\":false,\"is_dttm\":false,\"python_date_format\"\
-  :null,\"type\":\"INTEGER\",\"type_generic\":0,\"verbose_name\":\"0-28 \u1790\u17D2\
-  \u1784\u17C3 - \u1794\u17D2\u179A (0-28 day - M)\",\"warning_markdown\":null},\"\
-  datasourceWarning\":false,\"expressionType\":\"SIMPLE\",\"hasCustomLabel\":true,\"\
-  label\":\"ml28d\",\"optionName\":\"metric_k5ulvn1e85_ebfrsgpjae5\",\"sqlExpression\"\
-  :null},false]],\"annotation_layers\":[],\"row_limit\":10000,\"series_limit\":0,\"\
-  order_desc\":false,\"url_params\":{},\"custom_params\":{},\"custom_form_data\":{},\"\
-  post_processing\":[]},{\"time_range\":\"DATEADD(DATETIME(\\\"now\\\"), -1, year)\
-  \ : now\",\"granularity\":\"visit_date\",\"filters\":[],\"extras\":{\"time_grain_sqla\"\
-  :\"P1D\",\"having\":\"\",\"where\":\"\"},\"applied_time_extras\":{},\"columns\"\
-  :[],\"metrics\":[{\"aggregate\":\"SUM\",\"column\":{\"advanced_data_type\":null,\"\
-  certification_details\":null,\"certified_by\":null,\"column_name\":\"ml28d\",\"\
-  description\":null,\"expression\":null,\"filterable\":true,\"groupby\":true,\"id\"\
-  :1008,\"is_certified\":false,\"is_dttm\":false,\"python_date_format\":null,\"type\"\
-  :\"INTEGER\",\"type_generic\":0,\"verbose_name\":\"0-28 \u1790\u17D2\u1784\u17C3\
-  \ - \u1794\u17D2\u179A (0-28 day - M)\",\"warning_markdown\":null},\"datasourceWarning\"\
-  :false,\"expressionType\":\"SIMPLE\",\"hasCustomLabel\":true,\"label\":\"ml28d\"\
-  ,\"optionName\":\"metric_k5ulvn1e85_ebfrsgpjae5\",\"sqlExpression\":null},{\"aggregate\"\
-  :\"SUM\",\"column\":{\"advanced_data_type\":null,\"certification_details\":null,\"\
-  certified_by\":null,\"column_name\":\"fl28d\",\"description\":null,\"expression\"\
-  :null,\"filterable\":true,\"groupby\":true,\"id\":1009,\"is_certified\":false,\"\
-  is_dttm\":false,\"python_date_format\":null,\"type\":\"INTEGER\",\"type_generic\"\
-  :0,\"verbose_name\":\"0-28 \u1790\u17D2\u1784\u17C3 - \u179F\u17D2\u179A (0-28 days\
-  \ - F)\",\"warning_markdown\":null},\"datasourceWarning\":false,\"expressionType\"\
-  :\"SIMPLE\",\"hasCustomLabel\":true,\"label\":\"fl28d\",\"optionName\":\"metric_8n3gpfy30y_horxf7jjgou\"\
-  ,\"sqlExpression\":null},{\"aggregate\":\"SUM\",\"column\":{\"advanced_data_type\"\
-  :null,\"certification_details\":null,\"certified_by\":null,\"column_name\":\"ml12m\"\
-  ,\"description\":null,\"expression\":null,\"filterable\":true,\"groupby\":true,\"\
-  id\":1010,\"is_certified\":false,\"is_dttm\":false,\"python_date_format\":null,\"\
-  type\":\"INTEGER\",\"type_generic\":0,\"verbose_name\":\"29 \u1790\u17D2\u1784\u17C3\
-  -11 \u1781\u17C2 - \u1794\u17D2\u179A (29 days - 11 months - M)\",\"warning_markdown\"\
-  :null},\"datasourceWarning\":false,\"expressionType\":\"SIMPLE\",\"hasCustomLabel\"\
-  :true,\"label\":\"ml12m\",\"optionName\":\"metric_eie6bn2a3wm_5iocmsnpbn4\",\"sqlExpression\"\
-  :null},{\"aggregate\":\"SUM\",\"column\":{\"advanced_data_type\":null,\"certification_details\"\
-  :null,\"certified_by\":null,\"column_name\":\"ml4\",\"description\":null,\"expression\"\
-  :null,\"filterable\":true,\"groupby\":true,\"id\":1012,\"is_certified\":false,\"\
-  is_dttm\":false,\"python_date_format\":null,\"type\":\"INTEGER\",\"type_generic\"\
-  :0,\"verbose_name\":\"1-4 \u1786\u17D2\u1793\u17B6\u17C6 - \u1794\u17D2\u179A (1-4\
-  \ years - M)\",\"warning_markdown\":null},\"datasourceWarning\":false,\"expressionType\"\
-  :\"SIMPLE\",\"hasCustomLabel\":true,\"label\":\"ml4\",\"optionName\":\"metric_yadhl1wuaxe_274di2eq3ok\"\
-  ,\"sqlExpression\":null},{\"aggregate\":\"SUM\",\"column\":{\"advanced_data_type\"\
-  :null,\"certification_details\":null,\"certified_by\":null,\"column_name\":\"fl4\"\
-  ,\"description\":null,\"expression\":null,\"filterable\":true,\"groupby\":true,\"\
-  id\":1013,\"is_certified\":false,\"is_dttm\":false,\"python_date_format\":null,\"\
-  type\":\"INTEGER\",\"type_generic\":0,\"verbose_name\":\"1-4 \u1786\u17D2\u1793\u17B6\
-  \u17C6 - \u179F\u17D2\u179A (1-4 years - F)\",\"warning_markdown\":null},\"datasourceWarning\"\
-  :false,\"expressionType\":\"SIMPLE\",\"hasCustomLabel\":true,\"label\":\"fl4\",\"\
-  optionName\":\"metric_ujxemhzslv_rej623k4t9\",\"sqlExpression\":null},{\"aggregate\"\
-  :\"SUM\",\"column\":{\"advanced_data_type\":null,\"certification_details\":null,\"\
-  certified_by\":null,\"column_name\":\"ml13\",\"description\":null,\"expression\"\
-  :null,\"filterable\":true,\"groupby\":true,\"id\":1014,\"is_certified\":false,\"\
-  is_dttm\":false,\"python_date_format\":null,\"type\":\"INTEGER\",\"type_generic\"\
-  :0,\"verbose_name\":\"5-13 \u1786\u17D2\u1793\u17B6\u17C6 - \u1794\u17D2\u179A (5-13\
-  \ years - M)\",\"warning_markdown\":null},\"datasourceWarning\":false,\"expressionType\"\
-  :\"SIMPLE\",\"hasCustomLabel\":true,\"label\":\"ml13\",\"optionName\":\"metric_rkhf4715a7n_hje7mft8u8b\"\
-  ,\"sqlExpression\":null},{\"aggregate\":\"SUM\",\"column\":{\"advanced_data_type\"\
-  :null,\"certification_details\":null,\"certified_by\":null,\"column_name\":\"fl13\"\
-  ,\"description\":null,\"expression\":null,\"filterable\":true,\"groupby\":true,\"\
-  id\":1015,\"is_certified\":false,\"is_dttm\":false,\"python_date_format\":null,\"\
-  type\":\"INTEGER\",\"type_generic\":0,\"verbose_name\":\"5-13 \u1786\u17D2\u1793\
-  \u17B6\u17C6 - \u179F\u17D2\u179A (5-13 years - F)\",\"warning_markdown\":null},\"\
-  datasourceWarning\":false,\"expressionType\":\"SIMPLE\",\"hasCustomLabel\":true,\"\
-  label\":\"fl13\",\"optionName\":\"metric_hetx0c4d98u_akb5630plk5\",\"sqlExpression\"\
-  :null},{\"aggregate\":\"SUM\",\"column\":{\"advanced_data_type\":null,\"certification_details\"\
-  :null,\"certified_by\":null,\"column_name\":\"ml24\",\"description\":null,\"expression\"\
-  :null,\"filterable\":true,\"groupby\":true,\"id\":1016,\"is_certified\":false,\"\
-  is_dttm\":false,\"python_date_format\":null,\"type\":\"INTEGER\",\"type_generic\"\
-  :0,\"verbose_name\":\"6-24 \u1786\u17D2\u1793\u17B6\u17C6 - \u1794\u17D2\u179A (6-24\
-  \ years - M)\",\"warning_markdown\":null},\"datasourceWarning\":false,\"expressionType\"\
-  :\"SIMPLE\",\"hasCustomLabel\":true,\"label\":\"ml24\",\"optionName\":\"metric_upzon497jd_m4q2sy24ho\"\
-  ,\"sqlExpression\":null},{\"aggregate\":\"SUM\",\"column\":{\"advanced_data_type\"\
-  :null,\"certification_details\":null,\"certified_by\":null,\"column_name\":\"fl24\"\
-  ,\"description\":null,\"expression\":null,\"filterable\":true,\"groupby\":true,\"\
-  id\":1017,\"is_certified\":false,\"is_dttm\":false,\"python_date_format\":null,\"\
-  type\":\"INTEGER\",\"type_generic\":0,\"verbose_name\":\"6-24 \u1786\u17D2\u1793\
-  \u17B6\u17C6 - \u179F\u17D2\u179A (6-24 years - F)\",\"warning_markdown\":null},\"\
-  datasourceWarning\":false,\"expressionType\":\"SIMPLE\",\"hasCustomLabel\":true,\"\
-  label\":\"fl24\",\"optionName\":\"metric_3ahinowa0co_wconc4twrm\",\"sqlExpression\"\
-  :null},{\"aggregate\":\"SUM\",\"column\":{\"advanced_data_type\":null,\"certification_details\"\
-  :null,\"certified_by\":null,\"column_name\":\"ml49\",\"description\":null,\"expression\"\
-  :null,\"filterable\":true,\"groupby\":true,\"id\":1018,\"is_certified\":false,\"\
-  is_dttm\":false,\"python_date_format\":null,\"type\":\"INTEGER\",\"type_generic\"\
-  :0,\"verbose_name\":\"25-49 \u1786\u17D2\u1793\u17B6\u17C6 - \u1794\u17D2\u179A\
-  \ (25-49 years - M)\",\"warning_markdown\":null},\"datasourceWarning\":false,\"\
-  expressionType\":\"SIMPLE\",\"hasCustomLabel\":true,\"label\":\"ml49\",\"optionName\"\
-  :\"metric_hvu9txw0l09_roudzl9xuf\",\"sqlExpression\":null},{\"aggregate\":\"SUM\"\
-  ,\"column\":{\"advanced_data_type\":null,\"certification_details\":null,\"certified_by\"\
-  :null,\"column_name\":\"fl49\",\"description\":null,\"expression\":null,\"filterable\"\
-  :true,\"groupby\":true,\"id\":1019,\"is_certified\":false,\"is_dttm\":false,\"python_date_format\"\
-  :null,\"type\":\"INTEGER\",\"type_generic\":0,\"verbose_name\":\"25-49 \u1786\u17D2\
-  \u1793\u17B6\u17C6 - \u179F\u17D2\u179A (25-49 years - F)\",\"warning_markdown\"\
-  :null},\"datasourceWarning\":false,\"expressionType\":\"SIMPLE\",\"hasCustomLabel\"\
-  :true,\"label\":\"fl49\",\"optionName\":\"metric_65ue2jt9rww_dma3t4fsom6\",\"sqlExpression\"\
-  :null},{\"aggregate\":\"SUM\",\"column\":{\"advanced_data_type\":null,\"certification_details\"\
-  :null,\"certified_by\":null,\"column_name\":\"ml64\",\"description\":null,\"expression\"\
-  :null,\"filterable\":true,\"groupby\":true,\"id\":1020,\"is_certified\":false,\"\
-  is_dttm\":false,\"python_date_format\":null,\"type\":\"INTEGER\",\"type_generic\"\
-  :0,\"verbose_name\":\"50-64 \u1786\u17D2\u1793\u17B6\u17C6 - \u1794\u17D2\u179A\
-  \ (50-64 years - M)\",\"warning_markdown\":null},\"datasourceWarning\":false,\"\
-  expressionType\":\"SIMPLE\",\"hasCustomLabel\":true,\"label\":\"ml64\",\"optionName\"\
-  :\"metric_2kn0w4isb0i_fvbtjb54n0e\",\"sqlExpression\":null},{\"aggregate\":\"SUM\"\
-  ,\"column\":{\"advanced_data_type\":null,\"certification_details\":null,\"certified_by\"\
-  :null,\"column_name\":\"fl64\",\"description\":null,\"expression\":null,\"filterable\"\
-  :true,\"groupby\":true,\"id\":1021,\"is_certified\":false,\"is_dttm\":false,\"python_date_format\"\
-  :null,\"type\":\"INTEGER\",\"type_generic\":0,\"verbose_name\":\"50-64 \u1786\u17D2\
-  \u1793\u17B6\u17C6 - \u179F\u17D2\u179A (50-64 years - F)\",\"warning_markdown\"\
-  :null},\"datasourceWarning\":false,\"expressionType\":\"SIMPLE\",\"hasCustomLabel\"\
-  :true,\"label\":\"fl64\",\"optionName\":\"metric_9zh1hcelxz_0i58yqrywmdn\",\"sqlExpression\"\
-  :null},{\"aggregate\":\"SUM\",\"column\":{\"advanced_data_type\":null,\"certification_details\"\
-  :null,\"certified_by\":null,\"column_name\":\"mg64\",\"description\":null,\"expression\"\
-  :null,\"filterable\":true,\"groupby\":true,\"id\":1022,\"is_certified\":false,\"\
-  is_dttm\":false,\"python_date_format\":null,\"type\":\"INTEGER\",\"type_generic\"\
-  :0,\"verbose_name\":\">=65 \u1786\u17D2\u1793\u17B6\u17C6 - \u1794\u17D2\u179A (>=65\
-  \ years - M)\",\"warning_markdown\":null},\"datasourceWarning\":false,\"expressionType\"\
-  :\"SIMPLE\",\"hasCustomLabel\":true,\"label\":\"mg64\",\"optionName\":\"metric_vf77119z33b_0uxcz6tqzle\"\
-  ,\"sqlExpression\":null},{\"aggregate\":\"SUM\",\"column\":{\"advanced_data_type\"\
-  :null,\"certification_details\":null,\"certified_by\":null,\"column_name\":\"fg64\"\
-  ,\"description\":null,\"expression\":null,\"filterable\":true,\"groupby\":true,\"\
-  id\":1023,\"is_certified\":false,\"is_dttm\":false,\"python_date_format\":null,\"\
-  type\":\"INTEGER\",\"type_generic\":0,\"verbose_name\":\">=65 \u1786\u17D2\u1793\
-  \u17B6\u17C6 - \u179F\u17D2\u179A (>=65 years - F)\",\"warning_markdown\":null},\"\
-  datasourceWarning\":false,\"expressionType\":\"SIMPLE\",\"hasCustomLabel\":true,\"\
-  label\":\"fg64\",\"optionName\":\"metric_jat7hkqeimc_011p8qdetegr\",\"sqlExpression\"\
-  :null},{\"aggregate\":null,\"column\":null,\"datasourceWarning\":false,\"expressionType\"\
-  :\"SQL\",\"hasCustomLabel\":true,\"label\":\"\u179F\u179A\u17BB\u1794 - \u1794\u17D2\
-  \u179A (Total - M)\",\"optionName\":\"metric_q84jwa2qttq_fwsun06q5a\",\"sqlExpression\"\
-  :\"SUM(ml28d) + SUM(ml12m) + SUM(ml4) + SUM(ml13) + SUM(ml24) + SUM(ml49) + SUM(ml64)\
-  \ + SUM(mg64)\"},{\"aggregate\":null,\"column\":null,\"datasourceWarning\":false,\"\
-  expressionType\":\"SQL\",\"hasCustomLabel\":true,\"label\":\"\u179F\u179A\u17BB\u1794\
-  \ - \u179F\u17D2\u179A (Total - F)\",\"optionName\":\"metric_3aql3e4v2lj_mlqfs3tafw\"\
-  ,\"sqlExpression\":\"SUM(fl28d) + SUM(fl12m) + SUM(fl4) + SUM(fl13) + SUM(fl24)\
-  \ + SUM(fl49) + SUM(fl64) + SUM(fg64)\"}],\"annotation_layers\":[],\"row_limit\"\
-  :0,\"row_offset\":0,\"series_limit\":0,\"url_params\":{},\"custom_params\":{},\"\
-  custom_form_data\":{},\"post_processing\":[]}],\"form_data\":{\"datasource\":\"\
-  31__table\",\"viz_type\":\"table\",\"slice_id\":143,\"granularity_sqla\":\"visit_date\"\
-  ,\"time_grain_sqla\":\"P1D\",\"time_range\":\"DATEADD(DATETIME(\\\"now\\\"), -1,\
-  \ year) : now\",\"query_mode\":\"aggregate\",\"groupby\":[\"diagnosis\"],\"metrics\"\
-  :[{\"aggregate\":\"SUM\",\"column\":{\"advanced_data_type\":null,\"certification_details\"\
-  :null,\"certified_by\":null,\"column_name\":\"ml28d\",\"description\":null,\"expression\"\
-  :null,\"filterable\":true,\"groupby\":true,\"id\":1008,\"is_certified\":false,\"\
-  is_dttm\":false,\"python_date_format\":null,\"type\":\"INTEGER\",\"type_generic\"\
-  :0,\"verbose_name\":\"0-28 \u1790\u17D2\u1784\u17C3 - \u1794\u17D2\u179A (0-28 day\
-  \ - M)\",\"warning_markdown\":null},\"datasourceWarning\":false,\"expressionType\"\
-  :\"SIMPLE\",\"hasCustomLabel\":true,\"label\":\"ml28d\",\"optionName\":\"metric_k5ulvn1e85_ebfrsgpjae5\"\
-  ,\"sqlExpression\":null},{\"aggregate\":\"SUM\",\"column\":{\"advanced_data_type\"\
-  :null,\"certification_details\":null,\"certified_by\":null,\"column_name\":\"fl28d\"\
-  ,\"description\":null,\"expression\":null,\"filterable\":true,\"groupby\":true,\"\
-  id\":1009,\"is_certified\":false,\"is_dttm\":false,\"python_date_format\":null,\"\
-  type\":\"INTEGER\",\"type_generic\":0,\"verbose_name\":\"0-28 \u1790\u17D2\u1784\
-  \u17C3 - \u179F\u17D2\u179A (0-28 days - F)\",\"warning_markdown\":null},\"datasourceWarning\"\
-  :false,\"expressionType\":\"SIMPLE\",\"hasCustomLabel\":true,\"label\":\"fl28d\"\
-  ,\"optionName\":\"metric_8n3gpfy30y_horxf7jjgou\",\"sqlExpression\":null},{\"aggregate\"\
-  :\"SUM\",\"column\":{\"advanced_data_type\":null,\"certification_details\":null,\"\
-  certified_by\":null,\"column_name\":\"ml12m\",\"description\":null,\"expression\"\
-  :null,\"filterable\":true,\"groupby\":true,\"id\":1010,\"is_certified\":false,\"\
-  is_dttm\":false,\"python_date_format\":null,\"type\":\"INTEGER\",\"type_generic\"\
-  :0,\"verbose_name\":\"29 \u1790\u17D2\u1784\u17C3-11 \u1781\u17C2 - \u1794\u17D2\
-  \u179A (29 days - 11 months - M)\",\"warning_markdown\":null},\"datasourceWarning\"\
-  :false,\"expressionType\":\"SIMPLE\",\"hasCustomLabel\":true,\"label\":\"ml12m\"\
-  ,\"optionName\":\"metric_eie6bn2a3wm_5iocmsnpbn4\",\"sqlExpression\":null},{\"aggregate\"\
-  :\"SUM\",\"column\":{\"advanced_data_type\":null,\"certification_details\":null,\"\
-  certified_by\":null,\"column_name\":\"ml4\",\"description\":null,\"expression\"\
-  :null,\"filterable\":true,\"groupby\":true,\"id\":1012,\"is_certified\":false,\"\
-  is_dttm\":false,\"python_date_format\":null,\"type\":\"INTEGER\",\"type_generic\"\
-  :0,\"verbose_name\":\"1-4 \u1786\u17D2\u1793\u17B6\u17C6 - \u1794\u17D2\u179A (1-4\
-  \ years - M)\",\"warning_markdown\":null},\"datasourceWarning\":false,\"expressionType\"\
-  :\"SIMPLE\",\"hasCustomLabel\":true,\"label\":\"ml4\",\"optionName\":\"metric_yadhl1wuaxe_274di2eq3ok\"\
-  ,\"sqlExpression\":null},{\"aggregate\":\"SUM\",\"column\":{\"advanced_data_type\"\
-  :null,\"certification_details\":null,\"certified_by\":null,\"column_name\":\"fl4\"\
-  ,\"description\":null,\"expression\":null,\"filterable\":true,\"groupby\":true,\"\
-  id\":1013,\"is_certified\":false,\"is_dttm\":false,\"python_date_format\":null,\"\
-  type\":\"INTEGER\",\"type_generic\":0,\"verbose_name\":\"1-4 \u1786\u17D2\u1793\u17B6\
-  \u17C6 - \u179F\u17D2\u179A (1-4 years - F)\",\"warning_markdown\":null},\"datasourceWarning\"\
-  :false,\"expressionType\":\"SIMPLE\",\"hasCustomLabel\":true,\"label\":\"fl4\",\"\
-  optionName\":\"metric_ujxemhzslv_rej623k4t9\",\"sqlExpression\":null},{\"aggregate\"\
-  :\"SUM\",\"column\":{\"advanced_data_type\":null,\"certification_details\":null,\"\
-  certified_by\":null,\"column_name\":\"ml13\",\"description\":null,\"expression\"\
-  :null,\"filterable\":true,\"groupby\":true,\"id\":1014,\"is_certified\":false,\"\
-  is_dttm\":false,\"python_date_format\":null,\"type\":\"INTEGER\",\"type_generic\"\
-  :0,\"verbose_name\":\"5-13 \u1786\u17D2\u1793\u17B6\u17C6 - \u1794\u17D2\u179A (5-13\
-  \ years - M)\",\"warning_markdown\":null},\"datasourceWarning\":false,\"expressionType\"\
-  :\"SIMPLE\",\"hasCustomLabel\":true,\"label\":\"ml13\",\"optionName\":\"metric_rkhf4715a7n_hje7mft8u8b\"\
-  ,\"sqlExpression\":null},{\"aggregate\":\"SUM\",\"column\":{\"advanced_data_type\"\
-  :null,\"certification_details\":null,\"certified_by\":null,\"column_name\":\"fl13\"\
-  ,\"description\":null,\"expression\":null,\"filterable\":true,\"groupby\":true,\"\
-  id\":1015,\"is_certified\":false,\"is_dttm\":false,\"python_date_format\":null,\"\
-  type\":\"INTEGER\",\"type_generic\":0,\"verbose_name\":\"5-13 \u1786\u17D2\u1793\
-  \u17B6\u17C6 - \u179F\u17D2\u179A (5-13 years - F)\",\"warning_markdown\":null},\"\
-  datasourceWarning\":false,\"expressionType\":\"SIMPLE\",\"hasCustomLabel\":true,\"\
-  label\":\"fl13\",\"optionName\":\"metric_hetx0c4d98u_akb5630plk5\",\"sqlExpression\"\
-  :null},{\"aggregate\":\"SUM\",\"column\":{\"advanced_data_type\":null,\"certification_details\"\
-  :null,\"certified_by\":null,\"column_name\":\"ml24\",\"description\":null,\"expression\"\
-  :null,\"filterable\":true,\"groupby\":true,\"id\":1016,\"is_certified\":false,\"\
-  is_dttm\":false,\"python_date_format\":null,\"type\":\"INTEGER\",\"type_generic\"\
-  :0,\"verbose_name\":\"6-24 \u1786\u17D2\u1793\u17B6\u17C6 - \u1794\u17D2\u179A (6-24\
-  \ years - M)\",\"warning_markdown\":null},\"datasourceWarning\":false,\"expressionType\"\
-  :\"SIMPLE\",\"hasCustomLabel\":true,\"label\":\"ml24\",\"optionName\":\"metric_upzon497jd_m4q2sy24ho\"\
-  ,\"sqlExpression\":null},{\"aggregate\":\"SUM\",\"column\":{\"advanced_data_type\"\
-  :null,\"certification_details\":null,\"certified_by\":null,\"column_name\":\"fl24\"\
-  ,\"description\":null,\"expression\":null,\"filterable\":true,\"groupby\":true,\"\
-  id\":1017,\"is_certified\":false,\"is_dttm\":false,\"python_date_format\":null,\"\
-  type\":\"INTEGER\",\"type_generic\":0,\"verbose_name\":\"6-24 \u1786\u17D2\u1793\
-  \u17B6\u17C6 - \u179F\u17D2\u179A (6-24 years - F)\",\"warning_markdown\":null},\"\
-  datasourceWarning\":false,\"expressionType\":\"SIMPLE\",\"hasCustomLabel\":true,\"\
-  label\":\"fl24\",\"optionName\":\"metric_3ahinowa0co_wconc4twrm\",\"sqlExpression\"\
-  :null},{\"aggregate\":\"SUM\",\"column\":{\"advanced_data_type\":null,\"certification_details\"\
-  :null,\"certified_by\":null,\"column_name\":\"ml49\",\"description\":null,\"expression\"\
-  :null,\"filterable\":true,\"groupby\":true,\"id\":1018,\"is_certified\":false,\"\
-  is_dttm\":false,\"python_date_format\":null,\"type\":\"INTEGER\",\"type_generic\"\
-  :0,\"verbose_name\":\"25-49 \u1786\u17D2\u1793\u17B6\u17C6 - \u1794\u17D2\u179A\
-  \ (25-49 years - M)\",\"warning_markdown\":null},\"datasourceWarning\":false,\"\
-  expressionType\":\"SIMPLE\",\"hasCustomLabel\":true,\"label\":\"ml49\",\"optionName\"\
-  :\"metric_hvu9txw0l09_roudzl9xuf\",\"sqlExpression\":null},{\"aggregate\":\"SUM\"\
-  ,\"column\":{\"advanced_data_type\":null,\"certification_details\":null,\"certified_by\"\
-  :null,\"column_name\":\"fl49\",\"description\":null,\"expression\":null,\"filterable\"\
-  :true,\"groupby\":true,\"id\":1019,\"is_certified\":false,\"is_dttm\":false,\"python_date_format\"\
-  :null,\"type\":\"INTEGER\",\"type_generic\":0,\"verbose_name\":\"25-49 \u1786\u17D2\
-  \u1793\u17B6\u17C6 - \u179F\u17D2\u179A (25-49 years - F)\",\"warning_markdown\"\
-  :null},\"datasourceWarning\":false,\"expressionType\":\"SIMPLE\",\"hasCustomLabel\"\
-  :true,\"label\":\"fl49\",\"optionName\":\"metric_65ue2jt9rww_dma3t4fsom6\",\"sqlExpression\"\
-  :null},{\"aggregate\":\"SUM\",\"column\":{\"advanced_data_type\":null,\"certification_details\"\
-  :null,\"certified_by\":null,\"column_name\":\"ml64\",\"description\":null,\"expression\"\
-  :null,\"filterable\":true,\"groupby\":true,\"id\":1020,\"is_certified\":false,\"\
-  is_dttm\":false,\"python_date_format\":null,\"type\":\"INTEGER\",\"type_generic\"\
-  :0,\"verbose_name\":\"50-64 \u1786\u17D2\u1793\u17B6\u17C6 - \u1794\u17D2\u179A\
-  \ (50-64 years - M)\",\"warning_markdown\":null},\"datasourceWarning\":false,\"\
-  expressionType\":\"SIMPLE\",\"hasCustomLabel\":true,\"label\":\"ml64\",\"optionName\"\
-  :\"metric_2kn0w4isb0i_fvbtjb54n0e\",\"sqlExpression\":null},{\"aggregate\":\"SUM\"\
-  ,\"column\":{\"advanced_data_type\":null,\"certification_details\":null,\"certified_by\"\
-  :null,\"column_name\":\"fl64\",\"description\":null,\"expression\":null,\"filterable\"\
-  :true,\"groupby\":true,\"id\":1021,\"is_certified\":false,\"is_dttm\":false,\"python_date_format\"\
-  :null,\"type\":\"INTEGER\",\"type_generic\":0,\"verbose_name\":\"50-64 \u1786\u17D2\
-  \u1793\u17B6\u17C6 - \u179F\u17D2\u179A (50-64 years - F)\",\"warning_markdown\"\
-  :null},\"datasourceWarning\":false,\"expressionType\":\"SIMPLE\",\"hasCustomLabel\"\
-  :true,\"label\":\"fl64\",\"optionName\":\"metric_9zh1hcelxz_0i58yqrywmdn\",\"sqlExpression\"\
-  :null},{\"aggregate\":\"SUM\",\"column\":{\"advanced_data_type\":null,\"certification_details\"\
-  :null,\"certified_by\":null,\"column_name\":\"mg64\",\"description\":null,\"expression\"\
-  :null,\"filterable\":true,\"groupby\":true,\"id\":1022,\"is_certified\":false,\"\
-  is_dttm\":false,\"python_date_format\":null,\"type\":\"INTEGER\",\"type_generic\"\
-  :0,\"verbose_name\":\">=65 \u1786\u17D2\u1793\u17B6\u17C6 - \u1794\u17D2\u179A (>=65\
-  \ years - M)\",\"warning_markdown\":null},\"datasourceWarning\":false,\"expressionType\"\
-  :\"SIMPLE\",\"hasCustomLabel\":true,\"label\":\"mg64\",\"optionName\":\"metric_vf77119z33b_0uxcz6tqzle\"\
-  ,\"sqlExpression\":null},{\"aggregate\":\"SUM\",\"column\":{\"advanced_data_type\"\
-  :null,\"certification_details\":null,\"certified_by\":null,\"column_name\":\"fg64\"\
-  ,\"description\":null,\"expression\":null,\"filterable\":true,\"groupby\":true,\"\
-  id\":1023,\"is_certified\":false,\"is_dttm\":false,\"python_date_format\":null,\"\
-  type\":\"INTEGER\",\"type_generic\":0,\"verbose_name\":\">=65 \u1786\u17D2\u1793\
-  \u17B6\u17C6 - \u179F\u17D2\u179A (>=65 years - F)\",\"warning_markdown\":null},\"\
-  datasourceWarning\":false,\"expressionType\":\"SIMPLE\",\"hasCustomLabel\":true,\"\
-  label\":\"fg64\",\"optionName\":\"metric_jat7hkqeimc_011p8qdetegr\",\"sqlExpression\"\
-  :null},{\"aggregate\":null,\"column\":null,\"datasourceWarning\":false,\"expressionType\"\
-  :\"SQL\",\"hasCustomLabel\":true,\"label\":\"\u179F\u179A\u17BB\u1794 - \u1794\u17D2\
-  \u179A (Total - M)\",\"optionName\":\"metric_q84jwa2qttq_fwsun06q5a\",\"sqlExpression\"\
-  :\"SUM(ml28d) + SUM(ml12m) + SUM(ml4) + SUM(ml13) + SUM(ml24) + SUM(ml49) + SUM(ml64)\
-  \ + SUM(mg64)\"},{\"aggregate\":null,\"column\":null,\"datasourceWarning\":false,\"\
-  expressionType\":\"SQL\",\"hasCustomLabel\":true,\"label\":\"\u179F\u179A\u17BB\u1794\
-  \ - \u179F\u17D2\u179A (Total - F)\",\"optionName\":\"metric_3aql3e4v2lj_mlqfs3tafw\"\
-  ,\"sqlExpression\":\"SUM(fl28d) + SUM(fl12m) + SUM(fl4) + SUM(fl13) + SUM(fl24)\
-  \ + SUM(fl49) + SUM(fl64) + SUM(fg64)\"}],\"all_columns\":[],\"percent_metrics\"\
-  :[],\"adhoc_filters\":[],\"order_by_cols\":[],\"row_limit\":10000,\"server_page_length\"\
-  :10,\"order_desc\":false,\"show_totals\":true,\"table_timestamp_format\":\"smart_date\"\
-  ,\"include_search\":true,\"show_cell_bars\":true,\"color_pn\":true,\"column_config\"\
-  :{\"fg64\":{\"d3NumberFormat\":\"~g\",\"d3SmallNumberFormat\":\"~g\",\"showCellBars\"\
-  :false},\"fl13\":{\"d3NumberFormat\":\"~g\",\"d3SmallNumberFormat\":\"~g\",\"showCellBars\"\
-  :false},\"fl24\":{\"d3NumberFormat\":\"~g\",\"d3SmallNumberFormat\":\"~g\",\"showCellBars\"\
-  :false},\"fl28d\":{\"d3NumberFormat\":\"~g\",\"d3SmallNumberFormat\":\"~g\",\"showCellBars\"\
-  :false},\"fl4\":{\"d3NumberFormat\":\"~g\",\"d3SmallNumberFormat\":\"~g\",\"showCellBars\"\
-  :false},\"fl49\":{\"d3NumberFormat\":\"~g\",\"d3SmallNumberFormat\":\"~g\",\"showCellBars\"\
-  :false},\"fl64\":{\"d3NumberFormat\":\"~g\",\"d3SmallNumberFormat\":\"~g\",\"showCellBars\"\
-  :false},\"mg64\":{\"d3NumberFormat\":\"~g\",\"d3SmallNumberFormat\":\"~g\",\"showCellBars\"\
-  :false},\"ml12m\":{\"d3NumberFormat\":\"~g\",\"d3SmallNumberFormat\":\"~g\",\"showCellBars\"\
-  :false},\"ml13\":{\"d3NumberFormat\":\"~g\",\"d3SmallNumberFormat\":\"~g\",\"showCellBars\"\
-  :false},\"ml24\":{\"d3NumberFormat\":\"~g\",\"d3SmallNumberFormat\":\"~g\",\"showCellBars\"\
-  :false},\"ml28d\":{\"d3NumberFormat\":\"~g\",\"d3SmallNumberFormat\":\"~g\",\"showCellBars\"\
-  :false},\"ml4\":{\"d3NumberFormat\":\"~g\",\"d3SmallNumberFormat\":\"~g\",\"showCellBars\"\
-  :false},\"ml49\":{\"d3NumberFormat\":\"~g\",\"d3SmallNumberFormat\":\"~g\",\"showCellBars\"\
-  :false},\"ml64\":{\"d3NumberFormat\":\"~g\",\"d3SmallNumberFormat\":\"~g\",\"showCellBars\"\
-  :false},\"\u179F\u179A\u17BB\u1794 - \u1794\u17D2\u179A (Total - M)\":{\"d3NumberFormat\"\
-  :\"~g\",\"d3SmallNumberFormat\":\"~g\",\"showCellBars\":false},\"\u179F\u179A\u17BB\
-  \u1794 - \u179F\u17D2\u179A (Total - F)\":{\"d3NumberFormat\":\"~g\",\"d3SmallNumberFormat\"\
-  :\"~g\",\"showCellBars\":false}},\"conditional_formatting\":[],\"extra_form_data\"\
-  :{},\"dashboards\":[18],\"force\":false,\"result_format\":\"json\",\"result_type\"\
-  :\"full\"},\"result_format\":\"json\",\"result_type\":\"full\"}"
-cache_timeout: null
-uuid: b3599541-6658-4325-968b-82dd749af4ec
-version: 1.0.0
-dataset_uuid: 48365851-d1d2-451d-b2aa-18a5ffcdd72d
diff --git a/base/configs/superset/assets/charts/NCD_Indicators_26.yaml b/base/configs/superset/assets/charts/NCD_Indicators_21.yaml
similarity index 100%
rename from base/configs/superset/assets/charts/NCD_Indicators_26.yaml
rename to base/configs/superset/assets/charts/NCD_Indicators_21.yaml
diff --git a/base/configs/superset/assets/charts/NCD_Missed_Appointments_Report_34.yaml b/base/configs/superset/assets/charts/NCD_Missed_Appointments_Report_25.yaml
similarity index 100%
rename from base/configs/superset/assets/charts/NCD_Missed_Appointments_Report_34.yaml
rename to base/configs/superset/assets/charts/NCD_Missed_Appointments_Report_25.yaml
diff --git a/base/configs/superset/assets/charts/NCD_Missed_Referrals_Report_2.yaml b/base/configs/superset/assets/charts/NCD_Missed_Referrals_Report_37.yaml
similarity index 100%
rename from base/configs/superset/assets/charts/NCD_Missed_Referrals_Report_2.yaml
rename to base/configs/superset/assets/charts/NCD_Missed_Referrals_Report_37.yaml
diff --git a/base/configs/superset/assets/charts/NCD_RH_EMR_Raw_Data_39.yaml b/base/configs/superset/assets/charts/NCD_RH_EMR_Raw_Data_38.yaml
similarity index 100%
rename from base/configs/superset/assets/charts/NCD_RH_EMR_Raw_Data_39.yaml
rename to base/configs/superset/assets/charts/NCD_RH_EMR_Raw_Data_38.yaml
diff --git a/base/configs/superset/assets/charts/Number_of_CCS_Screening_-_Cumulative_61.yaml b/base/configs/superset/assets/charts/Number_of_CCS_Screening_-_Cumulative_56.yaml
similarity index 100%
rename from base/configs/superset/assets/charts/Number_of_CCS_Screening_-_Cumulative_61.yaml
rename to base/configs/superset/assets/charts/Number_of_CCS_Screening_-_Cumulative_56.yaml
diff --git a/base/configs/superset/assets/charts/Number_of_CCS_Screening_53.yaml b/base/configs/superset/assets/charts/Number_of_CCS_Screening_71.yaml
similarity index 100%
rename from base/configs/superset/assets/charts/Number_of_CCS_Screening_53.yaml
rename to base/configs/superset/assets/charts/Number_of_CCS_Screening_71.yaml
diff --git a/base/configs/superset/assets/charts/Payment_type_72.yaml b/base/configs/superset/assets/charts/Payment_type_24.yaml
similarity index 100%
rename from base/configs/superset/assets/charts/Payment_type_72.yaml
rename to base/configs/superset/assets/charts/Payment_type_24.yaml
diff --git a/base/configs/superset/assets/charts/Payment_type_from_the_start_to_the_end_of_the_selected_59.yaml b/base/configs/superset/assets/charts/Payment_type_from_the_start_to_the_end_of_the_selected_14.yaml
similarity index 100%
rename from base/configs/superset/assets/charts/Payment_type_from_the_start_to_the_end_of_the_selected_59.yaml
rename to base/configs/superset/assets/charts/Payment_type_from_the_start_to_the_end_of_the_selected_14.yaml
diff --git a/base/configs/superset/assets/charts/RH_CSS_Report_41.yaml b/base/configs/superset/assets/charts/RH_CSS_Report_26.yaml
similarity index 100%
rename from base/configs/superset/assets/charts/RH_CSS_Report_41.yaml
rename to base/configs/superset/assets/charts/RH_CSS_Report_26.yaml
diff --git a/base/configs/superset/assets/charts/RH_NCD_OPD_Register_Report_10.yaml b/base/configs/superset/assets/charts/RH_NCD_OPD_Register_Report_46.yaml
similarity index 100%
rename from base/configs/superset/assets/charts/RH_NCD_OPD_Register_Report_10.yaml
rename to base/configs/superset/assets/charts/RH_NCD_OPD_Register_Report_46.yaml
diff --git a/base/configs/superset/assets/charts/Register_-_cumulative_22.yaml b/base/configs/superset/assets/charts/Register_-_cumulative_55.yaml
similarity index 100%
rename from base/configs/superset/assets/charts/Register_-_cumulative_22.yaml
rename to base/configs/superset/assets/charts/Register_-_cumulative_55.yaml
diff --git a/base/configs/superset/assets/charts/Register_23.yaml b/base/configs/superset/assets/charts/Register_39.yaml
similarity index 100%
rename from base/configs/superset/assets/charts/Register_23.yaml
rename to base/configs/superset/assets/charts/Register_39.yaml
diff --git a/base/configs/superset/assets/charts/Registered_patients_aged_40_and_above_have_had_their_NCD_screening_for_the_first_time_with_a_follow-up_date_and_diagnosed_with_Hypertension__Diabetes_and_were_given_medication_with_at_least_a_4_weeks_prescription_4.yaml b/base/configs/superset/assets/charts/Registered_patients_aged_40_and_above_have_had_their_NCD_screening_for_the_first_time_with_a_follow-up_date_and_diagnosed_with_Hypertension__Diabetes_and_were_given_medication_with_at_least_a_4_weeks_prescription_41.yaml
similarity index 99%
rename from base/configs/superset/assets/charts/Registered_patients_aged_40_and_above_have_had_their_NCD_screening_for_the_first_time_with_a_follow-up_date_and_diagnosed_with_Hypertension__Diabetes_and_were_given_medication_with_at_least_a_4_weeks_prescription_4.yaml
rename to base/configs/superset/assets/charts/Registered_patients_aged_40_and_above_have_had_their_NCD_screening_for_the_first_time_with_a_follow-up_date_and_diagnosed_with_Hypertension__Diabetes_and_were_given_medication_with_at_least_a_4_weeks_prescription_41.yaml
index df20aeff..f5ae0257 100644
--- a/base/configs/superset/assets/charts/Registered_patients_aged_40_and_above_have_had_their_NCD_screening_for_the_first_time_with_a_follow-up_date_and_diagnosed_with_Hypertension__Diabetes_and_were_given_medication_with_at_least_a_4_weeks_prescription_4.yaml
+++ b/base/configs/superset/assets/charts/Registered_patients_aged_40_and_above_have_had_their_NCD_screening_for_the_first_time_with_a_follow-up_date_and_diagnosed_with_Hypertension__Diabetes_and_were_given_medication_with_at_least_a_4_weeks_prescription_41.yaml
@@ -124,6 +124,7 @@ params:
   extra_form_data: {}
   dashboards:
   - 13
+  annotation_layers: []
 query_context: '{"datasource":{"id":26,"type":"table"},"force":false,"queries":[{"filters":[{"col":"Visit
   Start date","op":"TEMPORAL_RANGE","val":"No filter"},{"col":"indicator","op":"==","val":"80-pecent-followup-with-hypertension-iabetes-and-medication"}],"extras":{"time_grain_sqla":"P1D","having":"","where":""},"applied_time_extras":{},"columns":["Facility
   Name","Facility District","Facility Province","OpenMRS ID","Patient''s First name","Patient''s
diff --git a/base/configs/superset/assets/charts/Registered_patients_aged_40_and_above_that_have_had_their_NCD_screening_for_the_first_time_1.yaml b/base/configs/superset/assets/charts/Registered_patients_aged_40_and_above_that_have_had_their_NCD_screening_for_the_first_time_49.yaml
similarity index 100%
rename from base/configs/superset/assets/charts/Registered_patients_aged_40_and_above_that_have_had_their_NCD_screening_for_the_first_time_1.yaml
rename to base/configs/superset/assets/charts/Registered_patients_aged_40_and_above_that_have_had_their_NCD_screening_for_the_first_time_49.yaml
diff --git a/base/configs/superset/assets/charts/Registered_women_aged_30_to_49_years_that_have_had_their_CCS_screening_for_the_first_time_48.yaml b/base/configs/superset/assets/charts/Registered_women_aged_30_to_49_years_that_have_had_their_CCS_screening_for_the_first_time_58.yaml
similarity index 99%
rename from base/configs/superset/assets/charts/Registered_women_aged_30_to_49_years_that_have_had_their_CCS_screening_for_the_first_time_48.yaml
rename to base/configs/superset/assets/charts/Registered_women_aged_30_to_49_years_that_have_had_their_CCS_screening_for_the_first_time_58.yaml
index fc25355c..1985babe 100644
--- a/base/configs/superset/assets/charts/Registered_women_aged_30_to_49_years_that_have_had_their_CCS_screening_for_the_first_time_48.yaml
+++ b/base/configs/superset/assets/charts/Registered_women_aged_30_to_49_years_that_have_had_their_CCS_screening_for_the_first_time_58.yaml
@@ -97,6 +97,7 @@ params:
   extra_form_data: {}
   dashboards:
   - 13
+  annotation_layers: []
 query_context: '{"datasource":{"id":13,"type":"table"},"force":false,"queries":[{"filters":[{"col":"Visit
   Start date","op":"TEMPORAL_RANGE","val":"No filter"},{"col":"indicator","op":"IN","val":["80-percent-women-aged-30-49-years-with-ccs-screening-first-time-via-positive-referred","women-aged-30-49-years-with-ccs-screening-first-time"]}],"extras":{"time_grain_sqla":"P1D","having":"","where":""},"applied_time_extras":{},"columns":["Facility
   Name","Facility District","Facility Province","Patient''s Last name","Patient''s
diff --git a/base/configs/superset/assets/charts/Registered_women_aged_30_to_49_years_that_have_had_their_CCS_screening_for_the_first_time_and_were_VIA_positive_and_referred_47.yaml b/base/configs/superset/assets/charts/Registered_women_aged_30_to_49_years_that_have_had_their_CCS_screening_for_the_first_time_and_were_VIA_positive_and_referred_19.yaml
similarity index 99%
rename from base/configs/superset/assets/charts/Registered_women_aged_30_to_49_years_that_have_had_their_CCS_screening_for_the_first_time_and_were_VIA_positive_and_referred_47.yaml
rename to base/configs/superset/assets/charts/Registered_women_aged_30_to_49_years_that_have_had_their_CCS_screening_for_the_first_time_and_were_VIA_positive_and_referred_19.yaml
index fa02d49a..e8fb2282 100644
--- a/base/configs/superset/assets/charts/Registered_women_aged_30_to_49_years_that_have_had_their_CCS_screening_for_the_first_time_and_were_VIA_positive_and_referred_47.yaml
+++ b/base/configs/superset/assets/charts/Registered_women_aged_30_to_49_years_that_have_had_their_CCS_screening_for_the_first_time_and_were_VIA_positive_and_referred_19.yaml
@@ -73,6 +73,7 @@ params:
   extra_form_data: {}
   dashboards:
   - 13
+  annotation_layers: []
 query_context: '{"datasource":{"id":13,"type":"table"},"force":false,"queries":[{"filters":[{"col":"indicator","op":"==","val":"80-percent-women-aged-30-49-years-with-ccs-screening-first-time-via-positive-referred"},{"col":"Visit
   Start date","op":"TEMPORAL_RANGE","val":"No filter"}],"extras":{"time_grain_sqla":"P1D","having":"","where":""},"applied_time_extras":{},"columns":["Facility
   Name","Facility District","Facility Province","OpenMRS ID","Patient''s First name","Patient''s
diff --git a/base/configs/superset/assets/charts/Result_of_Breast_Examination_by_Health_Staff_29.yaml b/base/configs/superset/assets/charts/Result_of_Breast_Examination_by_Health_Staff_20.yaml
similarity index 100%
rename from base/configs/superset/assets/charts/Result_of_Breast_Examination_by_Health_Staff_29.yaml
rename to base/configs/superset/assets/charts/Result_of_Breast_Examination_by_Health_Staff_20.yaml
diff --git a/base/configs/superset/assets/charts/VHSG_From_the_start_to_the_end_of_the_selected_57.yaml b/base/configs/superset/assets/charts/VHSG_From_the_start_to_the_end_of_the_selected_6.yaml
similarity index 100%
rename from base/configs/superset/assets/charts/VHSG_From_the_start_to_the_end_of_the_selected_57.yaml
rename to base/configs/superset/assets/charts/VHSG_From_the_start_to_the_end_of_the_selected_6.yaml
diff --git a/base/configs/superset/assets/charts/VHSG_selected_period_66.yaml b/base/configs/superset/assets/charts/VHSG_selected_period_68.yaml
similarity index 100%
rename from base/configs/superset/assets/charts/VHSG_selected_period_66.yaml
rename to base/configs/superset/assets/charts/VHSG_selected_period_68.yaml
diff --git a/base/configs/superset/assets/charts/VIA__of_women_per_VIA_result_36.yaml b/base/configs/superset/assets/charts/VIA__of_women_per_VIA_result_45.yaml
similarity index 100%
rename from base/configs/superset/assets/charts/VIA__of_women_per_VIA_result_36.yaml
rename to base/configs/superset/assets/charts/VIA__of_women_per_VIA_result_45.yaml
diff --git a/base/configs/superset/assets/charts/VIA__of_women_with_VIA_tested_37.yaml b/base/configs/superset/assets/charts/VIA__of_women_with_VIA_tested_65.yaml
similarity index 100%
rename from base/configs/superset/assets/charts/VIA__of_women_with_VIA_tested_37.yaml
rename to base/configs/superset/assets/charts/VIA__of_women_with_VIA_tested_65.yaml
diff --git a/base/configs/superset/assets/charts/of_Women_Educated_with_Breast_Examination_28.yaml b/base/configs/superset/assets/charts/of_Women_Educated_with_Breast_Examination_52.yaml
similarity index 100%
rename from base/configs/superset/assets/charts/of_Women_Educated_with_Breast_Examination_28.yaml
rename to base/configs/superset/assets/charts/of_Women_Educated_with_Breast_Examination_52.yaml
diff --git a/base/configs/superset/assets/charts/of_Women_per_Visit_Type_27.yaml b/base/configs/superset/assets/charts/of_Women_per_Visit_Type_64.yaml
similarity index 100%
rename from base/configs/superset/assets/charts/of_Women_per_Visit_Type_27.yaml
rename to base/configs/superset/assets/charts/of_Women_per_Visit_Type_64.yaml
diff --git a/base/configs/superset/assets/charts/of_women_per_visit_type_38.yaml b/base/configs/superset/assets/charts/of_women_per_visit_type_61.yaml
similarity index 100%
rename from base/configs/superset/assets/charts/of_women_per_visit_type_38.yaml
rename to base/configs/superset/assets/charts/of_women_per_visit_type_61.yaml
diff --git a/base/configs/superset/assets/dashboards/CCS_Referral_Status_Report_Dashboard_7.yaml b/base/configs/superset/assets/dashboards/CCS_Referral_Status_Report_Dashboard_17.yaml
similarity index 91%
rename from base/configs/superset/assets/dashboards/CCS_Referral_Status_Report_Dashboard_7.yaml
rename to base/configs/superset/assets/dashboards/CCS_Referral_Status_Report_Dashboard_17.yaml
index cc115cd3..90de4f6b 100644
--- a/base/configs/superset/assets/dashboards/CCS_Referral_Status_Report_Dashboard_7.yaml
+++ b/base/configs/superset/assets/dashboards/CCS_Referral_Status_Report_Dashboard_17.yaml
@@ -11,7 +11,7 @@ position:
     children: []
     id: CHART-GU8MjxzP6B
     meta:
-      chartId: 25
+      chartId: 29
       height: 97
       sliceName: CCS Referral Status Report
       uuid: 14eb222c-0b43-4ba9-8617-dfeb3754bc46
@@ -57,7 +57,12 @@ metadata:
   timed_refresh_immune_slices: []
   cross_filters_enabled: false
   default_filters: '{}'
-  chart_configuration: {}
+  chart_configuration:
+    '29':
+      id: 29
+      crossFilters:
+        scope: global
+        chartsInScope: []
   native_filter_configuration:
   - id: NATIVE_FILTER-np_ziSrzJ
     controlValues:
@@ -105,7 +110,8 @@ metadata:
       extraFormData: {}
       filterState: {}
       ownState: {}
-    cascadeParentIds: []
+    cascadeParentIds:
+    - NATIVE_FILTER-np_ziSrzJ
     scope:
       rootPath:
       - ROOT_ID
@@ -113,7 +119,7 @@ metadata:
     type: NATIVE_FILTER
     description: ''
     chartsInScope:
-    - 136
+    - 29
     tabsInScope: []
   - id: NATIVE_FILTER-cwZV98z_b
     controlValues:
@@ -134,7 +140,9 @@ metadata:
       extraFormData: {}
       filterState: {}
       ownState: {}
-    cascadeParentIds: []
+    cascadeParentIds:
+    - NATIVE_FILTER-np_ziSrzJ
+    - NATIVE_FILTER-BTQbykPsy
     scope:
       rootPath:
       - ROOT_ID
@@ -142,7 +150,7 @@ metadata:
     type: NATIVE_FILTER
     description: ''
     chartsInScope:
-    - 136
+    - 29
     tabsInScope: []
   - id: NATIVE_FILTER-HPs6DabvT
     controlValues:
@@ -169,4 +177,11 @@ metadata:
     tabsInScope: []
   shared_label_colors: {}
   color_scheme_domain: []
+  global_chart_configuration:
+    scope:
+      rootPath:
+      - ROOT_ID
+      excluded: []
+    chartsInScope:
+    - 29
 version: 1.0.0
diff --git a/base/configs/superset/assets/dashboards/Cervical_Cancer_Screening_Appointment_Status_Tracking_17.yaml b/base/configs/superset/assets/dashboards/Cervical_Cancer_Screening_Appointment_Status_Tracking_4.yaml
similarity index 78%
rename from base/configs/superset/assets/dashboards/Cervical_Cancer_Screening_Appointment_Status_Tracking_17.yaml
rename to base/configs/superset/assets/dashboards/Cervical_Cancer_Screening_Appointment_Status_Tracking_4.yaml
index f56cbd15..c26ffebb 100644
--- a/base/configs/superset/assets/dashboards/Cervical_Cancer_Screening_Appointment_Status_Tracking_17.yaml
+++ b/base/configs/superset/assets/dashboards/Cervical_Cancer_Screening_Appointment_Status_Tracking_4.yaml
@@ -12,7 +12,7 @@ position:
     children: []
     id: CHART-explore-17-1
     meta:
-      chartId: 40
+      chartId: 59
       height: 100
       sliceName: Appointment status tracking
       uuid: 127c71e6-af8a-4d9a-ba10-c56e534d9956
@@ -59,7 +59,12 @@ metadata:
   timed_refresh_immune_slices: []
   cross_filters_enabled: false
   default_filters: '{}'
-  chart_configuration: {}
+  chart_configuration:
+    '59':
+      id: 59
+      crossFilters:
+        scope: global
+        chartsInScope: []
   native_filter_configuration:
   - id: NATIVE_FILTER-EumcJiApY
     controlValues:
@@ -86,7 +91,7 @@ metadata:
     type: NATIVE_FILTER
     description: ''
     chartsInScope:
-    - 17
+    - 59
     tabsInScope: []
   - id: NATIVE_FILTER-uTQNiHhdj
     controlValues:
@@ -147,6 +152,40 @@ metadata:
     chartsInScope:
     - 17
     tabsInScope: []
+  - id: NATIVE_FILTER_DIVIDER-1ughKpvv4
+    type: DIVIDER
+    scope:
+      rootPath:
+      - ROOT_ID
+      excluded: []
+    title: "\u179A\u1799\u17C8\u1796\u17C1\u179B\u179A\u17B6\u1799\u1780\u17B6\u179A\
+      \u178E\u17CD (Reporting Period)"
+    description: ''
+  - id: NATIVE_FILTER-fk1fEAut9
+    controlValues:
+      enableEmptyFilter: false
+    name: "\u1787\u17BD\u179A\u1796\u17C1\u179B\u179C\u17C1\u179B\u17B6 (Time Range)"
+    filterType: filter_time
+    targets:
+    - {}
+    defaultDataMask:
+      extraFormData: {}
+      filterState: {}
+      ownState: {}
+    cascadeParentIds: []
+    scope:
+      rootPath:
+      - ROOT_ID
+      excluded: []
+    type: NATIVE_FILTER
+    description: ''
   shared_label_colors: {}
   color_scheme_domain: []
+  global_chart_configuration:
+    scope:
+      rootPath:
+      - ROOT_ID
+      excluded: []
+    chartsInScope:
+    - 59
 version: 1.0.0
diff --git a/base/configs/superset/assets/dashboards/Cervical_Cancer_Screening_HC_Raw_Data_18.yaml b/base/configs/superset/assets/dashboards/Cervical_Cancer_Screening_HC_Raw_Data_11.yaml
similarity index 90%
rename from base/configs/superset/assets/dashboards/Cervical_Cancer_Screening_HC_Raw_Data_18.yaml
rename to base/configs/superset/assets/dashboards/Cervical_Cancer_Screening_HC_Raw_Data_11.yaml
index bd910299..9f68b0bb 100644
--- a/base/configs/superset/assets/dashboards/Cervical_Cancer_Screening_HC_Raw_Data_18.yaml
+++ b/base/configs/superset/assets/dashboards/Cervical_Cancer_Screening_HC_Raw_Data_11.yaml
@@ -11,7 +11,7 @@ position:
     children: []
     id: CHART-explore-32-1
     meta:
-      chartId: 6
+      chartId: 16
       height: 101
       sliceName: HC Raw Data
       sliceNameOverride: Cervical Cancer Screening HC Raw Data
@@ -59,7 +59,12 @@ metadata:
   timed_refresh_immune_slices: []
   cross_filters_enabled: false
   default_filters: '{}'
-  chart_configuration: {}
+  chart_configuration:
+    '16':
+      id: 16
+      crossFilters:
+        scope: global
+        chartsInScope: []
   native_filter_configuration:
   - id: NATIVE_FILTER-yG0sftpoN
     controlValues:
@@ -67,7 +72,7 @@ metadata:
       defaultToFirstItem: false
       multiSelect: true
       searchAllOptions: true
-      inverseSelection: true
+      inverseSelection: false
     name: "\u1781\u17C1\u178F\u17D2\u178F (Province)"
     filterType: filter_select
     targets:
@@ -78,9 +83,7 @@ metadata:
       extraFormData: {}
       filterState: {}
       ownState: {}
-    cascadeParentIds:
-    - NATIVE_FILTER-OhmPrHMDt
-    - NATIVE_FILTER-afAlHXca9
+    cascadeParentIds: []
     scope:
       rootPath:
       - ROOT_ID
@@ -88,7 +91,7 @@ metadata:
     type: NATIVE_FILTER
     description: ''
     chartsInScope:
-    - 32
+    - 16
     tabsInScope: []
   - id: NATIVE_FILTER-afAlHXca9
     controlValues:
@@ -96,7 +99,7 @@ metadata:
       defaultToFirstItem: false
       multiSelect: true
       searchAllOptions: true
-      inverseSelection: true
+      inverseSelection: false
     name: "\u179F\u17D2\u179A\u17BB\u1780\u1794\u17D2\u179A\u178F\u17B7\u1794\u178F\
       \u17D2\u178F\u17B7 (District)"
     filterType: filter_select
@@ -109,7 +112,7 @@ metadata:
       filterState: {}
       ownState: {}
     cascadeParentIds:
-    - NATIVE_FILTER-OhmPrHMDt
+    - NATIVE_FILTER-yG0sftpoN
     scope:
       rootPath:
       - ROOT_ID
@@ -117,7 +120,7 @@ metadata:
     type: NATIVE_FILTER
     description: ''
     chartsInScope:
-    - 32
+    - 16
     tabsInScope: []
   - id: NATIVE_FILTER-OhmPrHMDt
     controlValues:
@@ -125,7 +128,7 @@ metadata:
       defaultToFirstItem: false
       multiSelect: true
       searchAllOptions: true
-      inverseSelection: true
+      inverseSelection: false
     name: "\u1798\u17BC\u179B\u178A\u17D2\u178B\u17B6\u1793\u179F\u17BB\u1781\u17B6\
       \u1797\u17B7\u1794\u17B6\u179B (Health Facility)"
     filterType: filter_select
@@ -137,7 +140,9 @@ metadata:
       extraFormData: {}
       filterState: {}
       ownState: {}
-    cascadeParentIds: []
+    cascadeParentIds:
+    - NATIVE_FILTER-yG0sftpoN
+    - NATIVE_FILTER-afAlHXca9
     scope:
       rootPath:
       - ROOT_ID
@@ -145,7 +150,7 @@ metadata:
     type: NATIVE_FILTER
     description: ''
     chartsInScope:
-    - 32
+    - 16
     tabsInScope: []
   - id: NATIVE_FILTER_DIVIDER-Wgo1hNZdF
     type: DIVIDER
@@ -181,4 +186,11 @@ metadata:
     tabsInScope: []
   shared_label_colors: {}
   color_scheme_domain: []
+  global_chart_configuration:
+    scope:
+      rootPath:
+      - ROOT_ID
+      excluded: []
+    chartsInScope:
+    - 16
 version: 1.0.0
diff --git a/base/configs/superset/assets/dashboards/Cervical_Cancer_Screening_RH_Raw_Data_3.yaml b/base/configs/superset/assets/dashboards/Cervical_Cancer_Screening_RH_Raw_Data_20.yaml
similarity index 99%
rename from base/configs/superset/assets/dashboards/Cervical_Cancer_Screening_RH_Raw_Data_3.yaml
rename to base/configs/superset/assets/dashboards/Cervical_Cancer_Screening_RH_Raw_Data_20.yaml
index 961892f8..1bab37f2 100644
--- a/base/configs/superset/assets/dashboards/Cervical_Cancer_Screening_RH_Raw_Data_3.yaml
+++ b/base/configs/superset/assets/dashboards/Cervical_Cancer_Screening_RH_Raw_Data_20.yaml
@@ -11,7 +11,7 @@ position:
     children: []
     id: CHART-explore-31-1
     meta:
-      chartId: 45
+      chartId: 67
       height: 102
       sliceName: Cervical Cancer Screening RH Raw Data
       sliceNameOverride: Cervical Cancer Screening RH Raw Data
diff --git a/base/configs/superset/assets/dashboards/Cervical_Cancer_Screening_for_Women_4.yaml b/base/configs/superset/assets/dashboards/Cervical_Cancer_Screening_for_Women_15.yaml
similarity index 98%
rename from base/configs/superset/assets/dashboards/Cervical_Cancer_Screening_for_Women_4.yaml
rename to base/configs/superset/assets/dashboards/Cervical_Cancer_Screening_for_Women_15.yaml
index 53b9a66c..ac2efef1 100644
--- a/base/configs/superset/assets/dashboards/Cervical_Cancer_Screening_for_Women_4.yaml
+++ b/base/configs/superset/assets/dashboards/Cervical_Cancer_Screening_for_Women_15.yaml
@@ -14,7 +14,7 @@ position:
     children: []
     id: CHART-explore-1-1
     meta:
-      chartId: 37
+      chartId: 65
       height: 39
       sliceName: "\u1785\u17C6\u1793\u17BD\u1793\u179F\u17D2\u178F\u17D2\u179A\u17B8\
         \u1794\u17B6\u1793 \u1792\u17D2\u179C\u17BE\u178F\u17C1\u179F\u17D2\u178F\
@@ -30,7 +30,7 @@ position:
     children: []
     id: CHART-explore-2-1
     meta:
-      chartId: 38
+      chartId: 61
       height: 39
       sliceName: "\u1785\u17C6\u1793\u17BD\u1793\u179F\u17D2\u178F\u17D2\u179A\u17B8\
         \u1780\u17D2\u1793\u17BB\u1784\u1798\u17BD\u1799\u1794\u17D2\u179A\u1797\u17C1\
@@ -51,7 +51,7 @@ position:
     children: []
     id: CHART-explore-3-1
     meta:
-      chartId: 35
+      chartId: 18
       height: 43
       sliceName: "\u1780\u17B6\u179A\u1782\u17D2\u179A\u1794\u17CB\u1782\u17D2\u179A\
         \u1784 (Management)"
@@ -66,7 +66,7 @@ position:
     children: []
     id: CHART-explore-4-1
     meta:
-      chartId: 36
+      chartId: 45
       height: 43
       sliceName: "\u179B\u1791\u17D2\u1792\u1795\u179B\u178F\u17C1\u179F\u17D2\u178F\
         \ VIA (# of women per VIA result)"
diff --git a/base/configs/superset/assets/dashboards/Disbursement_Report_Dashboard_13.yaml b/base/configs/superset/assets/dashboards/Disbursement_Report_Dashboard_10.yaml
similarity index 90%
rename from base/configs/superset/assets/dashboards/Disbursement_Report_Dashboard_13.yaml
rename to base/configs/superset/assets/dashboards/Disbursement_Report_Dashboard_10.yaml
index 1b4dc428..a9c8ba7d 100644
--- a/base/configs/superset/assets/dashboards/Disbursement_Report_Dashboard_13.yaml
+++ b/base/configs/superset/assets/dashboards/Disbursement_Report_Dashboard_10.yaml
@@ -11,7 +11,7 @@ position:
     children: []
     id: CHART-9thSsJSkeY
     meta:
-      chartId: 1
+      chartId: 49
       height: 84
       sliceName: Registered patients aged 40 and above that have had their NCD screening
         for the first time
@@ -28,7 +28,7 @@ position:
     children: []
     id: CHART-auU0qpYADt
     meta:
-      chartId: 8
+      chartId: 28
       height: 42
       sliceName: CCS Indicators
       uuid: ee7add1c-c8aa-4984-9db7-3fa3f726f15c
@@ -44,7 +44,7 @@ position:
     children: []
     id: CHART-gSiI5FA9Eh
     meta:
-      chartId: 48
+      chartId: 58
       height: 82
       sliceName: Registered women aged 30 to 49 years that have had their CCS screening
         for the first time
@@ -61,7 +61,7 @@ position:
     children: []
     id: CHART-l6yN9QRqOT
     meta:
-      chartId: 4
+      chartId: 41
       height: 84
       sliceName: Registered patients aged 40 and above have had their NCD screening
         for the first time with a follow-up date and diagnosed with Hypertension &
@@ -79,7 +79,7 @@ position:
     children: []
     id: CHART-wE9z76bX9M
     meta:
-      chartId: 47
+      chartId: 19
       height: 82
       sliceName: Registered women aged 30 to 49 years that have had their CCS screening
         for the first time and were VIA positive and referred
@@ -96,7 +96,7 @@ position:
     children: []
     id: CHART-wj7DkIY-Pb
     meta:
-      chartId: 26
+      chartId: 21
       height: 40
       sliceName: NCD Indicators
       uuid: 802a00e7-0681-407f-bd7a-c55a4f4e466e
@@ -244,66 +244,66 @@ metadata:
   cross_filters_enabled: false
   default_filters: '{}'
   chart_configuration:
-    '1':
-      id: 1
+    '19':
+      id: 19
       crossFilters:
         scope: global
         chartsInScope:
-        - 4
-        - 8
-        - 26
-        - 47
-        - 48
-    '4':
-      id: 4
+        - 21
+        - 28
+        - 41
+        - 49
+        - 58
+    '21':
+      id: 21
       crossFilters:
         scope: global
         chartsInScope:
-        - 1
-        - 8
-        - 26
-        - 47
-        - 48
-    '8':
-      id: 8
+        - 19
+        - 28
+        - 41
+        - 49
+        - 58
+    '28':
+      id: 28
       crossFilters:
         scope: global
         chartsInScope:
-        - 1
-        - 4
-        - 26
-        - 47
-        - 48
-    '26':
-      id: 26
+        - 19
+        - 21
+        - 41
+        - 49
+        - 58
+    '41':
+      id: 41
       crossFilters:
         scope: global
         chartsInScope:
-        - 1
-        - 4
-        - 8
-        - 47
-        - 48
-    '47':
-      id: 47
+        - 19
+        - 21
+        - 28
+        - 49
+        - 58
+    '49':
+      id: 49
       crossFilters:
         scope: global
         chartsInScope:
-        - 1
-        - 4
-        - 8
-        - 26
-        - 48
-    '48':
-      id: 48
+        - 19
+        - 21
+        - 28
+        - 41
+        - 58
+    '58':
+      id: 58
       crossFilters:
         scope: global
         chartsInScope:
-        - 1
-        - 4
-        - 8
-        - 26
-        - 47
+        - 19
+        - 21
+        - 28
+        - 41
+        - 49
   native_filter_configuration:
   - id: NATIVE_FILTER-pBRxyNbMB
     controlValues:
@@ -359,7 +359,8 @@ metadata:
       extraFormData: {}
       filterState: {}
       ownState: {}
-    cascadeParentIds: []
+    cascadeParentIds:
+    - NATIVE_FILTER-pBRxyNbMB
     scope:
       rootPath:
       - ROOT_ID
@@ -367,12 +368,16 @@ metadata:
     type: NATIVE_FILTER
     description: ''
     chartsInScope:
-    - 151
-    - 152
-    - 153
+    - 19
+    - 21
+    - 28
+    - 41
+    - 49
+    - 58
     tabsInScope:
     - TAB-MFLXG67ZDQ
     - TAB-Pf9SVE-52F
+    - TAB-zmiZPQAMiF
   - id: NATIVE_FILTER-segLnb0Vx
     controlValues:
       enableEmptyFilter: false
@@ -392,7 +397,9 @@ metadata:
       extraFormData: {}
       filterState: {}
       ownState: {}
-    cascadeParentIds: []
+    cascadeParentIds:
+    - NATIVE_FILTER-pBRxyNbMB
+    - NATIVE_FILTER-lEYFRZdtt
     scope:
       rootPath:
       - ROOT_ID
@@ -400,12 +407,16 @@ metadata:
     type: NATIVE_FILTER
     description: ''
     chartsInScope:
-    - 151
-    - 152
-    - 153
+    - 19
+    - 21
+    - 28
+    - 41
+    - 49
+    - 58
     tabsInScope:
     - TAB-MFLXG67ZDQ
     - TAB-Pf9SVE-52F
+    - TAB-zmiZPQAMiF
   - id: NATIVE_FILTER-R6N9v3yG4
     controlValues:
       enableEmptyFilter: false
@@ -439,10 +450,10 @@ metadata:
       - ROOT_ID
       excluded: []
     chartsInScope:
-    - 1
-    - 4
-    - 8
-    - 26
-    - 47
-    - 48
+    - 19
+    - 21
+    - 28
+    - 41
+    - 49
+    - 58
 version: 1.0.0
diff --git a/base/configs/superset/assets/dashboards/Drugs_use_5.yaml b/base/configs/superset/assets/dashboards/Drugs_use_18.yaml
similarity index 99%
rename from base/configs/superset/assets/dashboards/Drugs_use_5.yaml
rename to base/configs/superset/assets/dashboards/Drugs_use_18.yaml
index 022e5f3b..2ad693c7 100644
--- a/base/configs/superset/assets/dashboards/Drugs_use_5.yaml
+++ b/base/configs/superset/assets/dashboards/Drugs_use_18.yaml
@@ -12,7 +12,7 @@ position:
     children: []
     id: CHART-gfnDjBja_j
     meta:
-      chartId: 24
+      chartId: 9
       height: 111
       sliceName: "\u17B1\u179F\u1790\u178A\u17C2\u179B\u1794\u17B6\u1793\u1794\u17D2\
         \u179A\u17BE (Drug Use)"
diff --git a/base/configs/superset/assets/dashboards/HC_CCS_Report_Dashboard_6.yaml b/base/configs/superset/assets/dashboards/HC_CCS_Report_Dashboard_19.yaml
similarity index 93%
rename from base/configs/superset/assets/dashboards/HC_CCS_Report_Dashboard_6.yaml
rename to base/configs/superset/assets/dashboards/HC_CCS_Report_Dashboard_19.yaml
index ffb106a7..0cbcc6d0 100644
--- a/base/configs/superset/assets/dashboards/HC_CCS_Report_Dashboard_6.yaml
+++ b/base/configs/superset/assets/dashboards/HC_CCS_Report_Dashboard_19.yaml
@@ -11,7 +11,7 @@ position:
     children: []
     id: CHART-explore-133-1
     meta:
-      chartId: 7
+      chartId: 66
       height: 73
       sliceName: HC CCS Report
       uuid: 5aaa773a-3be3-4fed-b221-a1f3c395cc8b
@@ -27,7 +27,7 @@ position:
     children: []
     id: CHART-explore-134-1
     meta:
-      chartId: 43
+      chartId: 2
       height: 77
       sliceName: CCS Distribution of visits per Province
       uuid: dd5925be-e474-4104-97d9-0a2ef4a34290
@@ -43,7 +43,7 @@ position:
     children: []
     id: CHART-explore-135-1
     meta:
-      chartId: 3
+      chartId: 30
       height: 82
       sliceName: CCS Monthly total count of visits grouped by district
       uuid: 6d8cee3a-64cc-4a2e-af31-7f5b4fefc90b
@@ -167,7 +167,28 @@ metadata:
   timed_refresh_immune_slices: []
   cross_filters_enabled: false
   default_filters: '{}'
-  chart_configuration: {}
+  chart_configuration:
+    '2':
+      id: 2
+      crossFilters:
+        scope: global
+        chartsInScope:
+        - 30
+        - 66
+    '30':
+      id: 30
+      crossFilters:
+        scope: global
+        chartsInScope:
+        - 2
+        - 66
+    '66':
+      id: 66
+      crossFilters:
+        scope: global
+        chartsInScope:
+        - 2
+        - 30
   native_filter_configuration:
   - id: NATIVE_FILTER-AlqiTBOmI
     controlValues:
@@ -195,9 +216,9 @@ metadata:
     type: NATIVE_FILTER
     description: ''
     chartsInScope:
-    - 133
-    - 134
-    - 135
+    - 2
+    - 30
+    - 66
     tabsInScope:
     - TAB-4A9mAKKVi
     - TAB-nhk86jsT8
@@ -220,7 +241,8 @@ metadata:
       extraFormData: {}
       filterState: {}
       ownState: {}
-    cascadeParentIds: []
+    cascadeParentIds:
+    - NATIVE_FILTER-AlqiTBOmI
     scope:
       rootPath:
       - ROOT_ID
@@ -228,9 +250,9 @@ metadata:
     type: NATIVE_FILTER
     description: ''
     chartsInScope:
-    - 133
-    - 134
-    - 135
+    - 2
+    - 30
+    - 66
     tabsInScope:
     - TAB-4A9mAKKVi
     - TAB-nhk86jsT8
@@ -254,7 +276,9 @@ metadata:
       extraFormData: {}
       filterState: {}
       ownState: {}
-    cascadeParentIds: []
+    cascadeParentIds:
+    - NATIVE_FILTER-AlqiTBOmI
+    - NATIVE_FILTER-CbHxVrxZT
     scope:
       rootPath:
       - ROOT_ID
@@ -262,9 +286,9 @@ metadata:
     type: NATIVE_FILTER
     description: ''
     chartsInScope:
-    - 133
-    - 134
-    - 135
+    - 2
+    - 30
+    - 66
     tabsInScope:
     - TAB-4A9mAKKVi
     - TAB-nhk86jsT8
@@ -355,4 +379,13 @@ metadata:
     "\u17A2\u1784\u17D2\u1782\u179A\u1787\u17D0\u1799 / Angkor Chey": '#5AC189'
     "\u17A2\u1793\u17D2\u179B\u1784\u17CB\u179C\u17C2\u1784 / Anlong Veng": '#FF7F44'
   color_scheme_domain: []
+  global_chart_configuration:
+    scope:
+      rootPath:
+      - ROOT_ID
+      excluded: []
+    chartsInScope:
+    - 2
+    - 30
+    - 66
 version: 1.0.0
diff --git a/base/configs/superset/assets/dashboards/HC_NCD_OPD_Register_Report_Dashboard_19.yaml b/base/configs/superset/assets/dashboards/HC_NCD_OPD_Register_Report_Dashboard_8.yaml
similarity index 95%
rename from base/configs/superset/assets/dashboards/HC_NCD_OPD_Register_Report_Dashboard_19.yaml
rename to base/configs/superset/assets/dashboards/HC_NCD_OPD_Register_Report_Dashboard_8.yaml
index c366e6aa..0d00ad6f 100644
--- a/base/configs/superset/assets/dashboards/HC_NCD_OPD_Register_Report_Dashboard_19.yaml
+++ b/base/configs/superset/assets/dashboards/HC_NCD_OPD_Register_Report_Dashboard_8.yaml
@@ -11,7 +11,7 @@ position:
     children: []
     id: CHART-Ab9xXvvBoP
     meta:
-      chartId: 44
+      chartId: 48
       height: 76
       sliceName: HC NCD OPD Register Report
       uuid: 21650553-f9e7-4249-a0b2-088c1aaca1ea
@@ -60,8 +60,8 @@ metadata:
   cross_filters_enabled: false
   default_filters: '{}'
   chart_configuration:
-    '44':
-      id: 44
+    '48':
+      id: 48
       crossFilters:
         scope: global
         chartsInScope: []
@@ -92,7 +92,7 @@ metadata:
     type: NATIVE_FILTER
     description: ''
     chartsInScope:
-    - 142
+    - 48
     tabsInScope: []
   - id: NATIVE_FILTER-Msdpr8SxL
     controlValues:
@@ -112,7 +112,8 @@ metadata:
       extraFormData: {}
       filterState: {}
       ownState: {}
-    cascadeParentIds: []
+    cascadeParentIds:
+    - NATIVE_FILTER-aWX-Gl58W
     scope:
       rootPath:
       - ROOT_ID
@@ -120,7 +121,7 @@ metadata:
     type: NATIVE_FILTER
     description: ''
     chartsInScope:
-    - 142
+    - 48
     tabsInScope: []
   - id: NATIVE_FILTER-pJ6UTB2-p
     controlValues:
@@ -141,7 +142,9 @@ metadata:
       extraFormData: {}
       filterState: {}
       ownState: {}
-    cascadeParentIds: []
+    cascadeParentIds:
+    - NATIVE_FILTER-aWX-Gl58W
+    - NATIVE_FILTER-Msdpr8SxL
     scope:
       rootPath:
       - ROOT_ID
@@ -149,7 +152,7 @@ metadata:
     type: NATIVE_FILTER
     description: ''
     chartsInScope:
-    - 142
+    - 48
     tabsInScope: []
   - id: NATIVE_FILTER-a7uk2DuoT
     controlValues:
@@ -180,5 +183,5 @@ metadata:
       - ROOT_ID
       excluded: []
     chartsInScope:
-    - 44
+    - 48
 version: 1.0.0
diff --git a/base/configs/superset/assets/dashboards/Indicators_for_Monitoring_CCS__Management_Program_11.yaml b/base/configs/superset/assets/dashboards/Indicators_for_Monitoring_CCS__Management_Program_9.yaml
similarity index 99%
rename from base/configs/superset/assets/dashboards/Indicators_for_Monitoring_CCS__Management_Program_11.yaml
rename to base/configs/superset/assets/dashboards/Indicators_for_Monitoring_CCS__Management_Program_9.yaml
index dc52b44e..90ad0ef1 100644
--- a/base/configs/superset/assets/dashboards/Indicators_for_Monitoring_CCS__Management_Program_11.yaml
+++ b/base/configs/superset/assets/dashboards/Indicators_for_Monitoring_CCS__Management_Program_9.yaml
@@ -15,7 +15,7 @@ position:
     children: []
     id: CHART-explore-33-1
     meta:
-      chartId: 31
+      chartId: 22
       height: 52
       sliceName: Cervical Cancer Screen Indicators
       sliceNameOverride: Indicators for Cervical Cancer Screening & Management Program
diff --git a/base/configs/superset/assets/dashboards/Indicators_for_annual_monitoring_and_evaluation_Hypertension_and_Diabetes_management_program_12.yaml b/base/configs/superset/assets/dashboards/Indicators_for_annual_monitoring_and_evaluation_Hypertension_and_Diabetes_management_program_5.yaml
similarity index 99%
rename from base/configs/superset/assets/dashboards/Indicators_for_annual_monitoring_and_evaluation_Hypertension_and_Diabetes_management_program_12.yaml
rename to base/configs/superset/assets/dashboards/Indicators_for_annual_monitoring_and_evaluation_Hypertension_and_Diabetes_management_program_5.yaml
index 4de9347f..ec3d3a7b 100644
--- a/base/configs/superset/assets/dashboards/Indicators_for_annual_monitoring_and_evaluation_Hypertension_and_Diabetes_management_program_12.yaml
+++ b/base/configs/superset/assets/dashboards/Indicators_for_annual_monitoring_and_evaluation_Hypertension_and_Diabetes_management_program_5.yaml
@@ -12,7 +12,7 @@ position:
     children: []
     id: CHART-explore-65-1
     meta:
-      chartId: 9
+      chartId: 36
       height: 104
       sliceName: M&E Annual Indicators for Hypertension and Diabetes management program
       sliceNameOverride: "\u1780\u1798\u17D2\u1798\u179C\u17B7\u1792\u17B8\u1796\u17B7\
diff --git a/base/configs/superset/assets/dashboards/NCD_HC_EMR_Raw_Data_15.yaml b/base/configs/superset/assets/dashboards/NCD_HC_EMR_Raw_Data_21.yaml
similarity index 99%
rename from base/configs/superset/assets/dashboards/NCD_HC_EMR_Raw_Data_15.yaml
rename to base/configs/superset/assets/dashboards/NCD_HC_EMR_Raw_Data_21.yaml
index 125e9638..41a4d7c9 100644
--- a/base/configs/superset/assets/dashboards/NCD_HC_EMR_Raw_Data_15.yaml
+++ b/base/configs/superset/assets/dashboards/NCD_HC_EMR_Raw_Data_21.yaml
@@ -11,7 +11,7 @@ position:
     children: []
     id: CHART-explore-49-1
     meta:
-      chartId: 11
+      chartId: 47
       height: 105
       sliceName: NCD HC EMR Raw Data
       uuid: 43fdf069-6fb1-436f-bfbb-43cd28a650d4
diff --git a/base/configs/superset/assets/dashboards/NCD_HC_EMR_report_1.yaml b/base/configs/superset/assets/dashboards/NCD_HC_EMR_report_16.yaml
similarity index 98%
rename from base/configs/superset/assets/dashboards/NCD_HC_EMR_report_1.yaml
rename to base/configs/superset/assets/dashboards/NCD_HC_EMR_report_16.yaml
index 6a275d08..ec93a481 100644
--- a/base/configs/superset/assets/dashboards/NCD_HC_EMR_report_1.yaml
+++ b/base/configs/superset/assets/dashboards/NCD_HC_EMR_report_16.yaml
@@ -11,7 +11,7 @@ position:
     children: []
     id: CHART-KyPQi9RSjS
     meta:
-      chartId: 71
+      chartId: 62
       height: 69
       sliceName: "\u178F\u17B6\u1798\u178A\u17B6\u1793\u17A0\u17B6\u1793\u17B7\u1797\
         \u17D0\u1799\u1793\u17C3\u1787\u17C6\u1784\u17BA\u1794\u17C1\u17C7\u178A\u17BC\
@@ -32,7 +32,7 @@ position:
     children: []
     id: CHART-explore-18-1
     meta:
-      chartId: 66
+      chartId: 68
       height: 54
       sliceName: "\u17A2\u17D2\u1793\u1780\u1791\u17D2\u179A\u1791\u1784\u17CB\u179F\
         \u17BB\u1781\u1797\u17B6\u1796\u1797\u17BC\u1798\u17B7 \u179A\u1799\u17C8\u1796\
@@ -54,7 +54,7 @@ position:
     children: []
     id: CHART-explore-19-1
     meta:
-      chartId: 72
+      chartId: 24
       height: 64
       sliceName: "\u1794\u17D2\u179A\u1797\u17C1\u1791\u1794\u1784\u17CB\u1794\u17D2\
         \u179A\u17B6\u1780\u17CB (Payment type)"
@@ -74,7 +74,7 @@ position:
     children: []
     id: CHART-explore-20-1
     meta:
-      chartId: 67
+      chartId: 60
       height: 78
       sliceName: "\u1780\u1798\u17D2\u179A\u17B7\u178F\u17A0\u17B6\u1793\u17B7\u1797\
         \u17D0\u1799\u1793\u17C3\u1787\u17C6\u1784\u17BA\u1794\u17C1\u17C7\u178A\u17BC\
@@ -95,7 +95,7 @@ position:
     children: []
     id: CHART-explore-21-1
     meta:
-      chartId: 54
+      chartId: 8
       height: 39
       sliceName: "\u1787\u17C6\u1784\u17BA\u179B\u17BE\u179F \u179F\u1798\u17D2\u1796\
         \u17B6\u1792\u1788\u17B6\u1798 (HBP)"
@@ -115,7 +115,7 @@ position:
     children: []
     id: CHART-explore-22-1
     meta:
-      chartId: 49
+      chartId: 34
       height: 43
       sliceName: "\u1787\u17C6\u1784\u17BA\u1791\u17B9\u1793\u17C4\u1798\u1795\u17D2\
         \u17A2\u17C2\u1798 \u1793\u17B7\u1784\u1787\u17C6\u1784\u17BA\u179B\u17BE\u179F\
@@ -136,7 +136,7 @@ position:
     children: []
     id: CHART-explore-25-1
     meta:
-      chartId: 70
+      chartId: 15
       height: 39
       sliceName: "\u1787\u17C6\u1784\u17BA\u1791\u17B9\u1793\u17C4\u1798\u1795\u17D2\
         \u17A2\u17C2\u1798 (DM Follow-up)"
@@ -156,7 +156,7 @@ position:
     children: []
     id: CHART-explore-34-1
     meta:
-      chartId: 57
+      chartId: 6
       height: 54
       sliceName: "\u17A2\u17D2\u1793\u1780\u1791\u17D2\u179A\u1791\u1784\u17CB\u179F\
         \u17BB\u1781\u1797\u17B6\u1796\u1797\u17BC\u1798\u17B7 \u1796\u17B8\u1790\u17D2\
@@ -180,7 +180,7 @@ position:
     children: []
     id: CHART-explore-35-1
     meta:
-      chartId: 59
+      chartId: 14
       height: 64
       sliceName: "\u1794\u17D2\u179A\u1797\u17C1\u1791\u1794\u1784\u17CB\u1794\u17D2\
         \u179A\u17B6\u1780\u17CB (Payment type from the start to the end of the selected)"
@@ -200,7 +200,7 @@ position:
     children: []
     id: CHART-explore-36-1
     meta:
-      chartId: 52
+      chartId: 50
       height: 78
       sliceName: "\u1780\u1798\u17D2\u179A\u17B7\u178F\u17A0\u17B6\u1793\u17B7\u1797\
         \u17D0\u1799\u1793\u17C3\u1787\u17C6\u1784\u17BA\u1794\u17C1\u17C7\u178A\u17BC\
@@ -222,7 +222,7 @@ position:
     children: []
     id: CHART-explore-37-1
     meta:
-      chartId: 55
+      chartId: 23
       height: 39
       sliceName: "\u1787\u17C6\u1784\u17BA\u179B\u17BE\u179F \u179F\u1798\u17D2\u1796\
         \u17B6\u1792\u1788\u17B6\u1798 (HBP) - cumulative"
@@ -242,7 +242,7 @@ position:
     children: []
     id: CHART-explore-38-1
     meta:
-      chartId: 69
+      chartId: 42
       height: 43
       sliceName: "\u1787\u17C6\u1784\u17BA\u1791\u17B9\u1793\u17C4\u1798\u1795\u17D2\
         \u17A2\u17C2\u1798 \u1793\u17B7\u1784\u1787\u17C6\u1784\u17BA\u179B\u17BE\u179F\
@@ -263,7 +263,7 @@ position:
     children: []
     id: CHART-explore-39-1
     meta:
-      chartId: 56
+      chartId: 35
       height: 41
       sliceName: "\u1787\u17C6\u1784\u17BA\u1791\u17B9\u1793\u17C4\u1798\u1795\u17D2\
         \u17A2\u17C2\u1798 (DM)"
@@ -283,7 +283,7 @@ position:
     children: []
     id: CHART-explore-40-1
     meta:
-      chartId: 60
+      chartId: 11
       height: 41
       sliceName: "\u1787\u17C6\u1784\u17BA\u1791\u17B9\u1793\u17C4\u1798\u1795\u17D2\
         \u17A2\u17C2\u1798 (DM) - cumulative"
@@ -303,7 +303,7 @@ position:
     children: []
     id: CHART-explore-41-1
     meta:
-      chartId: 51
+      chartId: 44
       height: 39
       sliceName: "\u1787\u17C6\u1784\u17BA\u1791\u17B9\u1793\u17C4\u1798\u1795\u17D2\
         \u17A2\u17C2\u1798 (DM Follow-up) - cumulative"
@@ -323,7 +323,7 @@ position:
     children: []
     id: CHART-explore-42-1
     meta:
-      chartId: 50
+      chartId: 33
       height: 42
       sliceName: "\u1787\u17C6\u1784\u17BA\u179B\u17BE\u179F \u179F\u1798\u17D2\u1796\
         \u17B6\u1792\u1788\u17B6\u1798 (HBP Follow-up)"
@@ -343,7 +343,7 @@ position:
     children: []
     id: CHART-explore-43-1
     meta:
-      chartId: 68
+      chartId: 12
       height: 41
       sliceName: "\u1787\u17C6\u1784\u17BA\u179B\u17BE\u179F \u179F\u1798\u17D2\u1796\
         \u17B6\u1792\u1788\u17B6\u1798 (HBP Follow-up) - cumulative"
@@ -363,7 +363,7 @@ position:
     children: []
     id: CHART-explore-44-1
     meta:
-      chartId: 64
+      chartId: 51
       height: 44
       sliceName: "\u1787\u17C6\u1784\u17BA\u1791\u17B9\u1793\u17C4\u1798\u1795\u17D2\
         \u17A2\u17C2\u1798 \u1793\u17B7\u1784\u1787\u17C6\u1784\u17BA\u179B\u17BE\u179F\
@@ -384,7 +384,7 @@ position:
     children: []
     id: CHART-explore-45-1
     meta:
-      chartId: 65
+      chartId: 54
       height: 50
       sliceName: "\u1787\u17C6\u1784\u17BA\u1791\u17B9\u1793\u17C4\u1798\u1795\u17D2\
         \u17A2\u17C2\u1798 \u1793\u17B7\u1784\u1787\u17C6\u1784\u17BA\u179B\u17BE\u179F\
@@ -406,7 +406,7 @@ position:
     children: []
     id: CHART-explore-61-1
     meta:
-      chartId: 61
+      chartId: 56
       height: 36
       sliceName: Number of CCS Screening - Cumulative
       sliceNameOverride: "\u1794\u17D2\u179A\u1798\u17BC\u179B\u1795\u17D2\u178F\u17BB\
@@ -425,7 +425,7 @@ position:
     children: []
     id: CHART-explore-62-1
     meta:
-      chartId: 53
+      chartId: 71
       height: 36
       sliceName: Number of CCS Screening
       sliceNameOverride: "\u179A\u1799\u17C8\u1796\u17C1\u179B\u178A\u17C2\u179B\u1794\
@@ -444,7 +444,7 @@ position:
     children: []
     id: CHART-explore-63-1
     meta:
-      chartId: 63
+      chartId: 57
       height: 54
       sliceName: Dropout
       sliceNameOverride: "\u179A\u1799\u17C8\u1796\u17C1\u179B\u178A\u17C2\u179B\u1794\
@@ -463,7 +463,7 @@ position:
     children: []
     id: CHART-explore-64-1
     meta:
-      chartId: 62
+      chartId: 7
       height: 54
       sliceName: Dropout - cumulative
       sliceNameOverride: "\u1794\u17D2\u179A\u1798\u17BC\u179B\u1795\u17D2\u178F\u17BB\
@@ -482,7 +482,7 @@ position:
     children: []
     id: CHART-f3e66JQ-IW
     meta:
-      chartId: 58
+      chartId: 17
       height: 69
       sliceName: "\u178F\u17B6\u1798\u178A\u17B6\u1793\u17A0\u17B6\u1793\u17B7\u1797\
         \u17D0\u1799\u1793\u17C3\u1787\u17C6\u1784\u17BA\u1794\u17C1\u17C7\u178A\u17BC\
@@ -1826,18 +1826,18 @@ metadata:
       - TAB--mZklkexa
       - TAB-od4wsrTQX
       excluded:
-      - 57
-      - 59
-      - 52
-      - 55
-      - 69
-      - 60
-      - 51
-      - 68
-      - 65
-      - 61
-      - 58
-      - 62
+      - 6
+      - 14
+      - 50
+      - 23
+      - 42
+      - 11
+      - 44
+      - 12
+      - 54
+      - 56
+      - 17
+      - 7
     type: NATIVE_FILTER
     description: This filter applies to the left table.
     chartsInScope:
@@ -1900,18 +1900,18 @@ metadata:
       - TAB--mZklkexa
       - TAB-od4wsrTQX
       excluded:
+      - 62
+      - 68
+      - 24
+      - 60
+      - 8
+      - 34
+      - 15
+      - 35
+      - 33
+      - 51
       - 71
-      - 66
-      - 72
-      - 67
-      - 54
-      - 49
-      - 70
-      - 56
-      - 50
-      - 64
-      - 53
-      - 63
+      - 57
     type: NATIVE_FILTER
     description: This applies to the right table. From the beginning to the end of
       selected period.
diff --git a/base/configs/superset/assets/dashboards/NCD_HIS_Report_Dashboard_9.yaml b/base/configs/superset/assets/dashboards/NCD_HIS_Report_Dashboard_6.yaml
similarity index 85%
rename from base/configs/superset/assets/dashboards/NCD_HIS_Report_Dashboard_9.yaml
rename to base/configs/superset/assets/dashboards/NCD_HIS_Report_Dashboard_6.yaml
index adeadd75..c747f209 100644
--- a/base/configs/superset/assets/dashboards/NCD_HIS_Report_Dashboard_9.yaml
+++ b/base/configs/superset/assets/dashboards/NCD_HIS_Report_Dashboard_6.yaml
@@ -11,7 +11,7 @@ position:
     children: []
     id: CHART-K-4SQcOr5u
     meta:
-      chartId: 46
+      chartId: 31
       height: 42
       sliceName: NCD HIS New Cases From The Beginning
       uuid: edc6788b-ea27-457f-b3e7-1e272b7109ba
@@ -25,7 +25,7 @@ position:
     children: []
     id: CHART-explore-148-1
     meta:
-      chartId: 5
+      chartId: 4
       height: 50
       sliceName: NCD HIS Follow-up Cases Within Reporting Range
       uuid: e2896abd-821a-4aa8-8a19-c70c9eb18960
@@ -39,7 +39,7 @@ position:
     children: []
     id: CHART-explore-149-1
     meta:
-      chartId: 33
+      chartId: 13
       height: 50
       sliceName: NCD HIS Follow-up Cases From The Beginning
       uuid: 17f99ed6-713a-4436-9e7c-79639f96490c
@@ -53,7 +53,7 @@ position:
     children: []
     id: CHART-nSlyozQPY1
     meta:
-      chartId: 42
+      chartId: 40
       height: 42
       sliceName: NCD HIS New Cases Within Reporting Range
       uuid: b3599541-6658-4325-968b-82dd749af4ec
@@ -115,7 +115,39 @@ metadata:
   timed_refresh_immune_slices: []
   cross_filters_enabled: false
   default_filters: '{}'
-  chart_configuration: {}
+  chart_configuration:
+    '4':
+      id: 4
+      crossFilters:
+        scope: global
+        chartsInScope:
+        - 13
+        - 31
+        - 40
+    '13':
+      id: 13
+      crossFilters:
+        scope: global
+        chartsInScope:
+        - 4
+        - 31
+        - 40
+    '31':
+      id: 31
+      crossFilters:
+        scope: global
+        chartsInScope:
+        - 4
+        - 13
+        - 40
+    '40':
+      id: 40
+      crossFilters:
+        scope: global
+        chartsInScope:
+        - 4
+        - 13
+        - 31
   native_filter_configuration:
   - id: NATIVE_FILTER-sRZWuJkpb
     controlValues:
@@ -143,17 +175,10 @@ metadata:
     type: NATIVE_FILTER
     description: ''
     chartsInScope:
-    - 133
-    - 136
-    - 137
-    - 140
-    - 141
-    - 142
-    - 143
-    - 144
-    - 146
-    - 148
-    - 149
+    - 4
+    - 13
+    - 31
+    - 40
     tabsInScope: []
   - id: NATIVE_FILTER-IY0W6N-6N
     controlValues:
@@ -173,7 +198,8 @@ metadata:
       extraFormData: {}
       filterState: {}
       ownState: {}
-    cascadeParentIds: []
+    cascadeParentIds:
+    - NATIVE_FILTER-sRZWuJkpb
     scope:
       rootPath:
       - ROOT_ID
@@ -181,17 +207,10 @@ metadata:
     type: NATIVE_FILTER
     description: ''
     chartsInScope:
-    - 133
-    - 136
-    - 137
-    - 140
-    - 141
-    - 142
-    - 143
-    - 144
-    - 146
-    - 148
-    - 149
+    - 4
+    - 13
+    - 31
+    - 40
     tabsInScope: []
   - id: NATIVE_FILTER-LVKn33ZeF
     controlValues:
@@ -212,7 +231,9 @@ metadata:
       extraFormData: {}
       filterState: {}
       ownState: {}
-    cascadeParentIds: []
+    cascadeParentIds:
+    - NATIVE_FILTER-sRZWuJkpb
+    - NATIVE_FILTER-IY0W6N-6N
     scope:
       rootPath:
       - ROOT_ID
@@ -220,17 +241,10 @@ metadata:
     type: NATIVE_FILTER
     description: ''
     chartsInScope:
-    - 133
-    - 136
-    - 137
-    - 140
-    - 141
-    - 142
-    - 143
-    - 144
-    - 146
-    - 148
-    - 149
+    - 4
+    - 13
+    - 31
+    - 40
     tabsInScope: []
   - id: NATIVE_FILTER-yC5-Yil3K
     controlValues:
@@ -260,17 +274,10 @@ metadata:
     type: NATIVE_FILTER
     description: ''
     chartsInScope:
-    - 133
-    - 136
-    - 137
-    - 140
-    - 141
-    - 142
-    - 143
-    - 144
-    - 146
-    - 148
-    - 149
+    - 4
+    - 13
+    - 31
+    - 40
     tabsInScope: []
   - id: NATIVE_FILTER-hkcro12HK
     controlValues:
@@ -290,20 +297,13 @@ metadata:
       rootPath:
       - ROOT_ID
       excluded:
-      - 46
+      - 31
+      - 13
     type: NATIVE_FILTER
     description: ''
     chartsInScope:
-    - 133
-    - 136
-    - 137
-    - 140
-    - 141
-    - 142
-    - 143
-    - 146
-    - 148
-    - 149
+    - 4
+    - 40
     tabsInScope: []
   - id: NATIVE_FILTER-zzd1aTD-K
     controlValues:
@@ -315,21 +315,30 @@ metadata:
     targets:
     - {}
     defaultDataMask:
-      extraFormData:
-        time_range: 'Last 7 years : '
-      filterState:
-        value: 'Last 7 years : '
+      extraFormData: {}
+      filterState: {}
+      ownState: {}
     cascadeParentIds: []
     scope:
       rootPath:
       - ROOT_ID
       excluded:
-      - 5
-      - 42
+      - 4
+      - 40
     type: NATIVE_FILTER
     description: ''
     chartsInScope:
-    - 144
-    - 149
+    - 13
+    - 31
     tabsInScope: []
+  global_chart_configuration:
+    scope:
+      rootPath:
+      - ROOT_ID
+      excluded: []
+    chartsInScope:
+    - 4
+    - 13
+    - 31
+    - 40
 version: 1.0.0
diff --git a/base/configs/superset/assets/dashboards/NCD_Missed_Appointments_Report_Dashboard_20.yaml b/base/configs/superset/assets/dashboards/NCD_Missed_Appointments_Report_Dashboard_2.yaml
similarity index 90%
rename from base/configs/superset/assets/dashboards/NCD_Missed_Appointments_Report_Dashboard_20.yaml
rename to base/configs/superset/assets/dashboards/NCD_Missed_Appointments_Report_Dashboard_2.yaml
index ace24bf6..9696bb2f 100644
--- a/base/configs/superset/assets/dashboards/NCD_Missed_Appointments_Report_Dashboard_20.yaml
+++ b/base/configs/superset/assets/dashboards/NCD_Missed_Appointments_Report_Dashboard_2.yaml
@@ -11,7 +11,7 @@ position:
     children: []
     id: CHART-9_cxUnO_rZ
     meta:
-      chartId: 34
+      chartId: 25
       height: 74
       sliceName: NCD Appointment Report
       uuid: a5640d1c-bc02-4507-b639-787965bc42c7
@@ -57,7 +57,12 @@ metadata:
   timed_refresh_immune_slices: []
   cross_filters_enabled: false
   default_filters: '{}'
-  chart_configuration: {}
+  chart_configuration:
+    '25':
+      id: 25
+      crossFilters:
+        scope: global
+        chartsInScope: []
   native_filter_configuration:
   - id: NATIVE_FILTER-jvfgfSm-S
     controlValues:
@@ -85,7 +90,7 @@ metadata:
     type: NATIVE_FILTER
     description: ''
     chartsInScope:
-    - 141
+    - 25
     tabsInScope: []
   - id: NATIVE_FILTER-W14x47Ntg
     controlValues:
@@ -105,7 +110,8 @@ metadata:
       extraFormData: {}
       filterState: {}
       ownState: {}
-    cascadeParentIds: []
+    cascadeParentIds:
+    - NATIVE_FILTER-jvfgfSm-S
     scope:
       rootPath:
       - ROOT_ID
@@ -113,7 +119,7 @@ metadata:
     type: NATIVE_FILTER
     description: ''
     chartsInScope:
-    - 141
+    - 25
     tabsInScope: []
   - id: NATIVE_FILTER-Fd7aO5l2E
     controlValues:
@@ -134,7 +140,9 @@ metadata:
       extraFormData: {}
       filterState: {}
       ownState: {}
-    cascadeParentIds: []
+    cascadeParentIds:
+    - NATIVE_FILTER-jvfgfSm-S
+    - NATIVE_FILTER-W14x47Ntg
     scope:
       rootPath:
       - ROOT_ID
@@ -142,7 +150,7 @@ metadata:
     type: NATIVE_FILTER
     description: ''
     chartsInScope:
-    - 141
+    - 25
     tabsInScope: []
   - id: NATIVE_FILTER-NpwLz6Lx7
     controlValues:
@@ -169,4 +177,11 @@ metadata:
     tabsInScope: []
   shared_label_colors: {}
   color_scheme_domain: []
+  global_chart_configuration:
+    scope:
+      rootPath:
+      - ROOT_ID
+      excluded: []
+    chartsInScope:
+    - 25
 version: 1.0.0
diff --git a/base/configs/superset/assets/dashboards/NCD_RH_EMR_Raw_Data_14.yaml b/base/configs/superset/assets/dashboards/NCD_RH_EMR_Raw_Data_1.yaml
similarity index 99%
rename from base/configs/superset/assets/dashboards/NCD_RH_EMR_Raw_Data_14.yaml
rename to base/configs/superset/assets/dashboards/NCD_RH_EMR_Raw_Data_1.yaml
index 0ca9c62a..1c122912 100644
--- a/base/configs/superset/assets/dashboards/NCD_RH_EMR_Raw_Data_14.yaml
+++ b/base/configs/superset/assets/dashboards/NCD_RH_EMR_Raw_Data_1.yaml
@@ -11,7 +11,7 @@ position:
     children: []
     id: CHART-explore-48-1
     meta:
-      chartId: 39
+      chartId: 38
       height: 103
       sliceName: NCD RH EMR Raw Data
       uuid: 52bda91a-f96f-4984-aaa6-d96ac6e50497
diff --git a/base/configs/superset/assets/dashboards/NCD_RH_EMR_Report_2.yaml b/base/configs/superset/assets/dashboards/NCD_RH_EMR_Report_12.yaml
similarity index 97%
rename from base/configs/superset/assets/dashboards/NCD_RH_EMR_Report_2.yaml
rename to base/configs/superset/assets/dashboards/NCD_RH_EMR_Report_12.yaml
index e82228d3..05e3f978 100644
--- a/base/configs/superset/assets/dashboards/NCD_RH_EMR_Report_2.yaml
+++ b/base/configs/superset/assets/dashboards/NCD_RH_EMR_Report_12.yaml
@@ -11,7 +11,7 @@ position:
     children: []
     id: CHART-explore-29-1
     meta:
-      chartId: 23
+      chartId: 39
       height: 57
       sliceName: "\u1785\u17BB\u17C7\u1794\u1789\u17D2\u1787\u17B8\u1780\u17B6\u179A\
         \ (Register)"
@@ -29,7 +29,7 @@ position:
     children: []
     id: CHART-explore-50-1
     meta:
-      chartId: 12
+      chartId: 27
       height: 66
       sliceName: "\u1795\u179B\u179B\u17C6\u1794\u17B6\u1780\u1787\u17C6\u1784\u17BA\
         \u1791\u17B9\u1780\u1793\u17C4\u1798\u1795\u17D2\u17A2\u17C2\u1798 \u179B\u17BE\
@@ -49,7 +49,7 @@ position:
     children: []
     id: CHART-explore-51-1
     meta:
-      chartId: 22
+      chartId: 55
       height: 57
       sliceName: "\u1785\u17BB\u17C7\u1794\u1789\u17D2\u1787\u17B8\u1780\u17B6\u179A\
         \ (Register) - cumulative"
@@ -67,7 +67,7 @@ position:
     children: []
     id: CHART-explore-52-1
     meta:
-      chartId: 21
+      chartId: 63
       height: 77
       sliceName: "\u179A\u17C4\u1782\u179C\u17B7\u1793\u17B7\u1785\u17D2\u1786\u17D0\
         \u1799 (Diagnosis)"
@@ -85,7 +85,7 @@ position:
     children: []
     id: CHART-explore-53-1
     meta:
-      chartId: 19
+      chartId: 32
       height: 77
       sliceName: "\u179A\u17C4\u1782\u179C\u17B7\u1793\u17B7\u1785\u17D2\u1786\u17D0\
         \u1799 (Diagnosis) - cumulative"
@@ -103,7 +103,7 @@ position:
     children: []
     id: CHART-explore-54-1
     meta:
-      chartId: 15
+      chartId: 69
       height: 66
       sliceName: "\u1795\u179B\u179B\u17C6\u1794\u17B6\u1780\u1787\u17C6\u1784\u17BA\
         \u1791\u17B9\u1780\u1793\u17C4\u1798\u1795\u17D2\u17A2\u17C2\u1798 \u179B\u17BE\
@@ -123,7 +123,7 @@ position:
     children: []
     id: CHART-explore-55-1
     meta:
-      chartId: 14
+      chartId: 43
       height: 77
       sliceName: "\u178F\u17B6\u1798\u178A\u17B6\u1793 (Follow-up) NCD EMR Report"
       sliceNameOverride: "\u179A\u1799\u17C8\u1796\u17C1\u179B\u178A\u17C2\u179B\u1794\
@@ -140,7 +140,7 @@ position:
     children: []
     id: CHART-explore-56-1
     meta:
-      chartId: 17
+      chartId: 5
       height: 77
       sliceName: "\u178F\u17B6\u1798\u178A\u17B6\u1793 (Follow-up) NCD EMR Report\
         \ - Cumulative"
@@ -158,7 +158,7 @@ position:
     children: []
     id: CHART-explore-57-1
     meta:
-      chartId: 20
+      chartId: 70
       height: 76
       sliceName: "\u1794\u17C4\u17C7\u1794\u1784\u17CB\u1780\u17B6\u179A\u178F\u17B6\
         \u1798\u178A\u17B6\u1793 (Loss Follow-up) NCD EMR Report - Cumulative"
@@ -176,7 +176,7 @@ position:
     children: []
     id: CHART-explore-58-1
     meta:
-      chartId: 13
+      chartId: 10
       height: 76
       sliceName: "\u1794\u17C4\u17C7\u1794\u1784\u17CB\u1780\u17B6\u179A\u178F\u17B6\
         \u1798\u178A\u17B6\u1793 (Loss Follow-up) NCD EMR Report"
@@ -194,7 +194,7 @@ position:
     children: []
     id: CHART-explore-59-1
     meta:
-      chartId: 18
+      chartId: 3
       height: 57
       sliceName: "\u1780\u17B6\u179A\u179F\u17D2\u179B\u17B6\u1794\u17CB (Death) NCD\
         \ EMR Report"
@@ -212,7 +212,7 @@ position:
     children: []
     id: CHART-explore-60-1
     meta:
-      chartId: 16
+      chartId: 53
       height: 57
       sliceName: "\u1780\u17B6\u179A\u179F\u17D2\u179B\u17B6\u1794\u17CB (Death) NCD\
         \ EMR Report - Cumulative"
@@ -574,12 +574,12 @@ metadata:
       rootPath:
       - ROOT_ID
       excluded:
-      - 22
-      - 19
-      - 15
-      - 17
-      - 20
-      - 16
+      - 55
+      - 32
+      - 69
+      - 5
+      - 70
+      - 53
     type: NATIVE_FILTER
     description: ''
     chartsInScope:
@@ -617,12 +617,12 @@ metadata:
       rootPath:
       - ROOT_ID
       excluded:
-      - 23
-      - 12
-      - 21
-      - 14
-      - 13
-      - 18
+      - 39
+      - 27
+      - 63
+      - 43
+      - 10
+      - 3
     type: NATIVE_FILTER
     description: ''
     chartsInScope:
diff --git a/base/configs/superset/assets/dashboards/NCD_Referral_Status_Report_Dashboard_8.yaml b/base/configs/superset/assets/dashboards/NCD_Referral_Status_Report_Dashboard_13.yaml
similarity index 91%
rename from base/configs/superset/assets/dashboards/NCD_Referral_Status_Report_Dashboard_8.yaml
rename to base/configs/superset/assets/dashboards/NCD_Referral_Status_Report_Dashboard_13.yaml
index 2e9462dd..c862bce1 100644
--- a/base/configs/superset/assets/dashboards/NCD_Referral_Status_Report_Dashboard_8.yaml
+++ b/base/configs/superset/assets/dashboards/NCD_Referral_Status_Report_Dashboard_13.yaml
@@ -11,7 +11,7 @@ position:
     children: []
     id: CHART-VYBstwY1_B
     meta:
-      chartId: 2
+      chartId: 37
       height: 81
       sliceName: NCD Referral Status Report
       uuid: 9cf83bb1-cc39-4c8a-89fa-3291f726b69a
@@ -57,7 +57,12 @@ metadata:
   timed_refresh_immune_slices: []
   cross_filters_enabled: false
   default_filters: '{}'
-  chart_configuration: {}
+  chart_configuration:
+    '37':
+      id: 37
+      crossFilters:
+        scope: global
+        chartsInScope: []
   shared_label_colors: {}
   color_scheme_domain: []
   native_filter_configuration:
@@ -107,7 +112,8 @@ metadata:
       extraFormData: {}
       filterState: {}
       ownState: {}
-    cascadeParentIds: []
+    cascadeParentIds:
+    - NATIVE_FILTER-7J3bpaW7m
     scope:
       rootPath:
       - ROOT_ID
@@ -115,7 +121,7 @@ metadata:
     type: NATIVE_FILTER
     description: ''
     chartsInScope:
-    - 140
+    - 37
     tabsInScope: []
   - id: NATIVE_FILTER-WHn4E3Und
     controlValues:
@@ -136,7 +142,9 @@ metadata:
       extraFormData: {}
       filterState: {}
       ownState: {}
-    cascadeParentIds: []
+    cascadeParentIds:
+    - NATIVE_FILTER-7J3bpaW7m
+    - NATIVE_FILTER-oSWGxjyfb
     scope:
       rootPath:
       - ROOT_ID
@@ -144,7 +152,7 @@ metadata:
     type: NATIVE_FILTER
     description: ''
     chartsInScope:
-    - 140
+    - 37
     tabsInScope: []
   - id: NATIVE_FILTER-47jI6h7SU
     controlValues:
@@ -169,4 +177,11 @@ metadata:
     chartsInScope:
     - 140
     tabsInScope: []
+  global_chart_configuration:
+    scope:
+      rootPath:
+      - ROOT_ID
+      excluded: []
+    chartsInScope:
+    - 37
 version: 1.0.0
diff --git a/base/configs/superset/assets/dashboards/RH_CCS_Report_Dashboard_21.yaml b/base/configs/superset/assets/dashboards/RH_CCS_Report_Dashboard_14.yaml
similarity index 91%
rename from base/configs/superset/assets/dashboards/RH_CCS_Report_Dashboard_21.yaml
rename to base/configs/superset/assets/dashboards/RH_CCS_Report_Dashboard_14.yaml
index b344472a..9b2e84d1 100644
--- a/base/configs/superset/assets/dashboards/RH_CCS_Report_Dashboard_21.yaml
+++ b/base/configs/superset/assets/dashboards/RH_CCS_Report_Dashboard_14.yaml
@@ -11,7 +11,7 @@ position:
     children: []
     id: CHART-QbQ4qr8Gxx
     meta:
-      chartId: 41
+      chartId: 26
       height: 90
       sliceName: RH CSS Report
       uuid: e04a169b-60d4-4514-8820-8a6b386dfa82
@@ -59,7 +59,12 @@ metadata:
   timed_refresh_immune_slices: []
   cross_filters_enabled: false
   default_filters: '{}'
-  chart_configuration: {}
+  chart_configuration:
+    '26':
+      id: 26
+      crossFilters:
+        scope: global
+        chartsInScope: []
   native_filter_configuration:
   - id: NATIVE_FILTER-ldOxNBmPY
     controlValues:
@@ -107,7 +112,8 @@ metadata:
       extraFormData: {}
       filterState: {}
       ownState: {}
-    cascadeParentIds: []
+    cascadeParentIds:
+    - NATIVE_FILTER-ldOxNBmPY
     scope:
       rootPath:
       - ROOT_ID
@@ -115,7 +121,7 @@ metadata:
     type: NATIVE_FILTER
     description: ''
     chartsInScope:
-    - 137
+    - 26
     tabsInScope: []
   - id: NATIVE_FILTER-tGAL-IKjl
     controlValues:
@@ -136,7 +142,9 @@ metadata:
       extraFormData: {}
       filterState: {}
       ownState: {}
-    cascadeParentIds: []
+    cascadeParentIds:
+    - NATIVE_FILTER-ldOxNBmPY
+    - NATIVE_FILTER-CC9nN5FHx
     scope:
       rootPath:
       - ROOT_ID
@@ -144,7 +152,7 @@ metadata:
     type: NATIVE_FILTER
     description: ''
     chartsInScope:
-    - 137
+    - 26
     tabsInScope: []
   - id: NATIVE_FILTER-HQ1PU0hJg
     controlValues:
@@ -169,4 +177,11 @@ metadata:
     chartsInScope:
     - 137
     tabsInScope: []
+  global_chart_configuration:
+    scope:
+      rootPath:
+      - ROOT_ID
+      excluded: []
+    chartsInScope:
+    - 26
 version: 1.0.0
diff --git a/base/configs/superset/assets/dashboards/RH_NCD_OPD_Register_Report_Dashboard_10.yaml b/base/configs/superset/assets/dashboards/RH_NCD_OPD_Register_Report_Dashboard_3.yaml
similarity index 90%
rename from base/configs/superset/assets/dashboards/RH_NCD_OPD_Register_Report_Dashboard_10.yaml
rename to base/configs/superset/assets/dashboards/RH_NCD_OPD_Register_Report_Dashboard_3.yaml
index a1740644..c42a700e 100644
--- a/base/configs/superset/assets/dashboards/RH_NCD_OPD_Register_Report_Dashboard_10.yaml
+++ b/base/configs/superset/assets/dashboards/RH_NCD_OPD_Register_Report_Dashboard_3.yaml
@@ -11,7 +11,7 @@ position:
     children: []
     id: CHART-PscuRjwD2k
     meta:
-      chartId: 10
+      chartId: 46
       height: 83
       sliceName: RH NCD OPD Register Report
       uuid: 971a570a-0181-4e85-b6aa-f90ffd7e9926
@@ -59,7 +59,12 @@ metadata:
   timed_refresh_immune_slices: []
   cross_filters_enabled: false
   default_filters: '{}'
-  chart_configuration: {}
+  chart_configuration:
+    '46':
+      id: 46
+      crossFilters:
+        scope: global
+        chartsInScope: []
   native_filter_configuration:
   - id: NATIVE_FILTER-MaX1fMSCW
     controlValues:
@@ -87,7 +92,7 @@ metadata:
     type: NATIVE_FILTER
     description: ''
     chartsInScope:
-    - 146
+    - 46
     tabsInScope: []
   - id: NATIVE_FILTER-9kFNxXtAj
     controlValues:
@@ -107,7 +112,8 @@ metadata:
       extraFormData: {}
       filterState: {}
       ownState: {}
-    cascadeParentIds: []
+    cascadeParentIds:
+    - NATIVE_FILTER-MaX1fMSCW
     scope:
       rootPath:
       - ROOT_ID
@@ -115,7 +121,7 @@ metadata:
     type: NATIVE_FILTER
     description: ''
     chartsInScope:
-    - 146
+    - 46
     tabsInScope: []
   - id: NATIVE_FILTER-j74t2tqer
     controlValues:
@@ -136,7 +142,9 @@ metadata:
       extraFormData: {}
       filterState: {}
       ownState: {}
-    cascadeParentIds: []
+    cascadeParentIds:
+    - NATIVE_FILTER-MaX1fMSCW
+    - NATIVE_FILTER-9kFNxXtAj
     scope:
       rootPath:
       - ROOT_ID
@@ -144,7 +152,7 @@ metadata:
     type: NATIVE_FILTER
     description: ''
     chartsInScope:
-    - 146
+    - 46
     tabsInScope: []
   - id: NATIVE_FILTER-iih629B5c
     controlValues:
@@ -169,4 +177,11 @@ metadata:
     chartsInScope:
     - 146
     tabsInScope: []
+  global_chart_configuration:
+    scope:
+      rootPath:
+      - ROOT_ID
+      excluded: []
+    chartsInScope:
+    - 46
 version: 1.0.0
diff --git a/base/configs/superset/assets/dashboards/Self-breast_Educated_and_Examinated_Women_16.yaml b/base/configs/superset/assets/dashboards/Self-breast_Educated_and_Examinated_Women_7.yaml
similarity index 99%
rename from base/configs/superset/assets/dashboards/Self-breast_Educated_and_Examinated_Women_16.yaml
rename to base/configs/superset/assets/dashboards/Self-breast_Educated_and_Examinated_Women_7.yaml
index 69db0e45..1fd86dd8 100644
--- a/base/configs/superset/assets/dashboards/Self-breast_Educated_and_Examinated_Women_16.yaml
+++ b/base/configs/superset/assets/dashboards/Self-breast_Educated_and_Examinated_Women_7.yaml
@@ -15,7 +15,7 @@ position:
     children: []
     id: CHART-explore-5-1
     meta:
-      chartId: 28
+      chartId: 52
       height: 50
       sliceName: "\u1785\u17C6\u1793\u17BD\u1793\u179F\u17D2\u178F\u17D2\u179A\u17B8\
         \u1794\u17B6\u1793\u17A2\u1794\u17CB\u179A\u17C6\u1793\u17B7\u1784\u1796\u17B7\
@@ -32,7 +32,7 @@ position:
     children: []
     id: CHART-explore-6-1
     meta:
-      chartId: 27
+      chartId: 64
       height: 50
       sliceName: "\u1785\u17C6\u1793\u17BD\u1793\u179F\u17D2\u178F\u17D2\u179A\u17B8\
         \u1780\u17D2\u1793\u17BB\u1784\u1798\u17BD\u1799\u1794\u17D2\u179A\u1797\u17C1\
@@ -53,7 +53,7 @@ position:
     children: []
     id: CHART-explore-7-1
     meta:
-      chartId: 30
+      chartId: 1
       height: 50
       sliceName: "\u1780\u17B6\u179A\u1782\u17D2\u179A\u1794\u17CB\u1782\u17D2\u179A\
         \u1784 (Management)"
@@ -68,7 +68,7 @@ position:
     children: []
     id: CHART-explore-8-1
     meta:
-      chartId: 29
+      chartId: 20
       height: 50
       sliceName: "\u179B\u1791\u17D2\u1792\u1795\u179B\u1780\u17B6\u179A\u1796\u17B7\
         \u1793\u17B7\u178F\u17D2\u1799\u179F\u17D2\u1791\u17B6\u1794\u178A\u17C4\u17C7\
diff --git a/base/configs/superset/assets/datasets/Analytics/Cervical_Cancer_Screening_HC_Raw_Data.yaml b/base/configs/superset/assets/datasets/Analytics/Cervical_Cancer_Screening_HC_Raw_Data.yaml
index 9f5d7f9e..637e95d0 100644
--- a/base/configs/superset/assets/datasets/Analytics/Cervical_Cancer_Screening_HC_Raw_Data.yaml
+++ b/base/configs/superset/assets/datasets/Analytics/Cervical_Cancer_Screening_HC_Raw_Data.yaml
@@ -200,13 +200,13 @@ sql: "SELECT\n  MAX(p.openmrs_id) AS client_id,\n  MAX(p.patient_name) AS client
   \      ) AS ssn,\n      SUBSTRING(\n        identifiers\n        FROM\n        \
   \  'Passport No: ([^,]*)'\n      ) AS passport_no,\n      COALESCE(\n        REGEXP_REPLACE\
   \ (\n          REGEXP_REPLACE (\n            identifiers,\n            '(?:OpenMRS\
-  \ ID|National ID|IDPoor|PMRS ID|COVID vaccination ID): [^,]*,?\\s?',\n         \
-  \   '',\n            'g'\n          ),\n          '^, |, $',\n          ''\n   \
-  \     ),\n        NULL\n      ) AS other_identifiers,\n      -- Addresses\n    \
-  \  address_country AS country,\n      address_state_province AS province,\n    \
-  \  address_county_district AS district,\n      address_city AS commune,\n      address_1\
-  \ AS village,\n      -- Attributes\n      SUBSTRING(\n        attributes\n     \
-  \   FROM\n          'Occupation: ([^/]*)'\n      ) AS occupation,\n      SUBSTRING(\n\
+  \ ID|National ID|IDPoor|PMRS ID|NSSF|SSN|COVID vaccination ID): [^,]*,?\\s?',\n\
+  \            '',\n            'g'\n          ),\n          '^, |, $',\n        \
+  \  ''\n        ),\n        NULL\n      ) AS other_identifiers,\n      -- Addresses\n\
+  \      address_country AS country,\n      address_state_province AS province,\n\
+  \      address_county_district AS district,\n      address_city AS commune,\n  \
+  \    address_1 AS village,\n      -- Attributes\n      SUBSTRING(\n        attributes\n\
+  \        FROM\n          'Occupation: ([^/]*)'\n      ) AS occupation,\n      SUBSTRING(\n\
   \        attributes\n        FROM\n          'Place of Birth: ([^/]*)'\n      )\
   \ AS place_of_birth,\n      SUBSTRING(\n        attributes\n        FROM\n     \
   \     'Ethnicity: ([^/]*)'\n      ) AS ethnicity,\n      SUBSTRING(\n        attributes\n\
diff --git a/base/configs/superset/assets/datasets/Analytics/Cervical_Cancer_Screening_RH_Raw_Data.yaml b/base/configs/superset/assets/datasets/Analytics/Cervical_Cancer_Screening_RH_Raw_Data.yaml
index 7fceee31..986ffddd 100644
--- a/base/configs/superset/assets/datasets/Analytics/Cervical_Cancer_Screening_RH_Raw_Data.yaml
+++ b/base/configs/superset/assets/datasets/Analytics/Cervical_Cancer_Screening_RH_Raw_Data.yaml
@@ -200,9 +200,9 @@ sql: "SELECT\n  MAX(p.openmrs_id) AS client_id,\n  MAX(p.patient_name) AS client
   \     SUBSTRING(\n        identifiers\n        FROM\n          'Passport No: ([^,]*)'\n\
   \      ) AS passport_no,\n      COALESCE(\n        REGEXP_REPLACE (\n          REGEXP_REPLACE\
   \ (\n            identifiers,\n            '(?:OpenMRS ID|National ID|IDPoor|PMRS\
-  \ ID|COVID vaccination ID): [^,]*,?\\s?',\n            '',\n            'g'\n  \
-  \        ),\n          '^, |, $',\n          ''\n        ),\n        NULL\n    \
-  \  ) AS other_identifiers,\n      -- Addresses\n      address_country AS country,\n\
+  \ ID|NSSF|SSN|COVID vaccination ID): [^,]*,?\\s?',\n            '',\n          \
+  \  'g'\n          ),\n          '^, |, $',\n          ''\n        ),\n        NULL\n\
+  \      ) AS other_identifiers,\n      -- Addresses\n      address_country AS country,\n\
   \      address_state_province AS province,\n      address_county_district AS district,\n\
   \      address_city AS commune,\n      address_1 AS village,\n      -- Attributes\n\
   \      SUBSTRING(\n        attributes\n        FROM\n          'Occupation: ([^/]*)'\n\
@@ -850,7 +850,7 @@ columns:
   extra: {}
 - column_name: rf_hf_code
   verbose_name: "\u179B\u17C1\u1781\u1780\u17BC\u178A\u1798\u17BC\u179B\u178A\u17D2\
-    \u178B\u17B6\u1793\u179F\u17BB\u1781\u17B6\u1797\u17B7\u1794\u17B6\u179B (*Referral\
+    \u178B\u17B6\u1793\u179F\u17BB\u1781\u17B6\u1797\u17B7\u1794\u17B6\u179B (Referral\
     \ HF's Code)"
   is_dttm: false
   is_active: true
@@ -864,8 +864,8 @@ columns:
   extra: {}
 - column_name: rf_hf_name
   verbose_name: "\u1788\u17D2\u1798\u17C4\u17C7\u1798\u17BC\u179B\u178A\u17D2\u178B\
-    \u17B6\u1793\u179F\u17BB\u1781\u17B6\u1797\u17B7\u1794\u17B6\u179B (*Referral\
-    \ HF's Name)"
+    \u17B6\u1793\u179F\u17BB\u1781\u17B6\u1797\u17B7\u1794\u17B6\u179B (Referral HF's\
+    \ Name)"
   is_dttm: false
   is_active: true
   type: STRING
@@ -1059,22 +1059,10 @@ columns:
   description: null
   python_date_format: null
   extra: {}
-- column_name: rf_hf_province
-  verbose_name: "\u1781\u17C1\u178F\u17D2\u178F/\u1780\u17D2\u179A\u17BB\u1784 (*Referral\
-    \ Province/City)"
-  is_dttm: false
-  is_active: true
-  type: STRING
-  advanced_data_type: null
-  groupby: true
-  filterable: true
-  expression: ''
-  description: null
-  python_date_format: null
-  extra: {}
-- column_name: rf_hf_district
-  verbose_name: "\u179F\u17D2\u179A\u17BB\u1780\u1794\u17D2\u179A\u178F\u17B7\u1794\
-    \u178F\u17D2\u178F\u17B7 (*Referral OD)"
+- column_name: hiv_treatment
+  verbose_name: "\u1780\u17B6\u179A\u1796\u17D2\u1799\u17B6\u1794\u17B6\u179B\u1798\
+    \u17C1\u179A\u17C4\u1782\u17A2\u17C1\u178A\u179F\u17CD/\u1787\u17C6\u1784\u17BA\
+    \u17A2\u17C1\u178A\u179F\u17CD (HIV/AIDS treatment)"
   is_dttm: false
   is_active: true
   type: STRING
@@ -1085,10 +1073,9 @@ columns:
   description: null
   python_date_format: null
   extra: {}
-- column_name: hiv_treatment
-  verbose_name: "\u1780\u17B6\u179A\u1796\u17D2\u1799\u17B6\u1794\u17B6\u179B\u1798\
-    \u17C1\u179A\u17C4\u1782\u17A2\u17C1\u178A\u179F\u17CD/\u1787\u17C6\u1784\u17BA\
-    \u17A2\u17C1\u178A\u179F\u17CD (HIV/AIDS treatment)"
+- column_name: rf_hf_province
+  verbose_name: "\u1781\u17C1\u178F\u17D2\u178F/\u1780\u17D2\u179A\u17BB\u1784 (Referral\
+    \ Province/City)"
   is_dttm: false
   is_active: true
   type: STRING
@@ -1191,6 +1178,19 @@ columns:
   description: null
   python_date_format: null
   extra: {}
+- column_name: rf_hf_district
+  verbose_name: "\u179F\u17D2\u179A\u17BB\u1780\u1794\u17D2\u179A\u178F\u17B7\u1794\
+    \u178F\u17D2\u178F\u17B7 (Referral OD)"
+  is_dttm: false
+  is_active: true
+  type: STRING
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: ''
+  description: null
+  python_date_format: null
+  extra: {}
 - column_name: visit_start_time
   verbose_name: "\u1796\u17C1\u179B\u179C\u17C1\u179B\u17B6\u1785\u17B6\u1794\u17CB\
     \u1795\u17D2\u178F\u17BE\u1798\u1796\u17B7\u1793\u17B7\u178F\u17D2\u1799\u1787\
diff --git a/base/configs/superset/assets/datasets/Analytics/Cervical_Cancer_Screening_for_Women.yaml b/base/configs/superset/assets/datasets/Analytics/Cervical_Cancer_Screening_for_Women.yaml
index eb2004ae..a31aa23f 100644
--- a/base/configs/superset/assets/datasets/Analytics/Cervical_Cancer_Screening_for_Women.yaml
+++ b/base/configs/superset/assets/datasets/Analytics/Cervical_Cancer_Screening_for_Women.yaml
@@ -142,7 +142,7 @@ columns:
   verbose_name: "\u1780\u17B6\u179A\u1798\u1780\u1796\u17B7\u1793\u17B7\u178F\u17D2\
     \u1799 (Visit Type)"
   is_dttm: false
-  is_active: null
+  is_active: true
   type: STRING
   advanced_data_type: null
   groupby: true
@@ -168,7 +168,7 @@ columns:
   verbose_name: "\u179B\u1791\u17D2\u1792\u1795\u179B\u178F\u17C1\u179F\u17D2\u178F\
     \ VIA (VIA Result)"
   is_dttm: false
-  is_active: null
+  is_active: true
   type: STRING
   advanced_data_type: null
   groupby: true
@@ -180,7 +180,7 @@ columns:
 - column_name: date_started
   verbose_name: null
   is_dttm: true
-  is_active: null
+  is_active: true
   type: DATETIME
   advanced_data_type: null
   groupby: true
@@ -192,7 +192,7 @@ columns:
 - column_name: age
   verbose_name: null
   is_dttm: false
-  is_active: null
+  is_active: true
   type: FLOAT
   advanced_data_type: null
   groupby: true
@@ -204,7 +204,7 @@ columns:
 - column_name: has_via_test
   verbose_name: null
   is_dttm: false
-  is_active: null
+  is_active: true
   type: INTEGER
   advanced_data_type: null
   groupby: true
@@ -216,7 +216,7 @@ columns:
 - column_name: is_treated
   verbose_name: null
   is_dttm: false
-  is_active: null
+  is_active: true
   type: INTEGER
   advanced_data_type: null
   groupby: true
@@ -240,7 +240,7 @@ columns:
 - column_name: health_facility_name
   verbose_name: null
   is_dttm: false
-  is_active: null
+  is_active: true
   type: STRING
   advanced_data_type: null
   groupby: true
@@ -249,10 +249,10 @@ columns:
   description: null
   python_date_format: null
   extra: {}
-- column_name: health_facility_code
+- column_name: breast_cancer_referred
   verbose_name: null
   is_dttm: false
-  is_active: null
+  is_active: true
   type: STRING
   advanced_data_type: null
   groupby: true
@@ -261,10 +261,10 @@ columns:
   description: null
   python_date_format: null
   extra: {}
-- column_name: health_facility_district
+- column_name: cervical_cancer_referred
   verbose_name: null
   is_dttm: false
-  is_active: null
+  is_active: true
   type: STRING
   advanced_data_type: null
   groupby: true
@@ -273,10 +273,10 @@ columns:
   description: null
   python_date_format: null
   extra: {}
-- column_name: health_facility_province
+- column_name: health_facility_code
   verbose_name: null
   is_dttm: false
-  is_active: null
+  is_active: true
   type: STRING
   advanced_data_type: null
   groupby: true
@@ -285,10 +285,10 @@ columns:
   description: null
   python_date_format: null
   extra: {}
-- column_name: via_test_result
+- column_name: health_facility_district
   verbose_name: null
   is_dttm: false
-  is_active: null
+  is_active: true
   type: STRING
   advanced_data_type: null
   groupby: true
@@ -297,10 +297,10 @@ columns:
   description: null
   python_date_format: null
   extra: {}
-- column_name: via_test
+- column_name: health_facility_province
   verbose_name: null
   is_dttm: false
-  is_active: null
+  is_active: true
   type: STRING
   advanced_data_type: null
   groupby: true
@@ -309,10 +309,10 @@ columns:
   description: null
   python_date_format: null
   extra: {}
-- column_name: referred_from
+- column_name: via_test_result
   verbose_name: null
   is_dttm: false
-  is_active: null
+  is_active: true
   type: STRING
   advanced_data_type: null
   groupby: true
@@ -321,10 +321,10 @@ columns:
   description: null
   python_date_format: null
   extra: {}
-- column_name: treated
+- column_name: patient_uuid
   verbose_name: null
   is_dttm: false
-  is_active: null
+  is_active: true
   type: STRING
   advanced_data_type: null
   groupby: true
@@ -333,10 +333,10 @@ columns:
   description: null
   python_date_format: null
   extra: {}
-- column_name: gender
+- column_name: via_test
   verbose_name: null
   is_dttm: false
-  is_active: null
+  is_active: true
   type: STRING
   advanced_data_type: null
   groupby: true
@@ -345,7 +345,7 @@ columns:
   description: null
   python_date_format: null
   extra: {}
-- column_name: breast_cancer_referred
+- column_name: referred_from
   verbose_name: null
   is_dttm: false
   is_active: true
@@ -357,7 +357,7 @@ columns:
   description: null
   python_date_format: null
   extra: {}
-- column_name: cervical_cancer_referred
+- column_name: treated
   verbose_name: null
   is_dttm: false
   is_active: true
@@ -369,7 +369,7 @@ columns:
   description: null
   python_date_format: null
   extra: {}
-- column_name: patient_uuid
+- column_name: gender
   verbose_name: null
   is_dttm: false
   is_active: true
diff --git a/base/configs/superset/assets/datasets/Analytics/NCD_HC_EMR_Raw_Data.yaml b/base/configs/superset/assets/datasets/Analytics/NCD_HC_EMR_Raw_Data.yaml
index 01a3b2c6..ab2dce8c 100644
--- a/base/configs/superset/assets/datasets/Analytics/NCD_HC_EMR_Raw_Data.yaml
+++ b/base/configs/superset/assets/datasets/Analytics/NCD_HC_EMR_Raw_Data.yaml
@@ -217,7 +217,7 @@ sql: "SELECT\n  MAX(p.openmrs_id) AS client_id,\n  MAX(p.patient_name) AS client
   \        FROM\n          'SSN: ([^,]*)'\n      ) AS ssn,\n      SUBSTRING(\n   \
   \     identifiers\n        FROM\n          'Passport No: ([^,]*)'\n      ) AS passport_no,\n\
   \      COALESCE(\n        REGEXP_REPLACE (\n          REGEXP_REPLACE (\n       \
-  \     identifiers,\n            '(?:OpenMRS ID|National ID|IDPoor|PMRS ID|COVID\
+  \     identifiers,\n            '(?:OpenMRS ID|National ID|IDPoor|PMRS ID|NSSF|SSN|COVID\
   \ vaccination ID): [^,]*,?\\s?',\n            '',\n            'g'\n          ),\n\
   \          '^, |, $',\n          ''\n        ),\n        NULL\n      ) AS other_identifiers,\n\
   \      -- Addresses\n      address_country AS country,\n      address_state_province\
diff --git a/base/configs/superset/assets/datasets/Analytics/NCD_RH_EMR_Raw_Data.yaml b/base/configs/superset/assets/datasets/Analytics/NCD_RH_EMR_Raw_Data.yaml
index 13349a66..69bc4c95 100644
--- a/base/configs/superset/assets/datasets/Analytics/NCD_RH_EMR_Raw_Data.yaml
+++ b/base/configs/superset/assets/datasets/Analytics/NCD_RH_EMR_Raw_Data.yaml
@@ -240,28 +240,28 @@ sql: "SELECT\n  MAX(p.openmrs_id) AS client_id,\n  MAX(p.patient_name) AS client
   \        FROM\n          'SSN: ([^,]*)'\n      ) AS ssn,\n      SUBSTRING(\n   \
   \     identifiers\n        FROM\n          'Passport No: ([^,]*)'\n      ) AS passport_no,\n\
   \      COALESCE(\n        REGEXP_REPLACE (\n          REGEXP_REPLACE (\n       \
-  \     identifiers,\n            '(?:OpenMRS ID|National ID|IDPoor|PMRS ID|COVID\
-  \ vaccination ID): [^,]*,?\\s?',\n            '',\n            'g'\n          ),\n\
-  \          '^, |, $',\n          ''\n        ),\n        NULL\n      ) AS other_identifiers,\n\
-  \      -- Addresses\n      address_country AS country,\n      address_state_province\
-  \ AS province,\n      address_county_district AS district,\n      address_city AS\
-  \ commune,\n      address_1 AS village,\n      -- Attributes\n      SUBSTRING(\n\
-  \        attributes\n        FROM\n          'Occupation: ([^/]*)'\n      ) AS occupation,\n\
-  \      SUBSTRING(\n        attributes\n        FROM\n          'Place of Birth:\
-  \ ([^/]*)'\n      ) AS place_of_birth,\n      SUBSTRING(\n        attributes\n \
-  \       FROM\n          'Ethnicity: ([^/]*)'\n      ) AS ethnicity,\n      SUBSTRING(\n\
-  \        attributes\n        FROM\n          'Marital Status: ([^/]*)'\n      )\
-  \ AS marital_status,\n      SUBSTRING(\n        attributes\n        FROM\n     \
-  \     'Education: ([^/]*)'\n      ) AS education,\n      SUBSTRING(\n        attributes\n\
-  \        FROM\n          'Telephone Number: ([^/]*)'\n      ) AS phone_number\n\
-  \    FROM\n      patients\n    WHERE\n      person_voided IS FALSE\n  ) p ON (p.patient_uuid=v.patient_uuid)\n\
-  WHERE\n  o.obs_voided IS FALSE\n  AND v.visit_voided IS FALSE\n  AND v.visit_type_uuid\
-  \ IN (\n    '5f4975a7-1af8-4a0b-9bbb-c4cfc22f2aab',\n    '54da8fbc-b92f-4251-b53a-feedc8e8c594'\n\
-  \  )\n  -- NCD Consultation, Medication History and Orders Encounter Types\n  AND\
-  \ e.encounter_type_uuid IN (\n    'f9fdbe63-12b4-479f-b8fd-dcbfde6aa944',\n    'b870b6bb-9441-4664-9087-3d3477174213',\n\
-  \    '39da3525-afe4-45ff-8977-c53b7b359158'\n  ) -- 422b7e0c-b8f3-4748-8e60-d6684315f141\n\
-  \  -- Referral Hospital (RH)\n  AND l.location_tags ILIKE '%Referral Hospital%'\n\
-  GROUP BY\n  v.visit_uuid,\n  p.patient_uuid"
+  \     identifiers,\n            '(?:OpenMRS ID|National ID|IDPoor|NSSF|SSN|PMRS\
+  \ ID|COVID vaccination ID): [^,]*,?\\s?',\n            '',\n            'g'\n  \
+  \        ),\n          '^, |, $',\n          ''\n        ),\n        NULL\n    \
+  \  ) AS other_identifiers,\n      -- Addresses\n      address_country AS country,\n\
+  \      address_state_province AS province,\n      address_county_district AS district,\n\
+  \      address_city AS commune,\n      address_1 AS village,\n      -- Attributes\n\
+  \      SUBSTRING(\n        attributes\n        FROM\n          'Occupation: ([^/]*)'\n\
+  \      ) AS occupation,\n      SUBSTRING(\n        attributes\n        FROM\n  \
+  \        'Place of Birth: ([^/]*)'\n      ) AS place_of_birth,\n      SUBSTRING(\n\
+  \        attributes\n        FROM\n          'Ethnicity: ([^/]*)'\n      ) AS ethnicity,\n\
+  \      SUBSTRING(\n        attributes\n        FROM\n          'Marital Status:\
+  \ ([^/]*)'\n      ) AS marital_status,\n      SUBSTRING(\n        attributes\n \
+  \       FROM\n          'Education: ([^/]*)'\n      ) AS education,\n      SUBSTRING(\n\
+  \        attributes\n        FROM\n          'Telephone Number: ([^/]*)'\n     \
+  \ ) AS phone_number\n    FROM\n      patients\n    WHERE\n      person_voided IS\
+  \ FALSE\n  ) p ON (p.patient_uuid=v.patient_uuid)\nWHERE\n  o.obs_voided IS FALSE\n\
+  \  AND v.visit_voided IS FALSE\n  AND v.visit_type_uuid IN (\n    '5f4975a7-1af8-4a0b-9bbb-c4cfc22f2aab',\n\
+  \    '54da8fbc-b92f-4251-b53a-feedc8e8c594'\n  )\n  -- NCD Consultation, Medication\
+  \ History and Orders Encounter Types\n  AND e.encounter_type_uuid IN (\n    'f9fdbe63-12b4-479f-b8fd-dcbfde6aa944',\n\
+  \    'b870b6bb-9441-4664-9087-3d3477174213',\n    '39da3525-afe4-45ff-8977-c53b7b359158'\n\
+  \  ) -- 422b7e0c-b8f3-4748-8e60-d6684315f141\n  -- Referral Hospital (RH)\n  AND\
+  \ l.location_tags ILIKE '%Referral Hospital%'\nGROUP BY\n  v.visit_uuid,\n  p.patient_uuid"
 params: null
 template_params: null
 filter_select_enabled: false