diff --git a/base/configs/superset/assets/charts/CCS_Distribution_of_visits_per_Province_12.yaml b/base/configs/superset/assets/charts/CCS_Distribution_of_visits_per_Province_12.yaml
new file mode 100644
index 00000000..49517809
--- /dev/null
+++ b/base/configs/superset/assets/charts/CCS_Distribution_of_visits_per_Province_12.yaml
@@ -0,0 +1,42 @@
+slice_name: CCS Distribution of visits per Province
+description: null
+certified_by: null
+certification_details: null
+viz_type: pie
+params:
+  datasource: 24__table
+  viz_type: pie
+  slice_id: 134
+  granularity_sqla: Visit date
+  time_range: '2024-02-01T07:15:38 : now'
+  groupby:
+  - Facility Province
+  metric: count
+  adhoc_filters: []
+  row_limit: 100
+  sort_by_metric: true
+  color_scheme: supersetColors
+  show_labels_threshold: 5
+  show_legend: true
+  legendType: scroll
+  legendOrientation: top
+  label_type: key
+  number_format: SMART_NUMBER
+  date_format: smart_date
+  show_labels: true
+  labels_outside: true
+  outerRadius: 87
+  donut: false
+  innerRadius: 30
+  extra_form_data: {}
+  dashboards:
+  - 11
+  annotation_layers: []
+query_context: '{"datasource":{"id":24,"type":"table"},"force":false,"queries":[{"time_range":"2024-02-01T07:15:38
+  : now","granularity":"Visit date","filters":[],"extras":{"having":"","where":""},"applied_time_extras":{},"columns":["Facility
+  Province"],"metrics":["count"],"orderby":[["count",false]],"annotation_layers":[],"row_limit":100,"series_limit":0,"order_desc":true,"url_params":{},"custom_params":{},"custom_form_data":{}}],"form_data":{"datasource":"24__table","viz_type":"pie","slice_id":134,"granularity_sqla":"Visit
+  date","time_range":"2024-02-01T07:15:38 : now","groupby":["Facility Province"],"metric":"count","adhoc_filters":[],"row_limit":100,"sort_by_metric":true,"color_scheme":"supersetColors","show_labels_threshold":5,"show_legend":true,"legendType":"scroll","legendOrientation":"top","label_type":"key","number_format":"SMART_NUMBER","date_format":"smart_date","show_labels":true,"labels_outside":true,"outerRadius":87,"donut":false,"innerRadius":30,"extra_form_data":{},"dashboards":[11],"force":false,"result_format":"json","result_type":"full"},"result_format":"json","result_type":"full"}'
+cache_timeout: null
+uuid: dd5925be-e474-4104-97d9-0a2ef4a34290
+version: 1.0.0
+dataset_uuid: 7bbd77f5-46bc-49ef-8436-608aefbfb35e
diff --git a/base/configs/superset/assets/charts/CCS_Indicators_16.yaml b/base/configs/superset/assets/charts/CCS_Indicators_16.yaml
new file mode 100644
index 00000000..c3157357
--- /dev/null
+++ b/base/configs/superset/assets/charts/CCS_Indicators_16.yaml
@@ -0,0 +1,227 @@
+slice_name: CCS Indicators
+description: null
+certified_by: null
+certification_details: null
+viz_type: pivot_table_v2
+params:
+  datasource: 4__table
+  viz_type: pivot_table_v2
+  slice_id: 16
+  groupbyColumns: []
+  groupbyRows: []
+  time_grain_sqla: P1D
+  temporal_columns_lookup:
+    Encounter date and time: true
+    Visit End date: true
+    Visit Start date: true
+    Patient's Birthdate: true
+  metrics:
+  - expressionType: SQL
+    sqlExpression: COUNT(DISTINCT CASE WHEN (indicator = 'women-aged-30-49-years-with-ccs-screening-first-time'
+      OR indicator = '80-percent-women-aged-30-49-years-with-ccs-screening-first-time-via-positive-referred')
+      THEN "OpenMRS ID" END)
+    column: null
+    aggregate: null
+    datasourceWarning: false
+    hasCustomLabel: true
+    label: "\u1799\u17C9\u17B6\u1784\u17A0\u17C4\u1785\u178E\u17B6\u179F\u17CB\u179F\
+      \u17D2\u178F\u17D2\u179A\u17B8\u1785\u17C6\u1793\u17BD\u1793 \u17E3\u17E0 \u1793\
+      \u17B6\u1780\u17CB\u178A\u17C2\u179B\u1798\u17B6\u1793\u17A2\u17B6\u1799\u17BB\
+      \u17A2\u17B6\u1799\u17BB\u1796\u17B8 \u17E3\u17E0 \u178A\u179B\u17CB \u17E4\u17E9\
+      \u1786\u17D2\u1793\u17B6\u17C6 \u1780\u17D2\u1793\u17BB\u1784\u1798\u17BD\u1799\
+      \u1781\u17C2    \u1794\u17B6\u1793\u1785\u17BB\u17C7\u1788\u17D2\u1798\u17C4\
+      \u17C7\u1796\u17B7\u1793\u17B7\u178F\u17D2\u1799\u179F\u17BB\u1781\u1797\u17B6\
+      \u1796\u1798\u17B6\u178F\u17CB\u179F\u17D2\u1794\u17BC\u1793\u179A\u1780\u178A\
+      \u17C6\u1794\u17C5\u1798\u17BB\u1793\u1780\u17D2\u179B\u17B6\u1799\u1787\u17B6\
+      \u1798\u17A0\u17B6\u179A\u17B8\u1780\u179B\u17BE\u1780\u178A\u17C6\u1794\u17BC\
+      \u1784\u200B \u1793\u17B7\u1784   \u1780\u179A\u178E\u17B8VIA \u179C\u17B7\u1787\
+      \u17D2\u1787\u1798\u17B6\u1793 \u178F\u17D2\u179A\u17BC\u179C\u1794\u17B6\u1793\
+      \u1794\u1789\u17D2\u1787\u17BC\u1793\u1791\u17C5\u1796\u17D2\u1799\u17B6\u1794\
+      \u17B6\u179B\u178A\u17C6\u1794\u17C5\u1798\u17B6\u178F\u17CB\u179F\u17D2\u1794\
+      \u17BC\u1793\u1787\u17B6\u179B\u17BE\u1780\u178A\u17C6\u1794\u17BC\u1784\u17D4\
+      \ (At least 30 women aged 30 \u2013 49 years registered and received the first\
+      \ screening and VIA positive cases were referred for cervical precancerous lesion\
+      \ treatment per month)"
+    optionName: metric_bm4lu228m7_czv4wuqradj
+  - expressionType: SQL
+    sqlExpression: "CASE \n    WHEN (COUNT(DISTINCT CASE WHEN indicator = '80-percent-women-aged-30-49-years-with-ccs-screening-first-time-via-positive-referred'\
+      \ THEN \"OpenMRS ID\" END) * 100.0 / (COUNT(DISTINCT CASE WHEN indicator = 'women-aged-30-49-years-with-ccs-screening-first-time'\
+      \ THEN \"OpenMRS ID\" END) + COUNT(DISTINCT CASE WHEN indicator = '80-percent-women-aged-30-49-years-with-ccs-screening-first-time-via-positive-referred'\
+      \ THEN \"OpenMRS ID\" END))) >= 80 \n    THEN 'Yes'\n    ELSE 'No'\nEND\n"
+    column: null
+    aggregate: null
+    datasourceWarning: false
+    hasCustomLabel: true
+    label: "\u1799\u17C9\u17B6\u1784\u17A0\u17C4\u1785\u178E\u17B6\u179F\u17CB 80\
+      \ \u1797\u17B6\u1782\u179A\u1799\u1793\u17C3\u17A2\u17D2\u1793\u1780\u1787\u17C6\
+      \u1784\u17BA\u178A\u17C2\u179B\u1798\u17B6\u1793\u1780\u17B6\u179A\u1792\u17D2\
+      \u179C\u17BE\u179A\u17C4\u1782\u179C\u17B7\u1793\u17B7\u1785\u17D2\u1786\u17D0\
+      \u1799\u178A\u17C2\u179B\u1794\u17B6\u1793\u1794\u1789\u17D2\u1787\u17B6\u1780\
+      \u17CB\u1787\u17B6 VIA+ \u178F\u17D2\u179A\u17BC\u179C\u1794\u17B6\u1793\u1794\
+      \u1789\u17D2\u1787\u17BC\u1793\u1791\u17C5\u1796\u17D2\u1799\u17B6\u1794\u17B6\
+      \u179B\u1793\u17C5 \u1798\u1793\u17D2\u1791\u17B8\u179A\u1796\u17C1\u1791\u17D2\
+      \u1799\u1794\u1784\u17D2\u1792\u17C2\u1780\u17D4 \u1798\u17BD\u1799\u1786\u17D2\
+      \u1793\u17B6\u17C6\u1794\u1793\u17D2\u1791\u17B6\u1794\u17CB\u1796\u17B8\u1780\
+      \u17B6\u179A\u1796\u17D2\u1799\u17B6\u1794\u17B6\u179B \u17A2\u17D2\u1793\u1780\
+      \u1787\u17C6\u1784\u17BA\u1793\u17B9\u1784\u178F\u17D2\u179A\u17BC\u179C\u1794\
+      \u17B6\u1793\u1796\u17B7\u1793\u17B7\u178F\u17D2\u1799\u1798\u17D2\u178F\u1784\
+      \u1791\u17C0\u178F \u178A\u17BC\u1785\u178A\u17C2\u179B\u1794\u17B6\u1793\u178E\
+      \u17C2\u1793\u17B6\u17C6\u1793\u17C5\u1780\u17D2\u1793\u17BB\u1784\u1793\u17B7\
+      \u1799\u17B6\u1799\u1787\u17B6\u178F\u17B7 (SOP) \u17D4 (At least 80 percent\
+      \ of patients with confirmed diagnosis as VIA+ were referred for treatment at\
+      \ the RHs. One year after of treatment, the patients will be rescreened again\
+      \ as recommended by SOP.)"
+    optionName: metric_2cxj9ntl3yi_kdmjmpegqto
+  metricsLayout: ROWS
+  adhoc_filters:
+  - clause: WHERE
+    subject: Visit Start date
+    operator: TEMPORAL_RANGE
+    comparator: No filter
+    expressionType: SIMPLE
+  row_limit: 1000
+  order_desc: true
+  aggregateFunction: Sum
+  rowTotals: false
+  colTotals: false
+  transposePivot: true
+  combineMetric: false
+  valueFormat: ~g
+  date_format: smart_date
+  rowOrder: key_a_to_z
+  colOrder: key_a_to_z
+  conditional_formatting: []
+  extra_form_data: {}
+  dashboards:
+  - 1
+query_context: "{\"datasource\":{\"id\":4,\"type\":\"table\"},\"force\":false,\"queries\"\
+  :[{\"filters\":[{\"col\":\"Visit Start date\",\"op\":\"TEMPORAL_RANGE\",\"val\"\
+  :\"No filter\"}],\"extras\":{\"time_grain_sqla\":\"P1D\",\"having\":\"\",\"where\"\
+  :\"\"},\"applied_time_extras\":{},\"columns\":[],\"metrics\":[{\"expressionType\"\
+  :\"SQL\",\"sqlExpression\":\"COUNT(DISTINCT CASE WHEN (indicator = 'women-aged-30-49-years-with-ccs-screening-first-time'\
+  \ OR indicator = '80-percent-women-aged-30-49-years-with-ccs-screening-first-time-via-positive-referred')\
+  \ THEN \\\"OpenMRS ID\\\" END)\",\"column\":null,\"aggregate\":null,\"datasourceWarning\"\
+  :false,\"hasCustomLabel\":true,\"label\":\"\u1799\u17C9\u17B6\u1784\u17A0\u17C4\u1785\
+  \u178E\u17B6\u179F\u17CB\u179F\u17D2\u178F\u17D2\u179A\u17B8\u1785\u17C6\u1793\u17BD\
+  \u1793 \u17E3\u17E0 \u1793\u17B6\u1780\u17CB\u178A\u17C2\u179B\u1798\u17B6\u1793\
+  \u17A2\u17B6\u1799\u17BB\u17A2\u17B6\u1799\u17BB\u1796\u17B8 \u17E3\u17E0 \u178A\
+  \u179B\u17CB \u17E4\u17E9\u1786\u17D2\u1793\u17B6\u17C6 \u1780\u17D2\u1793\u17BB\
+  \u1784\u1798\u17BD\u1799\u1781\u17C2    \u1794\u17B6\u1793\u1785\u17BB\u17C7\u1788\
+  \u17D2\u1798\u17C4\u17C7\u1796\u17B7\u1793\u17B7\u178F\u17D2\u1799\u179F\u17BB\u1781\
+  \u1797\u17B6\u1796\u1798\u17B6\u178F\u17CB\u179F\u17D2\u1794\u17BC\u1793\u179A\u1780\
+  \u178A\u17C6\u1794\u17C5\u1798\u17BB\u1793\u1780\u17D2\u179B\u17B6\u1799\u1787\u17B6\
+  \u1798\u17A0\u17B6\u179A\u17B8\u1780\u179B\u17BE\u1780\u178A\u17C6\u1794\u17BC\u1784\
+  \u200B \u1793\u17B7\u1784   \u1780\u179A\u178E\u17B8VIA \u179C\u17B7\u1787\u17D2\
+  \u1787\u1798\u17B6\u1793 \u178F\u17D2\u179A\u17BC\u179C\u1794\u17B6\u1793\u1794\u1789\
+  \u17D2\u1787\u17BC\u1793\u1791\u17C5\u1796\u17D2\u1799\u17B6\u1794\u17B6\u179B\u178A\
+  \u17C6\u1794\u17C5\u1798\u17B6\u178F\u17CB\u179F\u17D2\u1794\u17BC\u1793\u1787\u17B6\
+  \u179B\u17BE\u1780\u178A\u17C6\u1794\u17BC\u1784\u17D4 (At least 30 women aged 30\
+  \ \u2013 49 years registered and received the first screening and VIA positive cases\
+  \ were referred for cervical precancerous lesion treatment per month)\",\"optionName\"\
+  :\"metric_bm4lu228m7_czv4wuqradj\"},{\"expressionType\":\"SQL\",\"sqlExpression\"\
+  :\"CASE \\n    WHEN (COUNT(DISTINCT CASE WHEN indicator = '80-percent-women-aged-30-49-years-with-ccs-screening-first-time-via-positive-referred'\
+  \ THEN \\\"OpenMRS ID\\\" END) * 100.0 / (COUNT(DISTINCT CASE WHEN indicator = 'women-aged-30-49-years-with-ccs-screening-first-time'\
+  \ THEN \\\"OpenMRS ID\\\" END) + COUNT(DISTINCT CASE WHEN indicator = '80-percent-women-aged-30-49-years-with-ccs-screening-first-time-via-positive-referred'\
+  \ THEN \\\"OpenMRS ID\\\" END))) >= 80 \\n    THEN 'Yes'\\n    ELSE 'No'\\nEND\\\
+  n\",\"column\":null,\"aggregate\":null,\"datasourceWarning\":false,\"hasCustomLabel\"\
+  :true,\"label\":\"\u1799\u17C9\u17B6\u1784\u17A0\u17C4\u1785\u178E\u17B6\u179F\u17CB\
+  \ 80 \u1797\u17B6\u1782\u179A\u1799\u1793\u17C3\u17A2\u17D2\u1793\u1780\u1787\u17C6\
+  \u1784\u17BA\u178A\u17C2\u179B\u1798\u17B6\u1793\u1780\u17B6\u179A\u1792\u17D2\u179C\
+  \u17BE\u179A\u17C4\u1782\u179C\u17B7\u1793\u17B7\u1785\u17D2\u1786\u17D0\u1799\u178A\
+  \u17C2\u179B\u1794\u17B6\u1793\u1794\u1789\u17D2\u1787\u17B6\u1780\u17CB\u1787\u17B6\
+  \ VIA+ \u178F\u17D2\u179A\u17BC\u179C\u1794\u17B6\u1793\u1794\u1789\u17D2\u1787\u17BC\
+  \u1793\u1791\u17C5\u1796\u17D2\u1799\u17B6\u1794\u17B6\u179B\u1793\u17C5 \u1798\u1793\
+  \u17D2\u1791\u17B8\u179A\u1796\u17C1\u1791\u17D2\u1799\u1794\u1784\u17D2\u1792\u17C2\
+  \u1780\u17D4 \u1798\u17BD\u1799\u1786\u17D2\u1793\u17B6\u17C6\u1794\u1793\u17D2\u1791\
+  \u17B6\u1794\u17CB\u1796\u17B8\u1780\u17B6\u179A\u1796\u17D2\u1799\u17B6\u1794\u17B6\
+  \u179B \u17A2\u17D2\u1793\u1780\u1787\u17C6\u1784\u17BA\u1793\u17B9\u1784\u178F\u17D2\
+  \u179A\u17BC\u179C\u1794\u17B6\u1793\u1796\u17B7\u1793\u17B7\u178F\u17D2\u1799\u1798\
+  \u17D2\u178F\u1784\u1791\u17C0\u178F \u178A\u17BC\u1785\u178A\u17C2\u179B\u1794\u17B6\
+  \u1793\u178E\u17C2\u1793\u17B6\u17C6\u1793\u17C5\u1780\u17D2\u1793\u17BB\u1784\u1793\
+  \u17B7\u1799\u17B6\u1799\u1787\u17B6\u178F\u17B7 (SOP) \u17D4 (At least 80 percent\
+  \ of patients with confirmed diagnosis as VIA+ were referred for treatment at the\
+  \ RHs. One year after of treatment, the patients will be rescreened again as recommended\
+  \ by SOP.)\",\"optionName\":\"metric_2cxj9ntl3yi_kdmjmpegqto\"}],\"orderby\":[[{\"\
+  expressionType\":\"SQL\",\"sqlExpression\":\"COUNT(DISTINCT CASE WHEN (indicator\
+  \ = 'women-aged-30-49-years-with-ccs-screening-first-time' OR indicator = '80-percent-women-aged-30-49-years-with-ccs-screening-first-time-via-positive-referred')\
+  \ THEN \\\"OpenMRS ID\\\" END)\",\"column\":null,\"aggregate\":null,\"datasourceWarning\"\
+  :false,\"hasCustomLabel\":true,\"label\":\"\u1799\u17C9\u17B6\u1784\u17A0\u17C4\u1785\
+  \u178E\u17B6\u179F\u17CB\u179F\u17D2\u178F\u17D2\u179A\u17B8\u1785\u17C6\u1793\u17BD\
+  \u1793 \u17E3\u17E0 \u1793\u17B6\u1780\u17CB\u178A\u17C2\u179B\u1798\u17B6\u1793\
+  \u17A2\u17B6\u1799\u17BB\u17A2\u17B6\u1799\u17BB\u1796\u17B8 \u17E3\u17E0 \u178A\
+  \u179B\u17CB \u17E4\u17E9\u1786\u17D2\u1793\u17B6\u17C6 \u1780\u17D2\u1793\u17BB\
+  \u1784\u1798\u17BD\u1799\u1781\u17C2    \u1794\u17B6\u1793\u1785\u17BB\u17C7\u1788\
+  \u17D2\u1798\u17C4\u17C7\u1796\u17B7\u1793\u17B7\u178F\u17D2\u1799\u179F\u17BB\u1781\
+  \u1797\u17B6\u1796\u1798\u17B6\u178F\u17CB\u179F\u17D2\u1794\u17BC\u1793\u179A\u1780\
+  \u178A\u17C6\u1794\u17C5\u1798\u17BB\u1793\u1780\u17D2\u179B\u17B6\u1799\u1787\u17B6\
+  \u1798\u17A0\u17B6\u179A\u17B8\u1780\u179B\u17BE\u1780\u178A\u17C6\u1794\u17BC\u1784\
+  \u200B \u1793\u17B7\u1784   \u1780\u179A\u178E\u17B8VIA \u179C\u17B7\u1787\u17D2\
+  \u1787\u1798\u17B6\u1793 \u178F\u17D2\u179A\u17BC\u179C\u1794\u17B6\u1793\u1794\u1789\
+  \u17D2\u1787\u17BC\u1793\u1791\u17C5\u1796\u17D2\u1799\u17B6\u1794\u17B6\u179B\u178A\
+  \u17C6\u1794\u17C5\u1798\u17B6\u178F\u17CB\u179F\u17D2\u1794\u17BC\u1793\u1787\u17B6\
+  \u179B\u17BE\u1780\u178A\u17C6\u1794\u17BC\u1784\u17D4 (At least 30 women aged 30\
+  \ \u2013 49 years registered and received the first screening and VIA positive cases\
+  \ were referred for cervical precancerous lesion treatment per month)\",\"optionName\"\
+  :\"metric_bm4lu228m7_czv4wuqradj\"},false]],\"annotation_layers\":[],\"row_limit\"\
+  :1000,\"series_limit\":0,\"order_desc\":true,\"url_params\":{},\"custom_params\"\
+  :{},\"custom_form_data\":{}}],\"form_data\":{\"datasource\":\"4__table\",\"viz_type\"\
+  :\"pivot_table_v2\",\"slice_id\":16,\"groupbyColumns\":[],\"groupbyRows\":[],\"\
+  time_grain_sqla\":\"P1D\",\"temporal_columns_lookup\":{\"Encounter date and time\"\
+  :true,\"Visit End date\":true,\"Visit Start date\":true,\"Patient's Birthdate\"\
+  :true},\"metrics\":[{\"expressionType\":\"SQL\",\"sqlExpression\":\"COUNT(DISTINCT\
+  \ CASE WHEN (indicator = 'women-aged-30-49-years-with-ccs-screening-first-time'\
+  \ OR indicator = '80-percent-women-aged-30-49-years-with-ccs-screening-first-time-via-positive-referred')\
+  \ THEN \\\"OpenMRS ID\\\" END)\",\"column\":null,\"aggregate\":null,\"datasourceWarning\"\
+  :false,\"hasCustomLabel\":true,\"label\":\"\u1799\u17C9\u17B6\u1784\u17A0\u17C4\u1785\
+  \u178E\u17B6\u179F\u17CB\u179F\u17D2\u178F\u17D2\u179A\u17B8\u1785\u17C6\u1793\u17BD\
+  \u1793 \u17E3\u17E0 \u1793\u17B6\u1780\u17CB\u178A\u17C2\u179B\u1798\u17B6\u1793\
+  \u17A2\u17B6\u1799\u17BB\u17A2\u17B6\u1799\u17BB\u1796\u17B8 \u17E3\u17E0 \u178A\
+  \u179B\u17CB \u17E4\u17E9\u1786\u17D2\u1793\u17B6\u17C6 \u1780\u17D2\u1793\u17BB\
+  \u1784\u1798\u17BD\u1799\u1781\u17C2    \u1794\u17B6\u1793\u1785\u17BB\u17C7\u1788\
+  \u17D2\u1798\u17C4\u17C7\u1796\u17B7\u1793\u17B7\u178F\u17D2\u1799\u179F\u17BB\u1781\
+  \u1797\u17B6\u1796\u1798\u17B6\u178F\u17CB\u179F\u17D2\u1794\u17BC\u1793\u179A\u1780\
+  \u178A\u17C6\u1794\u17C5\u1798\u17BB\u1793\u1780\u17D2\u179B\u17B6\u1799\u1787\u17B6\
+  \u1798\u17A0\u17B6\u179A\u17B8\u1780\u179B\u17BE\u1780\u178A\u17C6\u1794\u17BC\u1784\
+  \u200B \u1793\u17B7\u1784   \u1780\u179A\u178E\u17B8VIA \u179C\u17B7\u1787\u17D2\
+  \u1787\u1798\u17B6\u1793 \u178F\u17D2\u179A\u17BC\u179C\u1794\u17B6\u1793\u1794\u1789\
+  \u17D2\u1787\u17BC\u1793\u1791\u17C5\u1796\u17D2\u1799\u17B6\u1794\u17B6\u179B\u178A\
+  \u17C6\u1794\u17C5\u1798\u17B6\u178F\u17CB\u179F\u17D2\u1794\u17BC\u1793\u1787\u17B6\
+  \u179B\u17BE\u1780\u178A\u17C6\u1794\u17BC\u1784\u17D4 (At least 30 women aged 30\
+  \ \u2013 49 years registered and received the first screening and VIA positive cases\
+  \ were referred for cervical precancerous lesion treatment per month)\",\"optionName\"\
+  :\"metric_bm4lu228m7_czv4wuqradj\"},{\"expressionType\":\"SQL\",\"sqlExpression\"\
+  :\"CASE \\n    WHEN (COUNT(DISTINCT CASE WHEN indicator = '80-percent-women-aged-30-49-years-with-ccs-screening-first-time-via-positive-referred'\
+  \ THEN \\\"OpenMRS ID\\\" END) * 100.0 / (COUNT(DISTINCT CASE WHEN indicator = 'women-aged-30-49-years-with-ccs-screening-first-time'\
+  \ THEN \\\"OpenMRS ID\\\" END) + COUNT(DISTINCT CASE WHEN indicator = '80-percent-women-aged-30-49-years-with-ccs-screening-first-time-via-positive-referred'\
+  \ THEN \\\"OpenMRS ID\\\" END))) >= 80 \\n    THEN 'Yes'\\n    ELSE 'No'\\nEND\\\
+  n\",\"column\":null,\"aggregate\":null,\"datasourceWarning\":false,\"hasCustomLabel\"\
+  :true,\"label\":\"\u1799\u17C9\u17B6\u1784\u17A0\u17C4\u1785\u178E\u17B6\u179F\u17CB\
+  \ 80 \u1797\u17B6\u1782\u179A\u1799\u1793\u17C3\u17A2\u17D2\u1793\u1780\u1787\u17C6\
+  \u1784\u17BA\u178A\u17C2\u179B\u1798\u17B6\u1793\u1780\u17B6\u179A\u1792\u17D2\u179C\
+  \u17BE\u179A\u17C4\u1782\u179C\u17B7\u1793\u17B7\u1785\u17D2\u1786\u17D0\u1799\u178A\
+  \u17C2\u179B\u1794\u17B6\u1793\u1794\u1789\u17D2\u1787\u17B6\u1780\u17CB\u1787\u17B6\
+  \ VIA+ \u178F\u17D2\u179A\u17BC\u179C\u1794\u17B6\u1793\u1794\u1789\u17D2\u1787\u17BC\
+  \u1793\u1791\u17C5\u1796\u17D2\u1799\u17B6\u1794\u17B6\u179B\u1793\u17C5 \u1798\u1793\
+  \u17D2\u1791\u17B8\u179A\u1796\u17C1\u1791\u17D2\u1799\u1794\u1784\u17D2\u1792\u17C2\
+  \u1780\u17D4 \u1798\u17BD\u1799\u1786\u17D2\u1793\u17B6\u17C6\u1794\u1793\u17D2\u1791\
+  \u17B6\u1794\u17CB\u1796\u17B8\u1780\u17B6\u179A\u1796\u17D2\u1799\u17B6\u1794\u17B6\
+  \u179B \u17A2\u17D2\u1793\u1780\u1787\u17C6\u1784\u17BA\u1793\u17B9\u1784\u178F\u17D2\
+  \u179A\u17BC\u179C\u1794\u17B6\u1793\u1796\u17B7\u1793\u17B7\u178F\u17D2\u1799\u1798\
+  \u17D2\u178F\u1784\u1791\u17C0\u178F \u178A\u17BC\u1785\u178A\u17C2\u179B\u1794\u17B6\
+  \u1793\u178E\u17C2\u1793\u17B6\u17C6\u1793\u17C5\u1780\u17D2\u1793\u17BB\u1784\u1793\
+  \u17B7\u1799\u17B6\u1799\u1787\u17B6\u178F\u17B7 (SOP) \u17D4 (At least 80 percent\
+  \ of patients with confirmed diagnosis as VIA+ were referred for treatment at the\
+  \ RHs. One year after of treatment, the patients will be rescreened again as recommended\
+  \ by SOP.)\",\"optionName\":\"metric_2cxj9ntl3yi_kdmjmpegqto\"}],\"metricsLayout\"\
+  :\"ROWS\",\"adhoc_filters\":[{\"clause\":\"WHERE\",\"subject\":\"Visit Start date\"\
+  ,\"operator\":\"TEMPORAL_RANGE\",\"comparator\":\"No filter\",\"expressionType\"\
+  :\"SIMPLE\"}],\"row_limit\":1000,\"order_desc\":true,\"aggregateFunction\":\"Sum\"\
+  ,\"rowTotals\":false,\"colTotals\":false,\"transposePivot\":true,\"combineMetric\"\
+  :false,\"valueFormat\":\"~g\",\"date_format\":\"smart_date\",\"rowOrder\":\"key_a_to_z\"\
+  ,\"colOrder\":\"key_a_to_z\",\"conditional_formatting\":[],\"extra_form_data\":{},\"\
+  dashboards\":[1],\"force\":false,\"result_format\":\"json\",\"result_type\":\"full\"\
+  },\"result_format\":\"json\",\"result_type\":\"full\"}"
+cache_timeout: null
+uuid: ee7add1c-c8aa-4984-9db7-3fa3f726f15c
+version: 1.0.0
+dataset_uuid: 3680ccf7-bec7-45bc-8e9d-8afaba18b508
diff --git a/base/configs/superset/assets/charts/CCS_Missed_Referrals_Report_8.yaml b/base/configs/superset/assets/charts/CCS_Missed_Referrals_Report_8.yaml
new file mode 100644
index 00000000..47e053c3
--- /dev/null
+++ b/base/configs/superset/assets/charts/CCS_Missed_Referrals_Report_8.yaml
@@ -0,0 +1,67 @@
+slice_name: CCS Missed Referrals Report
+description: null
+certified_by: null
+certification_details: null
+viz_type: table
+params:
+  datasource: 25__table
+  viz_type: table
+  slice_id: 136
+  granularity_sqla: Visit date
+  time_grain_sqla: P1D
+  time_range: No filter
+  query_mode: aggregate
+  groupby:
+  - Facility Name
+  - Facility District
+  - Facility Province
+  - Referral Facility Name
+  - Referral Facility District
+  - Referral Facility Province
+  - OpenMRS ID
+  - Patient's name
+  - Age
+  - Phone number
+  - Province/City
+  - District/ Khan
+  - Commune/ Sangkat
+  - Village
+  - Visit date
+  - Cervical cancer reason for referral
+  - Other cervical cancer reason for referral
+  - Breast cancer reason for referral
+  - Other breast cancer reason for referral
+  all_columns: []
+  percent_metrics: []
+  adhoc_filters: []
+  order_by_cols: []
+  row_limit: 10000
+  server_page_length: 10
+  order_desc: true
+  table_timestamp_format: smart_date
+  include_search: true
+  show_cell_bars: true
+  color_pn: true
+  allow_rearrange_columns: true
+  conditional_formatting: []
+  extra_form_data: {}
+  dashboards:
+  - 12
+  annotation_layers: []
+query_context: '{"datasource":{"id":25,"type":"table"},"force":false,"queries":[{"time_range":"No
+  filter","granularity":"Visit date","filters":[],"extras":{"time_grain_sqla":"P1D","having":"","where":""},"applied_time_extras":{},"columns":["Facility
+  Name","Facility District","Facility Province","Referral Facility Name","Referral
+  Facility District","Referral Facility Province","OpenMRS ID","Patient''s name","Age","Phone
+  number","Province/City","District/ Khan","Commune/ Sangkat","Village","Visit date","Cervical
+  cancer reason for referral","Other cervical cancer reason for referral","Breast
+  cancer reason for referral","Other breast cancer reason for referral"],"metrics":[],"orderby":[],"annotation_layers":[],"row_limit":10000,"series_limit":0,"order_desc":true,"url_params":{},"custom_params":{},"custom_form_data":{},"post_processing":[]}],"form_data":{"datasource":"25__table","viz_type":"table","slice_id":136,"granularity_sqla":"Visit
+  date","time_grain_sqla":"P1D","time_range":"No filter","query_mode":"aggregate","groupby":["Facility
+  Name","Facility District","Facility Province","Referral Facility Name","Referral
+  Facility District","Referral Facility Province","OpenMRS ID","Patient''s name","Age","Phone
+  number","Province/City","District/ Khan","Commune/ Sangkat","Village","Visit date","Cervical
+  cancer reason for referral","Other cervical cancer reason for referral","Breast
+  cancer reason for referral","Other breast cancer reason for referral"],"all_columns":[],"percent_metrics":[],"adhoc_filters":[],"order_by_cols":[],"row_limit":10000,"server_page_length":10,"order_desc":true,"table_timestamp_format":"smart_date","include_search":true,"show_cell_bars":true,"color_pn":true,"allow_rearrange_columns":true,"conditional_formatting":[],"extra_form_data":{},"dashboards":[12],"force":false,"result_format":"json","result_type":"full"},"result_format":"json","result_type":"full"}'
+cache_timeout: null
+uuid: 14eb222c-0b43-4ba9-8617-dfeb3754bc46
+version: 1.0.0
+dataset_uuid: 412423af-0fdd-4e33-b15d-2b63a9e213e1
diff --git a/base/configs/superset/assets/charts/CCS_Monthly_total_count_of_visits_grouped_by_district_9.yaml b/base/configs/superset/assets/charts/CCS_Monthly_total_count_of_visits_grouped_by_district_9.yaml
new file mode 100644
index 00000000..cd3e5b46
--- /dev/null
+++ b/base/configs/superset/assets/charts/CCS_Monthly_total_count_of_visits_grouped_by_district_9.yaml
@@ -0,0 +1,59 @@
+slice_name: CCS Monthly total count of visits grouped by district
+description: null
+certified_by: null
+certification_details: null
+viz_type: echarts_timeseries_bar
+params:
+  datasource: 24__table
+  viz_type: echarts_timeseries_bar
+  slice_id: 135
+  granularity_sqla: Visit date
+  time_grain_sqla: P1M
+  time_range: 'DATEADD(DATETIME("now"), -1, year) : now'
+  metrics:
+  - count
+  groupby:
+  - Facility District
+  adhoc_filters: []
+  order_desc: true
+  row_limit: 10000
+  truncate_metric: true
+  show_empty_columns: true
+  comparison_type: values
+  annotation_layers: []
+  forecastPeriods: 10
+  forecastInterval: 0.8
+  orientation: vertical
+  x_axis_title_margin: 15
+  y_axis_title_margin: 15
+  y_axis_title_position: Left
+  color_scheme: supersetColors
+  show_value: true
+  stack: false
+  only_total: true
+  zoomable: true
+  show_legend: true
+  legendType: scroll
+  legendOrientation: top
+  x_axis_time_format: smart_date
+  y_axis_format: SMART_NUMBER
+  y_axis_bounds:
+  - null
+  - null
+  rich_tooltip: true
+  tooltipSortByMetric: false
+  tooltipTimeFormat: smart_date
+  extra_form_data: {}
+  dashboards:
+  - 11
+query_context: '{"datasource":{"id":24,"type":"table"},"force":false,"queries":[{"time_range":"DATEADD(DATETIME(\"now\"),
+  -1, year) : now","granularity":"Visit date","filters":[],"extras":{"time_grain_sqla":"P1M","having":"","where":""},"applied_time_extras":{},"columns":["Facility
+  District"],"metrics":["count"],"orderby":[["count",false]],"annotation_layers":[],"row_limit":10000,"series_columns":["Facility
+  District"],"series_limit":0,"order_desc":true,"url_params":{},"custom_params":{},"custom_form_data":{},"is_timeseries":true,"time_offsets":[],"post_processing":[{"operation":"pivot","options":{"index":["__timestamp"],"columns":["Facility
+  District"],"aggregates":{"count":{"operator":"mean"}},"drop_missing_columns":false}},{"operation":"rename","options":{"columns":{"count":null},"level":0,"inplace":true}},{"operation":"flatten"}]}],"form_data":{"datasource":"24__table","viz_type":"echarts_timeseries_bar","slice_id":135,"granularity_sqla":"Visit
+  date","time_grain_sqla":"P1M","time_range":"DATEADD(DATETIME(\"now\"), -1, year)
+  : now","metrics":["count"],"groupby":["Facility District"],"adhoc_filters":[],"order_desc":true,"row_limit":10000,"truncate_metric":true,"show_empty_columns":true,"comparison_type":"values","annotation_layers":[],"forecastPeriods":10,"forecastInterval":0.8,"orientation":"vertical","x_axis_title_margin":15,"y_axis_title_margin":15,"y_axis_title_position":"Left","color_scheme":"supersetColors","show_value":true,"stack":false,"only_total":true,"zoomable":true,"show_legend":true,"legendType":"scroll","legendOrientation":"top","x_axis_time_format":"smart_date","y_axis_format":"SMART_NUMBER","y_axis_bounds":[null,null],"rich_tooltip":true,"tooltipSortByMetric":false,"tooltipTimeFormat":"smart_date","extra_form_data":{},"dashboards":[11],"force":false,"result_format":"json","result_type":"full"},"result_format":"json","result_type":"full"}'
+cache_timeout: null
+uuid: 6d8cee3a-64cc-4a2e-af31-7f5b4fefc90b
+version: 1.0.0
+dataset_uuid: 7bbd77f5-46bc-49ef-8436-608aefbfb35e
diff --git a/base/configs/superset/assets/charts/HC_CCS_Report_1.yaml b/base/configs/superset/assets/charts/HC_CCS_Report_1.yaml
new file mode 100644
index 00000000..8ebf591e
--- /dev/null
+++ b/base/configs/superset/assets/charts/HC_CCS_Report_1.yaml
@@ -0,0 +1,85 @@
+slice_name: HC CCS Report
+description: null
+certified_by: null
+certification_details: null
+viz_type: table
+params:
+  datasource: 24__table
+  viz_type: table
+  slice_id: 133
+  granularity_sqla: Visit date
+  time_range: 'DATEADD(DATETIME("now"), -1, year) : now'
+  query_mode: raw
+  groupby: []
+  all_columns:
+  - OpenMRS ID
+  - ID Poor Card
+  - National ID Card
+  - PMRS ID Number
+  - Other Identifiers
+  - Patient's name
+  - Age
+  - Province/City
+  - District/ Khan
+  - Commune/ Sangkat
+  - Village
+  - Phone number
+  - Visit date
+  - Type of visit
+  - Payment type
+  - Referred From
+  - SCJ
+  - VIA test result
+  - If VIA(+) Number of Quadrants involved
+  - If VIA(+) % of Acetowhite site
+  - HPV Test result
+  - 'Type of HPV '
+  - Treatment option
+  - Other treatment specified
+  - Self breast examination and education
+  - Breast Examination Result
+  - Other Breast Examination Result
+  - Treatment
+  - Facility Province
+  - Facility District
+  - Facility Name
+  percent_metrics: []
+  adhoc_filters: []
+  order_by_cols: []
+  row_limit: 10000
+  server_page_length: 10
+  order_desc: true
+  table_timestamp_format: smart_date
+  include_search: true
+  show_cell_bars: true
+  color_pn: true
+  allow_rearrange_columns: true
+  column_config:
+    Age:
+      showCellBars: false
+  conditional_formatting: []
+  extra_form_data: {}
+  dashboards:
+  - 11
+  annotation_layers: []
+query_context: '{"datasource":{"id":24,"type":"table"},"force":false,"queries":[{"time_range":"DATEADD(DATETIME(\"now\"),
+  -1, year) : now","granularity":"Visit date","filters":[],"extras":{"having":"","where":""},"applied_time_extras":{},"columns":["OpenMRS
+  ID","ID Poor Card","National ID Card","PMRS ID Number","Other Identifiers","Patient''s
+  name","Age","Province/City","District/ Khan","Commune/ Sangkat","Village","Phone
+  number","Visit date","Type of visit","Payment type","Referred From","SCJ","VIA test
+  result","If VIA(+) Number of Quadrants involved","If VIA(+) % of Acetowhite site","HPV
+  Test result","Type of HPV ","Treatment option","Other treatment specified","Self
+  breast examination and education","Breast Examination Result","Other Breast Examination
+  Result","Treatment","Facility Province","Facility District","Facility Name"],"orderby":[],"annotation_layers":[],"row_limit":10000,"series_limit":0,"order_desc":true,"url_params":{},"custom_params":{},"custom_form_data":{},"post_processing":[]}],"form_data":{"datasource":"24__table","viz_type":"table","slice_id":133,"granularity_sqla":"Visit
+  date","time_range":"DATEADD(DATETIME(\"now\"), -1, year) : now","query_mode":"raw","groupby":[],"all_columns":["OpenMRS
+  ID","ID Poor Card","National ID Card","PMRS ID Number","Other Identifiers","Patient''s
+  name","Age","Province/City","District/ Khan","Commune/ Sangkat","Village","Phone
+  number","Visit date","Type of visit","Payment type","Referred From","SCJ","VIA test
+  result","If VIA(+) Number of Quadrants involved","If VIA(+) % of Acetowhite site","HPV
+  Test result","Type of HPV ","Treatment option","Other treatment specified","Self
+  breast examination and education","Breast Examination Result","Other Breast Examination
+  Result","Treatment","Facility Province","Facility District","Facility Name"],"percent_metrics":[],"adhoc_filters":[],"order_by_cols":[],"row_limit":10000,"server_page_length":10,"include_time":false,"order_desc":true,"table_timestamp_format":"smart_date","include_search":true,"show_cell_bars":true,"color_pn":true,"allow_rearrange_columns":true,"column_config":{"Age":{"showCellBars":false}},"conditional_formatting":[],"extra_form_data":{},"dashboards":[11],"force":false,"result_format":"json","result_type":"full"},"result_format":"json","result_type":"full"}'
+cache_timeout: null
+uuid: 5aaa773a-3be3-4fed-b221-a1f3c395cc8b
+version: 1.0.0
+dataset_uuid: 7bbd77f5-46bc-49ef-8436-608aefbfb35e
diff --git a/base/configs/superset/assets/charts/HC_NCD_OPD_Register_Report_17.yaml b/base/configs/superset/assets/charts/HC_NCD_OPD_Register_Report_17.yaml
new file mode 100644
index 00000000..14867fcd
--- /dev/null
+++ b/base/configs/superset/assets/charts/HC_NCD_OPD_Register_Report_17.yaml
@@ -0,0 +1,102 @@
+slice_name: HC NCD OPD Register Report
+description: null
+certified_by: null
+certification_details: null
+viz_type: table
+params:
+  datasource: 30__table
+  viz_type: table
+  slice_id: 142
+  granularity_sqla: Visit Date
+  time_grain_sqla: P1D
+  time_range: No filter
+  query_mode: raw
+  groupby: []
+  all_columns:
+  - Facility Name
+  - Facility District
+  - Facility Province
+  - Patient's name
+  - OpenMRS ID
+  - Gender
+  - Phone number
+  - Referred By
+  - Village
+  - District/ Khan
+  - Commune/ Sangkat
+  - BMI
+  - Province/City
+  - Age
+  - Visit Date
+  - Zone
+  - Weight
+  - Temperature
+  - Diastolic Pressure
+  - Height
+  - Respiratory Rate
+  - Systolic Pressure
+  - Circumference
+  - Pulse
+  - Fasting Blood Sugar
+  - Random Blood Sugar
+  - OGTT
+  - Albumin
+  - Ketones
+  - HbA1c
+  - Smoking Status
+  - Physical Exercise
+  - Alcohol Use
+  - CVD risk score (%)
+  - Tele-consultation with NCD unit
+  - Diagnosis 1
+  - Diagnosis 2
+  - Management Lifestyle
+  - Management - Medications
+  - Appointment Reason
+  - Referral Facility
+  - Reason for referral
+  - Payment Type
+  - Remarks
+  percent_metrics: []
+  adhoc_filters: []
+  order_by_cols: []
+  row_limit: 1000
+  server_page_length: 10
+  order_desc: true
+  table_timestamp_format: smart_date
+  page_length: 0
+  include_search: true
+  show_cell_bars: true
+  color_pn: true
+  allow_rearrange_columns: true
+  column_config:
+    Age:
+      showCellBars: false
+  conditional_formatting: []
+  extra_form_data: {}
+  dashboards:
+  - 17
+  annotation_layers: []
+query_context: '{"datasource":{"id":30,"type":"table"},"force":false,"queries":[{"time_range":"No
+  filter","granularity":"Visit Date","filters":[],"extras":{"time_grain_sqla":"P1D","having":"","where":""},"applied_time_extras":{},"columns":["Facility
+  Name","Facility District","Facility Province","Patient''s name","OpenMRS ID","Gender","Phone
+  number","Referred By","Village","District/ Khan","Commune/ Sangkat","BMI","Province/City","Age","Visit
+  Date","Zone","Weight","Temperature","Diastolic Pressure","Height","Respiratory Rate","Systolic
+  Pressure","Circumference","Pulse","Fasting Blood Sugar","Random Blood Sugar","OGTT","Albumin","Ketones","HbA1c","Smoking
+  Status","Physical Exercise","Alcohol Use","CVD risk score (%)","Tele-consultation
+  with NCD unit","Diagnosis 1","Diagnosis 2","Management Lifestyle","Management -
+  Medications","Appointment Reason","Referral Facility","Reason for referral","Payment
+  Type","Remarks"],"orderby":[],"annotation_layers":[],"row_limit":1000,"series_limit":0,"order_desc":true,"url_params":{},"custom_params":{},"custom_form_data":{},"post_processing":[]}],"form_data":{"datasource":"30__table","viz_type":"table","slice_id":142,"granularity_sqla":"Visit
+  Date","time_grain_sqla":"P1D","time_range":"No filter","query_mode":"raw","groupby":[],"all_columns":["Facility
+  Name","Facility District","Facility Province","Patient''s name","OpenMRS ID","Gender","Phone
+  number","Referred By","Village","District/ Khan","Commune/ Sangkat","BMI","Province/City","Age","Visit
+  Date","Zone","Weight","Temperature","Diastolic Pressure","Height","Respiratory Rate","Systolic
+  Pressure","Circumference","Pulse","Fasting Blood Sugar","Random Blood Sugar","OGTT","Albumin","Ketones","HbA1c","Smoking
+  Status","Physical Exercise","Alcohol Use","CVD risk score (%)","Tele-consultation
+  with NCD unit","Diagnosis 1","Diagnosis 2","Management Lifestyle","Management -
+  Medications","Appointment Reason","Referral Facility","Reason for referral","Payment
+  Type","Remarks"],"percent_metrics":[],"adhoc_filters":[],"order_by_cols":[],"row_limit":1000,"server_page_length":10,"include_time":false,"order_desc":true,"table_timestamp_format":"smart_date","page_length":0,"include_search":true,"show_cell_bars":true,"color_pn":true,"allow_rearrange_columns":true,"column_config":{"Age":{"showCellBars":false}},"conditional_formatting":[],"extra_form_data":{},"dashboards":[17],"force":false,"result_format":"json","result_type":"full"},"result_format":"json","result_type":"full"}'
+cache_timeout: null
+uuid: 21650553-f9e7-4249-a0b2-088c1aaca1ea
+version: 1.0.0
+dataset_uuid: 262d446a-2c07-4b3b-8ab0-a792b242dea4
diff --git a/base/configs/superset/assets/charts/HC_NCD_OPD_Register_Report_20.yaml b/base/configs/superset/assets/charts/HC_NCD_OPD_Register_Report_20.yaml
new file mode 100644
index 00000000..9938d9ee
--- /dev/null
+++ b/base/configs/superset/assets/charts/HC_NCD_OPD_Register_Report_20.yaml
@@ -0,0 +1,116 @@
+slice_name: HC NCD OPD Register Report
+description: null
+certified_by: null
+certification_details: null
+viz_type: table
+params:
+  datasource: 6__table
+  viz_type: table
+  slice_id: 17
+  query_mode: raw
+  groupby: []
+  time_grain_sqla: P1D
+  temporal_columns_lookup:
+    Appointment Date: true
+    Visit Date: true
+  all_columns:
+  - Facility Name
+  - Facility District
+  - Facility Province
+  - Patient's name
+  - OpenMRS ID
+  - Gender
+  - Phone number
+  - Referred By
+  - Village
+  - District/ Khan
+  - Commune/ Sangkat
+  - BMI
+  - Province/City
+  - Age
+  - Visit Date
+  - Zone
+  - Weight
+  - Temperature
+  - Diastolic Pressure
+  - Height
+  - Respiratory Rate
+  - Systolic Pressure
+  - Circumference
+  - Pulse
+  - Fasting Blood Sugar
+  - Random Blood Sugar
+  - OGTT
+  - Albumin
+  - Ketones
+  - HbA1c
+  - Smoking Status
+  - Physical Exercise
+  - Alcohol Use
+  - CVD risk score (%)
+  - Tele-consultation with NCD unit
+  - Diagnosis 1
+  - Diagnosis 2
+  - Management Lifestyle
+  - Management - Medications
+  - Appointment Reason
+  - Referral Facility
+  - Reason for referral
+  - Payment Type
+  - Remarks
+  percent_metrics: []
+  adhoc_filters:
+  - clause: WHERE
+    subject: Visit Date
+    operator: TEMPORAL_RANGE
+    comparator: Last quarter
+    expressionType: SIMPLE
+  order_by_cols: []
+  row_limit: 1000
+  server_page_length: 10
+  order_desc: true
+  table_timestamp_format: smart_date
+  page_length: 0
+  include_search: true
+  show_cell_bars: true
+  color_pn: true
+  allow_rearrange_columns: true
+  column_config:
+    Age:
+      showCellBars: false
+    BMI:
+      showCellBars: false
+    Weight:
+      showCellBars: false
+    Temperature:
+      showCellBars: false
+    Diastolic Pressure:
+      showCellBars: false
+  conditional_formatting: []
+  extra_form_data: {}
+  dashboards:
+  - 2
+query_context: '{"datasource":{"id":6,"type":"table"},"force":false,"queries":[{"filters":[{"col":"Visit
+  Date","op":"TEMPORAL_RANGE","val":"Last quarter"}],"extras":{"time_grain_sqla":"P1D","having":"","where":""},"applied_time_extras":{},"columns":["Facility
+  Name","Facility District","Facility Province","Patient''s name","OpenMRS ID","Gender","Phone
+  number","Referred By","Village","District/ Khan","Commune/ Sangkat","BMI","Province/City","Age","Visit
+  Date","Zone","Weight","Temperature","Diastolic Pressure","Height","Respiratory Rate","Systolic
+  Pressure","Circumference","Pulse","Fasting Blood Sugar","Random Blood Sugar","OGTT","Albumin","Ketones","HbA1c","Smoking
+  Status","Physical Exercise","Alcohol Use","CVD risk score (%)","Tele-consultation
+  with NCD unit","Diagnosis 1","Diagnosis 2","Management Lifestyle","Management -
+  Medications","Appointment Reason","Referral Facility","Reason for referral","Payment
+  Type","Remarks"],"orderby":[],"annotation_layers":[],"row_limit":1000,"series_limit":0,"order_desc":true,"url_params":{},"custom_params":{},"custom_form_data":{},"post_processing":[]}],"form_data":{"datasource":"6__table","viz_type":"table","slice_id":17,"query_mode":"raw","groupby":[],"time_grain_sqla":"P1D","temporal_columns_lookup":{"Appointment
+  Date":true,"Visit Date":true},"all_columns":["Facility Name","Facility District","Facility
+  Province","Patient''s name","OpenMRS ID","Gender","Phone number","Referred By","Village","District/
+  Khan","Commune/ Sangkat","BMI","Province/City","Age","Visit Date","Zone","Weight","Temperature","Diastolic
+  Pressure","Height","Respiratory Rate","Systolic Pressure","Circumference","Pulse","Fasting
+  Blood Sugar","Random Blood Sugar","OGTT","Albumin","Ketones","HbA1c","Smoking Status","Physical
+  Exercise","Alcohol Use","CVD risk score (%)","Tele-consultation with NCD unit","Diagnosis
+  1","Diagnosis 2","Management Lifestyle","Management - Medications","Appointment
+  Reason","Referral Facility","Reason for referral","Payment Type","Remarks"],"percent_metrics":[],"adhoc_filters":[{"clause":"WHERE","subject":"Visit
+  Date","operator":"TEMPORAL_RANGE","comparator":"Last quarter","expressionType":"SIMPLE"}],"order_by_cols":[],"row_limit":1000,"server_page_length":10,"order_desc":true,"table_timestamp_format":"smart_date","page_length":0,"include_search":true,"show_cell_bars":true,"color_pn":true,"allow_rearrange_columns":true,"column_config":{"Age":{"showCellBars":false},"BMI":{"showCellBars":false},"Weight":{"showCellBars":false},"Temperature":{"showCellBars":false},"Diastolic
+  Pressure":{"showCellBars":false}},"conditional_formatting":[],"extra_form_data":{},"dashboards":[2],"force":false,"result_format":"json","result_type":"full","include_time":false},"result_format":"json","result_type":"full"}'
+cache_timeout: null
+uuid: ce1ff86a-5c0f-4223-ae62-3e56317a236d
+version: 1.0.0
+dataset_uuid: 262d446a-2c07-4b3b-8ab0-a792b242dea4
diff --git a/base/configs/superset/assets/charts/ME_Annual_Indicators_for_Hypertension_and_Diabetes_management_program_22.yaml b/base/configs/superset/assets/charts/ME_Annual_Indicators_for_Hypertension_and_Diabetes_management_program_22.yaml
new file mode 100644
index 00000000..01015ab5
--- /dev/null
+++ b/base/configs/superset/assets/charts/ME_Annual_Indicators_for_Hypertension_and_Diabetes_management_program_22.yaml
@@ -0,0 +1,71 @@
+slice_name: M&E Annual Indicators for Hypertension and Diabetes management program
+description: null
+certified_by: null
+certification_details: null
+viz_type: pivot_table_v2
+params:
+  datasource: 12__table
+  viz_type: pivot_table_v2
+  slice_id: 22
+  groupbyColumns: []
+  groupbyRows: []
+  time_grain_sqla: P1D
+  temporal_columns_lookup:
+    date_started: true
+  metrics:
+  - dist_count_patient_screened
+  - dist_count_patients_diagnosed_with_dm
+  - percentage_patients_diagnosed_with_dm
+  - dist_count_patients_diagnosed_with_hbp
+  - percentage_patients_diagnosed_with_hbp
+  - dist_count_patients_diagnosed_with_dm_and_hbp
+  - percentage_patients_diagnosed_with_dm_and_hbp
+  - dist_count_diagnosed_with_dm_and_treated
+  - percentage_diagnosed_with_dm_and_treated
+  - dist_count_diagnosed_with_hbp_and_treated
+  - percentage_diagnosed_with_hbp_and_treated
+  - dist_count_diagnosed_with_dm_and_hbp_and_treated
+  - percentage_diagnosed_with_dm_and_hbp_and_treated
+  - dist_count_diag_with_dm_treated_fulfilled_followup
+  - percentage_diag_with_dm_treated_fulfilled_followup
+  - dist_count_diag_with_hbp_treated_fulfilled_followup
+  - percentage_diag_with_hbp_treated_fulfilled_followup
+  - dist_count_diag_dm_treated_no_showup_after_30d_of_app
+  - percentage_diag_dm_treated_no_showup_after_30d_of_app
+  - dist_count_diag_hbp_treated_no_showup_after_30d_of_app
+  - percentage_diag_hbp_treated_no_showup_after_30d_of_app
+  - dist_count_diag_dm_hbp_treated_no_showup_after_30d_of_app
+  - percentage_diag_dm_hbp_treated_no_showup_after_30d_of_app
+  - dist_count_dm_dropout_90
+  - percentage_dm_dropout_90
+  - dist_count_hbp_dropout_90
+  - percentage_hbp_dropout_90
+  - dist_count_dm_with_hbp_dropout_90
+  - percentage_dm_with_hbp_dropout_90
+  metricsLayout: ROWS
+  adhoc_filters:
+  - clause: WHERE
+    comparator: No filter
+    expressionType: SIMPLE
+    operator: TEMPORAL_RANGE
+    subject: date_started
+  row_limit: 10000
+  order_desc: true
+  aggregateFunction: Sum
+  transposePivot: false
+  valueFormat: ~g
+  date_format: smart_date
+  rowOrder: key_a_to_z
+  colOrder: key_a_to_z
+  colSubtotalPosition: true
+  conditional_formatting: []
+  extra_form_data: {}
+  dashboards:
+  - 10
+query_context: '{"datasource":{"id":12,"type":"table"},"force":false,"queries":[{"filters":[{"col":"date_started","op":"TEMPORAL_RANGE","val":"No
+  filter"}],"extras":{"time_grain_sqla":"P1D","having":"","where":""},"applied_time_extras":{},"columns":[],"metrics":["dist_count_patient_screened","dist_count_patients_diagnosed_with_dm","percentage_patients_diagnosed_with_dm","dist_count_patients_diagnosed_with_hbp","percentage_patients_diagnosed_with_hbp","dist_count_patients_diagnosed_with_dm_and_hbp","percentage_patients_diagnosed_with_dm_and_hbp","dist_count_diagnosed_with_dm_and_treated","percentage_diagnosed_with_dm_and_treated","dist_count_diagnosed_with_hbp_and_treated","percentage_diagnosed_with_hbp_and_treated","dist_count_diagnosed_with_dm_and_hbp_and_treated","percentage_diagnosed_with_dm_and_hbp_and_treated","dist_count_diag_with_dm_treated_fulfilled_followup","percentage_diag_with_dm_treated_fulfilled_followup","dist_count_diag_with_hbp_treated_fulfilled_followup","percentage_diag_with_hbp_treated_fulfilled_followup","dist_count_diag_dm_treated_no_showup_after_30d_of_app","percentage_diag_dm_treated_no_showup_after_30d_of_app","dist_count_diag_hbp_treated_no_showup_after_30d_of_app","percentage_diag_hbp_treated_no_showup_after_30d_of_app","dist_count_diag_dm_hbp_treated_no_showup_after_30d_of_app","percentage_diag_dm_hbp_treated_no_showup_after_30d_of_app","dist_count_dm_dropout_90","percentage_dm_dropout_90","dist_count_hbp_dropout_90","percentage_hbp_dropout_90","dist_count_dm_with_hbp_dropout_90","percentage_dm_with_hbp_dropout_90"],"orderby":[["dist_count_patient_screened",false]],"annotation_layers":[],"row_limit":10000,"series_limit":0,"order_desc":true,"url_params":{},"custom_params":{},"custom_form_data":{}}],"form_data":{"datasource":"12__table","viz_type":"pivot_table_v2","slice_id":22,"groupbyColumns":[],"groupbyRows":[],"time_grain_sqla":"P1D","temporal_columns_lookup":{"date_started":true},"metrics":["dist_count_patient_screened","dist_count_patients_diagnosed_with_dm","percentage_patients_diagnosed_with_dm","dist_count_patients_diagnosed_with_hbp","percentage_patients_diagnosed_with_hbp","dist_count_patients_diagnosed_with_dm_and_hbp","percentage_patients_diagnosed_with_dm_and_hbp","dist_count_diagnosed_with_dm_and_treated","percentage_diagnosed_with_dm_and_treated","dist_count_diagnosed_with_hbp_and_treated","percentage_diagnosed_with_hbp_and_treated","dist_count_diagnosed_with_dm_and_hbp_and_treated","percentage_diagnosed_with_dm_and_hbp_and_treated","dist_count_diag_with_dm_treated_fulfilled_followup","percentage_diag_with_dm_treated_fulfilled_followup","dist_count_diag_with_hbp_treated_fulfilled_followup","percentage_diag_with_hbp_treated_fulfilled_followup","dist_count_diag_dm_treated_no_showup_after_30d_of_app","percentage_diag_dm_treated_no_showup_after_30d_of_app","dist_count_diag_hbp_treated_no_showup_after_30d_of_app","percentage_diag_hbp_treated_no_showup_after_30d_of_app","dist_count_diag_dm_hbp_treated_no_showup_after_30d_of_app","percentage_diag_dm_hbp_treated_no_showup_after_30d_of_app","dist_count_dm_dropout_90","percentage_dm_dropout_90","dist_count_hbp_dropout_90","percentage_hbp_dropout_90","dist_count_dm_with_hbp_dropout_90","percentage_dm_with_hbp_dropout_90"],"metricsLayout":"ROWS","adhoc_filters":[{"clause":"WHERE","comparator":"No
+  filter","expressionType":"SIMPLE","operator":"TEMPORAL_RANGE","subject":"date_started"}],"row_limit":10000,"order_desc":true,"aggregateFunction":"Sum","transposePivot":false,"valueFormat":"~g","date_format":"smart_date","rowOrder":"key_a_to_z","colOrder":"key_a_to_z","colSubtotalPosition":true,"conditional_formatting":[],"extra_form_data":{},"dashboards":[10],"force":false,"result_format":"json","result_type":"full"},"result_format":"json","result_type":"full"}'
+cache_timeout: null
+uuid: 9bf461f4-855c-40af-9299-fd37dde51778
+version: 1.0.0
+dataset_uuid: aee334cc-f803-4296-8aad-948f4560bc0a
diff --git a/base/configs/superset/assets/charts/NCD_HIS_Follow-up_Cases_From_The_Beginning_19.yaml b/base/configs/superset/assets/charts/NCD_HIS_Follow-up_Cases_From_The_Beginning_19.yaml
new file mode 100644
index 00000000..f8ad4cf4
--- /dev/null
+++ b/base/configs/superset/assets/charts/NCD_HIS_Follow-up_Cases_From_The_Beginning_19.yaml
@@ -0,0 +1,987 @@
+slice_name: NCD HIS Follow-up Cases From The Beginning
+description: null
+certified_by: null
+certification_details: null
+viz_type: table
+params:
+  datasource: 34__table
+  viz_type: table
+  slice_id: 149
+  granularity_sqla: visit_date
+  time_grain_sqla: P1D
+  time_range: No filter
+  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: 1104
+      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_3iadl22xl1t_h2eiqia49lp
+    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: 1105
+      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_kvdxwzarnar_kudcxljma1b
+    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: 1106
+      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_y9tbhps4cwl_5io18y9famr
+    sqlExpression: null
+  - aggregate: SUM
+    column:
+      advanced_data_type: null
+      certification_details: null
+      certified_by: null
+      column_name: fl12m
+      description: null
+      expression: null
+      filterable: true
+      groupby: true
+      id: 1107
+      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
+    datasourceWarning: false
+    expressionType: SIMPLE
+    hasCustomLabel: true
+    label: fl12m
+    optionName: metric_7zmclw7zqpe_0rs184ipvvhi
+    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: 1108
+      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_n9d7q0hb3g_4npw9ecsblt
+    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: 1109
+      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_xv1issi2mka_meht4ye2ma
+    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: 1110
+      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_ptn6gekrz4_p5zvuar3gpm
+    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: 1111
+      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_un8csqd451d_tufra9yf1ie
+    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: 1112
+      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_affnn1k6eh5_vo2eyu9grwr
+    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: 1113
+      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_dd1rcq6j4ga_yh6wcdgfjlr
+    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: 1114
+      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_eq8lm7zlp9h_zuixh4upbek
+    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: 1115
+      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_td6skswrbz_20jya2r9hzj
+    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: 1116
+      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_zn2fxaj2xtg_y2h1ddzhte
+    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: 1117
+      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_h6qoitqqqm9_6iewbvg60wd
+    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: 1118
+      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_rshjp15ksio_hj1qxtzl6hn
+    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: 1119
+      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_oh5u1cqmbbs_kgd27r8iqps
+    sqlExpression: null
+  - aggregate: null
+    column: null
+    datasourceWarning: false
+    expressionType: SQL
+    hasCustomLabel: true
+    label: "\u179F\u179A\u17BB\u1794 - \u1794\u17D2\u179A (Total - M)"
+    optionName: metric_cqh7dg4krfg_ai6k6t5n46i
+    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_f8um2gqc4cb_8ofcljy6xn
+    sqlExpression: SUM(fl28d) + SUM(fl12m) + SUM(fl4) + SUM(fl13) + SUM(fl24) + SUM(fl49)
+      + SUM(fl64) + SUM(fg64)
+  all_columns:
+  - diagnosis
+  - ml28d
+  - fl28d
+  - ml12m
+  - fl12m
+  - ml4
+  - fl4
+  - ml13
+  - fl13
+  - ml24
+  - fl24
+  - ml49
+  - fl49
+  - ml64
+  - fl64
+  - mg64
+  - fg64
+  - f_province
+  - f_district
+  - f_name
+  - f_type
+  - visit_date
+  percent_metrics: []
+  adhoc_filters: []
+  order_by_cols: []
+  row_limit: 1000
+  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
+    fl12m:
+      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\":34,\"type\":\"table\"},\"force\":false,\"\
+  queries\":[{\"time_range\":\"No filter\",\"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\":1104,\"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_3iadl22xl1t_h2eiqia49lp\",\"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\":1105,\"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_kvdxwzarnar_kudcxljma1b\"\
+  ,\"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\":1106,\"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_y9tbhps4cwl_5io18y9famr\",\"sqlExpression\"\
+  :null},{\"aggregate\":\"SUM\",\"column\":{\"advanced_data_type\":null,\"certification_details\"\
+  :null,\"certified_by\":null,\"column_name\":\"fl12m\",\"description\":null,\"expression\"\
+  :null,\"filterable\":true,\"groupby\":true,\"id\":1107,\"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},\"datasourceWarning\"\
+  :false,\"expressionType\":\"SIMPLE\",\"hasCustomLabel\":true,\"label\":\"fl12m\"\
+  ,\"optionName\":\"metric_7zmclw7zqpe_0rs184ipvvhi\",\"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\":1108,\"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_n9d7q0hb3g_4npw9ecsblt\"\
+  ,\"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\":1109,\"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_xv1issi2mka_meht4ye2ma\",\"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\":1110,\"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_ptn6gekrz4_p5zvuar3gpm\"\
+  ,\"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\":1111,\"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_un8csqd451d_tufra9yf1ie\",\"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\":1112,\"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_affnn1k6eh5_vo2eyu9grwr\"\
+  ,\"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\":1113,\"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_dd1rcq6j4ga_yh6wcdgfjlr\",\"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\":1114,\"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_eq8lm7zlp9h_zuixh4upbek\",\"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\":1115,\"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_td6skswrbz_20jya2r9hzj\",\"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\":1116,\"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_zn2fxaj2xtg_y2h1ddzhte\",\"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\":1117,\"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_h6qoitqqqm9_6iewbvg60wd\",\"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\":1118,\"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_rshjp15ksio_hj1qxtzl6hn\"\
+  ,\"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\":1119,\"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_oh5u1cqmbbs_kgd27r8iqps\",\"sqlExpression\"\
+  :null},{\"aggregate\":null,\"column\":null,\"datasourceWarning\":false,\"expressionType\"\
+  :\"SQL\",\"hasCustomLabel\":true,\"label\":\"\u179F\u179A\u17BB\u1794 - \u1794\u17D2\
+  \u179A (Total - M)\",\"optionName\":\"metric_cqh7dg4krfg_ai6k6t5n46i\",\"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_f8um2gqc4cb_8ofcljy6xn\"\
+  ,\"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\":1104,\"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_3iadl22xl1t_h2eiqia49lp\",\"sqlExpression\"\
+  :null},false]],\"annotation_layers\":[],\"row_limit\":1000,\"series_limit\":0,\"\
+  order_desc\":false,\"url_params\":{},\"custom_params\":{},\"custom_form_data\":{},\"\
+  post_processing\":[]},{\"time_range\":\"No filter\",\"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\":1104,\"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_3iadl22xl1t_h2eiqia49lp\"\
+  ,\"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\":1105,\"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_kvdxwzarnar_kudcxljma1b\",\"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\":1106,\"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_y9tbhps4cwl_5io18y9famr\",\"sqlExpression\":null},{\"aggregate\"\
+  :\"SUM\",\"column\":{\"advanced_data_type\":null,\"certification_details\":null,\"\
+  certified_by\":null,\"column_name\":\"fl12m\",\"description\":null,\"expression\"\
+  :null,\"filterable\":true,\"groupby\":true,\"id\":1107,\"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},\"datasourceWarning\"\
+  :false,\"expressionType\":\"SIMPLE\",\"hasCustomLabel\":true,\"label\":\"fl12m\"\
+  ,\"optionName\":\"metric_7zmclw7zqpe_0rs184ipvvhi\",\"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\":1108,\"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_n9d7q0hb3g_4npw9ecsblt\"\
+  ,\"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\":1109,\"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_xv1issi2mka_meht4ye2ma\",\"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\":1110,\"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_ptn6gekrz4_p5zvuar3gpm\"\
+  ,\"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\":1111,\"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_un8csqd451d_tufra9yf1ie\",\"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\":1112,\"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_affnn1k6eh5_vo2eyu9grwr\"\
+  ,\"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\":1113,\"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_dd1rcq6j4ga_yh6wcdgfjlr\",\"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\":1114,\"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_eq8lm7zlp9h_zuixh4upbek\",\"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\":1115,\"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_td6skswrbz_20jya2r9hzj\",\"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\":1116,\"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_zn2fxaj2xtg_y2h1ddzhte\",\"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\":1117,\"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_h6qoitqqqm9_6iewbvg60wd\",\"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\":1118,\"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_rshjp15ksio_hj1qxtzl6hn\"\
+  ,\"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\":1119,\"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_oh5u1cqmbbs_kgd27r8iqps\",\"sqlExpression\"\
+  :null},{\"aggregate\":null,\"column\":null,\"datasourceWarning\":false,\"expressionType\"\
+  :\"SQL\",\"hasCustomLabel\":true,\"label\":\"\u179F\u179A\u17BB\u1794 - \u1794\u17D2\
+  \u179A (Total - M)\",\"optionName\":\"metric_cqh7dg4krfg_ai6k6t5n46i\",\"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_f8um2gqc4cb_8ofcljy6xn\"\
+  ,\"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\":\"\
+  34__table\",\"viz_type\":\"table\",\"slice_id\":149,\"granularity_sqla\":\"visit_date\"\
+  ,\"time_grain_sqla\":\"P1D\",\"time_range\":\"No filter\",\"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\":1104,\"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_3iadl22xl1t_h2eiqia49lp\",\"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\":1105,\"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_kvdxwzarnar_kudcxljma1b\"\
+  ,\"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\":1106,\"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_y9tbhps4cwl_5io18y9famr\",\"sqlExpression\"\
+  :null},{\"aggregate\":\"SUM\",\"column\":{\"advanced_data_type\":null,\"certification_details\"\
+  :null,\"certified_by\":null,\"column_name\":\"fl12m\",\"description\":null,\"expression\"\
+  :null,\"filterable\":true,\"groupby\":true,\"id\":1107,\"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},\"datasourceWarning\"\
+  :false,\"expressionType\":\"SIMPLE\",\"hasCustomLabel\":true,\"label\":\"fl12m\"\
+  ,\"optionName\":\"metric_7zmclw7zqpe_0rs184ipvvhi\",\"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\":1108,\"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_n9d7q0hb3g_4npw9ecsblt\"\
+  ,\"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\":1109,\"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_xv1issi2mka_meht4ye2ma\",\"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\":1110,\"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_ptn6gekrz4_p5zvuar3gpm\"\
+  ,\"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\":1111,\"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_un8csqd451d_tufra9yf1ie\",\"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\":1112,\"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_affnn1k6eh5_vo2eyu9grwr\"\
+  ,\"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\":1113,\"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_dd1rcq6j4ga_yh6wcdgfjlr\",\"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\":1114,\"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_eq8lm7zlp9h_zuixh4upbek\",\"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\":1115,\"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_td6skswrbz_20jya2r9hzj\",\"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\":1116,\"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_zn2fxaj2xtg_y2h1ddzhte\",\"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\":1117,\"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_h6qoitqqqm9_6iewbvg60wd\",\"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\":1118,\"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_rshjp15ksio_hj1qxtzl6hn\"\
+  ,\"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\":1119,\"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_oh5u1cqmbbs_kgd27r8iqps\",\"sqlExpression\"\
+  :null},{\"aggregate\":null,\"column\":null,\"datasourceWarning\":false,\"expressionType\"\
+  :\"SQL\",\"hasCustomLabel\":true,\"label\":\"\u179F\u179A\u17BB\u1794 - \u1794\u17D2\
+  \u179A (Total - M)\",\"optionName\":\"metric_cqh7dg4krfg_ai6k6t5n46i\",\"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_f8um2gqc4cb_8ofcljy6xn\"\
+  ,\"sqlExpression\":\"SUM(fl28d) + SUM(fl12m) + SUM(fl4) + SUM(fl13) + SUM(fl24)\
+  \ + SUM(fl49) + SUM(fl64) + SUM(fg64)\"}],\"all_columns\":[\"diagnosis\",\"ml28d\"\
+  ,\"fl28d\",\"ml12m\",\"fl12m\",\"ml4\",\"fl4\",\"ml13\",\"fl13\",\"ml24\",\"fl24\"\
+  ,\"ml49\",\"fl49\",\"ml64\",\"fl64\",\"mg64\",\"fg64\",\"f_province\",\"f_district\"\
+  ,\"f_name\",\"f_type\",\"visit_date\"],\"percent_metrics\":[],\"adhoc_filters\"\
+  :[],\"order_by_cols\":[],\"row_limit\":1000,\"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},\"\
+  fl12m\":{\"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: 17f99ed6-713a-4436-9e7c-79639f96490c
+version: 1.0.0
+dataset_uuid: d534a5f4-9799-40a4-8096-cfe32243edc1
diff --git a/base/configs/superset/assets/charts/NCD_HIS_Follow-up_Cases_Within_Reporting_Range_15.yaml b/base/configs/superset/assets/charts/NCD_HIS_Follow-up_Cases_Within_Reporting_Range_15.yaml
new file mode 100644
index 00000000..62deea1d
--- /dev/null
+++ b/base/configs/superset/assets/charts/NCD_HIS_Follow-up_Cases_Within_Reporting_Range_15.yaml
@@ -0,0 +1,987 @@
+slice_name: NCD HIS Follow-up Cases Within Reporting Range
+description: null
+certified_by: null
+certification_details: null
+viz_type: table
+params:
+  datasource: 34__table
+  viz_type: table
+  slice_id: 148
+  granularity_sqla: visit_date
+  time_grain_sqla: P1D
+  time_range: No filter
+  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: 1104
+      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_3iadl22xl1t_h2eiqia49lp
+    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: 1105
+      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_kvdxwzarnar_kudcxljma1b
+    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: 1106
+      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_y9tbhps4cwl_5io18y9famr
+    sqlExpression: null
+  - aggregate: SUM
+    column:
+      advanced_data_type: null
+      certification_details: null
+      certified_by: null
+      column_name: fl12m
+      description: null
+      expression: null
+      filterable: true
+      groupby: true
+      id: 1107
+      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
+    datasourceWarning: false
+    expressionType: SIMPLE
+    hasCustomLabel: true
+    label: fl12m
+    optionName: metric_7zmclw7zqpe_0rs184ipvvhi
+    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: 1108
+      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_n9d7q0hb3g_4npw9ecsblt
+    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: 1109
+      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_xv1issi2mka_meht4ye2ma
+    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: 1110
+      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_ptn6gekrz4_p5zvuar3gpm
+    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: 1111
+      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_un8csqd451d_tufra9yf1ie
+    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: 1112
+      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_affnn1k6eh5_vo2eyu9grwr
+    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: 1113
+      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_dd1rcq6j4ga_yh6wcdgfjlr
+    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: 1114
+      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_eq8lm7zlp9h_zuixh4upbek
+    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: 1115
+      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_td6skswrbz_20jya2r9hzj
+    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: 1116
+      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_zn2fxaj2xtg_y2h1ddzhte
+    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: 1117
+      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_h6qoitqqqm9_6iewbvg60wd
+    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: 1118
+      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_rshjp15ksio_hj1qxtzl6hn
+    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: 1119
+      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_oh5u1cqmbbs_kgd27r8iqps
+    sqlExpression: null
+  - aggregate: null
+    column: null
+    datasourceWarning: false
+    expressionType: SQL
+    hasCustomLabel: true
+    label: "\u179F\u179A\u17BB\u1794 - \u1794\u17D2\u179A (Total - M)"
+    optionName: metric_cqh7dg4krfg_ai6k6t5n46i
+    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_re9vpqw0t9_2f9auqgjq1j
+    sqlExpression: SUM(fl28d) + SUM(fl12m) + SUM(fl4) + SUM(fl13) + SUM(fl24) + SUM(fl49)
+      + SUM(fl64) + SUM(fg64)
+  all_columns:
+  - diagnosis
+  - ml28d
+  - fl28d
+  - ml12m
+  - fl12m
+  - ml4
+  - fl4
+  - ml13
+  - fl13
+  - ml24
+  - fl24
+  - ml49
+  - fl49
+  - ml64
+  - fl64
+  - mg64
+  - fg64
+  - f_province
+  - f_district
+  - f_name
+  - f_type
+  - visit_date
+  percent_metrics: []
+  adhoc_filters: []
+  order_by_cols: []
+  row_limit: 1000
+  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
+    fl12m:
+      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\":34,\"type\":\"table\"},\"force\":false,\"\
+  queries\":[{\"time_range\":\"No filter\",\"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\":1104,\"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_3iadl22xl1t_h2eiqia49lp\",\"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\":1105,\"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_kvdxwzarnar_kudcxljma1b\"\
+  ,\"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\":1106,\"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_y9tbhps4cwl_5io18y9famr\",\"sqlExpression\"\
+  :null},{\"aggregate\":\"SUM\",\"column\":{\"advanced_data_type\":null,\"certification_details\"\
+  :null,\"certified_by\":null,\"column_name\":\"fl12m\",\"description\":null,\"expression\"\
+  :null,\"filterable\":true,\"groupby\":true,\"id\":1107,\"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},\"datasourceWarning\"\
+  :false,\"expressionType\":\"SIMPLE\",\"hasCustomLabel\":true,\"label\":\"fl12m\"\
+  ,\"optionName\":\"metric_7zmclw7zqpe_0rs184ipvvhi\",\"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\":1108,\"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_n9d7q0hb3g_4npw9ecsblt\"\
+  ,\"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\":1109,\"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_xv1issi2mka_meht4ye2ma\",\"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\":1110,\"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_ptn6gekrz4_p5zvuar3gpm\"\
+  ,\"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\":1111,\"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_un8csqd451d_tufra9yf1ie\",\"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\":1112,\"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_affnn1k6eh5_vo2eyu9grwr\"\
+  ,\"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\":1113,\"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_dd1rcq6j4ga_yh6wcdgfjlr\",\"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\":1114,\"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_eq8lm7zlp9h_zuixh4upbek\",\"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\":1115,\"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_td6skswrbz_20jya2r9hzj\",\"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\":1116,\"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_zn2fxaj2xtg_y2h1ddzhte\",\"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\":1117,\"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_h6qoitqqqm9_6iewbvg60wd\",\"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\":1118,\"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_rshjp15ksio_hj1qxtzl6hn\"\
+  ,\"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\":1119,\"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_oh5u1cqmbbs_kgd27r8iqps\",\"sqlExpression\"\
+  :null},{\"aggregate\":null,\"column\":null,\"datasourceWarning\":false,\"expressionType\"\
+  :\"SQL\",\"hasCustomLabel\":true,\"label\":\"\u179F\u179A\u17BB\u1794 - \u1794\u17D2\
+  \u179A (Total - M)\",\"optionName\":\"metric_cqh7dg4krfg_ai6k6t5n46i\",\"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_re9vpqw0t9_2f9auqgjq1j\"\
+  ,\"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\":1104,\"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_3iadl22xl1t_h2eiqia49lp\",\"sqlExpression\"\
+  :null},false]],\"annotation_layers\":[],\"row_limit\":1000,\"series_limit\":0,\"\
+  order_desc\":false,\"url_params\":{},\"custom_params\":{},\"custom_form_data\":{},\"\
+  post_processing\":[]},{\"time_range\":\"No filter\",\"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\":1104,\"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_3iadl22xl1t_h2eiqia49lp\"\
+  ,\"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\":1105,\"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_kvdxwzarnar_kudcxljma1b\",\"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\":1106,\"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_y9tbhps4cwl_5io18y9famr\",\"sqlExpression\":null},{\"aggregate\"\
+  :\"SUM\",\"column\":{\"advanced_data_type\":null,\"certification_details\":null,\"\
+  certified_by\":null,\"column_name\":\"fl12m\",\"description\":null,\"expression\"\
+  :null,\"filterable\":true,\"groupby\":true,\"id\":1107,\"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},\"datasourceWarning\"\
+  :false,\"expressionType\":\"SIMPLE\",\"hasCustomLabel\":true,\"label\":\"fl12m\"\
+  ,\"optionName\":\"metric_7zmclw7zqpe_0rs184ipvvhi\",\"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\":1108,\"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_n9d7q0hb3g_4npw9ecsblt\"\
+  ,\"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\":1109,\"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_xv1issi2mka_meht4ye2ma\",\"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\":1110,\"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_ptn6gekrz4_p5zvuar3gpm\"\
+  ,\"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\":1111,\"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_un8csqd451d_tufra9yf1ie\",\"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\":1112,\"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_affnn1k6eh5_vo2eyu9grwr\"\
+  ,\"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\":1113,\"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_dd1rcq6j4ga_yh6wcdgfjlr\",\"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\":1114,\"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_eq8lm7zlp9h_zuixh4upbek\",\"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\":1115,\"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_td6skswrbz_20jya2r9hzj\",\"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\":1116,\"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_zn2fxaj2xtg_y2h1ddzhte\",\"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\":1117,\"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_h6qoitqqqm9_6iewbvg60wd\",\"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\":1118,\"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_rshjp15ksio_hj1qxtzl6hn\"\
+  ,\"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\":1119,\"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_oh5u1cqmbbs_kgd27r8iqps\",\"sqlExpression\"\
+  :null},{\"aggregate\":null,\"column\":null,\"datasourceWarning\":false,\"expressionType\"\
+  :\"SQL\",\"hasCustomLabel\":true,\"label\":\"\u179F\u179A\u17BB\u1794 - \u1794\u17D2\
+  \u179A (Total - M)\",\"optionName\":\"metric_cqh7dg4krfg_ai6k6t5n46i\",\"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_re9vpqw0t9_2f9auqgjq1j\"\
+  ,\"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\":\"\
+  34__table\",\"viz_type\":\"table\",\"slice_id\":148,\"granularity_sqla\":\"visit_date\"\
+  ,\"time_grain_sqla\":\"P1D\",\"time_range\":\"No filter\",\"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\":1104,\"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_3iadl22xl1t_h2eiqia49lp\",\"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\":1105,\"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_kvdxwzarnar_kudcxljma1b\"\
+  ,\"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\":1106,\"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_y9tbhps4cwl_5io18y9famr\",\"sqlExpression\"\
+  :null},{\"aggregate\":\"SUM\",\"column\":{\"advanced_data_type\":null,\"certification_details\"\
+  :null,\"certified_by\":null,\"column_name\":\"fl12m\",\"description\":null,\"expression\"\
+  :null,\"filterable\":true,\"groupby\":true,\"id\":1107,\"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},\"datasourceWarning\"\
+  :false,\"expressionType\":\"SIMPLE\",\"hasCustomLabel\":true,\"label\":\"fl12m\"\
+  ,\"optionName\":\"metric_7zmclw7zqpe_0rs184ipvvhi\",\"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\":1108,\"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_n9d7q0hb3g_4npw9ecsblt\"\
+  ,\"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\":1109,\"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_xv1issi2mka_meht4ye2ma\",\"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\":1110,\"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_ptn6gekrz4_p5zvuar3gpm\"\
+  ,\"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\":1111,\"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_un8csqd451d_tufra9yf1ie\",\"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\":1112,\"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_affnn1k6eh5_vo2eyu9grwr\"\
+  ,\"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\":1113,\"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_dd1rcq6j4ga_yh6wcdgfjlr\",\"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\":1114,\"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_eq8lm7zlp9h_zuixh4upbek\",\"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\":1115,\"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_td6skswrbz_20jya2r9hzj\",\"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\":1116,\"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_zn2fxaj2xtg_y2h1ddzhte\",\"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\":1117,\"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_h6qoitqqqm9_6iewbvg60wd\",\"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\":1118,\"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_rshjp15ksio_hj1qxtzl6hn\"\
+  ,\"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\":1119,\"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_oh5u1cqmbbs_kgd27r8iqps\",\"sqlExpression\"\
+  :null},{\"aggregate\":null,\"column\":null,\"datasourceWarning\":false,\"expressionType\"\
+  :\"SQL\",\"hasCustomLabel\":true,\"label\":\"\u179F\u179A\u17BB\u1794 - \u1794\u17D2\
+  \u179A (Total - M)\",\"optionName\":\"metric_cqh7dg4krfg_ai6k6t5n46i\",\"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_re9vpqw0t9_2f9auqgjq1j\"\
+  ,\"sqlExpression\":\"SUM(fl28d) + SUM(fl12m) + SUM(fl4) + SUM(fl13) + SUM(fl24)\
+  \ + SUM(fl49) + SUM(fl64) + SUM(fg64)\"}],\"all_columns\":[\"diagnosis\",\"ml28d\"\
+  ,\"fl28d\",\"ml12m\",\"fl12m\",\"ml4\",\"fl4\",\"ml13\",\"fl13\",\"ml24\",\"fl24\"\
+  ,\"ml49\",\"fl49\",\"ml64\",\"fl64\",\"mg64\",\"fg64\",\"f_province\",\"f_district\"\
+  ,\"f_name\",\"f_type\",\"visit_date\"],\"percent_metrics\":[],\"adhoc_filters\"\
+  :[],\"order_by_cols\":[],\"row_limit\":1000,\"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},\"\
+  fl12m\":{\"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: e2896abd-821a-4aa8-8a19-c70c9eb18960
+version: 1.0.0
+dataset_uuid: d534a5f4-9799-40a4-8096-cfe32243edc1
diff --git a/base/configs/superset/assets/charts/NCD_HIS_New_Cases_From_The_Beginning_4.yaml b/base/configs/superset/assets/charts/NCD_HIS_New_Cases_From_The_Beginning_4.yaml
new file mode 100644
index 00000000..f957b696
--- /dev/null
+++ b/base/configs/superset/assets/charts/NCD_HIS_New_Cases_From_The_Beginning_4.yaml
@@ -0,0 +1,911 @@
+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_2.yaml b/base/configs/superset/assets/charts/NCD_HIS_New_Cases_Within_Reporting_Range_2.yaml
new file mode 100644
index 00000000..3bd13969
--- /dev/null
+++ b/base/configs/superset/assets/charts/NCD_HIS_New_Cases_Within_Reporting_Range_2.yaml
@@ -0,0 +1,910 @@
+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_7.yaml b/base/configs/superset/assets/charts/NCD_Indicators_7.yaml
new file mode 100644
index 00000000..1860116e
--- /dev/null
+++ b/base/configs/superset/assets/charts/NCD_Indicators_7.yaml
@@ -0,0 +1,258 @@
+slice_name: NCD Indicators
+description: null
+certified_by: null
+certification_details: null
+viz_type: pivot_table_v2
+params:
+  datasource: 9__table
+  viz_type: pivot_table_v2
+  slice_id: 7
+  groupbyColumns: []
+  groupbyRows: []
+  time_grain_sqla: P1D
+  temporal_columns_lookup:
+    Visit End date: true
+    Visit Start date: true
+    Follow-Up Date: true
+    Patient's Birthdate: true
+  metrics:
+  - expressionType: SQL
+    sqlExpression: COUNT(DISTINCT CASE WHEN indicator = 'patients-aged-40-above-with-first-time
+      ncd-screening' OR indicator = '80-pecent-followup-with-hypertension-iabetes-and-medication'
+      THEN "OpenMRS ID" END)
+    column: null
+    aggregate: null
+    datasourceWarning: false
+    hasCustomLabel: true
+    label: "\u1799\u17C9\u17B6\u1784\u17A0\u17C4\u1785\u178E\u17B6\u179F\u17CB\u1794\
+      \u17D2\u179A\u1787\u17B6\u1787\u1793\u1790\u17D2\u1798\u17B8\u1785\u17C6\u1793\
+      \u17BD\u1793\u17E5\u17E0\u1793\u17B6\u1780\u17CB\u1780\u17D2\u1793\u17BB\u1784\
+      \u17E1\u1781\u17C2 \u178A\u17C2\u179B\u1798\u17B6\u1793\u17A2\u17B6\u1799\u17BB\
+      \u1785\u17B6\u1794\u17CB\u1796\u17B8\u17E4\u17E0\u1786\u17D2\u1793\u17B6\u17C6\
+      \u17A1\u17BE\u1784\u1791\u17C5\u1794\u17B6\u1793\u1785\u17BB\u17C7\u1788\u17D2\
+      \u1798\u17C4\u17C7 \u1793\u17B7\u1784\u1791\u1791\u17BD\u179B\u1794\u17B6\u1793\
+      \u179F\u17C1\u179C\u17B6\u1796\u17B7\u1793\u17B7\u178F\u17D2\u1799\u179A\u1780\
+      \u1787\u17C6\u1784\u17BA\u1791\u17B9\u1780\u1793\u17C4\u1798\u1795\u17D2\u17A2\
+      \u17C2\u1798 \u1793\u17B7\u1784\u1787\u17C6\u1784\u17BA\u179B\u17BE\u179F\u179F\
+      \u1798\u17D2\u1796\u17B6\u1792\u1788\u17B6\u1798  \u1793\u17B7\u1784\u1796\u17D2\
+      \u1799\u17B6\u1794\u17B6\u179B\u1787\u17B6\u179B\u17BE\u1780\u178A\u17C6\u1794\
+      \u17BC\u1784\u17D4  (At least 50 population aged 40 years+ registered and received\
+      \ the first screening and treatment services for diabetes and hypertension per\
+      \ month)"
+    optionName: metric_9ttlclpl5ts_chyyfmbkdlq
+  - expressionType: SQL
+    sqlExpression: "CASE \n    WHEN (COUNT(DISTINCT CASE WHEN indicator = '80-pecent-followup-with-hypertension-iabetes-and-medication'\
+      \ THEN \"OpenMRS ID\" END) * 100.0 / (COUNT(DISTINCT CASE WHEN indicator = 'patients-aged-40-above-with-first-time\
+      \ ncd-screening' THEN \"OpenMRS ID\" END) + COUNT(DISTINCT CASE WHEN indicator\
+      \ = '80-pecent-followup-with-hypertension-iabetes-and-medication' THEN \"OpenMRS\
+      \ ID\" END))) >= 80 \n    THEN 'Yes'\n    ELSE 'No'\nEND\n"
+    column: null
+    aggregate: null
+    datasourceWarning: false
+    hasCustomLabel: true
+    label: "\u1799\u17C9\u17B6\u1784\u17A0\u17C4\u1785\u178E\u17B6\u179F\u17CB 80\
+      \ \u1797\u17B6\u1782\u179A\u1799\u1793\u17C3\u17A2\u17D2\u1793\u1780\u1787\u17C6\
+      \u1784\u17BA\u178A\u17C2\u179B\u1798\u17B6\u1793\u1780\u17B6\u179A\u1792\u17D2\
+      \u179C\u17BE\u179A\u17C4\u1782\u179C\u17B7\u1793\u17B7\u1785\u17D2\u1786\u17D0\
+      \u1799\u1790\u17B6\u1798\u17B6\u1793\u1787\u17C6\u1784\u17BA\u1791\u17B9\u1780\
+      \u1793\u17C4\u1798\u1795\u17D2\u17A2\u17C2\u1798 \u1793\u17B7\u1784/\u17AC\u1787\
+      \u17C6\u1784\u17BA\u179B\u17BE\u179F\u1788\u17B6\u1798\u1794\u17B6\u1793\u1791\
+      \u1791\u17BD\u179B\u1780\u17B6\u179A\u1796\u17D2\u1799\u17B6\u1794\u17B6\u179B\
+      \u178F\u17D2\u179A\u17B9\u1798\u178F\u17D2\u179A\u17BC\u179C (\u17A7. \u1794\
+      \u17B6\u1793\u1791\u1791\u17BD\u179B\u1790\u17D2\u1793\u17B6\u17C6\u179F\u1798\
+      \u17D2\u179A\u17B6\u1794\u17CB\u1780\u17B6\u179A\u1796\u17D2\u1799\u17B6\u1794\
+      \u17B6\u179B\u1787\u17B6\u1794\u17D2\u179A\u1785\u17B6\u17C6 \u1793\u17B7\u1784\
+      \u1794\u17D2\u179A\u1785\u17B6\u17C6\u1781\u17C2)\u17D4 \u17A2\u17D2\u1793\u1780\
+      \u1787\u17C6\u1784\u17BA\u1782\u17BD\u179A\u178F\u17C2\u178F\u17D2\u179A\u17BC\
+      \u179C\u1794\u17B6\u1793\u1792\u17D2\u179C\u17BE\u178F\u17C1\u179F\u17D2\u178F\
+      \u1787\u17B6\u1791\u17C0\u1784\u1791\u17B6\u178F\u17CB\u178F\u17B6\u1798\u1780\
+      \u17B6\u179A\u178E\u17C2\u1793\u17B6\u17C6\u1793\u17C3\u1780\u17B6\u179A\u1796\
+      \u17D2\u1799\u17B6\u1794\u17B6\u179B\u17D4 \u17B1\u179F\u1790 (\u17B1\u179F\u1790\
+      \u179F\u17B6\u179A\u179C\u1793\u17D2\u178F ) \u179F\u1798\u17D2\u179A\u17B6\u1794\
+      \u17CB\u1780\u17B6\u179A\u1796\u17D2\u1799\u17B6\u1794\u17B6\u179B\u1782\u17BD\
+      \u179A\u178F\u17C2\u178F\u17D2\u179A\u17BC\u179C\u1794\u17B6\u1793\u1795\u17D2\
+      \u178F\u179B\u17CB\u1787\u17BC\u1793\u178A\u17C4\u1799\u1798\u17B7\u1793\u1782\
+      \u17B7\u178F\u1790\u17D2\u179B\u17C3\u1794\u1793\u17D2\u1790\u17C2\u1798\u178A\
+      \u179B\u17CB\u17A2\u17D2\u1793\u1780\u1787\u17C6\u1784\u17BA \u17A0\u17BE\u1799\
+      \u1798\u17BC\u179B\u178A\u17D2\u178B\u17B6\u1793\u179F\u17BB\u1781\u17B6\u1797\
+      \u17B7\u1794\u17B6\u179B\u1798\u17B7\u1793\u1782\u17BD\u179A\u17A2\u1793\u17BB\
+      \u1789\u17D2\u1789\u17B6\u178F\u17B1\u17D2\u1799\u17A2\u17D2\u1793\u1780\u1787\
+      \u17C6\u1784\u17BA\u1791\u17B7\u1789\u1790\u17D2\u1793\u17B6\u17C6)\u17D4 (At\
+      \ least 80 percent of patients with confirmed diagnosis as having diabetes and/or\
+      \ hypertension received proper treatment (i.e., received medicines for treatment\
+      \ regularly and on a monthly basis). The patients should be tested regularly\
+      \ according to the treatment guidelines. Drugs (essential drugs) for treatment\
+      \ should be provided without additional charge to the patients, and health facilities\
+      \ should not let patients purchase medicines))"
+    optionName: metric_dmznsk3y057_77lv31713b2
+  metricsLayout: ROWS
+  adhoc_filters:
+  - clause: WHERE
+    subject: Visit Start date
+    operator: TEMPORAL_RANGE
+    comparator: No filter
+    expressionType: SIMPLE
+  row_limit: 1000
+  order_desc: true
+  aggregateFunction: Sum
+  transposePivot: true
+  valueFormat: ~g
+  date_format: smart_date
+  rowOrder: key_a_to_z
+  colOrder: key_a_to_z
+  conditional_formatting: []
+  extra_form_data: {}
+  dashboards:
+  - 1
+query_context: "{\"datasource\":{\"id\":9,\"type\":\"table\"},\"force\":false,\"queries\"\
+  :[{\"filters\":[{\"col\":\"Visit Start date\",\"op\":\"TEMPORAL_RANGE\",\"val\"\
+  :\"No filter\"}],\"extras\":{\"time_grain_sqla\":\"P1D\",\"having\":\"\",\"where\"\
+  :\"\"},\"applied_time_extras\":{},\"columns\":[],\"metrics\":[{\"expressionType\"\
+  :\"SQL\",\"sqlExpression\":\"COUNT(DISTINCT CASE WHEN indicator = 'patients-aged-40-above-with-first-time\
+  \ ncd-screening' OR indicator = '80-pecent-followup-with-hypertension-iabetes-and-medication'\
+  \ THEN \\\"OpenMRS ID\\\" END)\",\"column\":null,\"aggregate\":null,\"datasourceWarning\"\
+  :false,\"hasCustomLabel\":true,\"label\":\"\u1799\u17C9\u17B6\u1784\u17A0\u17C4\u1785\
+  \u178E\u17B6\u179F\u17CB\u1794\u17D2\u179A\u1787\u17B6\u1787\u1793\u1790\u17D2\u1798\
+  \u17B8\u1785\u17C6\u1793\u17BD\u1793\u17E5\u17E0\u1793\u17B6\u1780\u17CB\u1780\u17D2\
+  \u1793\u17BB\u1784\u17E1\u1781\u17C2 \u178A\u17C2\u179B\u1798\u17B6\u1793\u17A2\u17B6\
+  \u1799\u17BB\u1785\u17B6\u1794\u17CB\u1796\u17B8\u17E4\u17E0\u1786\u17D2\u1793\u17B6\
+  \u17C6\u17A1\u17BE\u1784\u1791\u17C5\u1794\u17B6\u1793\u1785\u17BB\u17C7\u1788\u17D2\
+  \u1798\u17C4\u17C7 \u1793\u17B7\u1784\u1791\u1791\u17BD\u179B\u1794\u17B6\u1793\u179F\
+  \u17C1\u179C\u17B6\u1796\u17B7\u1793\u17B7\u178F\u17D2\u1799\u179A\u1780\u1787\u17C6\
+  \u1784\u17BA\u1791\u17B9\u1780\u1793\u17C4\u1798\u1795\u17D2\u17A2\u17C2\u1798 \u1793\
+  \u17B7\u1784\u1787\u17C6\u1784\u17BA\u179B\u17BE\u179F\u179F\u1798\u17D2\u1796\u17B6\
+  \u1792\u1788\u17B6\u1798  \u1793\u17B7\u1784\u1796\u17D2\u1799\u17B6\u1794\u17B6\
+  \u179B\u1787\u17B6\u179B\u17BE\u1780\u178A\u17C6\u1794\u17BC\u1784\u17D4  (At least\
+  \ 50 population aged 40 years+ registered and received the first screening and treatment\
+  \ services for diabetes and hypertension per month)\",\"optionName\":\"metric_9ttlclpl5ts_chyyfmbkdlq\"\
+  },{\"expressionType\":\"SQL\",\"sqlExpression\":\"CASE \\n    WHEN (COUNT(DISTINCT\
+  \ CASE WHEN indicator = '80-pecent-followup-with-hypertension-iabetes-and-medication'\
+  \ THEN \\\"OpenMRS ID\\\" END) * 100.0 / (COUNT(DISTINCT CASE WHEN indicator = 'patients-aged-40-above-with-first-time\
+  \ ncd-screening' THEN \\\"OpenMRS ID\\\" END) + COUNT(DISTINCT CASE WHEN indicator\
+  \ = '80-pecent-followup-with-hypertension-iabetes-and-medication' THEN \\\"OpenMRS\
+  \ ID\\\" END))) >= 80 \\n    THEN 'Yes'\\n    ELSE 'No'\\nEND\\n\",\"column\":null,\"\
+  aggregate\":null,\"datasourceWarning\":false,\"hasCustomLabel\":true,\"label\":\"\
+  \u1799\u17C9\u17B6\u1784\u17A0\u17C4\u1785\u178E\u17B6\u179F\u17CB 80 \u1797\u17B6\
+  \u1782\u179A\u1799\u1793\u17C3\u17A2\u17D2\u1793\u1780\u1787\u17C6\u1784\u17BA\u178A\
+  \u17C2\u179B\u1798\u17B6\u1793\u1780\u17B6\u179A\u1792\u17D2\u179C\u17BE\u179A\u17C4\
+  \u1782\u179C\u17B7\u1793\u17B7\u1785\u17D2\u1786\u17D0\u1799\u1790\u17B6\u1798\u17B6\
+  \u1793\u1787\u17C6\u1784\u17BA\u1791\u17B9\u1780\u1793\u17C4\u1798\u1795\u17D2\u17A2\
+  \u17C2\u1798 \u1793\u17B7\u1784/\u17AC\u1787\u17C6\u1784\u17BA\u179B\u17BE\u179F\
+  \u1788\u17B6\u1798\u1794\u17B6\u1793\u1791\u1791\u17BD\u179B\u1780\u17B6\u179A\u1796\
+  \u17D2\u1799\u17B6\u1794\u17B6\u179B\u178F\u17D2\u179A\u17B9\u1798\u178F\u17D2\u179A\
+  \u17BC\u179C (\u17A7. \u1794\u17B6\u1793\u1791\u1791\u17BD\u179B\u1790\u17D2\u1793\
+  \u17B6\u17C6\u179F\u1798\u17D2\u179A\u17B6\u1794\u17CB\u1780\u17B6\u179A\u1796\u17D2\
+  \u1799\u17B6\u1794\u17B6\u179B\u1787\u17B6\u1794\u17D2\u179A\u1785\u17B6\u17C6 \u1793\
+  \u17B7\u1784\u1794\u17D2\u179A\u1785\u17B6\u17C6\u1781\u17C2)\u17D4 \u17A2\u17D2\
+  \u1793\u1780\u1787\u17C6\u1784\u17BA\u1782\u17BD\u179A\u178F\u17C2\u178F\u17D2\u179A\
+  \u17BC\u179C\u1794\u17B6\u1793\u1792\u17D2\u179C\u17BE\u178F\u17C1\u179F\u17D2\u178F\
+  \u1787\u17B6\u1791\u17C0\u1784\u1791\u17B6\u178F\u17CB\u178F\u17B6\u1798\u1780\u17B6\
+  \u179A\u178E\u17C2\u1793\u17B6\u17C6\u1793\u17C3\u1780\u17B6\u179A\u1796\u17D2\u1799\
+  \u17B6\u1794\u17B6\u179B\u17D4 \u17B1\u179F\u1790 (\u17B1\u179F\u1790\u179F\u17B6\
+  \u179A\u179C\u1793\u17D2\u178F ) \u179F\u1798\u17D2\u179A\u17B6\u1794\u17CB\u1780\
+  \u17B6\u179A\u1796\u17D2\u1799\u17B6\u1794\u17B6\u179B\u1782\u17BD\u179A\u178F\u17C2\
+  \u178F\u17D2\u179A\u17BC\u179C\u1794\u17B6\u1793\u1795\u17D2\u178F\u179B\u17CB\u1787\
+  \u17BC\u1793\u178A\u17C4\u1799\u1798\u17B7\u1793\u1782\u17B7\u178F\u1790\u17D2\u179B\
+  \u17C3\u1794\u1793\u17D2\u1790\u17C2\u1798\u178A\u179B\u17CB\u17A2\u17D2\u1793\u1780\
+  \u1787\u17C6\u1784\u17BA \u17A0\u17BE\u1799\u1798\u17BC\u179B\u178A\u17D2\u178B\u17B6\
+  \u1793\u179F\u17BB\u1781\u17B6\u1797\u17B7\u1794\u17B6\u179B\u1798\u17B7\u1793\u1782\
+  \u17BD\u179A\u17A2\u1793\u17BB\u1789\u17D2\u1789\u17B6\u178F\u17B1\u17D2\u1799\u17A2\
+  \u17D2\u1793\u1780\u1787\u17C6\u1784\u17BA\u1791\u17B7\u1789\u1790\u17D2\u1793\u17B6\
+  \u17C6)\u17D4 (At least 80 percent of patients with confirmed diagnosis as having\
+  \ diabetes and/or hypertension received proper treatment (i.e., received medicines\
+  \ for treatment regularly and on a monthly basis). The patients should be tested\
+  \ regularly according to the treatment guidelines. Drugs (essential drugs) for treatment\
+  \ should be provided without additional charge to the patients, and health facilities\
+  \ should not let patients purchase medicines))\",\"optionName\":\"metric_dmznsk3y057_77lv31713b2\"\
+  }],\"orderby\":[[{\"expressionType\":\"SQL\",\"sqlExpression\":\"COUNT(DISTINCT\
+  \ CASE WHEN indicator = 'patients-aged-40-above-with-first-time ncd-screening' OR\
+  \ indicator = '80-pecent-followup-with-hypertension-iabetes-and-medication' THEN\
+  \ \\\"OpenMRS ID\\\" END)\",\"column\":null,\"aggregate\":null,\"datasourceWarning\"\
+  :false,\"hasCustomLabel\":true,\"label\":\"\u1799\u17C9\u17B6\u1784\u17A0\u17C4\u1785\
+  \u178E\u17B6\u179F\u17CB\u1794\u17D2\u179A\u1787\u17B6\u1787\u1793\u1790\u17D2\u1798\
+  \u17B8\u1785\u17C6\u1793\u17BD\u1793\u17E5\u17E0\u1793\u17B6\u1780\u17CB\u1780\u17D2\
+  \u1793\u17BB\u1784\u17E1\u1781\u17C2 \u178A\u17C2\u179B\u1798\u17B6\u1793\u17A2\u17B6\
+  \u1799\u17BB\u1785\u17B6\u1794\u17CB\u1796\u17B8\u17E4\u17E0\u1786\u17D2\u1793\u17B6\
+  \u17C6\u17A1\u17BE\u1784\u1791\u17C5\u1794\u17B6\u1793\u1785\u17BB\u17C7\u1788\u17D2\
+  \u1798\u17C4\u17C7 \u1793\u17B7\u1784\u1791\u1791\u17BD\u179B\u1794\u17B6\u1793\u179F\
+  \u17C1\u179C\u17B6\u1796\u17B7\u1793\u17B7\u178F\u17D2\u1799\u179A\u1780\u1787\u17C6\
+  \u1784\u17BA\u1791\u17B9\u1780\u1793\u17C4\u1798\u1795\u17D2\u17A2\u17C2\u1798 \u1793\
+  \u17B7\u1784\u1787\u17C6\u1784\u17BA\u179B\u17BE\u179F\u179F\u1798\u17D2\u1796\u17B6\
+  \u1792\u1788\u17B6\u1798  \u1793\u17B7\u1784\u1796\u17D2\u1799\u17B6\u1794\u17B6\
+  \u179B\u1787\u17B6\u179B\u17BE\u1780\u178A\u17C6\u1794\u17BC\u1784\u17D4  (At least\
+  \ 50 population aged 40 years+ registered and received the first screening and treatment\
+  \ services for diabetes and hypertension per month)\",\"optionName\":\"metric_9ttlclpl5ts_chyyfmbkdlq\"\
+  },false]],\"annotation_layers\":[],\"row_limit\":1000,\"series_limit\":0,\"order_desc\"\
+  :true,\"url_params\":{},\"custom_params\":{},\"custom_form_data\":{}}],\"form_data\"\
+  :{\"datasource\":\"9__table\",\"viz_type\":\"pivot_table_v2\",\"slice_id\":7,\"\
+  groupbyColumns\":[],\"groupbyRows\":[],\"time_grain_sqla\":\"P1D\",\"temporal_columns_lookup\"\
+  :{\"Visit End date\":true,\"Visit Start date\":true,\"Follow-Up Date\":true,\"Patient's\
+  \ Birthdate\":true},\"metrics\":[{\"expressionType\":\"SQL\",\"sqlExpression\":\"\
+  COUNT(DISTINCT CASE WHEN indicator = 'patients-aged-40-above-with-first-time ncd-screening'\
+  \ OR indicator = '80-pecent-followup-with-hypertension-iabetes-and-medication' THEN\
+  \ \\\"OpenMRS ID\\\" END)\",\"column\":null,\"aggregate\":null,\"datasourceWarning\"\
+  :false,\"hasCustomLabel\":true,\"label\":\"\u1799\u17C9\u17B6\u1784\u17A0\u17C4\u1785\
+  \u178E\u17B6\u179F\u17CB\u1794\u17D2\u179A\u1787\u17B6\u1787\u1793\u1790\u17D2\u1798\
+  \u17B8\u1785\u17C6\u1793\u17BD\u1793\u17E5\u17E0\u1793\u17B6\u1780\u17CB\u1780\u17D2\
+  \u1793\u17BB\u1784\u17E1\u1781\u17C2 \u178A\u17C2\u179B\u1798\u17B6\u1793\u17A2\u17B6\
+  \u1799\u17BB\u1785\u17B6\u1794\u17CB\u1796\u17B8\u17E4\u17E0\u1786\u17D2\u1793\u17B6\
+  \u17C6\u17A1\u17BE\u1784\u1791\u17C5\u1794\u17B6\u1793\u1785\u17BB\u17C7\u1788\u17D2\
+  \u1798\u17C4\u17C7 \u1793\u17B7\u1784\u1791\u1791\u17BD\u179B\u1794\u17B6\u1793\u179F\
+  \u17C1\u179C\u17B6\u1796\u17B7\u1793\u17B7\u178F\u17D2\u1799\u179A\u1780\u1787\u17C6\
+  \u1784\u17BA\u1791\u17B9\u1780\u1793\u17C4\u1798\u1795\u17D2\u17A2\u17C2\u1798 \u1793\
+  \u17B7\u1784\u1787\u17C6\u1784\u17BA\u179B\u17BE\u179F\u179F\u1798\u17D2\u1796\u17B6\
+  \u1792\u1788\u17B6\u1798  \u1793\u17B7\u1784\u1796\u17D2\u1799\u17B6\u1794\u17B6\
+  \u179B\u1787\u17B6\u179B\u17BE\u1780\u178A\u17C6\u1794\u17BC\u1784\u17D4  (At least\
+  \ 50 population aged 40 years+ registered and received the first screening and treatment\
+  \ services for diabetes and hypertension per month)\",\"optionName\":\"metric_9ttlclpl5ts_chyyfmbkdlq\"\
+  },{\"expressionType\":\"SQL\",\"sqlExpression\":\"CASE \\n    WHEN (COUNT(DISTINCT\
+  \ CASE WHEN indicator = '80-pecent-followup-with-hypertension-iabetes-and-medication'\
+  \ THEN \\\"OpenMRS ID\\\" END) * 100.0 / (COUNT(DISTINCT CASE WHEN indicator = 'patients-aged-40-above-with-first-time\
+  \ ncd-screening' THEN \\\"OpenMRS ID\\\" END) + COUNT(DISTINCT CASE WHEN indicator\
+  \ = '80-pecent-followup-with-hypertension-iabetes-and-medication' THEN \\\"OpenMRS\
+  \ ID\\\" END))) >= 80 \\n    THEN 'Yes'\\n    ELSE 'No'\\nEND\\n\",\"column\":null,\"\
+  aggregate\":null,\"datasourceWarning\":false,\"hasCustomLabel\":true,\"label\":\"\
+  \u1799\u17C9\u17B6\u1784\u17A0\u17C4\u1785\u178E\u17B6\u179F\u17CB 80 \u1797\u17B6\
+  \u1782\u179A\u1799\u1793\u17C3\u17A2\u17D2\u1793\u1780\u1787\u17C6\u1784\u17BA\u178A\
+  \u17C2\u179B\u1798\u17B6\u1793\u1780\u17B6\u179A\u1792\u17D2\u179C\u17BE\u179A\u17C4\
+  \u1782\u179C\u17B7\u1793\u17B7\u1785\u17D2\u1786\u17D0\u1799\u1790\u17B6\u1798\u17B6\
+  \u1793\u1787\u17C6\u1784\u17BA\u1791\u17B9\u1780\u1793\u17C4\u1798\u1795\u17D2\u17A2\
+  \u17C2\u1798 \u1793\u17B7\u1784/\u17AC\u1787\u17C6\u1784\u17BA\u179B\u17BE\u179F\
+  \u1788\u17B6\u1798\u1794\u17B6\u1793\u1791\u1791\u17BD\u179B\u1780\u17B6\u179A\u1796\
+  \u17D2\u1799\u17B6\u1794\u17B6\u179B\u178F\u17D2\u179A\u17B9\u1798\u178F\u17D2\u179A\
+  \u17BC\u179C (\u17A7. \u1794\u17B6\u1793\u1791\u1791\u17BD\u179B\u1790\u17D2\u1793\
+  \u17B6\u17C6\u179F\u1798\u17D2\u179A\u17B6\u1794\u17CB\u1780\u17B6\u179A\u1796\u17D2\
+  \u1799\u17B6\u1794\u17B6\u179B\u1787\u17B6\u1794\u17D2\u179A\u1785\u17B6\u17C6 \u1793\
+  \u17B7\u1784\u1794\u17D2\u179A\u1785\u17B6\u17C6\u1781\u17C2)\u17D4 \u17A2\u17D2\
+  \u1793\u1780\u1787\u17C6\u1784\u17BA\u1782\u17BD\u179A\u178F\u17C2\u178F\u17D2\u179A\
+  \u17BC\u179C\u1794\u17B6\u1793\u1792\u17D2\u179C\u17BE\u178F\u17C1\u179F\u17D2\u178F\
+  \u1787\u17B6\u1791\u17C0\u1784\u1791\u17B6\u178F\u17CB\u178F\u17B6\u1798\u1780\u17B6\
+  \u179A\u178E\u17C2\u1793\u17B6\u17C6\u1793\u17C3\u1780\u17B6\u179A\u1796\u17D2\u1799\
+  \u17B6\u1794\u17B6\u179B\u17D4 \u17B1\u179F\u1790 (\u17B1\u179F\u1790\u179F\u17B6\
+  \u179A\u179C\u1793\u17D2\u178F ) \u179F\u1798\u17D2\u179A\u17B6\u1794\u17CB\u1780\
+  \u17B6\u179A\u1796\u17D2\u1799\u17B6\u1794\u17B6\u179B\u1782\u17BD\u179A\u178F\u17C2\
+  \u178F\u17D2\u179A\u17BC\u179C\u1794\u17B6\u1793\u1795\u17D2\u178F\u179B\u17CB\u1787\
+  \u17BC\u1793\u178A\u17C4\u1799\u1798\u17B7\u1793\u1782\u17B7\u178F\u1790\u17D2\u179B\
+  \u17C3\u1794\u1793\u17D2\u1790\u17C2\u1798\u178A\u179B\u17CB\u17A2\u17D2\u1793\u1780\
+  \u1787\u17C6\u1784\u17BA \u17A0\u17BE\u1799\u1798\u17BC\u179B\u178A\u17D2\u178B\u17B6\
+  \u1793\u179F\u17BB\u1781\u17B6\u1797\u17B7\u1794\u17B6\u179B\u1798\u17B7\u1793\u1782\
+  \u17BD\u179A\u17A2\u1793\u17BB\u1789\u17D2\u1789\u17B6\u178F\u17B1\u17D2\u1799\u17A2\
+  \u17D2\u1793\u1780\u1787\u17C6\u1784\u17BA\u1791\u17B7\u1789\u1790\u17D2\u1793\u17B6\
+  \u17C6)\u17D4 (At least 80 percent of patients with confirmed diagnosis as having\
+  \ diabetes and/or hypertension received proper treatment (i.e., received medicines\
+  \ for treatment regularly and on a monthly basis). The patients should be tested\
+  \ regularly according to the treatment guidelines. Drugs (essential drugs) for treatment\
+  \ should be provided without additional charge to the patients, and health facilities\
+  \ should not let patients purchase medicines))\",\"optionName\":\"metric_dmznsk3y057_77lv31713b2\"\
+  }],\"metricsLayout\":\"ROWS\",\"adhoc_filters\":[{\"clause\":\"WHERE\",\"subject\"\
+  :\"Visit Start date\",\"operator\":\"TEMPORAL_RANGE\",\"comparator\":\"No filter\"\
+  ,\"expressionType\":\"SIMPLE\"}],\"row_limit\":1000,\"order_desc\":true,\"aggregateFunction\"\
+  :\"Sum\",\"transposePivot\":true,\"valueFormat\":\"~g\",\"date_format\":\"smart_date\"\
+  ,\"rowOrder\":\"key_a_to_z\",\"colOrder\":\"key_a_to_z\",\"conditional_formatting\"\
+  :[],\"extra_form_data\":{},\"dashboards\":[1],\"force\":false,\"result_format\"\
+  :\"json\",\"result_type\":\"full\"},\"result_format\":\"json\",\"result_type\":\"\
+  full\"}"
+cache_timeout: null
+uuid: 802a00e7-0681-407f-bd7a-c55a4f4e466e
+version: 1.0.0
+dataset_uuid: 54c5a8fb-66f7-4279-8498-abebf5d65e7f
diff --git a/base/configs/superset/assets/charts/NCD_Missed_Appointments_Report_11.yaml b/base/configs/superset/assets/charts/NCD_Missed_Appointments_Report_11.yaml
new file mode 100644
index 00000000..ed929b07
--- /dev/null
+++ b/base/configs/superset/assets/charts/NCD_Missed_Appointments_Report_11.yaml
@@ -0,0 +1,62 @@
+slice_name: NCD Missed Appointments Report
+description: null
+certified_by: null
+certification_details: null
+viz_type: table
+params:
+  datasource: 29__table
+  viz_type: table
+  slice_id: 141
+  granularity_sqla: Appointment date
+  time_grain_sqla: P1D
+  time_range: No filter
+  query_mode: raw
+  groupby: []
+  all_columns:
+  - Facility Name
+  - Facility District
+  - Facility Province
+  - OpenMRS ID
+  - Patient's name
+  - Gender
+  - Age
+  - Phone number
+  - Village
+  - Commune/ Sangkat
+  - District/ Khan
+  - Province/City
+  - Appointment date
+  - Appointment/follow-up reasaon
+  - Notes
+  percent_metrics: []
+  adhoc_filters: []
+  order_by_cols: []
+  row_limit: 10000
+  server_page_length: 10
+  order_desc: true
+  table_timestamp_format: smart_date
+  include_search: true
+  show_cell_bars: true
+  color_pn: true
+  allow_rearrange_columns: true
+  column_config:
+    Age:
+      showCellBars: false
+  conditional_formatting: []
+  extra_form_data: {}
+  dashboards:
+  - 16
+  annotation_layers: []
+query_context: '{"datasource":{"id":29,"type":"table"},"force":false,"queries":[{"time_range":"No
+  filter","granularity":"Appointment date","filters":[],"extras":{"time_grain_sqla":"P1D","having":"","where":""},"applied_time_extras":{},"columns":["Facility
+  Name","Facility District","Facility Province","OpenMRS ID","Patient''s name","Gender","Age","Phone
+  number","Village","Commune/ Sangkat","District/ Khan","Province/City","Appointment
+  date","Appointment/follow-up reasaon","Notes"],"orderby":[],"annotation_layers":[],"row_limit":10000,"series_limit":0,"order_desc":true,"url_params":{},"custom_params":{},"custom_form_data":{},"post_processing":[]}],"form_data":{"datasource":"29__table","viz_type":"table","slice_id":141,"granularity_sqla":"Appointment
+  date","time_grain_sqla":"P1D","time_range":"No filter","query_mode":"raw","groupby":[],"all_columns":["Facility
+  Name","Facility District","Facility Province","OpenMRS ID","Patient''s name","Gender","Age","Phone
+  number","Village","Commune/ Sangkat","District/ Khan","Province/City","Appointment
+  date","Appointment/follow-up reasaon","Notes"],"percent_metrics":[],"adhoc_filters":[],"order_by_cols":[],"row_limit":10000,"server_page_length":10,"include_time":false,"order_desc":true,"table_timestamp_format":"smart_date","include_search":true,"show_cell_bars":true,"color_pn":true,"allow_rearrange_columns":true,"column_config":{"Age":{"showCellBars":false}},"conditional_formatting":[],"extra_form_data":{},"dashboards":[16],"force":false,"result_format":"json","result_type":"full"},"result_format":"json","result_type":"full"}'
+cache_timeout: null
+uuid: a5640d1c-bc02-4507-b639-787965bc42c7
+version: 1.0.0
+dataset_uuid: ffccf504-e9e6-4312-916b-51489c810249
diff --git a/base/configs/superset/assets/charts/NCD_Missed_Referrals_Report_3.yaml b/base/configs/superset/assets/charts/NCD_Missed_Referrals_Report_3.yaml
new file mode 100644
index 00000000..a11b6d5d
--- /dev/null
+++ b/base/configs/superset/assets/charts/NCD_Missed_Referrals_Report_3.yaml
@@ -0,0 +1,66 @@
+slice_name: NCD Missed Referrals Report
+description: null
+certified_by: null
+certification_details: null
+viz_type: table
+params:
+  datasource: 28__table
+  viz_type: table
+  slice_id: 140
+  granularity_sqla: Referral date
+  time_grain_sqla: P1D
+  time_range: No filter
+  query_mode: raw
+  groupby: []
+  metrics: []
+  all_columns:
+  - Facility Name
+  - Facility District
+  - Facility Province
+  - Referral Facility Name
+  - Referral Facility District
+  - Referral Facility Province
+  - OpenMRS ID
+  - Patient's name
+  - Age
+  - Phone number
+  - Village
+  - Commune/ Sangkat
+  - District/ Khan
+  - Province/City
+  - Reason for referral
+  - Referral date
+  percent_metrics: []
+  adhoc_filters: []
+  order_by_cols: []
+  row_limit: 10000
+  server_page_length: 10
+  order_desc: true
+  table_timestamp_format: smart_date
+  include_search: true
+  show_cell_bars: true
+  color_pn: true
+  allow_rearrange_columns: true
+  column_config:
+    Age:
+      showCellBars: false
+  conditional_formatting: []
+  extra_form_data: {}
+  dashboards:
+  - 15
+  annotation_layers: []
+query_context: '{"datasource":{"id":28,"type":"table"},"force":false,"queries":[{"time_range":"No
+  filter","granularity":"Referral date","filters":[],"extras":{"time_grain_sqla":"P1D","having":"","where":""},"applied_time_extras":{},"columns":["Facility
+  Name","Facility District","Facility Province","Referral Facility Name","Referral
+  Facility District","Referral Facility Province","OpenMRS ID","Patient''s name","Age","Phone
+  number","Village","Commune/ Sangkat","District/ Khan","Province/City","Reason for
+  referral","Referral date"],"orderby":[],"annotation_layers":[],"row_limit":10000,"series_limit":0,"order_desc":true,"url_params":{},"custom_params":{},"custom_form_data":{},"post_processing":[]}],"form_data":{"datasource":"28__table","viz_type":"table","slice_id":140,"granularity_sqla":"Referral
+  date","time_grain_sqla":"P1D","time_range":"No filter","query_mode":"raw","groupby":[],"metrics":[],"all_columns":["Facility
+  Name","Facility District","Facility Province","Referral Facility Name","Referral
+  Facility District","Referral Facility Province","OpenMRS ID","Patient''s name","Age","Phone
+  number","Village","Commune/ Sangkat","District/ Khan","Province/City","Reason for
+  referral","Referral date"],"percent_metrics":[],"adhoc_filters":[],"order_by_cols":[],"row_limit":10000,"server_page_length":10,"include_time":false,"order_desc":true,"table_timestamp_format":"smart_date","include_search":true,"show_cell_bars":true,"color_pn":true,"allow_rearrange_columns":true,"column_config":{"Age":{"showCellBars":false}},"conditional_formatting":[],"extra_form_data":{},"dashboards":[15],"force":false,"result_format":"json","result_type":"full"},"result_format":"json","result_type":"full"}'
+cache_timeout: null
+uuid: 9cf83bb1-cc39-4c8a-89fa-3291f726b69a
+version: 1.0.0
+dataset_uuid: e7351329-6fdc-4bb7-9aaa-66cab8efeeb1
diff --git a/base/configs/superset/assets/charts/RH_CSS_Report_10.yaml b/base/configs/superset/assets/charts/RH_CSS_Report_10.yaml
new file mode 100644
index 00000000..92c421cb
--- /dev/null
+++ b/base/configs/superset/assets/charts/RH_CSS_Report_10.yaml
@@ -0,0 +1,87 @@
+slice_name: RH CSS Report
+description: null
+certified_by: null
+certification_details: null
+viz_type: table
+params:
+  datasource: 26__table
+  viz_type: table
+  slice_id: 137
+  granularity_sqla: Visit date
+  time_grain_sqla: P1D
+  time_range: No filter
+  query_mode: raw
+  groupby: []
+  metrics: []
+  all_columns:
+  - OpenMRS ID
+  - ID Poor Card
+  - National ID Card
+  - PMRS ID Number
+  - Other Identifiers
+  - Patient's name
+  - Age
+  - Province/City
+  - District/ Khan
+  - Commune/ Sangkat
+  - Village
+  - Phone number
+  - Visit date
+  - Type of visit
+  - Payment type
+  - Referred From
+  - SCJ
+  - VIA test result
+  - If VIA(+) Number of Quadrants involved
+  - If VIA(+) % of Acetowhite site
+  - HPV Test result
+  - 'Type of HPV '
+  - Treatment option
+  - Other treatment specified
+  - Self breast examination and education
+  - Breast Examination Result
+  - Other Breast Examination Result
+  - Treatment
+  - Facility Province
+  - Facility District
+  - Facility Name
+  percent_metrics: []
+  adhoc_filters: []
+  order_by_cols: []
+  row_limit: 10000
+  server_page_length: 10
+  order_desc: true
+  table_timestamp_format: smart_date
+  include_search: true
+  show_cell_bars: true
+  color_pn: true
+  allow_rearrange_columns: true
+  column_config:
+    Age:
+      showCellBars: false
+  conditional_formatting: []
+  extra_form_data: {}
+  dashboards:
+  - 13
+  annotation_layers: []
+query_context: '{"datasource":{"id":26,"type":"table"},"force":false,"queries":[{"time_range":"No
+  filter","granularity":"Visit date","filters":[],"extras":{"time_grain_sqla":"P1D","having":"","where":""},"applied_time_extras":{},"columns":["OpenMRS
+  ID","ID Poor Card","National ID Card","PMRS ID Number","Other Identifiers","Patient''s
+  name","Age","Province/City","District/ Khan","Commune/ Sangkat","Village","Phone
+  number","Visit date","Type of visit","Payment type","Referred From","SCJ","VIA test
+  result","If VIA(+) Number of Quadrants involved","If VIA(+) % of Acetowhite site","HPV
+  Test result","Type of HPV ","Treatment option","Other treatment specified","Self
+  breast examination and education","Breast Examination Result","Other Breast Examination
+  Result","Treatment","Facility Province","Facility District","Facility Name"],"orderby":[],"annotation_layers":[],"row_limit":10000,"series_limit":0,"order_desc":true,"url_params":{},"custom_params":{},"custom_form_data":{},"post_processing":[]}],"form_data":{"datasource":"26__table","viz_type":"table","slice_id":137,"granularity_sqla":"Visit
+  date","time_grain_sqla":"P1D","time_range":"No filter","query_mode":"raw","groupby":[],"metrics":[],"all_columns":["OpenMRS
+  ID","ID Poor Card","National ID Card","PMRS ID Number","Other Identifiers","Patient''s
+  name","Age","Province/City","District/ Khan","Commune/ Sangkat","Village","Phone
+  number","Visit date","Type of visit","Payment type","Referred From","SCJ","VIA test
+  result","If VIA(+) Number of Quadrants involved","If VIA(+) % of Acetowhite site","HPV
+  Test result","Type of HPV ","Treatment option","Other treatment specified","Self
+  breast examination and education","Breast Examination Result","Other Breast Examination
+  Result","Treatment","Facility Province","Facility District","Facility Name"],"percent_metrics":[],"adhoc_filters":[],"order_by_cols":[],"row_limit":10000,"server_page_length":10,"include_time":false,"order_desc":true,"table_timestamp_format":"smart_date","include_search":true,"show_cell_bars":true,"color_pn":true,"allow_rearrange_columns":true,"column_config":{"Age":{"showCellBars":false}},"conditional_formatting":[],"extra_form_data":{},"dashboards":[13],"force":false,"result_format":"json","result_type":"full"},"result_format":"json","result_type":"full"}'
+cache_timeout: null
+uuid: e04a169b-60d4-4514-8820-8a6b386dfa82
+version: 1.0.0
+dataset_uuid: ec4ccb14-7449-490e-acb4-20bac3bd9935
diff --git a/base/configs/superset/assets/charts/RH_NCD_OPD_Register_Report_18.yaml b/base/configs/superset/assets/charts/RH_NCD_OPD_Register_Report_18.yaml
new file mode 100644
index 00000000..3c3711d9
--- /dev/null
+++ b/base/configs/superset/assets/charts/RH_NCD_OPD_Register_Report_18.yaml
@@ -0,0 +1,104 @@
+slice_name: RH NCD OPD Register Report
+description: null
+certified_by: null
+certification_details: null
+viz_type: table
+params:
+  datasource: 33__table
+  viz_type: table
+  slice_id: 146
+  granularity_sqla: Visit Date
+  time_grain_sqla: P1D
+  time_range: No filter
+  query_mode: raw
+  groupby: []
+  all_columns:
+  - Facility Name
+  - Facility District
+  - Facility Province
+  - OpenMRS ID
+  - Patient's name
+  - Gender
+  - Age
+  - Phone number
+  - Referred By
+  - Village
+  - Commune/ Sangkat
+  - District/ Khan
+  - Province/City
+  - Visit Date
+  - Zone
+  - Circumference
+  - Weight
+  - Height
+  - BMI
+  - Diastolic Pressure
+  - Systolic Pressure
+  - Pulse
+  - Temperature
+  - Respiratory Rate
+  - SpO2
+  - Fasting Blood Sugar
+  - Random Blood Sugar
+  - OGTT 1 Hour
+  - OGTT 2 Hours
+  - HbA1c
+  - Albumin
+  - Ketones
+  - Smoking Status
+  - Physical Exercise
+  - Alcohol Use
+  - CVD risk score (%)
+  - Diagnosis 1
+  - Diagnosis 2
+  - Complications
+  - Management - Lifestlye
+  - Management - Medications
+  - Appointment Reason
+  - Appointment Date
+  - Reason For Referral
+  - Referral Facility
+  - Payment Type
+  - Remarks
+  percent_metrics: []
+  adhoc_filters: []
+  order_by_cols: []
+  row_limit: 10000
+  server_page_length: 10
+  order_desc: true
+  table_timestamp_format: smart_date
+  include_search: true
+  show_cell_bars: true
+  color_pn: true
+  allow_rearrange_columns: true
+  column_config:
+    Age:
+      showCellBars: false
+  conditional_formatting: []
+  extra_form_data: {}
+  dashboards:
+  - 19
+  annotation_layers: []
+query_context: '{"datasource":{"id":33,"type":"table"},"force":false,"queries":[{"time_range":"No
+  filter","granularity":"Visit Date","filters":[],"extras":{"time_grain_sqla":"P1D","having":"","where":""},"applied_time_extras":{},"columns":["Facility
+  Name","Facility District","Facility Province","OpenMRS ID","Patient''s name","Gender","Age","Phone
+  number","Referred By","Village","Commune/ Sangkat","District/ Khan","Province/City","Visit
+  Date","Zone","Circumference","Weight","Height","BMI","Diastolic Pressure","Systolic
+  Pressure","Pulse","Temperature","Respiratory Rate","SpO2","Fasting Blood Sugar","Random
+  Blood Sugar","OGTT 1 Hour","OGTT 2 Hours","HbA1c","Albumin","Ketones","Smoking Status","Physical
+  Exercise","Alcohol Use","CVD risk score (%)","Diagnosis 1","Diagnosis 2","Complications","Management
+  - Lifestlye","Management - Medications","Appointment Reason","Appointment Date","Reason
+  For Referral","Referral Facility","Payment Type","Remarks"],"orderby":[],"annotation_layers":[],"row_limit":10000,"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":146,"granularity_sqla":"Visit
+  Date","time_grain_sqla":"P1D","time_range":"No filter","query_mode":"raw","groupby":[],"all_columns":["Facility
+  Name","Facility District","Facility Province","OpenMRS ID","Patient''s name","Gender","Age","Phone
+  number","Referred By","Village","Commune/ Sangkat","District/ Khan","Province/City","Visit
+  Date","Zone","Circumference","Weight","Height","BMI","Diastolic Pressure","Systolic
+  Pressure","Pulse","Temperature","Respiratory Rate","SpO2","Fasting Blood Sugar","Random
+  Blood Sugar","OGTT 1 Hour","OGTT 2 Hours","HbA1c","Albumin","Ketones","Smoking Status","Physical
+  Exercise","Alcohol Use","CVD risk score (%)","Diagnosis 1","Diagnosis 2","Complications","Management
+  - Lifestlye","Management - Medications","Appointment Reason","Appointment Date","Reason
+  For Referral","Referral Facility","Payment Type","Remarks"],"percent_metrics":[],"adhoc_filters":[],"order_by_cols":[],"row_limit":10000,"server_page_length":10,"include_time":false,"order_desc":true,"table_timestamp_format":"smart_date","include_search":true,"show_cell_bars":true,"color_pn":true,"allow_rearrange_columns":true,"column_config":{"Age":{"showCellBars":false}},"conditional_formatting":[],"extra_form_data":{},"dashboards":[19],"force":false,"result_format":"json","result_type":"full"},"result_format":"json","result_type":"full"}'
+cache_timeout: null
+uuid: 971a570a-0181-4e85-b6aa-f90ffd7e9926
+version: 1.0.0
+dataset_uuid: eae4ea82-b387-41fd-be9c-39bce338d4fa
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_13.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_13.yaml
new file mode 100644
index 00000000..098503b3
--- /dev/null
+++ 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_13.yaml
@@ -0,0 +1,150 @@
+slice_name: 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
+description: "\u1799\u17C9\u17B6\u1784\u17A0\u17C4\u1785\u178E\u17B6\u179F\u17CB 80\
+  \ \u1797\u17B6\u1782\u179A\u1799\u1793\u17C3\u17A2\u17D2\u1793\u1780\u1787\u17C6\
+  \u1784\u17BA\u178A\u17C2\u179B\u1798\u17B6\u1793\u1780\u17B6\u179A\u1792\u17D2\u179C\
+  \u17BE\u179A\u17C4\u1782\u179C\u17B7\u1793\u17B7\u1785\u17D2\u1786\u17D0\u1799\u1790\
+  \u17B6\u1798\u17B6\u1793\u1787\u17C6\u1784\u17BA\u1791\u17B9\u1780\u1793\u17C4\u1798\
+  \u1795\u17D2\u17A2\u17C2\u1798 \u1793\u17B7\u1784/\u17AC\u1787\u17C6\u1784\u17BA\
+  \u179B\u17BE\u179F\u1788\u17B6\u1798\u1794\u17B6\u1793\u1791\u1791\u17BD\u179B\u1780\
+  \u17B6\u179A\u1796\u17D2\u1799\u17B6\u1794\u17B6\u179B\u178F\u17D2\u179A\u17B9\u1798\
+  \u178F\u17D2\u179A\u17BC\u179C (\u17A7. \u1794\u17B6\u1793\u1791\u1791\u17BD\u179B\
+  \u1790\u17D2\u1793\u17B6\u17C6\u179F\u1798\u17D2\u179A\u17B6\u1794\u17CB\u1780\u17B6\
+  \u179A\u1796\u17D2\u1799\u17B6\u1794\u17B6\u179B\u1787\u17B6\u1794\u17D2\u179A\u1785\
+  \u17B6\u17C6 \u1793\u17B7\u1784\u1794\u17D2\u179A\u1785\u17B6\u17C6\u1781\u17C2\
+  )\u17D4 \u17A2\u17D2\u1793\u1780\u1787\u17C6\u1784\u17BA\u1782\u17BD\u179A\u178F\
+  \u17C2\u178F\u17D2\u179A\u17BC\u179C\u1794\u17B6\u1793\u1792\u17D2\u179C\u17BE\u178F\
+  \u17C1\u179F\u17D2\u178F\u1787\u17B6\u1791\u17C0\u1784\u1791\u17B6\u178F\u17CB\u178F\
+  \u17B6\u1798\u1780\u17B6\u179A\u178E\u17C2\u1793\u17B6\u17C6\u1793\u17C3\u1780\u17B6\
+  \u179A\u1796\u17D2\u1799\u17B6\u1794\u17B6\u179B\u17D4 \u17B1\u179F\u1790 (\u17B1\
+  \u179F\u1790\u179F\u17B6\u179A\u179C\u1793\u17D2\u178F ) \u179F\u1798\u17D2\u179A\
+  \u17B6\u1794\u17CB\u1780\u17B6\u179A\u1796\u17D2\u1799\u17B6\u1794\u17B6\u179B\u1782\
+  \u17BD\u179A\u178F\u17C2\u178F\u17D2\u179A\u17BC\u179C\u1794\u17B6\u1793\u1795\u17D2\
+  \u178F\u179B\u17CB\u1787\u17BC\u1793\u178A\u17C4\u1799\u1798\u17B7\u1793\u1782\u17B7\
+  \u178F\u1790\u17D2\u179B\u17C3\u1794\u1793\u17D2\u1790\u17C2\u1798\u178A\u179B\u17CB\
+  \u17A2\u17D2\u1793\u1780\u1787\u17C6\u1784\u17BA \u17A0\u17BE\u1799\u1798\u17BC\u179B\
+  \u178A\u17D2\u178B\u17B6\u1793\u179F\u17BB\u1781\u17B6\u1797\u17B7\u1794\u17B6\u179B\
+  \u1798\u17B7\u1793\u1782\u17BD\u179A\u17A2\u1793\u17BB\u1789\u17D2\u1789\u17B6\u178F\
+  \u17B1\u17D2\u1799\u17A2\u17D2\u1793\u1780\u1787\u17C6\u1784\u17BA\u1791\u17B7\u1789\
+  \u1790\u17D2\u1793\u17B6\u17C6)\u17D4 (At least 80 percent of patients with confirmed\
+  \ diagnosis as having diabetes and/or hypertension received proper treatment (i.e.,\
+  \ received medicines for treatment regularly and on a monthly basis). The patients\
+  \ should be tested regularly according to the treatment guidelines. Drugs (essential\
+  \ drugs) for treatment should be provided without additional charge to the patients,\
+  \ and health facilities should not let patients purchase medicines))"
+certified_by: null
+certification_details: null
+viz_type: table
+params:
+  datasource: 9__table
+  viz_type: table
+  slice_id: 13
+  query_mode: raw
+  groupby: []
+  time_grain_sqla: P1D
+  temporal_columns_lookup:
+    Visit End date: true
+    Visit Start date: true
+    Follow-Up Date: true
+    Patient's Birthdate: true
+  all_columns:
+  - Facility Name
+  - Facility District
+  - Facility Province
+  - OpenMRS ID
+  - Patient's First name
+  - Patient's Last name
+  - Patient's Gender
+  - Patient's Birthdate
+  - Patient Address
+  - Phone number
+  - Other Identifiers
+  - Visit Start date
+  - Visit End date
+  - Visit Type
+  - Referral source
+  - Insurance type
+  - Known Diabetes
+  - Known Hypertension
+  - Weight
+  - Height
+  - Circumference
+  - BMI
+  - Systolic Pressure
+  - Diastolic Pressure
+  - Pulse
+  - Temperature
+  - Fasting Blood Sugar
+  - Random Blood Sugar
+  - HbA1c
+  - OGTT
+  - Albumin
+  - Ketones
+  - Diagnosis 1
+  - Diagnosis 2
+  - Referral Facility
+  - Has a Referral Letter
+  - CVD Risk Score
+  - Follow-Up For
+  - Follow-Up Date
+  - Started on Medication
+  - Drug Names
+  percent_metrics: []
+  adhoc_filters:
+  - clause: WHERE
+    comparator: No filter
+    datasourceWarning: false
+    expressionType: SIMPLE
+    filterOptionName: filter_n2m1tvtq7r_gt8yj3uke8k
+    isExtra: false
+    isNew: false
+    operator: TEMPORAL_RANGE
+    sqlExpression: null
+    subject: Visit Start date
+  - clause: WHERE
+    comparator: 80-pecent-followup-with-hypertension-iabetes-and-medication
+    datasourceWarning: false
+    expressionType: SIMPLE
+    filterOptionName: filter_8rr0knozg92_ohvf6b9r5sc
+    isExtra: false
+    isNew: false
+    operator: ==
+    operatorId: EQUALS
+    sqlExpression: null
+    subject: indicator
+  order_by_cols: []
+  row_limit: 1000
+  server_page_length: 10
+  order_desc: true
+  table_timestamp_format: smart_date
+  show_cell_bars: true
+  color_pn: true
+  extra_form_data: {}
+  dashboards:
+  - 1
+query_context: '{"datasource":{"id":9,"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
+  Last name","Patient''s Gender","Patient''s Birthdate","Patient Address","Phone number","Other
+  Identifiers","Visit Start date","Visit End date","Visit Type","Referral source","Insurance
+  type","Known Diabetes","Known Hypertension","Weight","Height","Circumference","BMI","Systolic
+  Pressure","Diastolic Pressure","Pulse","Temperature","Fasting Blood Sugar","Random
+  Blood Sugar","HbA1c","OGTT","Albumin","Ketones","Diagnosis 1","Diagnosis 2","Referral
+  Facility","Has a Referral Letter","CVD Risk Score","Follow-Up For","Follow-Up Date","Started
+  on Medication","Drug Names"],"orderby":[],"annotation_layers":[],"row_limit":1000,"series_limit":0,"order_desc":true,"url_params":{},"custom_params":{},"custom_form_data":{},"post_processing":[]}],"form_data":{"datasource":"9__table","viz_type":"table","slice_id":13,"query_mode":"raw","groupby":[],"time_grain_sqla":"P1D","temporal_columns_lookup":{"Visit
+  End date":true,"Visit Start date":true,"Follow-Up Date":true,"Patient''s Birthdate":true},"all_columns":["Facility
+  Name","Facility District","Facility Province","OpenMRS ID","Patient''s First name","Patient''s
+  Last name","Patient''s Gender","Patient''s Birthdate","Patient Address","Phone number","Other
+  Identifiers","Visit Start date","Visit End date","Visit Type","Referral source","Insurance
+  type","Known Diabetes","Known Hypertension","Weight","Height","Circumference","BMI","Systolic
+  Pressure","Diastolic Pressure","Pulse","Temperature","Fasting Blood Sugar","Random
+  Blood Sugar","HbA1c","OGTT","Albumin","Ketones","Diagnosis 1","Diagnosis 2","Referral
+  Facility","Has a Referral Letter","CVD Risk Score","Follow-Up For","Follow-Up Date","Started
+  on Medication","Drug Names"],"percent_metrics":[],"adhoc_filters":[{"clause":"WHERE","comparator":"No
+  filter","datasourceWarning":false,"expressionType":"SIMPLE","filterOptionName":"filter_n2m1tvtq7r_gt8yj3uke8k","isExtra":false,"isNew":false,"operator":"TEMPORAL_RANGE","sqlExpression":null,"subject":"Visit
+  Start date"},{"clause":"WHERE","comparator":"80-pecent-followup-with-hypertension-iabetes-and-medication","datasourceWarning":false,"expressionType":"SIMPLE","filterOptionName":"filter_8rr0knozg92_ohvf6b9r5sc","isExtra":false,"isNew":false,"operator":"==","operatorId":"EQUALS","sqlExpression":null,"subject":"indicator"}],"order_by_cols":[],"row_limit":1000,"server_page_length":10,"order_desc":true,"table_timestamp_format":"smart_date","show_cell_bars":true,"color_pn":true,"extra_form_data":{},"dashboards":[1],"force":false,"result_format":"json","result_type":"full","include_time":false},"result_format":"json","result_type":"full"}'
+cache_timeout: null
+uuid: 07b02091-ffa9-4d41-8c26-965416489fb3
+version: 1.0.0
+dataset_uuid: 54c5a8fb-66f7-4279-8498-abebf5d65e7f
diff --git a/base/configs/superset/assets/charts/Registered_patients_aged_40_and_above_that_have_had_their_NCD_screening_for_the_first_time_14.yaml b/base/configs/superset/assets/charts/Registered_patients_aged_40_and_above_that_have_had_their_NCD_screening_for_the_first_time_14.yaml
new file mode 100644
index 00000000..239b6e06
--- /dev/null
+++ b/base/configs/superset/assets/charts/Registered_patients_aged_40_and_above_that_have_had_their_NCD_screening_for_the_first_time_14.yaml
@@ -0,0 +1,135 @@
+slice_name: Registered patients aged 40 and above that have had their NCD screening
+  for the first time
+description: "\u1799\u17C9\u17B6\u1784\u17A0\u17C4\u1785\u178E\u17B6\u179F\u17CB\u1794\
+  \u17D2\u179A\u1787\u17B6\u1787\u1793\u1790\u17D2\u1798\u17B8\u1785\u17C6\u1793\u17BD\
+  \u1793\u17E5\u17E0\u1793\u17B6\u1780\u17CB\u1780\u17D2\u1793\u17BB\u1784\u17E1\u1781\
+  \u17C2 \u178A\u17C2\u179B\u1798\u17B6\u1793\u17A2\u17B6\u1799\u17BB\u1785\u17B6\u1794\
+  \u17CB\u1796\u17B8\u17E4\u17E0\u1786\u17D2\u1793\u17B6\u17C6\u17A1\u17BE\u1784\u1791\
+  \u17C5\u1794\u17B6\u1793\u1785\u17BB\u17C7\u1788\u17D2\u1798\u17C4\u17C7 \u1793\u17B7\
+  \u1784\u1791\u1791\u17BD\u179B\u1794\u17B6\u1793\u179F\u17C1\u179C\u17B6\u1796\u17B7\
+  \u1793\u17B7\u178F\u17D2\u1799\u179A\u1780\u1787\u17C6\u1784\u17BA\u1791\u17B9\u1780\
+  \u1793\u17C4\u1798\u1795\u17D2\u17A2\u17C2\u1798 \u1793\u17B7\u1784\u1787\u17C6\u1784\
+  \u17BA\u179B\u17BE\u179F\u179F\u1798\u17D2\u1796\u17B6\u1792\u1788\u17B6\u1798 \u1793\
+  \u17B7\u1784\u1796\u17D2\u1799\u17B6\u1794\u17B6\u179B\u1787\u17B6\u179B\u17BE\u1780\
+  \u178A\u17C6\u1794\u17BC\u1784\u17D4 (At least 50 population aged 40 years+ registered\
+  \ and received the first screening and treatment services for diabetes and hypertension\
+  \ per month)"
+certified_by: null
+certification_details: null
+viz_type: table
+params:
+  datasource: 9__table
+  viz_type: table
+  slice_id: 14
+  query_mode: raw
+  groupby: []
+  time_grain_sqla: P1D
+  temporal_columns_lookup:
+    Visit End date: true
+    Visit Start date: true
+    Follow-Up Date: true
+    Patient's Birthdate: true
+  metrics: []
+  all_columns:
+  - Facility Province
+  - Facility District
+  - Facility Name
+  - OpenMRS ID
+  - Patient's Last name
+  - Patient's First name
+  - Patient's Birthdate
+  - Patient Address
+  - Other Identifiers
+  - Patient's Gender
+  - Phone number
+  - Visit Type
+  - Visit Start date
+  - Visit End date
+  - Referral source
+  - Insurance type
+  - Known Diabetes
+  - Known Hypertension
+  - Weight
+  - Height
+  - Circumference
+  - BMI
+  - Systolic Pressure
+  - Diastolic Pressure
+  - Pulse
+  - Temperature
+  - Random Blood Sugar
+  - Fasting Blood Sugar
+  - HbA1c
+  - OGTT
+  - Albumin
+  - Ketones
+  - Diagnosis 1
+  - Diagnosis 2
+  - Referral Facility
+  - Has a Referral Letter
+  - CVD Risk Score
+  - Follow-Up For
+  - Follow-Up Date
+  - Started on Medication
+  - Drug Names
+  percent_metrics: []
+  adhoc_filters:
+  - expressionType: SIMPLE
+    subject: Visit Start date
+    operator: TEMPORAL_RANGE
+    comparator: No filter
+    clause: WHERE
+    sqlExpression: null
+    isExtra: false
+    isNew: false
+    datasourceWarning: false
+    filterOptionName: filter_n5dad56ctk_yji7xby1r0a
+  - expressionType: SIMPLE
+    subject: indicator
+    operator: IN
+    operatorId: IN
+    comparator:
+    - 80-pecent-followup-with-hypertension-iabetes-and-medication
+    - patients-aged-40-above-with-first-time ncd-screening
+    clause: WHERE
+    sqlExpression: null
+    isExtra: false
+    isNew: false
+    datasourceWarning: false
+    filterOptionName: filter_skfq75qb4zi_azi1ldrrjvj
+  order_by_cols: []
+  row_limit: 1000
+  server_page_length: 10
+  order_desc: true
+  table_timestamp_format: smart_date
+  show_cell_bars: true
+  color_pn: true
+  extra_form_data: {}
+  dashboards:
+  - 1
+query_context: '{"datasource":{"id":9,"type":"table"},"force":false,"queries":[{"filters":[{"col":"Visit
+  Start date","op":"TEMPORAL_RANGE","val":"No filter"},{"col":"indicator","op":"IN","val":["80-pecent-followup-with-hypertension-iabetes-and-medication","patients-aged-40-above-with-first-time
+  ncd-screening"]}],"extras":{"time_grain_sqla":"P1D","having":"","where":""},"applied_time_extras":{},"columns":["Facility
+  Province","Facility District","Facility Name","OpenMRS ID","Patient''s Last name","Patient''s
+  First name","Patient''s Birthdate","Patient Address","Other Identifiers","Patient''s
+  Gender","Phone number","Visit Type","Visit Start date","Visit End date","Referral
+  source","Insurance type","Known Diabetes","Known Hypertension","Weight","Height","Circumference","BMI","Systolic
+  Pressure","Diastolic Pressure","Pulse","Temperature","Random Blood Sugar","Fasting
+  Blood Sugar","HbA1c","OGTT","Albumin","Ketones","Diagnosis 1","Diagnosis 2","Referral
+  Facility","Has a Referral Letter","CVD Risk Score","Follow-Up For","Follow-Up Date","Started
+  on Medication","Drug Names"],"orderby":[],"annotation_layers":[],"row_limit":1000,"series_limit":0,"order_desc":true,"url_params":{},"custom_params":{},"custom_form_data":{},"post_processing":[]}],"form_data":{"datasource":"9__table","viz_type":"table","slice_id":14,"query_mode":"raw","groupby":[],"time_grain_sqla":"P1D","temporal_columns_lookup":{"Visit
+  End date":true,"Visit Start date":true,"Follow-Up Date":true,"Patient''s Birthdate":true},"metrics":[],"all_columns":["Facility
+  Province","Facility District","Facility Name","OpenMRS ID","Patient''s Last name","Patient''s
+  First name","Patient''s Birthdate","Patient Address","Other Identifiers","Patient''s
+  Gender","Phone number","Visit Type","Visit Start date","Visit End date","Referral
+  source","Insurance type","Known Diabetes","Known Hypertension","Weight","Height","Circumference","BMI","Systolic
+  Pressure","Diastolic Pressure","Pulse","Temperature","Random Blood Sugar","Fasting
+  Blood Sugar","HbA1c","OGTT","Albumin","Ketones","Diagnosis 1","Diagnosis 2","Referral
+  Facility","Has a Referral Letter","CVD Risk Score","Follow-Up For","Follow-Up Date","Started
+  on Medication","Drug Names"],"percent_metrics":[],"adhoc_filters":[{"expressionType":"SIMPLE","subject":"Visit
+  Start date","operator":"TEMPORAL_RANGE","comparator":"No filter","clause":"WHERE","sqlExpression":null,"isExtra":false,"isNew":false,"datasourceWarning":false,"filterOptionName":"filter_n5dad56ctk_yji7xby1r0a"},{"expressionType":"SIMPLE","subject":"indicator","operator":"IN","operatorId":"IN","comparator":["80-pecent-followup-with-hypertension-iabetes-and-medication","patients-aged-40-above-with-first-time
+  ncd-screening"],"clause":"WHERE","sqlExpression":null,"isExtra":false,"isNew":false,"datasourceWarning":false,"filterOptionName":"filter_skfq75qb4zi_azi1ldrrjvj"}],"order_by_cols":[],"row_limit":1000,"server_page_length":10,"order_desc":true,"table_timestamp_format":"smart_date","show_cell_bars":true,"color_pn":true,"extra_form_data":{},"dashboards":[1],"force":false,"result_format":"json","result_type":"full","include_time":false},"result_format":"json","result_type":"full"}'
+cache_timeout: null
+uuid: c7bd827c-daa4-48ab-986d-0cd07a139b9a
+version: 1.0.0
+dataset_uuid: 54c5a8fb-66f7-4279-8498-abebf5d65e7f
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_6.yaml b/base/configs/superset/assets/charts/Registered_women_aged_30_to_49_years_that_have_had_their_CCS_screening_for_the_first_time_6.yaml
new file mode 100644
index 00000000..248c11ac
--- /dev/null
+++ b/base/configs/superset/assets/charts/Registered_women_aged_30_to_49_years_that_have_had_their_CCS_screening_for_the_first_time_6.yaml
@@ -0,0 +1,122 @@
+slice_name: Registered women aged 30 to 49 years that have had their CCS screening
+  for the first time
+description: "\u1799\u17C9\u17B6\u1784\u17A0\u17C4\u1785\u178E\u17B6\u179F\u17CB\u179F\
+  \u17D2\u178F\u17D2\u179A\u17B8\u1785\u17C6\u1793\u17BD\u1793 \u17E3\u17E0 \u1793\
+  \u17B6\u1780\u17CB\u178A\u17C2\u179B\u1798\u17B6\u1793\u17A2\u17B6\u1799\u17BB\u17A2\
+  \u17B6\u1799\u17BB\u1796\u17B8 \u17E3\u17E0 \u178A\u179B\u17CB \u17E4\u17E9\u1786\
+  \u17D2\u1793\u17B6\u17C6 \u1780\u17D2\u1793\u17BB\u1784\u1798\u17BD\u1799\u1781\u17C2\
+  \ \u1794\u17B6\u1793\u1785\u17BB\u17C7\u1788\u17D2\u1798\u17C4\u17C7\u1796\u17B7\
+  \u1793\u17B7\u178F\u17D2\u1799\u179F\u17BB\u1781\u1797\u17B6\u1796\u1798\u17B6\u178F\
+  \u17CB\u179F\u17D2\u1794\u17BC\u1793\u179A\u1780\u178A\u17C6\u1794\u17C5\u1798\u17BB\
+  \u1793\u1780\u17D2\u179B\u17B6\u1799\u1787\u17B6\u1798\u17A0\u17B6\u179A\u17B8\u1780\
+  \u179B\u17BE\u1780\u178A\u17C6\u1794\u17BC\u1784\u200B \u1793\u17B7\u1784 \u1780\
+  \u179A\u178E\u17B8VIA \u179C\u17B7\u1787\u17D2\u1787\u1798\u17B6\u1793 \u178F\u17D2\
+  \u179A\u17BC\u179C\u1794\u17B6\u1793\u1794\u1789\u17D2\u1787\u17BC\u1793\u1791\u17C5\
+  \u1796\u17D2\u1799\u17B6\u1794\u17B6\u179B\u178A\u17C6\u1794\u17C5\u1798\u17B6\u178F\
+  \u17CB\u179F\u17D2\u1794\u17BC\u1793\u1787\u17B6\u179B\u17BE\u1780\u178A\u17C6\u1794\
+  \u17BC\u1784\u17D4 (At least 30 women aged 30 \u2013 49 years registered and received\
+  \ the first screening and VIA positive cases were referred for cervical precancerous\
+  \ lesion treatment per month)"
+certified_by: null
+certification_details: null
+viz_type: table
+params:
+  datasource: 4__table
+  viz_type: table
+  slice_id: 6
+  query_mode: raw
+  groupby: []
+  time_grain_sqla: P1D
+  temporal_columns_lookup:
+    Encounter date and time: true
+    Visit End date: true
+    Visit Start date: true
+    Patient's Birthdate: true
+  all_columns:
+  - Facility Name
+  - Facility District
+  - Facility Province
+  - Patient's Last name
+  - Patient's First name
+  - Patient's Gender
+  - Patient's Birthdate
+  - Patient Address
+  - Phone number
+  - Other Identifiers
+  - Visit End date
+  - Visit Start date
+  - Referral source
+  - Insurance type
+  - First Screening?
+  - HPV Test
+  - OpenMRS ID
+  - Visit Type
+  - Visibility of SCJ
+  - VIA Test Result
+  - Area of ectocervix
+  - Cervical Biopsy
+  - Pap Smear
+  - Referral Facility
+  - Number of Quadrants
+  - CC Reason for Referral
+  - Colposcopy
+  - CC Treatment
+  - CC Follow-up date
+  - Encounter date and time
+  percent_metrics: []
+  adhoc_filters:
+  - expressionType: SIMPLE
+    subject: Visit Start date
+    operator: TEMPORAL_RANGE
+    comparator: No filter
+    clause: WHERE
+    sqlExpression: null
+    isExtra: false
+    isNew: false
+    datasourceWarning: false
+    filterOptionName: filter_7cvigde0ca_cgiov8yrc4w
+  - expressionType: SIMPLE
+    subject: indicator
+    operator: IN
+    operatorId: IN
+    comparator:
+    - 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
+    clause: WHERE
+    sqlExpression: null
+    isExtra: false
+    isNew: false
+    datasourceWarning: false
+    filterOptionName: filter_p2xjxqmjbl_ztolrl0r7ek
+  order_by_cols: []
+  row_limit: 1000
+  server_page_length: 10
+  order_desc: true
+  table_timestamp_format: smart_date
+  show_cell_bars: true
+  color_pn: true
+  extra_form_data: {}
+  dashboards:
+  - 1
+query_context: '{"datasource":{"id":4,"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
+  First name","Patient''s Gender","Patient''s Birthdate","Patient Address","Phone
+  number","Other Identifiers","Visit End date","Visit Start date","Referral source","Insurance
+  type","First Screening?","HPV Test","OpenMRS ID","Visit Type","Visibility of SCJ","VIA
+  Test Result","Area of ectocervix","Cervical Biopsy","Pap Smear","Referral Facility","Number
+  of Quadrants","CC Reason for Referral","Colposcopy","CC Treatment","CC Follow-up
+  date","Encounter date and time"],"orderby":[],"annotation_layers":[],"row_limit":1000,"series_limit":0,"order_desc":true,"url_params":{},"custom_params":{},"custom_form_data":{},"post_processing":[]}],"form_data":{"datasource":"4__table","viz_type":"table","slice_id":6,"query_mode":"raw","groupby":[],"time_grain_sqla":"P1D","temporal_columns_lookup":{"Encounter
+  date and time":true,"Visit End date":true,"Visit Start date":true,"Patient''s Birthdate":true},"all_columns":["Facility
+  Name","Facility District","Facility Province","Patient''s Last name","Patient''s
+  First name","Patient''s Gender","Patient''s Birthdate","Patient Address","Phone
+  number","Other Identifiers","Visit End date","Visit Start date","Referral source","Insurance
+  type","First Screening?","HPV Test","OpenMRS ID","Visit Type","Visibility of SCJ","VIA
+  Test Result","Area of ectocervix","Cervical Biopsy","Pap Smear","Referral Facility","Number
+  of Quadrants","CC Reason for Referral","Colposcopy","CC Treatment","CC Follow-up
+  date","Encounter date and time"],"percent_metrics":[],"adhoc_filters":[{"expressionType":"SIMPLE","subject":"Visit
+  Start date","operator":"TEMPORAL_RANGE","comparator":"No filter","clause":"WHERE","sqlExpression":null,"isExtra":false,"isNew":false,"datasourceWarning":false,"filterOptionName":"filter_7cvigde0ca_cgiov8yrc4w"},{"expressionType":"SIMPLE","subject":"indicator","operator":"IN","operatorId":"IN","comparator":["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"],"clause":"WHERE","sqlExpression":null,"isExtra":false,"isNew":false,"datasourceWarning":false,"filterOptionName":"filter_p2xjxqmjbl_ztolrl0r7ek"}],"order_by_cols":[],"row_limit":1000,"server_page_length":10,"order_desc":true,"table_timestamp_format":"smart_date","show_cell_bars":true,"color_pn":true,"extra_form_data":{},"dashboards":[1],"force":false,"result_format":"json","result_type":"full","include_time":false},"result_format":"json","result_type":"full"}'
+cache_timeout: null
+uuid: 37c2b93f-2cdf-4bf7-9195-076c83eda4b4
+version: 1.0.0
+dataset_uuid: 3680ccf7-bec7-45bc-8e9d-8afaba18b508
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_5.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_5.yaml
new file mode 100644
index 00000000..677c6c62
--- /dev/null
+++ 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_5.yaml
@@ -0,0 +1,88 @@
+slice_name: Registered women aged 30 to 49 years that have had their CCS screening
+  for the first time and were VIA positive and referred
+description: null
+certified_by: null
+certification_details: null
+viz_type: table
+params:
+  datasource: 35__table
+  viz_type: table
+  slice_id: 155
+  granularity_sqla: Visit Start date
+  time_grain_sqla: P1D
+  time_range: No filter
+  query_mode: raw
+  groupby: []
+  metrics: []
+  all_columns:
+  - Facility Name
+  - Facility District
+  - Facility Province
+  - OpenMRS ID
+  - Patient's First name
+  - Patient's Last name
+  - Patient Address
+  - Phone number
+  - Other Identifiers
+  - Visit Start date
+  - Visit End date
+  - Visit Type
+  - Referral source
+  - Insurance type
+  - First Screening?
+  - HPV Test
+  - Visibility of SCJ
+  - VIA Test Result
+  - Number of Quadrants
+  - Area of ectocervix
+  - Colposcopy
+  - Cervical Biopsy
+  - Pap Smear
+  - Referral Facility
+  - CC Reason for Referral
+  - CC Treatment
+  - CC Follow-up date
+  - Encounter date and time
+  percent_metrics: []
+  adhoc_filters:
+  - expressionType: SIMPLE
+    subject: indicator
+    operator: ==
+    operatorId: EQUALS
+    comparator: 80-percent-women-aged-30-49-years-with-ccs-screening-first-time-via-positive-referred
+    clause: WHERE
+    sqlExpression: null
+    isExtra: false
+    isNew: false
+    datasourceWarning: false
+    filterOptionName: filter_5stpm8h7cda_f2e3lyfu96d
+  order_by_cols: []
+  row_limit: 1000
+  server_page_length: 10
+  order_desc: true
+  table_timestamp_format: smart_date
+  show_cell_bars: true
+  color_pn: true
+  extra_form_data: {}
+  dashboards:
+  - 20
+  annotation_layers: []
+query_context: '{"datasource":{"id":35,"type":"table"},"force":false,"queries":[{"time_range":"No
+  filter","granularity":"Visit Start date","filters":[{"col":"indicator","op":"==","val":"80-percent-women-aged-30-49-years-with-ccs-screening-first-time-via-positive-referred"}],"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
+  Last name","Patient Address","Phone number","Other Identifiers","Visit Start date","Visit
+  End date","Visit Type","Referral source","Insurance type","First Screening?","HPV
+  Test","Visibility of SCJ","VIA Test Result","Number of Quadrants","Area of ectocervix","Colposcopy","Cervical
+  Biopsy","Pap Smear","Referral Facility","CC Reason for Referral","CC Treatment","CC
+  Follow-up date","Encounter date and time"],"orderby":[],"annotation_layers":[],"row_limit":1000,"series_limit":0,"order_desc":true,"url_params":{},"custom_params":{},"custom_form_data":{},"post_processing":[]}],"form_data":{"datasource":"35__table","viz_type":"table","slice_id":155,"granularity_sqla":"Visit
+  Start date","time_grain_sqla":"P1D","time_range":"No filter","query_mode":"raw","groupby":[],"metrics":[],"all_columns":["Facility
+  Name","Facility District","Facility Province","OpenMRS ID","Patient''s First name","Patient''s
+  Last name","Patient Address","Phone number","Other Identifiers","Visit Start date","Visit
+  End date","Visit Type","Referral source","Insurance type","First Screening?","HPV
+  Test","Visibility of SCJ","VIA Test Result","Number of Quadrants","Area of ectocervix","Colposcopy","Cervical
+  Biopsy","Pap Smear","Referral Facility","CC Reason for Referral","CC Treatment","CC
+  Follow-up date","Encounter date and time"],"percent_metrics":[],"adhoc_filters":[{"expressionType":"SIMPLE","subject":"indicator","operator":"==","operatorId":"EQUALS","comparator":"80-percent-women-aged-30-49-years-with-ccs-screening-first-time-via-positive-referred","clause":"WHERE","sqlExpression":null,"isExtra":false,"isNew":false,"datasourceWarning":false,"filterOptionName":"filter_5stpm8h7cda_f2e3lyfu96d"}],"order_by_cols":[],"row_limit":1000,"server_page_length":10,"include_time":false,"order_desc":true,"table_timestamp_format":"smart_date","show_cell_bars":true,"color_pn":true,"extra_form_data":{},"dashboards":[20],"force":false,"result_format":"json","result_type":"full"},"result_format":"json","result_type":"full"}'
+cache_timeout: null
+uuid: a770204a-9220-4c7e-8ea0-4773b2bf8a62
+version: 1.0.0
+dataset_uuid: 3680ccf7-bec7-45bc-8e9d-8afaba18b508
diff --git a/base/configs/superset/assets/dashboards/CCS_Referral_Status_Report_Dashboard_8.yaml b/base/configs/superset/assets/dashboards/CCS_Referral_Status_Report_Dashboard_8.yaml
new file mode 100644
index 00000000..7900e576
--- /dev/null
+++ b/base/configs/superset/assets/dashboards/CCS_Referral_Status_Report_Dashboard_8.yaml
@@ -0,0 +1,172 @@
+dashboard_title: CCS Referral Status Report Dashboard
+description: null
+css: ''
+slug: null
+certified_by: null
+certification_details: null
+published: true
+uuid: f2ceaa67-1e71-4ed4-ad56-b97f4f3682a9
+position:
+  CHART-GU8MjxzP6B:
+    children: []
+    id: CHART-GU8MjxzP6B
+    meta:
+      chartId: 8
+      height: 97
+      sliceName: CCS Referral Status Report
+      uuid: 14eb222c-0b43-4ba9-8617-dfeb3754bc46
+      width: 12
+    parents:
+    - ROOT_ID
+    - GRID_ID
+    - ROW-Rsxri3VTw8
+    type: CHART
+  DASHBOARD_VERSION_KEY: v2
+  GRID_ID:
+    children:
+    - ROW-Rsxri3VTw8
+    id: GRID_ID
+    parents:
+    - ROOT_ID
+    type: GRID
+  HEADER_ID:
+    id: HEADER_ID
+    meta:
+      text: CCS Referral Status Report Dashboard
+    type: HEADER
+  ROOT_ID:
+    children:
+    - GRID_ID
+    id: ROOT_ID
+    type: ROOT
+  ROW-Rsxri3VTw8:
+    children:
+    - CHART-GU8MjxzP6B
+    id: ROW-Rsxri3VTw8
+    meta:
+      background: BACKGROUND_TRANSPARENT
+    parents:
+    - ROOT_ID
+    - GRID_ID
+    type: ROW
+metadata:
+  color_scheme: ''
+  refresh_frequency: 0
+  expanded_slices: {}
+  label_colors: {}
+  timed_refresh_immune_slices: []
+  cross_filters_enabled: false
+  default_filters: '{}'
+  chart_configuration: {}
+  native_filter_configuration:
+  - id: NATIVE_FILTER-np_ziSrzJ
+    controlValues:
+      enableEmptyFilter: false
+      defaultToFirstItem: false
+      multiSelect: true
+      searchAllOptions: true
+      inverseSelection: false
+    name: "\u1798\u1793\u17D2\u1791\u17B8\u179A\u179F\u17BB\u1781\u17B6\u1797\u17B7\
+      \u1794\u17B6\u179B\u1781\u17C1\u178F\u17D2\u178F (Provincial Health Department)"
+    filterType: filter_select
+    targets:
+    - column:
+        name: Facility Province
+      datasetUuid: 412423af-0fdd-4e33-b15d-2b63a9e213e1
+    defaultDataMask:
+      extraFormData: {}
+      filterState: {}
+      ownState: {}
+    cascadeParentIds: []
+    scope:
+      rootPath:
+      - ROOT_ID
+      excluded: []
+    type: NATIVE_FILTER
+    description: ''
+    chartsInScope:
+    - 136
+    tabsInScope: []
+  - id: NATIVE_FILTER-BTQbykPsy
+    controlValues:
+      enableEmptyFilter: false
+      defaultToFirstItem: false
+      multiSelect: true
+      searchAllOptions: true
+      inverseSelection: false
+    name: "\u179F\u17D2\u179A\u17BB\u1780\u1794\u17D2\u179A\u178F\u17B7\u1794\u178F\
+      \u17D2\u178F\u17B7 (Operational District)"
+    filterType: filter_select
+    targets:
+    - column:
+        name: Facility District
+      datasetUuid: 412423af-0fdd-4e33-b15d-2b63a9e213e1
+    defaultDataMask:
+      extraFormData: {}
+      filterState: {}
+      ownState: {}
+    cascadeParentIds: []
+    scope:
+      rootPath:
+      - ROOT_ID
+      excluded: []
+    type: NATIVE_FILTER
+    description: ''
+    chartsInScope:
+    - 136
+    tabsInScope: []
+  - id: NATIVE_FILTER-cwZV98z_b
+    controlValues:
+      enableEmptyFilter: false
+      defaultToFirstItem: false
+      multiSelect: true
+      searchAllOptions: true
+      inverseSelection: false
+    name: "\u1788\u17D2\u1798\u17C4\u17C7\u1793\u17B7\u1784\u179B\u17C1\u1781\u1780\
+      \u17BC\u178A\u1798\u17BC\u179B\u178A\u17D2\u178B\u17B6\u1793\u179F\u17BB\u1781\
+      \u17B6\u1797\u17B7\u1794\u17B6\u179B (Health Facility's Name)"
+    filterType: filter_select
+    targets:
+    - column:
+        name: Facility Name
+      datasetUuid: 412423af-0fdd-4e33-b15d-2b63a9e213e1
+    defaultDataMask:
+      extraFormData: {}
+      filterState: {}
+      ownState: {}
+    cascadeParentIds: []
+    scope:
+      rootPath:
+      - ROOT_ID
+      excluded: []
+    type: NATIVE_FILTER
+    description: ''
+    chartsInScope:
+    - 136
+    tabsInScope: []
+  - id: NATIVE_FILTER-HPs6DabvT
+    controlValues:
+      enableEmptyFilter: false
+    name: "\u1780\u17B6\u179A\u179A\u17B6\u1799\u1780\u17B6\u179A\u178E\u17CD\u17A2\
+      \u17C6\u1796\u17B8\u1787\u17BD\u179A\u1796\u17C1\u179B\u179C\u17C1\u179B\u17B6\
+      \ (Reporting Time Range)"
+    filterType: filter_time
+    targets:
+    - {}
+    defaultDataMask:
+      extraFormData: {}
+      filterState: {}
+      ownState: {}
+    cascadeParentIds: []
+    scope:
+      rootPath:
+      - ROOT_ID
+      excluded: []
+    type: NATIVE_FILTER
+    description: ''
+    chartsInScope:
+    - 136
+    tabsInScope: []
+  shared_label_colors: {}
+  color_scheme_domain: []
+version: 1.0.0
diff --git a/base/configs/superset/assets/dashboards/Disbursement_Report_Dashboard_1.yaml b/base/configs/superset/assets/dashboards/Disbursement_Report_Dashboard_1.yaml
new file mode 100644
index 00000000..ced9d30a
--- /dev/null
+++ b/base/configs/superset/assets/dashboards/Disbursement_Report_Dashboard_1.yaml
@@ -0,0 +1,448 @@
+dashboard_title: Disbursement Report Dashboard
+description: null
+css: ''
+slug: null
+certified_by: ''
+certification_details: ''
+published: true
+uuid: 2439cfd3-bd2d-42f7-988e-e9af336eb2cd
+position:
+  CHART-9thSsJSkeY:
+    children: []
+    id: CHART-9thSsJSkeY
+    meta:
+      chartId: 14
+      height: 50
+      sliceName: Registered patients aged 40 and above that have had their NCD screening
+        for the first time
+      uuid: c7bd827c-daa4-48ab-986d-0cd07a139b9a
+      width: 6
+    parents:
+    - ROOT_ID
+    - GRID_ID
+    - TABS-ZRS7TWNBEY
+    - TAB-MFLXG67ZDQ
+    - ROW-a3xYoJoMRW
+    type: CHART
+  CHART-auU0qpYADt:
+    children: []
+    id: CHART-auU0qpYADt
+    meta:
+      chartId: 16
+      height: 31
+      sliceName: CCS Indicators
+      uuid: ee7add1c-c8aa-4984-9db7-3fa3f726f15c
+      width: 6
+    parents:
+    - ROOT_ID
+    - GRID_ID
+    - TABS-vVToFo37Yd
+    - TAB-Pf9SVE-52F
+    - ROW-fDSarEWFr
+    type: CHART
+  CHART-gSiI5FA9Eh:
+    children: []
+    id: CHART-gSiI5FA9Eh
+    meta:
+      chartId: 6
+      height: 50
+      sliceName: Registered women aged 30 to 49 years that have had their CCS screening
+        for the first time
+      uuid: 37c2b93f-2cdf-4bf7-9195-076c83eda4b4
+      width: 6
+    parents:
+    - ROOT_ID
+    - GRID_ID
+    - TABS-jAi7lQUpvu
+    - TAB-zmiZPQAMiF
+    - ROW-lSn0ovyoVx
+    type: CHART
+  CHART-l6yN9QRqOT:
+    children: []
+    id: CHART-l6yN9QRqOT
+    meta:
+      chartId: 13
+      height: 50
+      sliceName: Registered patients aged 40 and above and screened 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
+      uuid: 07b02091-ffa9-4d41-8c26-965416489fb3
+      width: 6
+    parents:
+    - ROOT_ID
+    - GRID_ID
+    - TABS-ZRS7TWNBEY
+    - TAB-MFLXG67ZDQ
+    - ROW-a3xYoJoMRW
+    type: CHART
+  CHART-wE9z76bX9M:
+    children: []
+    id: CHART-wE9z76bX9M
+    meta:
+      chartId: 5
+      height: 50
+      sliceName: Registered women aged 30 to 49 years that have had their CCS screening
+        for the first time and were VIA positive and referred
+      uuid: a770204a-9220-4c7e-8ea0-4773b2bf8a62
+      width: 6
+    parents:
+    - ROOT_ID
+    - GRID_ID
+    - TABS-jAi7lQUpvu
+    - TAB-zmiZPQAMiF
+    - ROW-lSn0ovyoVx
+    type: CHART
+  CHART-wj7DkIY-Pb:
+    children: []
+    id: CHART-wj7DkIY-Pb
+    meta:
+      chartId: 7
+      height: 31
+      sliceName: NCD Indicators
+      uuid: 802a00e7-0681-407f-bd7a-c55a4f4e466e
+      width: 6
+    parents:
+    - ROOT_ID
+    - GRID_ID
+    - TABS-vVToFo37Yd
+    - TAB-Pf9SVE-52F
+    - ROW-fDSarEWFr
+    type: CHART
+  DASHBOARD_VERSION_KEY: v2
+  GRID_ID:
+    children:
+    - TABS-vVToFo37Yd
+    - TABS-ZRS7TWNBEY
+    - TABS-jAi7lQUpvu
+    id: GRID_ID
+    parents:
+    - ROOT_ID
+    type: GRID
+  HEADER_ID:
+    id: HEADER_ID
+    meta:
+      text: Disbursement Report Dashboard
+    type: HEADER
+  ROOT_ID:
+    children:
+    - GRID_ID
+    id: ROOT_ID
+    type: ROOT
+  ROW-a3xYoJoMRW:
+    children:
+    - CHART-9thSsJSkeY
+    - CHART-l6yN9QRqOT
+    id: ROW-a3xYoJoMRW
+    meta:
+      background: BACKGROUND_TRANSPARENT
+    parents:
+    - ROOT_ID
+    - GRID_ID
+    - TABS-ZRS7TWNBEY
+    - TAB-MFLXG67ZDQ
+    type: ROW
+  ROW-fDSarEWFr:
+    children:
+    - CHART-auU0qpYADt
+    - CHART-wj7DkIY-Pb
+    id: ROW-fDSarEWFr
+    meta:
+      background: BACKGROUND_TRANSPARENT
+    parents:
+    - ROOT_ID
+    - GRID_ID
+    - TABS-vVToFo37Yd
+    - TAB-Pf9SVE-52F
+    type: ROW
+  ROW-lSn0ovyoVx:
+    children:
+    - CHART-gSiI5FA9Eh
+    - CHART-wE9z76bX9M
+    id: ROW-lSn0ovyoVx
+    meta:
+      background: BACKGROUND_TRANSPARENT
+    parents:
+    - ROOT_ID
+    - GRID_ID
+    - TABS-jAi7lQUpvu
+    - TAB-zmiZPQAMiF
+    type: ROW
+  TAB-MFLXG67ZDQ:
+    children:
+    - ROW-a3xYoJoMRW
+    id: TAB-MFLXG67ZDQ
+    meta:
+      defaultText: Tab title
+      placeholder: Tab title
+      text: NCD Indicators Supporting Data
+    parents:
+    - ROOT_ID
+    - GRID_ID
+    - TABS-ZRS7TWNBEY
+    type: TAB
+  TAB-Pf9SVE-52F:
+    children:
+    - ROW-fDSarEWFr
+    id: TAB-Pf9SVE-52F
+    meta:
+      defaultText: Tab title
+      placeholder: Tab title
+      text: Indicators
+    parents:
+    - ROOT_ID
+    - GRID_ID
+    - TABS-vVToFo37Yd
+    type: TAB
+  TAB-zmiZPQAMiF:
+    children:
+    - ROW-lSn0ovyoVx
+    id: TAB-zmiZPQAMiF
+    meta:
+      defaultText: Tab title
+      placeholder: Tab title
+      text: CCS Indicators Supporting Data
+    parents:
+    - ROOT_ID
+    - GRID_ID
+    - TABS-jAi7lQUpvu
+    type: TAB
+  TABS-ZRS7TWNBEY:
+    children:
+    - TAB-MFLXG67ZDQ
+    id: TABS-ZRS7TWNBEY
+    meta: {}
+    parents:
+    - ROOT_ID
+    - GRID_ID
+    type: TABS
+  TABS-jAi7lQUpvu:
+    children:
+    - TAB-zmiZPQAMiF
+    id: TABS-jAi7lQUpvu
+    meta: {}
+    parents:
+    - ROOT_ID
+    - GRID_ID
+    type: TABS
+  TABS-vVToFo37Yd:
+    children:
+    - TAB-Pf9SVE-52F
+    id: TABS-vVToFo37Yd
+    meta: {}
+    parents:
+    - ROOT_ID
+    - GRID_ID
+    type: TABS
+metadata:
+  color_scheme: ''
+  refresh_frequency: 0
+  shared_label_colors: {}
+  color_scheme_domain: []
+  expanded_slices: {}
+  label_colors: {}
+  timed_refresh_immune_slices: []
+  cross_filters_enabled: false
+  default_filters: '{}'
+  chart_configuration:
+    '5':
+      id: 5
+      crossFilters:
+        scope: global
+        chartsInScope:
+        - 6
+        - 7
+        - 13
+        - 14
+        - 16
+    '6':
+      id: 6
+      crossFilters:
+        scope: global
+        chartsInScope:
+        - 5
+        - 7
+        - 13
+        - 14
+        - 16
+    '7':
+      id: 7
+      crossFilters:
+        scope: global
+        chartsInScope:
+        - 5
+        - 6
+        - 13
+        - 14
+        - 16
+    '13':
+      id: 13
+      crossFilters:
+        scope: global
+        chartsInScope:
+        - 5
+        - 6
+        - 7
+        - 14
+        - 16
+    '14':
+      id: 14
+      crossFilters:
+        scope: global
+        chartsInScope:
+        - 5
+        - 6
+        - 7
+        - 13
+        - 16
+    '16':
+      id: 16
+      crossFilters:
+        scope: global
+        chartsInScope:
+        - 5
+        - 6
+        - 7
+        - 13
+        - 14
+  native_filter_configuration:
+  - id: NATIVE_FILTER-pBRxyNbMB
+    controlValues:
+      enableEmptyFilter: false
+      defaultToFirstItem: false
+      multiSelect: true
+      searchAllOptions: true
+      inverseSelection: false
+    name: "\u1798\u1793\u17D2\u1791\u17B8\u179A\u179F\u17BB\u1781\u17B6\u1797\u17B7\
+      \u1794\u17B6\u179B\u1781\u17C1\u178F\u17D2\u178F (Provincial Health Department)"
+    filterType: filter_select
+    targets:
+    - column:
+        name: Facility Province
+      datasetUuid: 54c5a8fb-66f7-4279-8498-abebf5d65e7f
+    defaultDataMask:
+      extraFormData: {}
+      filterState: {}
+      ownState: {}
+    cascadeParentIds: []
+    scope:
+      rootPath:
+      - ROOT_ID
+      excluded: []
+    type: NATIVE_FILTER
+    description: ''
+    chartsInScope:
+    - 150
+    - 151
+    - 152
+    - 153
+    - 154
+    - 155
+    tabsInScope:
+    - TAB-MFLXG67ZDQ
+    - TAB-Pf9SVE-52F
+    - TAB-zmiZPQAMiF
+  - id: NATIVE_FILTER-lEYFRZdtt
+    controlValues:
+      enableEmptyFilter: false
+      defaultToFirstItem: false
+      multiSelect: true
+      searchAllOptions: true
+      inverseSelection: false
+    name: "\u179F\u17D2\u179A\u17BB\u1780\u1794\u17D2\u179A\u178F\u17B7\u1794\u178F\
+      \u17D2\u178F\u17B7 (Operational District)"
+    filterType: filter_select
+    targets:
+    - column:
+        name: Facility District
+      datasetUuid: 54c5a8fb-66f7-4279-8498-abebf5d65e7f
+    defaultDataMask:
+      extraFormData: {}
+      filterState: {}
+      ownState: {}
+    cascadeParentIds: []
+    scope:
+      rootPath:
+      - ROOT_ID
+      excluded: []
+    type: NATIVE_FILTER
+    description: ''
+    chartsInScope:
+    - 151
+    - 152
+    - 153
+    tabsInScope:
+    - TAB-MFLXG67ZDQ
+    - TAB-Pf9SVE-52F
+  - id: NATIVE_FILTER-segLnb0Vx
+    controlValues:
+      enableEmptyFilter: false
+      defaultToFirstItem: false
+      multiSelect: true
+      searchAllOptions: true
+      inverseSelection: false
+    name: "\u1788\u17D2\u1798\u17C4\u17C7\u1793\u17B7\u1784\u179B\u17C1\u1781\u1780\
+      \u17BC\u178A\u1798\u17BC\u179B\u178A\u17D2\u178B\u17B6\u1793\u179F\u17BB\u1781\
+      \u17B6\u1797\u17B7\u1794\u17B6\u179B (Health Facility's Name)"
+    filterType: filter_select
+    targets:
+    - column:
+        name: Facility Name
+      datasetUuid: 54c5a8fb-66f7-4279-8498-abebf5d65e7f
+    defaultDataMask:
+      extraFormData: {}
+      filterState: {}
+      ownState: {}
+    cascadeParentIds: []
+    scope:
+      rootPath:
+      - ROOT_ID
+      excluded: []
+    type: NATIVE_FILTER
+    description: ''
+    chartsInScope:
+    - 151
+    - 152
+    - 153
+    tabsInScope:
+    - TAB-MFLXG67ZDQ
+    - TAB-Pf9SVE-52F
+  - id: NATIVE_FILTER-R6N9v3yG4
+    controlValues:
+      enableEmptyFilter: false
+    name: "\u1780\u17B6\u179A\u179A\u17B6\u1799\u1780\u17B6\u179A\u178E\u17CD\u17A2\
+      \u17C6\u1796\u17B8\u1787\u17BD\u179A\u1796\u17C1\u179B\u179C\u17C1\u179B\u17B6\
+      \ (Reporting Time Range)"
+    filterType: filter_time
+    targets:
+    - {}
+    defaultDataMask:
+      extraFormData: {}
+      filterState: {}
+      ownState: {}
+    cascadeParentIds: []
+    scope:
+      rootPath:
+      - ROOT_ID
+      excluded: []
+    type: NATIVE_FILTER
+    description: ''
+    chartsInScope:
+    - 151
+    - 152
+    - 153
+    tabsInScope:
+    - TAB-MFLXG67ZDQ
+    - TAB-Pf9SVE-52F
+  global_chart_configuration:
+    scope:
+      rootPath:
+      - ROOT_ID
+      excluded: []
+    chartsInScope:
+    - 5
+    - 6
+    - 7
+    - 13
+    - 14
+    - 16
+version: 1.0.0
diff --git a/base/configs/superset/assets/dashboards/HC_CCS_Report_Dashboard_4.yaml b/base/configs/superset/assets/dashboards/HC_CCS_Report_Dashboard_4.yaml
new file mode 100644
index 00000000..154ed3fe
--- /dev/null
+++ b/base/configs/superset/assets/dashboards/HC_CCS_Report_Dashboard_4.yaml
@@ -0,0 +1,358 @@
+dashboard_title: HC CCS Report Dashboard
+description: null
+css: ''
+slug: null
+certified_by: null
+certification_details: null
+published: true
+uuid: 64931de3-be8c-4c14-a282-eab9f08ab40d
+position:
+  CHART-explore-133-1:
+    children: []
+    id: CHART-explore-133-1
+    meta:
+      chartId: 1
+      height: 73
+      sliceName: HC CCS Report
+      uuid: 5aaa773a-3be3-4fed-b221-a1f3c395cc8b
+      width: 12
+    parents:
+    - ROOT_ID
+    - GRID_ID
+    - TABS-GpUy3WrOHy
+    - TAB-wgDTzzzIHk
+    - ROW-zuVOcW2w6
+    type: CHART
+  CHART-explore-134-1:
+    children: []
+    id: CHART-explore-134-1
+    meta:
+      chartId: 12
+      height: 77
+      sliceName: CCS Distribution of visits per Province
+      uuid: dd5925be-e474-4104-97d9-0a2ef4a34290
+      width: 7
+    parents:
+    - ROOT_ID
+    - GRID_ID
+    - TABS-GpUy3WrOHy
+    - TAB-4A9mAKKVi
+    - ROW-AOfGEE39X
+    type: CHART
+  CHART-explore-135-1:
+    children: []
+    id: CHART-explore-135-1
+    meta:
+      chartId: 9
+      height: 82
+      sliceName: CCS Monthly total count of visits grouped by district
+      uuid: 6d8cee3a-64cc-4a2e-af31-7f5b4fefc90b
+      width: 11
+    parents:
+    - ROOT_ID
+    - GRID_ID
+    - TABS-GpUy3WrOHy
+    - TAB-nhk86jsT8
+    - ROW-viFyYvu_f
+    type: CHART
+  DASHBOARD_VERSION_KEY: v2
+  GRID_ID:
+    children:
+    - TABS-GpUy3WrOHy
+    id: GRID_ID
+    parents:
+    - ROOT_ID
+    type: GRID
+  HEADER_ID:
+    id: HEADER_ID
+    meta:
+      text: HC CCS Report Dashboard
+    type: HEADER
+  ROOT_ID:
+    children:
+    - GRID_ID
+    id: ROOT_ID
+    type: ROOT
+  ROW-AOfGEE39X:
+    children:
+    - CHART-explore-134-1
+    id: ROW-AOfGEE39X
+    meta:
+      background: BACKGROUND_TRANSPARENT
+    parents:
+    - ROOT_ID
+    - GRID_ID
+    - TABS-GpUy3WrOHy
+    - TAB-4A9mAKKVi
+    type: ROW
+  ROW-viFyYvu_f:
+    children:
+    - CHART-explore-135-1
+    id: ROW-viFyYvu_f
+    meta:
+      background: BACKGROUND_TRANSPARENT
+    parents:
+    - ROOT_ID
+    - GRID_ID
+    - TABS-GpUy3WrOHy
+    - TAB-nhk86jsT8
+    type: ROW
+  ROW-zuVOcW2w6:
+    children:
+    - CHART-explore-133-1
+    id: ROW-zuVOcW2w6
+    meta:
+      background: BACKGROUND_TRANSPARENT
+    parents:
+    - ROOT_ID
+    - GRID_ID
+    - TABS-GpUy3WrOHy
+    - TAB-wgDTzzzIHk
+    type: ROW
+  TAB-4A9mAKKVi:
+    children:
+    - ROW-AOfGEE39X
+    id: TAB-4A9mAKKVi
+    meta:
+      defaultText: Tab title
+      placeholder: Tab title
+      text: Pie Chart
+    parents:
+    - ROOT_ID
+    - GRID_ID
+    - TABS-GpUy3WrOHy
+    type: TAB
+  TAB-nhk86jsT8:
+    children:
+    - ROW-viFyYvu_f
+    id: TAB-nhk86jsT8
+    meta:
+      defaultText: Tab title
+      placeholder: Tab title
+      text: Bar Chart
+    parents:
+    - ROOT_ID
+    - GRID_ID
+    - TABS-GpUy3WrOHy
+    type: TAB
+  TAB-wgDTzzzIHk:
+    children:
+    - ROW-zuVOcW2w6
+    id: TAB-wgDTzzzIHk
+    meta:
+      defaultText: Tab title
+      placeholder: Tab title
+      text: Table
+    parents:
+    - ROOT_ID
+    - GRID_ID
+    - TABS-GpUy3WrOHy
+    type: TAB
+  TABS-GpUy3WrOHy:
+    children:
+    - TAB-wgDTzzzIHk
+    - TAB-4A9mAKKVi
+    - TAB-nhk86jsT8
+    id: TABS-GpUy3WrOHy
+    meta: {}
+    parents:
+    - ROOT_ID
+    - GRID_ID
+    type: TABS
+metadata:
+  color_scheme: ''
+  refresh_frequency: 0
+  expanded_slices: {}
+  label_colors: {}
+  timed_refresh_immune_slices: []
+  cross_filters_enabled: false
+  default_filters: '{}'
+  chart_configuration: {}
+  native_filter_configuration:
+  - id: NATIVE_FILTER-AlqiTBOmI
+    controlValues:
+      enableEmptyFilter: false
+      defaultToFirstItem: false
+      multiSelect: true
+      searchAllOptions: true
+      inverseSelection: false
+    name: "\u1798\u1793\u17D2\u1791\u17B8\u179A\u179F\u17BB\u1781\u17B6\u1797\u17B7\
+      \u1794\u17B6\u179B\u1781\u17C1\u178F\u17D2\u178F (Provincial Health Department)"
+    filterType: filter_select
+    targets:
+    - column:
+        name: Facility Province
+      datasetUuid: 7bbd77f5-46bc-49ef-8436-608aefbfb35e
+    defaultDataMask:
+      extraFormData: {}
+      filterState: {}
+      ownState: {}
+    cascadeParentIds: []
+    scope:
+      rootPath:
+      - ROOT_ID
+      excluded: []
+    type: NATIVE_FILTER
+    description: ''
+    chartsInScope:
+    - 133
+    - 134
+    - 135
+    tabsInScope:
+    - TAB-4A9mAKKVi
+    - TAB-nhk86jsT8
+    - TAB-wgDTzzzIHk
+  - id: NATIVE_FILTER-CbHxVrxZT
+    controlValues:
+      enableEmptyFilter: false
+      defaultToFirstItem: false
+      multiSelect: true
+      searchAllOptions: true
+      inverseSelection: false
+    name: "\u179F\u17D2\u179A\u17BB\u1780\u1794\u17D2\u179A\u178F\u17B7\u1794\u178F\
+      \u17D2\u178F\u17B7 (Operational District)"
+    filterType: filter_select
+    targets:
+    - column:
+        name: Facility District
+      datasetUuid: 7bbd77f5-46bc-49ef-8436-608aefbfb35e
+    defaultDataMask:
+      extraFormData: {}
+      filterState: {}
+      ownState: {}
+    cascadeParentIds: []
+    scope:
+      rootPath:
+      - ROOT_ID
+      excluded: []
+    type: NATIVE_FILTER
+    description: ''
+    chartsInScope:
+    - 133
+    - 134
+    - 135
+    tabsInScope:
+    - TAB-4A9mAKKVi
+    - TAB-nhk86jsT8
+    - TAB-wgDTzzzIHk
+  - id: NATIVE_FILTER-VLn6yqx2t
+    controlValues:
+      enableEmptyFilter: false
+      defaultToFirstItem: false
+      multiSelect: true
+      searchAllOptions: true
+      inverseSelection: false
+    name: "\u1788\u17D2\u1798\u17C4\u17C7\u1793\u17B7\u1784\u179B\u17C1\u1781\u1780\
+      \u17BC\u178A\u1798\u17BC\u179B\u178A\u17D2\u178B\u17B6\u1793\u179F\u17BB\u1781\
+      \u17B6\u1797\u17B7\u1794\u17B6\u179B (Health Facility's Name)"
+    filterType: filter_select
+    targets:
+    - column:
+        name: Facility Name
+      datasetUuid: 7bbd77f5-46bc-49ef-8436-608aefbfb35e
+    defaultDataMask:
+      extraFormData: {}
+      filterState: {}
+      ownState: {}
+    cascadeParentIds: []
+    scope:
+      rootPath:
+      - ROOT_ID
+      excluded: []
+    type: NATIVE_FILTER
+    description: ''
+    chartsInScope:
+    - 133
+    - 134
+    - 135
+    tabsInScope:
+    - TAB-4A9mAKKVi
+    - TAB-nhk86jsT8
+    - TAB-wgDTzzzIHk
+  - id: NATIVE_FILTER-IrPRDx3z1
+    controlValues:
+      enableEmptyFilter: false
+    name: "\u1780\u17B6\u179A\u179A\u17B6\u1799\u1780\u17B6\u179A\u178E\u17CD\u17A2\
+      \u17C6\u1796\u17B8\u1787\u17BD\u179A\u1796\u17C1\u179B\u179C\u17C1\u179B\u17B6\
+      \ (Reporting Time Range)"
+    filterType: filter_time
+    targets:
+    - {}
+    defaultDataMask:
+      extraFormData: {}
+      filterState: {}
+      ownState: {}
+    cascadeParentIds: []
+    scope:
+      rootPath:
+      - ROOT_ID
+      excluded: []
+    type: NATIVE_FILTER
+    description: ''
+    chartsInScope:
+    - 133
+    - 134
+    - 135
+    tabsInScope:
+    - TAB-4A9mAKKVi
+    - TAB-nhk86jsT8
+    - TAB-wgDTzzzIHk
+  shared_label_colors:
+    "\u1794\u17B6\u178F\u17CB\u178A\u17C6\u1794\u1784 / Battambang": '#1FA8C9'
+    "\u1780\u17C6\u1796\u178F / Kampot": '#454E7C'
+    "\u1780\u17C6\u1796\u1784\u17CB\u1785\u17B6\u1798 / Kampong Cham": '#5AC189'
+    "\u178F\u17B6\u1780\u17C2\u179C / Takeo": '#FF7F44'
+    "\u1794\u1793\u17D2\u1791\u17B6\u1799\u1798\u17B6\u1793\u1787\u17D0\u1799 / Banteay Meanchey": '#666666'
+    "\u1780\u17C6\u1796\u1784\u17CB\u1786\u17D2\u1793\u17B6\u17C6\u1784 / Kampong Chhnang": '#E04355'
+    "\u178F\u17D2\u1794\u17BC\u1784\u1783\u17D2\u1798\u17BB\u17C6 / Tbong Khmum": '#FCC700'
+    "\u1780\u17D2\u179A\u1785\u17C1\u17C7 / Kratie": '#A868B7'
+    "\u17A7\u178F\u17D2\u178F\u179A\u1798\u17B6\u1793\u1787\u17D0\u1799 / Oddar Meanchey": '#3CCCCB'
+    "\u1780\u17C6\u1796\u1784\u17CB\u179F\u17D2\u1796\u17BA / Kampong Speu": '#A38F79'
+    "\u179F\u17C0\u1798\u179A\u17B6\u1794 / Siemreap": '#8FD3E4'
+    "\u1780\u17C6\u1796\u1784\u17CB\u1792\u17C6 / Kampong Thom": '#A1A6BD'
+    "\u179F\u17D2\u179C\u17B6\u1799\u179A\u17C0\u1784 / Svay Rieng": '#ACE1C4'
+    "\u1780\u178E\u17D2\u178A\u17B6\u179B / Kandal": '#FEC0A1'
+    "\u1796\u17D2\u179A\u17C3\u179C\u17C2\u1784 / Prey Veng": '#B2B2B2'
+    "\u1796\u17D2\u179A\u17C7\u179C\u17B7\u17A0\u17B6\u179A / Preah Vihear": '#EFA1AA'
+    "\u1780\u17C2\u1794 / Kep": '#FDE380'
+    "\u1780\u17C6\u1796\u1784\u17CB\u1785\u17B6\u1798 - \u1780\u17C6\u1796\u1784\u17CB\u179F\u17C0\u1798 / Kampong Cham - Kg. Siem": '#454E7C'
+    "\u1780\u17C6\u1796\u1784\u17CB\u178F\u17D2\u179A\u17A1\u17B6\u1785 / Kampong Tralach": '#FF7F44'
+    "\u1780\u17C6\u1796\u1784\u17CB\u178F\u17D2\u179A\u17B6\u1785 / Kampong Trach": '#666666'
+    "\u1780\u17D2\u179A\u17A1\u17B6\u1789\u17CB / Kralanh": '#A868B7'
+    "\u1780\u17D2\u179A\u17BC\u1785\u1786\u17D2\u1798\u17B6\u179A / Kroch Chhmar": '#3CCCCB'
+    "\u1785\u17C6\u1780\u17B6\u179A\u179B\u17BE / Chamkar Leu": '#A38F79'
+    "\u1786\u17D2\u179B\u17BC\u1784 / Chhlong": '#8FD3E4'
+    "\u1787\u17BE\u1784\u1796\u17D2\u179A\u17C3 / Choeung Prey": '#A1A6BD'
+    "\u1788\u17BC\u1780 / Chhouk": '#ACE1C4'
+    "\u178A\u17BC\u1793\u1780\u17C2\u179C / Daun Keo": '#FEC0A1'
+    "\u178F\u17B6\u1781\u17D2\u1798\u17C5 / Takhmao": '#B2B2B2'
+    "\u178F\u17C6\u1794\u17C2\u179A / Dambae": '#EFA1AA'
+    "\u178F\u17D2\u1794\u17C2\u1784\u1798\u17B6\u1793\u1787\u17D0\u1799 / Tbeng Meanchey": '#FDE380'
+    "\u1790\u17D2\u1798\u1782\u17C4\u179B / Thma Koul": '#D3B3DA'
+    "\u1790\u17D2\u1798\u1796\u17BD\u1780 / Thma Puok": '#9EE5E5'
+    "\u1794\u179A\u17B7\u1794\u17BC\u178E\u17CD / Boribo": '#D1C6BC'
+    "\u1794\u17B6\u1791\u17B8 / Bati": '#454E7C'
+    "\u1794\u17B6\u1792\u17B6\u1799 / Batheay": '#5AC189'
+    "\u1794\u17B6\u1797\u17D2\u1793\u17C6 / OD Baphnom": '#FF7F44'
+    "\u1794\u17B6\u179A\u17B6\u1799\u178E\u17CD\u179F\u1793\u17D2\u1791\u17BB\u1780 / Baray and Santuk": '#666666'
+    "\u1794\u17C9\u17C4\u1799\u1794\u17C9\u17C2\u178F / Poipet": '#E04355'
+    "\u1796\u1789\u17B6\u1780\u17D2\u179A\u17C2\u1780 / Ponhea Krek": '#FCC700'
+    "\u1796\u17D2\u179A\u17C3\u1780\u1794\u17D2\u1794\u17B6\u179F / Prey Kabass": '#A868B7'
+    "\u1796\u17D2\u179A\u17C3\u1788\u179A / Prey Chhor": '#3CCCCB'
+    "\u1796\u17D2\u179A\u17C7\u200B\u1793\u17C1\u178F\u17D2\u179A\u200B\u1796\u17D2\u179A\u17C7 / Preah Net Preah": '#A38F79'
+    "\u1798\u17C4\u1784\u17AB\u179F\u17D2\u179F\u17B8 / Maung Russei": '#8FD3E4'
+    "\u179A\u1798\u17B6\u179F\u17A0\u17C2\u1780 / Romeas Hek": '#A1A6BD'
+    "\u179F\u1784\u17D2\u1780\u17C2 / Sangkae": '#ACE1C4'
+    "\u179F\u17B7\u179A\u17B8\u179F\u17C4\u1797\u17D0\u178E / Serei Sophon": '#FEC0A1'
+    "\u179F\u17C0\u1798\u179A\u17B6\u1794 / Siem Reap": '#B2B2B2'
+    "\u179F\u17C6\u1796\u17C5\u179B\u17BC\u1793 / Sampov Luon": '#EFA1AA'
+    "\u179F\u17D2\u1791\u17B9\u1784\u178F\u17D2\u179A\u1784\u17CB / Stueng Trang": '#FDE380'
+    "\u179F\u17D2\u1791\u17C4\u1784 / Stong": '#D3B3DA'
+    "\u179F\u17D2\u179A\u17B8\u179F\u1793\u17D2\u1792\u179A / Srey Santhor": '#9EE5E5'
+    "\u179F\u17D2\u179C\u17B6\u1799\u1791\u17B6\u1794 / Svay Teap": '#D1C6BC'
+    "\u17A2\u1784\u17D2\u1782\u179A\u1780\u17B6\u179A / Ang Rokar": '#1FA8C9'
+    "\u17A2\u1784\u17D2\u1782\u179A\u1787\u17BB\u17C6 / Angkor Chhum": '#454E7C'
+    "\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: []
+version: 1.0.0
diff --git a/base/configs/superset/assets/dashboards/HC_NCD_OPD_Register_Report_Dashboard_2.yaml b/base/configs/superset/assets/dashboards/HC_NCD_OPD_Register_Report_Dashboard_2.yaml
new file mode 100644
index 00000000..b358da78
--- /dev/null
+++ b/base/configs/superset/assets/dashboards/HC_NCD_OPD_Register_Report_Dashboard_2.yaml
@@ -0,0 +1,198 @@
+dashboard_title: HC NCD OPD Register Report Dashboard
+description: null
+css: ''
+slug: null
+certified_by: null
+certification_details: null
+published: true
+uuid: 5ad1d328-14a9-4063-bc27-ee40546d7581
+position:
+  CHART-Ab9xXvvBoP:
+    children: []
+    id: CHART-Ab9xXvvBoP
+    meta:
+      chartId: 17
+      height: 76
+      sliceName: HC NCD OPD Register Report
+      uuid: 21650553-f9e7-4249-a0b2-088c1aaca1ea
+      width: 12
+    parents:
+    - ROOT_ID
+    - GRID_ID
+    - ROW-XCnHAguP-V
+    type: CHART
+  DASHBOARD_VERSION_KEY: v2
+  GRID_ID:
+    children:
+    - ROW-XCnHAguP-V
+    - ROW-N-F8ZDKRP6
+    id: GRID_ID
+    parents:
+    - ROOT_ID
+    type: GRID
+  HEADER_ID:
+    id: HEADER_ID
+    meta:
+      text: HC NCD OPD Register Report Dashboard
+    type: HEADER
+  ROOT_ID:
+    children:
+    - GRID_ID
+    id: ROOT_ID
+    type: ROOT
+  ROW-XCnHAguP-V:
+    children:
+    - CHART-Ab9xXvvBoP
+    id: ROW-XCnHAguP-V
+    meta:
+      background: BACKGROUND_TRANSPARENT
+    parents:
+    - ROOT_ID
+    - GRID_ID
+    type: ROW
+  ROW-N-F8ZDKRP6:
+    children:
+    - CHART-LD3JWZB8
+    id: ROW-N-F8ZDKRP6
+    meta:
+      '0': ROOT_ID
+      background: BACKGROUND_TRANSPARENT
+    type: ROW
+    parents:
+    - ROOT_ID
+    - GRID_ID
+  CHART-LD3JWZB8:
+    children: []
+    id: CHART-LD3JWZB8
+    meta:
+      chartId: 20
+      height: 50
+      sliceName: HC NCD OPD Register Report
+      uuid: ce1ff86a-5c0f-4223-ae62-3e56317a236d
+      width: 4
+    type: CHART
+    parents:
+    - ROOT_ID
+    - GRID_ID
+    - ROW-N-F8ZDKRP6
+metadata:
+  color_scheme: ''
+  refresh_frequency: 0
+  shared_label_colors: {}
+  color_scheme_domain: []
+  expanded_slices: {}
+  label_colors: {}
+  timed_refresh_immune_slices: []
+  cross_filters_enabled: false
+  default_filters: '{}'
+  chart_configuration: {}
+  native_filter_configuration:
+  - id: NATIVE_FILTER-aWX-Gl58W
+    controlValues:
+      enableEmptyFilter: false
+      defaultToFirstItem: false
+      multiSelect: true
+      searchAllOptions: true
+      inverseSelection: false
+    name: "\u1798\u1793\u17D2\u1791\u17B8\u179A\u179F\u17BB\u1781\u17B6\u1797\u17B7\
+      \u1794\u17B6\u179B\u1781\u17C1\u178F\u17D2\u178F (Provincial Health Department)"
+    filterType: filter_select
+    targets:
+    - column:
+        name: Facility Province
+      datasetUuid: 262d446a-2c07-4b3b-8ab0-a792b242dea4
+    defaultDataMask:
+      extraFormData: {}
+      filterState: {}
+      ownState: {}
+    cascadeParentIds: []
+    scope:
+      rootPath:
+      - ROOT_ID
+      excluded: []
+    type: NATIVE_FILTER
+    description: ''
+    chartsInScope:
+    - 142
+    tabsInScope: []
+  - id: NATIVE_FILTER-Msdpr8SxL
+    controlValues:
+      enableEmptyFilter: false
+      defaultToFirstItem: false
+      multiSelect: true
+      searchAllOptions: true
+      inverseSelection: false
+    name: "\u179F\u17D2\u179A\u17BB\u1780\u1794\u17D2\u179A\u178F\u17B7\u1794\u178F\
+      \u17D2\u178F\u17B7 (Operational District)"
+    filterType: filter_select
+    targets:
+    - column:
+        name: Facility District
+      datasetUuid: 262d446a-2c07-4b3b-8ab0-a792b242dea4
+    defaultDataMask:
+      extraFormData: {}
+      filterState: {}
+      ownState: {}
+    cascadeParentIds: []
+    scope:
+      rootPath:
+      - ROOT_ID
+      excluded: []
+    type: NATIVE_FILTER
+    description: ''
+    chartsInScope:
+    - 142
+    tabsInScope: []
+  - id: NATIVE_FILTER-pJ6UTB2-p
+    controlValues:
+      enableEmptyFilter: false
+      defaultToFirstItem: false
+      multiSelect: true
+      searchAllOptions: true
+      inverseSelection: false
+    name: "\u1788\u17D2\u1798\u17C4\u17C7\u1793\u17B7\u1784\u179B\u17C1\u1781\u1780\
+      \u17BC\u178A\u1798\u17BC\u179B\u178A\u17D2\u178B\u17B6\u1793\u179F\u17BB\u1781\
+      \u17B6\u1797\u17B7\u1794\u17B6\u179B (Health Facility's Name)"
+    filterType: filter_select
+    targets:
+    - column:
+        name: Facility Name
+      datasetUuid: 262d446a-2c07-4b3b-8ab0-a792b242dea4
+    defaultDataMask:
+      extraFormData: {}
+      filterState: {}
+      ownState: {}
+    cascadeParentIds: []
+    scope:
+      rootPath:
+      - ROOT_ID
+      excluded: []
+    type: NATIVE_FILTER
+    description: ''
+    chartsInScope:
+    - 142
+    tabsInScope: []
+  - id: NATIVE_FILTER-a7uk2DuoT
+    controlValues:
+      enableEmptyFilter: false
+    name: "\u1780\u17B6\u179A\u179A\u17B6\u1799\u1780\u17B6\u179A\u178E\u17CD\u17A2\
+      \u17C6\u1796\u17B8\u1787\u17BD\u179A\u1796\u17C1\u179B\u179C\u17C1\u179B\u17B6\
+      \ (Reporting Time Range)"
+    filterType: filter_time
+    targets:
+    - {}
+    defaultDataMask:
+      extraFormData: {}
+      filterState: {}
+      ownState: {}
+    cascadeParentIds: []
+    scope:
+      rootPath:
+      - ROOT_ID
+      excluded: []
+    type: NATIVE_FILTER
+    description: ''
+    chartsInScope:
+    - 142
+    tabsInScope: []
+version: 1.0.0
diff --git a/base/configs/superset/assets/dashboards/Indicators_for_annual_monitoring_and_evaluation_Hypertension_and_Diabetes_management_program_10.yaml b/base/configs/superset/assets/dashboards/Indicators_for_annual_monitoring_and_evaluation_Hypertension_and_Diabetes_management_program_10.yaml
new file mode 100644
index 00000000..742f889f
--- /dev/null
+++ b/base/configs/superset/assets/dashboards/Indicators_for_annual_monitoring_and_evaluation_Hypertension_and_Diabetes_management_program_10.yaml
@@ -0,0 +1,193 @@
+dashboard_title: Indicators for annual monitoring and evaluation Hypertension and
+  Diabetes management program
+description: null
+css: ''
+slug: null
+certified_by: null
+certification_details: null
+published: false
+uuid: 1c38c06f-0a18-48df-9bf7-82facc3ecc6e
+position:
+  CHART-explore-65-1:
+    children: []
+    id: CHART-explore-65-1
+    meta:
+      chartId: 22
+      height: 104
+      sliceName: M&E Annual Indicators for Hypertension and Diabetes management program
+      sliceNameOverride: "\u1780\u1798\u17D2\u1798\u179C\u17B7\u1792\u17B8\u1796\u17B7\
+        \u1793\u17B7\u178F\u17D2\u1799\u179A\u1780\u17A0\u17B6\u1793\u17B7\u1797\u17D0\
+        \u1799\u1793\u17C3\u1787\u17C6\u1784\u17BA\u1794\u17C1\u17C7\u178A\u17BC\u1784\
+        \ \u179F\u179A\u179F\u17C3\u1788\u17B6\u1798 \u1793\u17B7\u1784\u1782\u17D2\
+        \u179A\u1794\u17CB\u1782\u17D2\u179A\u1784\u1787\u17C6\u1784\u17BA\u1791\u17B9\
+        \u1780\u1793\u17C4\u1798\u1795\u17D2\u17A2\u17C2\u1798\u1793\u17B7\u1784\u179B\
+        \u17BE\u179F\u179F\u1798\u17D2\u1796\u17B6\u1792\u1788\u17B6\u1798 \u1793\u17B9\
+        \u1784\u178F\u17D2\u179A\u17BC\u179C\u1794\u17B6\u1793\u179C\u17B6\u179F\u17CB\
+        \u179C\u17C2\u1784\u178A\u17C4\u1799\u1794\u17D2\u179A\u17BE\u179F\u17BC\u1785\
+        \u1793\u17B6\u1780\u179A(indicators)\u1794\u17D2\u179A\u1785\u17B6\u17C6\u1786\
+        \u17D2\u1793\u17B6\u17C6\u178A\u17BC\u1785\u1781\u17B6\u1784\u1780\u17D2\u179A\
+        \u17C4\u1798\u17D6 (Screening for CVD Risk and Diabetes and Hypertension Management\
+        \ program will be measured using the following annual indicators)"
+      uuid: 9bf461f4-855c-40af-9299-fd37dde51778
+      width: 12
+    parents:
+    - ROOT_ID
+    - GRID_ID
+    - ROW-t3pcetBBvm
+    type: CHART
+  DASHBOARD_VERSION_KEY: v2
+  GRID_ID:
+    children:
+    - ROW-t3pcetBBvm
+    id: GRID_ID
+    parents:
+    - ROOT_ID
+    type: GRID
+  HEADER_ID:
+    id: HEADER_ID
+    meta:
+      text: Indicators for annual monitoring and evaluation Hypertension and Diabetes
+        management program
+    type: HEADER
+  ROOT_ID:
+    children:
+    - GRID_ID
+    id: ROOT_ID
+    type: ROOT
+  ROW-t3pcetBBvm:
+    children:
+    - CHART-explore-65-1
+    id: ROW-t3pcetBBvm
+    meta:
+      '0': ROOT_ID
+      background: BACKGROUND_TRANSPARENT
+    parents:
+    - ROOT_ID
+    - GRID_ID
+    type: ROW
+metadata:
+  color_scheme: ''
+  refresh_frequency: 0
+  shared_label_colors: {}
+  color_scheme_domain: []
+  expanded_slices: {}
+  label_colors: {}
+  timed_refresh_immune_slices: []
+  cross_filters_enabled: false
+  chart_configuration: {}
+  native_filter_configuration:
+  - id: NATIVE_FILTER-Y0eNqUA-h
+    controlValues:
+      enableEmptyFilter: false
+      defaultToFirstItem: false
+      multiSelect: true
+      searchAllOptions: true
+      inverseSelection: false
+    name: "\u1781\u17C1\u178F\u17D2\u178F (Province)"
+    filterType: filter_select
+    targets:
+    - column:
+        name: health_facility_province
+      datasetUuid: aee334cc-f803-4296-8aad-948f4560bc0a
+    defaultDataMask:
+      extraFormData: {}
+      filterState: {}
+      ownState: {}
+    cascadeParentIds: []
+    scope:
+      rootPath:
+      - ROOT_ID
+      excluded: []
+    type: NATIVE_FILTER
+    description: ''
+    chartsInScope:
+    - 65
+    tabsInScope: []
+  - id: NATIVE_FILTER-ZvYlEwNch
+    controlValues:
+      enableEmptyFilter: false
+      defaultToFirstItem: false
+      multiSelect: true
+      searchAllOptions: true
+      inverseSelection: false
+    name: "\u179F\u17D2\u179A\u17BB\u1780\u1794\u17D2\u179A\u178F\u17B7\u1794\u178F\
+      \u17D2\u178F\u17B7 (District)"
+    filterType: filter_select
+    targets:
+    - column:
+        name: health_facility_district
+      datasetUuid: aee334cc-f803-4296-8aad-948f4560bc0a
+    defaultDataMask:
+      extraFormData: {}
+      filterState: {}
+      ownState: {}
+    cascadeParentIds:
+    - NATIVE_FILTER-Y0eNqUA-h
+    scope:
+      rootPath:
+      - ROOT_ID
+      excluded: []
+    type: NATIVE_FILTER
+    description: ''
+    chartsInScope:
+    - 65
+    tabsInScope: []
+  - id: NATIVE_FILTER-WHKcu_Lp4
+    controlValues:
+      enableEmptyFilter: false
+      defaultToFirstItem: false
+      multiSelect: true
+      searchAllOptions: 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
+    targets:
+    - column:
+        name: health_facility_name
+      datasetUuid: aee334cc-f803-4296-8aad-948f4560bc0a
+    defaultDataMask:
+      extraFormData: {}
+      filterState: {}
+      ownState: {}
+    cascadeParentIds:
+    - NATIVE_FILTER-Y0eNqUA-h
+    - NATIVE_FILTER-ZvYlEwNch
+    scope:
+      rootPath:
+      - ROOT_ID
+      excluded: []
+    type: NATIVE_FILTER
+    description: ''
+    chartsInScope:
+    - 65
+    tabsInScope: []
+  - id: NATIVE_FILTER_DIVIDER-4PaLOlqql
+    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-axbb_AgVV
+    controlValues:
+      enableEmptyFilter: false
+    name: "\u1787\u17BD\u179A\u1796\u17C1\u179B\u179C\u17C1\u179B\u17B6 (Time Range)"
+    filterType: filter_time
+    targets:
+    - {}
+    defaultDataMask:
+      extraFormData:
+        time_range: Last year
+      filterState:
+        value: Last year
+    cascadeParentIds: []
+    scope:
+      rootPath:
+      - ROOT_ID
+      excluded: []
+    type: NATIVE_FILTER
+    description: Defaults to the last 12 months
+version: 1.0.0
diff --git a/base/configs/superset/assets/dashboards/NCD_HIS_Report_Dashboard_9.yaml b/base/configs/superset/assets/dashboards/NCD_HIS_Report_Dashboard_9.yaml
new file mode 100644
index 00000000..329f6f8a
--- /dev/null
+++ b/base/configs/superset/assets/dashboards/NCD_HIS_Report_Dashboard_9.yaml
@@ -0,0 +1,335 @@
+dashboard_title: NCD HIS Report Dashboard
+description: null
+css: ''
+slug: null
+certified_by: null
+certification_details: null
+published: true
+uuid: c7de4cc7-bc96-48da-8723-b72028c6aa46
+position:
+  CHART-K-4SQcOr5u:
+    children: []
+    id: CHART-K-4SQcOr5u
+    meta:
+      chartId: 4
+      height: 42
+      sliceName: NCD HIS New Cases From The Beginning
+      uuid: edc6788b-ea27-457f-b3e7-1e272b7109ba
+      width: 6
+    parents:
+    - ROOT_ID
+    - GRID_ID
+    - ROW-DTPUf0Dct
+    type: CHART
+  CHART-explore-148-1:
+    children: []
+    id: CHART-explore-148-1
+    meta:
+      chartId: 15
+      height: 50
+      sliceName: NCD HIS Follow-up Cases Within Reporting Range
+      uuid: e2896abd-821a-4aa8-8a19-c70c9eb18960
+      width: 6
+    parents:
+    - ROOT_ID
+    - GRID_ID
+    - ROW-P0rzjFH098
+    type: CHART
+  CHART-explore-149-1:
+    children: []
+    id: CHART-explore-149-1
+    meta:
+      chartId: 19
+      height: 50
+      sliceName: NCD HIS Follow-up Cases From The Beginning
+      uuid: 17f99ed6-713a-4436-9e7c-79639f96490c
+      width: 6
+    parents:
+    - ROOT_ID
+    - GRID_ID
+    - ROW-P0rzjFH098
+    type: CHART
+  CHART-nSlyozQPY1:
+    children: []
+    id: CHART-nSlyozQPY1
+    meta:
+      chartId: 2
+      height: 42
+      sliceName: NCD HIS New Cases Within Reporting Range
+      uuid: b3599541-6658-4325-968b-82dd749af4ec
+      width: 6
+    parents:
+    - ROOT_ID
+    - GRID_ID
+    - ROW-DTPUf0Dct
+    type: CHART
+  DASHBOARD_VERSION_KEY: v2
+  GRID_ID:
+    children:
+    - ROW-DTPUf0Dct
+    - ROW-P0rzjFH098
+    id: GRID_ID
+    parents:
+    - ROOT_ID
+    type: GRID
+  HEADER_ID:
+    id: HEADER_ID
+    meta:
+      text: NCD HIS Report Dashboard
+    type: HEADER
+  ROOT_ID:
+    children:
+    - GRID_ID
+    id: ROOT_ID
+    type: ROOT
+  ROW-DTPUf0Dct:
+    children:
+    - CHART-nSlyozQPY1
+    - CHART-K-4SQcOr5u
+    id: ROW-DTPUf0Dct
+    meta:
+      background: BACKGROUND_TRANSPARENT
+    parents:
+    - ROOT_ID
+    - GRID_ID
+    type: ROW
+  ROW-P0rzjFH098:
+    children:
+    - CHART-explore-148-1
+    - CHART-explore-149-1
+    id: ROW-P0rzjFH098
+    meta:
+      '0': ROOT_ID
+      background: BACKGROUND_TRANSPARENT
+    parents:
+    - ROOT_ID
+    - GRID_ID
+    type: ROW
+metadata:
+  color_scheme: ''
+  refresh_frequency: 0
+  shared_label_colors: {}
+  color_scheme_domain: []
+  expanded_slices: {}
+  label_colors: {}
+  timed_refresh_immune_slices: []
+  cross_filters_enabled: false
+  default_filters: '{}'
+  chart_configuration: {}
+  native_filter_configuration:
+  - id: NATIVE_FILTER-sRZWuJkpb
+    controlValues:
+      enableEmptyFilter: false
+      defaultToFirstItem: false
+      multiSelect: true
+      searchAllOptions: true
+      inverseSelection: false
+    name: "\u1798\u1793\u17D2\u1791\u17B8\u179A\u179F\u17BB\u1781\u17B6\u1797\u17B7\
+      \u1794\u17B6\u179B\u1781\u17C1\u178F\u17D2\u178F (Provincial Health Department)"
+    filterType: filter_select
+    targets:
+    - column:
+        name: f_province
+      datasetUuid: 48365851-d1d2-451d-b2aa-18a5ffcdd72d
+    defaultDataMask:
+      extraFormData: {}
+      filterState: {}
+      ownState: {}
+    cascadeParentIds: []
+    scope:
+      rootPath:
+      - ROOT_ID
+      excluded: []
+    type: NATIVE_FILTER
+    description: ''
+    chartsInScope:
+    - 133
+    - 136
+    - 137
+    - 140
+    - 141
+    - 142
+    - 143
+    - 144
+    - 146
+    - 148
+    - 149
+    tabsInScope: []
+  - id: NATIVE_FILTER-IY0W6N-6N
+    controlValues:
+      enableEmptyFilter: false
+      defaultToFirstItem: false
+      multiSelect: true
+      searchAllOptions: false
+      inverseSelection: false
+    name: "\u179F\u17D2\u179A\u17BB\u1780\u1794\u17D2\u179A\u178F\u17B7\u1794\u178F\
+      \u17D2\u178F\u17B7 (Operational District)"
+    filterType: filter_select
+    targets:
+    - column:
+        name: f_district
+      datasetUuid: 48365851-d1d2-451d-b2aa-18a5ffcdd72d
+    defaultDataMask:
+      extraFormData: {}
+      filterState: {}
+      ownState: {}
+    cascadeParentIds: []
+    scope:
+      rootPath:
+      - ROOT_ID
+      excluded: []
+    type: NATIVE_FILTER
+    description: ''
+    chartsInScope:
+    - 133
+    - 136
+    - 137
+    - 140
+    - 141
+    - 142
+    - 143
+    - 144
+    - 146
+    - 148
+    - 149
+    tabsInScope: []
+  - id: NATIVE_FILTER-LVKn33ZeF
+    controlValues:
+      enableEmptyFilter: false
+      defaultToFirstItem: false
+      multiSelect: true
+      searchAllOptions: false
+      inverseSelection: false
+    name: "\u1788\u17D2\u1798\u17C4\u17C7\u1793\u17B7\u1784\u179B\u17C1\u1781\u1780\
+      \u17BC\u178A\u1798\u17BC\u179B\u178A\u17D2\u178B\u17B6\u1793\u179F\u17BB\u1781\
+      \u17B6\u1797\u17B7\u1794\u17B6\u179B (Health Facility's Name)"
+    filterType: filter_select
+    targets:
+    - column:
+        name: f_name
+      datasetUuid: 48365851-d1d2-451d-b2aa-18a5ffcdd72d
+    defaultDataMask:
+      extraFormData: {}
+      filterState: {}
+      ownState: {}
+    cascadeParentIds: []
+    scope:
+      rootPath:
+      - ROOT_ID
+      excluded: []
+    type: NATIVE_FILTER
+    description: ''
+    chartsInScope:
+    - 133
+    - 136
+    - 137
+    - 140
+    - 141
+    - 142
+    - 143
+    - 144
+    - 146
+    - 148
+    - 149
+    tabsInScope: []
+  - id: NATIVE_FILTER-yC5-Yil3K
+    controlValues:
+      enableEmptyFilter: false
+      defaultToFirstItem: false
+      multiSelect: true
+      searchAllOptions: true
+      inverseSelection: false
+    name: "\u1798\u1793\u17D2\u1791\u17B8\u179A\u1796\u17C1\u1791\u17D2\u1799\u1781\
+      \u17C1\u178F\u17D2\u178F-\u1798\u1793\u17D2\u1791\u17B8\u179A\u1796\u17C1\u1791\
+      \u17D2\u1799\u1794\u1784\u17D2\u17A2\u17C2\u1780/\u1798\u178E\u17D2\u178C\u179B\
+      \u179F\u17BB\u1781\u1797\u17B6\u1796 (RH/HC)"
+    filterType: filter_select
+    targets:
+    - column:
+        name: f_type
+      datasetUuid: 48365851-d1d2-451d-b2aa-18a5ffcdd72d
+    defaultDataMask:
+      extraFormData: {}
+      filterState: {}
+      ownState: {}
+    cascadeParentIds: []
+    scope:
+      rootPath:
+      - ROOT_ID
+      excluded: []
+    type: NATIVE_FILTER
+    description: ''
+    chartsInScope:
+    - 133
+    - 136
+    - 137
+    - 140
+    - 141
+    - 142
+    - 143
+    - 144
+    - 146
+    - 148
+    - 149
+    tabsInScope: []
+  - id: NATIVE_FILTER-hkcro12HK
+    controlValues:
+      enableEmptyFilter: false
+    name: "\u1780\u17B6\u179A\u179A\u17B6\u1799\u1780\u17B6\u179A\u178E\u17CD\u17A2\
+      \u17C6\u1796\u17B8\u1787\u17BD\u179A\u1796\u17C1\u179B\u179C\u17C1\u179B\u17B6\
+      \ (Reporting Time Range)"
+    filterType: filter_time
+    targets:
+    - {}
+    defaultDataMask:
+      extraFormData: {}
+      filterState: {}
+      ownState: {}
+    cascadeParentIds: []
+    scope:
+      rootPath:
+      - ROOT_ID
+      excluded:
+      - 4
+    type: NATIVE_FILTER
+    description: ''
+    chartsInScope:
+    - 133
+    - 136
+    - 137
+    - 140
+    - 141
+    - 142
+    - 143
+    - 146
+    - 148
+    - 149
+    tabsInScope: []
+  - id: NATIVE_FILTER-zzd1aTD-K
+    controlValues:
+      enableEmptyFilter: false
+    name: "\u1796\u17C1\u179B\u179C\u17C1\u179B\u17B6\u179A\u17B6\u1799\u1780\u17B6\
+      \u179A\u178E\u17CD\u1796\u17B8\u1780\u17B6\u179A\u1785\u17B6\u1794\u17CB\u1795\
+      \u17D2\u178F\u17BE\u1798 (Reporing Time from the Beginning)"
+    filterType: filter_time
+    targets:
+    - {}
+    defaultDataMask:
+      extraFormData:
+        time_range: 'Last 7 years : '
+      filterState:
+        value: 'Last 7 years : '
+    cascadeParentIds: []
+    scope:
+      rootPath:
+      - ROOT_ID
+      excluded:
+      - 15
+      - 2
+    type: NATIVE_FILTER
+    description: ''
+    chartsInScope:
+    - 144
+    - 149
+    tabsInScope: []
+version: 1.0.0
diff --git a/base/configs/superset/assets/dashboards/NCD_Missed_Appointments_Report_Dashboard_5.yaml b/base/configs/superset/assets/dashboards/NCD_Missed_Appointments_Report_Dashboard_5.yaml
new file mode 100644
index 00000000..5b205384
--- /dev/null
+++ b/base/configs/superset/assets/dashboards/NCD_Missed_Appointments_Report_Dashboard_5.yaml
@@ -0,0 +1,172 @@
+dashboard_title: NCD Missed Appointments Report Dashboard
+description: null
+css: ''
+slug: null
+certified_by: null
+certification_details: null
+published: true
+uuid: 0971fabd-1194-4150-8cd2-b17ea31684c4
+position:
+  CHART-9_cxUnO_rZ:
+    children: []
+    id: CHART-9_cxUnO_rZ
+    meta:
+      chartId: 11
+      height: 74
+      sliceName: NCD Appointment Report
+      uuid: a5640d1c-bc02-4507-b639-787965bc42c7
+      width: 12
+    parents:
+    - ROOT_ID
+    - GRID_ID
+    - ROW-OtyrqE9UuC
+    type: CHART
+  DASHBOARD_VERSION_KEY: v2
+  GRID_ID:
+    children:
+    - ROW-OtyrqE9UuC
+    id: GRID_ID
+    parents:
+    - ROOT_ID
+    type: GRID
+  HEADER_ID:
+    id: HEADER_ID
+    meta:
+      text: NCD Appointment Report dashboard
+    type: HEADER
+  ROOT_ID:
+    children:
+    - GRID_ID
+    id: ROOT_ID
+    type: ROOT
+  ROW-OtyrqE9UuC:
+    children:
+    - CHART-9_cxUnO_rZ
+    id: ROW-OtyrqE9UuC
+    meta:
+      background: BACKGROUND_TRANSPARENT
+    parents:
+    - ROOT_ID
+    - GRID_ID
+    type: ROW
+metadata:
+  color_scheme: ''
+  refresh_frequency: 0
+  expanded_slices: {}
+  label_colors: {}
+  timed_refresh_immune_slices: []
+  cross_filters_enabled: false
+  default_filters: '{}'
+  chart_configuration: {}
+  native_filter_configuration:
+  - id: NATIVE_FILTER-jvfgfSm-S
+    controlValues:
+      enableEmptyFilter: false
+      defaultToFirstItem: false
+      multiSelect: true
+      searchAllOptions: true
+      inverseSelection: false
+    name: "\u1798\u1793\u17D2\u1791\u17B8\u179A\u179F\u17BB\u1781\u17B6\u1797\u17B7\
+      \u1794\u17B6\u179B\u1781\u17C1\u178F\u17D2\u178F (Provincial Health Department)"
+    filterType: filter_select
+    targets:
+    - column:
+        name: Facility Province
+      datasetUuid: ffccf504-e9e6-4312-916b-51489c810249
+    defaultDataMask:
+      extraFormData: {}
+      filterState: {}
+      ownState: {}
+    cascadeParentIds: []
+    scope:
+      rootPath:
+      - ROOT_ID
+      excluded: []
+    type: NATIVE_FILTER
+    description: ''
+    chartsInScope:
+    - 141
+    tabsInScope: []
+  - id: NATIVE_FILTER-W14x47Ntg
+    controlValues:
+      enableEmptyFilter: false
+      defaultToFirstItem: false
+      multiSelect: true
+      searchAllOptions: true
+      inverseSelection: false
+    name: "\u179F\u17D2\u179A\u17BB\u1780\u1794\u17D2\u179A\u178F\u17B7\u1794\u178F\
+      \u17D2\u178F\u17B7 (Operational District)"
+    filterType: filter_select
+    targets:
+    - column:
+        name: Facility District
+      datasetUuid: ffccf504-e9e6-4312-916b-51489c810249
+    defaultDataMask:
+      extraFormData: {}
+      filterState: {}
+      ownState: {}
+    cascadeParentIds: []
+    scope:
+      rootPath:
+      - ROOT_ID
+      excluded: []
+    type: NATIVE_FILTER
+    description: ''
+    chartsInScope:
+    - 141
+    tabsInScope: []
+  - id: NATIVE_FILTER-Fd7aO5l2E
+    controlValues:
+      enableEmptyFilter: false
+      defaultToFirstItem: false
+      multiSelect: true
+      searchAllOptions: true
+      inverseSelection: false
+    name: "\u1788\u17D2\u1798\u17C4\u17C7\u1793\u17B7\u1784\u179B\u17C1\u1781\u1780\
+      \u17BC\u178A\u1798\u17BC\u179B\u178A\u17D2\u178B\u17B6\u1793\u179F\u17BB\u1781\
+      \u17B6\u1797\u17B7\u1794\u17B6\u179B (Health Facility's Name)"
+    filterType: filter_select
+    targets:
+    - column:
+        name: Facility Name
+      datasetUuid: ffccf504-e9e6-4312-916b-51489c810249
+    defaultDataMask:
+      extraFormData: {}
+      filterState: {}
+      ownState: {}
+    cascadeParentIds: []
+    scope:
+      rootPath:
+      - ROOT_ID
+      excluded: []
+    type: NATIVE_FILTER
+    description: ''
+    chartsInScope:
+    - 141
+    tabsInScope: []
+  - id: NATIVE_FILTER-NpwLz6Lx7
+    controlValues:
+      enableEmptyFilter: false
+    name: "\u1780\u17B6\u179A\u179A\u17B6\u1799\u1780\u17B6\u179A\u178E\u17CD\u17A2\
+      \u17C6\u1796\u17B8\u1787\u17BD\u179A\u1796\u17C1\u179B\u179C\u17C1\u179B\u17B6\
+      \ (Reporting Time Range)"
+    filterType: filter_time
+    targets:
+    - {}
+    defaultDataMask:
+      extraFormData: {}
+      filterState: {}
+      ownState: {}
+    cascadeParentIds: []
+    scope:
+      rootPath:
+      - ROOT_ID
+      excluded: []
+    type: NATIVE_FILTER
+    description: ''
+    chartsInScope:
+    - 141
+    tabsInScope: []
+  shared_label_colors: {}
+  color_scheme_domain: []
+version: 1.0.0
diff --git a/base/configs/superset/assets/dashboards/NCD_Referral_Status_Report_Dashboard_3.yaml b/base/configs/superset/assets/dashboards/NCD_Referral_Status_Report_Dashboard_3.yaml
new file mode 100644
index 00000000..68f0d9a3
--- /dev/null
+++ b/base/configs/superset/assets/dashboards/NCD_Referral_Status_Report_Dashboard_3.yaml
@@ -0,0 +1,172 @@
+dashboard_title: NCD Referral Status Report Dashboard
+description: null
+css: ''
+slug: null
+certified_by: null
+certification_details: null
+published: true
+uuid: 8c5cf31e-629b-41f2-8ec8-5cd6229f1499
+position:
+  CHART-VYBstwY1_B:
+    children: []
+    id: CHART-VYBstwY1_B
+    meta:
+      chartId: 3
+      height: 81
+      sliceName: NCD Referral Status Report
+      uuid: 9cf83bb1-cc39-4c8a-89fa-3291f726b69a
+      width: 12
+    parents:
+    - ROOT_ID
+    - GRID_ID
+    - ROW-Si9ZuvRil
+    type: CHART
+  DASHBOARD_VERSION_KEY: v2
+  GRID_ID:
+    children:
+    - ROW-Si9ZuvRil
+    id: GRID_ID
+    parents:
+    - ROOT_ID
+    type: GRID
+  HEADER_ID:
+    id: HEADER_ID
+    meta:
+      text: NCD Referral Status Report Dashboard
+    type: HEADER
+  ROOT_ID:
+    children:
+    - GRID_ID
+    id: ROOT_ID
+    type: ROOT
+  ROW-Si9ZuvRil:
+    children:
+    - CHART-VYBstwY1_B
+    id: ROW-Si9ZuvRil
+    meta:
+      background: BACKGROUND_TRANSPARENT
+    parents:
+    - ROOT_ID
+    - GRID_ID
+    type: ROW
+metadata:
+  color_scheme: ''
+  refresh_frequency: 0
+  expanded_slices: {}
+  label_colors: {}
+  timed_refresh_immune_slices: []
+  cross_filters_enabled: false
+  default_filters: '{}'
+  chart_configuration: {}
+  shared_label_colors: {}
+  color_scheme_domain: []
+  native_filter_configuration:
+  - id: NATIVE_FILTER-7J3bpaW7m
+    controlValues:
+      enableEmptyFilter: false
+      defaultToFirstItem: false
+      multiSelect: true
+      searchAllOptions: true
+      inverseSelection: false
+    name: "\u1798\u1793\u17D2\u1791\u17B8\u179A\u179F\u17BB\u1781\u17B6\u1797\u17B7\
+      \u1794\u17B6\u179B\u1781\u17C1\u178F\u17D2\u178F (Provincial Health Department)"
+    filterType: filter_select
+    targets:
+    - column:
+        name: Facility Province
+      datasetUuid: e7351329-6fdc-4bb7-9aaa-66cab8efeeb1
+    defaultDataMask:
+      extraFormData: {}
+      filterState: {}
+      ownState: {}
+    cascadeParentIds: []
+    scope:
+      rootPath:
+      - ROOT_ID
+      excluded: []
+    type: NATIVE_FILTER
+    description: ''
+    chartsInScope:
+    - 140
+    tabsInScope: []
+  - id: NATIVE_FILTER-oSWGxjyfb
+    controlValues:
+      enableEmptyFilter: false
+      defaultToFirstItem: false
+      multiSelect: true
+      searchAllOptions: true
+      inverseSelection: false
+    name: "\u179F\u17D2\u179A\u17BB\u1780\u1794\u17D2\u179A\u178F\u17B7\u1794\u178F\
+      \u17D2\u178F\u17B7 (Operational District)"
+    filterType: filter_select
+    targets:
+    - column:
+        name: Facility District
+      datasetUuid: e7351329-6fdc-4bb7-9aaa-66cab8efeeb1
+    defaultDataMask:
+      extraFormData: {}
+      filterState: {}
+      ownState: {}
+    cascadeParentIds: []
+    scope:
+      rootPath:
+      - ROOT_ID
+      excluded: []
+    type: NATIVE_FILTER
+    description: ''
+    chartsInScope:
+    - 140
+    tabsInScope: []
+  - id: NATIVE_FILTER-WHn4E3Und
+    controlValues:
+      enableEmptyFilter: false
+      defaultToFirstItem: false
+      multiSelect: true
+      searchAllOptions: true
+      inverseSelection: false
+    name: "\u1788\u17D2\u1798\u17C4\u17C7\u1793\u17B7\u1784\u179B\u17C1\u1781\u1780\
+      \u17BC\u178A\u1798\u17BC\u179B\u178A\u17D2\u178B\u17B6\u1793\u179F\u17BB\u1781\
+      \u17B6\u1797\u17B7\u1794\u17B6\u179B (Health Facility's Name)"
+    filterType: filter_select
+    targets:
+    - column:
+        name: Facility Name
+      datasetUuid: e7351329-6fdc-4bb7-9aaa-66cab8efeeb1
+    defaultDataMask:
+      extraFormData: {}
+      filterState: {}
+      ownState: {}
+    cascadeParentIds: []
+    scope:
+      rootPath:
+      - ROOT_ID
+      excluded: []
+    type: NATIVE_FILTER
+    description: ''
+    chartsInScope:
+    - 140
+    tabsInScope: []
+  - id: NATIVE_FILTER-47jI6h7SU
+    controlValues:
+      enableEmptyFilter: false
+    name: "\u1780\u17B6\u179A\u179A\u17B6\u1799\u1780\u17B6\u179A\u178E\u17CD\u17A2\
+      \u17C6\u1796\u17B8\u1787\u17BD\u179A\u1796\u17C1\u179B\u179C\u17C1\u179B\u17B6\
+      \ (Reporting Time Range)"
+    filterType: filter_time
+    targets:
+    - {}
+    defaultDataMask:
+      extraFormData: {}
+      filterState: {}
+      ownState: {}
+    cascadeParentIds: []
+    scope:
+      rootPath:
+      - ROOT_ID
+      excluded: []
+    type: NATIVE_FILTER
+    description: ''
+    chartsInScope:
+    - 140
+    tabsInScope: []
+version: 1.0.0
diff --git a/base/configs/superset/assets/dashboards/RH_CCS_Report_Dashboard_6.yaml b/base/configs/superset/assets/dashboards/RH_CCS_Report_Dashboard_6.yaml
new file mode 100644
index 00000000..adaf24a8
--- /dev/null
+++ b/base/configs/superset/assets/dashboards/RH_CCS_Report_Dashboard_6.yaml
@@ -0,0 +1,172 @@
+dashboard_title: RH CCS Report Dashboard
+description: null
+css: ''
+slug: null
+certified_by: null
+certification_details: null
+published: true
+uuid: ab9aeaaf-2a02-4f56-bfa6-ee531b963ea6
+position:
+  CHART-QbQ4qr8Gxx:
+    children: []
+    id: CHART-QbQ4qr8Gxx
+    meta:
+      chartId: 10
+      height: 90
+      sliceName: RH CSS Report
+      uuid: e04a169b-60d4-4514-8820-8a6b386dfa82
+      width: 12
+    parents:
+    - ROOT_ID
+    - GRID_ID
+    - ROW-iksrbIRje0
+    type: CHART
+  DASHBOARD_VERSION_KEY: v2
+  GRID_ID:
+    children:
+    - ROW-iksrbIRje0
+    id: GRID_ID
+    parents:
+    - ROOT_ID
+    type: GRID
+  HEADER_ID:
+    id: HEADER_ID
+    meta:
+      text: RH CCS Report Dashboard
+    type: HEADER
+  ROOT_ID:
+    children:
+    - GRID_ID
+    id: ROOT_ID
+    type: ROOT
+  ROW-iksrbIRje0:
+    children:
+    - CHART-QbQ4qr8Gxx
+    id: ROW-iksrbIRje0
+    meta:
+      background: BACKGROUND_TRANSPARENT
+    parents:
+    - ROOT_ID
+    - GRID_ID
+    type: ROW
+metadata:
+  color_scheme: ''
+  refresh_frequency: 0
+  shared_label_colors: {}
+  color_scheme_domain: []
+  expanded_slices: {}
+  label_colors: {}
+  timed_refresh_immune_slices: []
+  cross_filters_enabled: false
+  default_filters: '{}'
+  chart_configuration: {}
+  native_filter_configuration:
+  - id: NATIVE_FILTER-ldOxNBmPY
+    controlValues:
+      enableEmptyFilter: false
+      defaultToFirstItem: false
+      multiSelect: true
+      searchAllOptions: true
+      inverseSelection: false
+    name: "\u1798\u1793\u17D2\u1791\u17B8\u179A\u179F\u17BB\u1781\u17B6\u1797\u17B7\
+      \u1794\u17B6\u179B\u1781\u17C1\u178F\u17D2\u178F (Provincial Health Department)"
+    filterType: filter_select
+    targets:
+    - column:
+        name: Facility Province
+      datasetUuid: ec4ccb14-7449-490e-acb4-20bac3bd9935
+    defaultDataMask:
+      extraFormData: {}
+      filterState: {}
+      ownState: {}
+    cascadeParentIds: []
+    scope:
+      rootPath:
+      - ROOT_ID
+      excluded: []
+    type: NATIVE_FILTER
+    description: ''
+    chartsInScope:
+    - 137
+    tabsInScope: []
+  - id: NATIVE_FILTER-CC9nN5FHx
+    controlValues:
+      enableEmptyFilter: false
+      defaultToFirstItem: false
+      multiSelect: true
+      searchAllOptions: true
+      inverseSelection: false
+    name: "\u179F\u17D2\u179A\u17BB\u1780\u1794\u17D2\u179A\u178F\u17B7\u1794\u178F\
+      \u17D2\u178F\u17B7 (Operational District)"
+    filterType: filter_select
+    targets:
+    - column:
+        name: Facility District
+      datasetUuid: ec4ccb14-7449-490e-acb4-20bac3bd9935
+    defaultDataMask:
+      extraFormData: {}
+      filterState: {}
+      ownState: {}
+    cascadeParentIds: []
+    scope:
+      rootPath:
+      - ROOT_ID
+      excluded: []
+    type: NATIVE_FILTER
+    description: ''
+    chartsInScope:
+    - 137
+    tabsInScope: []
+  - id: NATIVE_FILTER-tGAL-IKjl
+    controlValues:
+      enableEmptyFilter: false
+      defaultToFirstItem: false
+      multiSelect: true
+      searchAllOptions: true
+      inverseSelection: false
+    name: "\u1788\u17D2\u1798\u17C4\u17C7\u1793\u17B7\u1784\u179B\u17C1\u1781\u1780\
+      \u17BC\u178A\u1798\u17BC\u179B\u178A\u17D2\u178B\u17B6\u1793\u179F\u17BB\u1781\
+      \u17B6\u1797\u17B7\u1794\u17B6\u179B (Health Facility's Name)"
+    filterType: filter_select
+    targets:
+    - column:
+        name: Facility Name
+      datasetUuid: ec4ccb14-7449-490e-acb4-20bac3bd9935
+    defaultDataMask:
+      extraFormData: {}
+      filterState: {}
+      ownState: {}
+    cascadeParentIds: []
+    scope:
+      rootPath:
+      - ROOT_ID
+      excluded: []
+    type: NATIVE_FILTER
+    description: ''
+    chartsInScope:
+    - 137
+    tabsInScope: []
+  - id: NATIVE_FILTER-HQ1PU0hJg
+    controlValues:
+      enableEmptyFilter: false
+    name: "\u1780\u17B6\u179A\u179A\u17B6\u1799\u1780\u17B6\u179A\u178E\u17CD\u17A2\
+      \u17C6\u1796\u17B8\u1787\u17BD\u179A\u1796\u17C1\u179B\u179C\u17C1\u179B\u17B6\
+      \ (Reporting Time Range)"
+    filterType: filter_time
+    targets:
+    - {}
+    defaultDataMask:
+      extraFormData: {}
+      filterState: {}
+      ownState: {}
+    cascadeParentIds: []
+    scope:
+      rootPath:
+      - ROOT_ID
+      excluded: []
+    type: NATIVE_FILTER
+    description: ''
+    chartsInScope:
+    - 137
+    tabsInScope: []
+version: 1.0.0
diff --git a/base/configs/superset/assets/dashboards/RH_NCD_OPD_Register_Report_Dashboard_7.yaml b/base/configs/superset/assets/dashboards/RH_NCD_OPD_Register_Report_Dashboard_7.yaml
new file mode 100644
index 00000000..00f19288
--- /dev/null
+++ b/base/configs/superset/assets/dashboards/RH_NCD_OPD_Register_Report_Dashboard_7.yaml
@@ -0,0 +1,172 @@
+dashboard_title: RH NCD OPD Register Report Dashboard
+description: null
+css: ''
+slug: null
+certified_by: null
+certification_details: null
+published: true
+uuid: e6903ed0-2ba9-4187-b93b-1b2ad57a5a73
+position:
+  CHART-PscuRjwD2k:
+    children: []
+    id: CHART-PscuRjwD2k
+    meta:
+      chartId: 18
+      height: 83
+      sliceName: RH NCD OPD Register Report
+      uuid: 971a570a-0181-4e85-b6aa-f90ffd7e9926
+      width: 12
+    parents:
+    - ROOT_ID
+    - GRID_ID
+    - ROW-Fr6mw-Zlox
+    type: CHART
+  DASHBOARD_VERSION_KEY: v2
+  GRID_ID:
+    children:
+    - ROW-Fr6mw-Zlox
+    id: GRID_ID
+    parents:
+    - ROOT_ID
+    type: GRID
+  HEADER_ID:
+    id: HEADER_ID
+    meta:
+      text: RH NCD OPD Register Report Dashboard
+    type: HEADER
+  ROOT_ID:
+    children:
+    - GRID_ID
+    id: ROOT_ID
+    type: ROOT
+  ROW-Fr6mw-Zlox:
+    children:
+    - CHART-PscuRjwD2k
+    id: ROW-Fr6mw-Zlox
+    meta:
+      background: BACKGROUND_TRANSPARENT
+    parents:
+    - ROOT_ID
+    - GRID_ID
+    type: ROW
+metadata:
+  color_scheme: ''
+  refresh_frequency: 0
+  shared_label_colors: {}
+  color_scheme_domain: []
+  expanded_slices: {}
+  label_colors: {}
+  timed_refresh_immune_slices: []
+  cross_filters_enabled: false
+  default_filters: '{}'
+  chart_configuration: {}
+  native_filter_configuration:
+  - id: NATIVE_FILTER-MaX1fMSCW
+    controlValues:
+      enableEmptyFilter: false
+      defaultToFirstItem: false
+      multiSelect: true
+      searchAllOptions: true
+      inverseSelection: false
+    name: "\u1798\u1793\u17D2\u1791\u17B8\u179A\u179F\u17BB\u1781\u17B6\u1797\u17B7\
+      \u1794\u17B6\u179B\u1781\u17C1\u178F\u17D2\u178F (Provincial Health Department)"
+    filterType: filter_select
+    targets:
+    - column:
+        name: Facility Province
+      datasetUuid: eae4ea82-b387-41fd-be9c-39bce338d4fa
+    defaultDataMask:
+      extraFormData: {}
+      filterState: {}
+      ownState: {}
+    cascadeParentIds: []
+    scope:
+      rootPath:
+      - ROOT_ID
+      excluded: []
+    type: NATIVE_FILTER
+    description: ''
+    chartsInScope:
+    - 146
+    tabsInScope: []
+  - id: NATIVE_FILTER-9kFNxXtAj
+    controlValues:
+      enableEmptyFilter: false
+      defaultToFirstItem: false
+      multiSelect: true
+      searchAllOptions: true
+      inverseSelection: false
+    name: "\u179F\u17D2\u179A\u17BB\u1780\u1794\u17D2\u179A\u178F\u17B7\u1794\u178F\
+      \u17D2\u178F\u17B7 (Operational District)"
+    filterType: filter_select
+    targets:
+    - column:
+        name: Facility District
+      datasetUuid: eae4ea82-b387-41fd-be9c-39bce338d4fa
+    defaultDataMask:
+      extraFormData: {}
+      filterState: {}
+      ownState: {}
+    cascadeParentIds: []
+    scope:
+      rootPath:
+      - ROOT_ID
+      excluded: []
+    type: NATIVE_FILTER
+    description: ''
+    chartsInScope:
+    - 146
+    tabsInScope: []
+  - id: NATIVE_FILTER-j74t2tqer
+    controlValues:
+      enableEmptyFilter: false
+      defaultToFirstItem: false
+      multiSelect: true
+      searchAllOptions: true
+      inverseSelection: false
+    name: "\u1788\u17D2\u1798\u17C4\u17C7\u1793\u17B7\u1784\u179B\u17C1\u1781\u1780\
+      \u17BC\u178A\u1798\u17BC\u179B\u178A\u17D2\u178B\u17B6\u1793\u179F\u17BB\u1781\
+      \u17B6\u1797\u17B7\u1794\u17B6\u179B (Health Facility's Name)"
+    filterType: filter_select
+    targets:
+    - column:
+        name: Facility Name
+      datasetUuid: eae4ea82-b387-41fd-be9c-39bce338d4fa
+    defaultDataMask:
+      extraFormData: {}
+      filterState: {}
+      ownState: {}
+    cascadeParentIds: []
+    scope:
+      rootPath:
+      - ROOT_ID
+      excluded: []
+    type: NATIVE_FILTER
+    description: ''
+    chartsInScope:
+    - 146
+    tabsInScope: []
+  - id: NATIVE_FILTER-iih629B5c
+    controlValues:
+      enableEmptyFilter: false
+    name: "\u1780\u17B6\u179A\u179A\u17B6\u1799\u1780\u17B6\u179A\u178E\u17CD\u17A2\
+      \u17C6\u1796\u17B8\u1787\u17BD\u179A\u1796\u17C1\u179B\u179C\u17C1\u179B\u17B6\
+      \ (Reporting Time Range)"
+    filterType: filter_time
+    targets:
+    - {}
+    defaultDataMask:
+      extraFormData: {}
+      filterState: {}
+      ownState: {}
+    cascadeParentIds: []
+    scope:
+      rootPath:
+      - ROOT_ID
+      excluded: []
+    type: NATIVE_FILTER
+    description: ''
+    chartsInScope:
+    - 146
+    tabsInScope: []
+version: 1.0.0
diff --git a/base/configs/superset/assets/datasets/Analytics/CCS_Referral_Status_Query-dataset.yaml b/base/configs/superset/assets/datasets/Analytics/CCS_Referral_Status_Query-dataset.yaml
new file mode 100644
index 00000000..85d783fb
--- /dev/null
+++ b/base/configs/superset/assets/datasets/Analytics/CCS_Referral_Status_Query-dataset.yaml
@@ -0,0 +1,359 @@
+table_name: CCS Referral Status Query-dataset
+main_dttm_col: null
+description: null
+default_endpoint: null
+offset: 0
+cache_timeout: null
+schema: public
+sql: "SELECT\n    f_facility AS \"Facility Name\",\n    f_district AS \"Facility District\"\
+  ,\n    f_province AS \"Facility Province\",\n    referral_facility_name AS \"Referral\
+  \ Facility Name\",\n    referral_facility_district AS \"Referral Facility District\"\
+  ,\n    referral_facility_province AS \"Referral Facility Province\",\n    CASE \n\
+  \        WHEN identifiers ~ '.*OpenMRS ID: (.*?)(,|$).*' THEN REGEXP_REPLACE(identifiers,\
+  \ '.*OpenMRS ID: (.*?)(,|$).*', '\\1', 'g')\n        ELSE ''\n    END AS \"OpenMRS\
+  \ ID\",\n    CONCAT_WS(' ', given_name, middle_name, family_name) AS \"Patient's\
+  \ name\",\n    DATE_PART('year', age(visit_date, birthdate)) AS \"Age\",\n    CASE\
+  \ \n        WHEN attributes ~ '.*Telephone Number: (.*?)(\\/|$).*' THEN REGEXP_REPLACE(attributes,\
+  \ '.*Telephone Number: (.*?)(\\/|$).*', '\\1', 'g')\n        ELSE ''\n    END AS\
+  \ \"Phone number\",\n    address_state_province AS \"Province/City\",\n    address_county_district\
+  \ AS \"District/ Khan\",\n    address_city AS \"Commune/ Sangkat\",\n    address_1\
+  \ AS \"Village\",\n    visit_date AS \"Visit date\",\n    cervical_cancer_reason_for_referral\
+  \ AS \"Cervical cancer reason for referral\",\n    other_cervical_cancer_reason_for_referral\
+  \ AS \"Other cervical cancer reason for referral\",\n    breast_cancer_reason_for_referral\
+  \ AS \"Breast cancer reason for referral\",\n    other_breast_cancer_reason_for_referral\
+  \ AS \"Other breast cancer reason for referral\"\nFROM (\n    SELECT\n        DISTINCT\
+  \ obs_referral_centre.obs_id,\n        facility_address.state_province AS \"f_province\"\
+  ,\n        facility_address.county_district AS \"f_district\",\n        facility_address.name\
+  \ AS \"f_facility\",\n        TRIM(BOTH ' ' FROM split_part(obs_referral_centre.answer_coded,\
+  \ '>', 1)) AS referral_facility_province,\n        TRIM(BOTH ' ' FROM split_part(obs_referral_centre.answer_coded,\
+  \ '>', 2)) AS referral_facility_district,\n        TRIM(BOTH ' ' FROM split_part(obs_referral_centre.answer_coded,\
+  \ '>', 3)) AS referral_facility_name,\n        patient_id,\n        given_name,\n\
+  \        middle_name,\n        family_name,\n        identifiers,\n        birthdate,\n\
+  \        address_state_province,\n        address_county_district,\n        address_city,\n\
+  \        address_1,\n        attributes,\n        vi.date_started AS \"visit_date\"\
+  ,\n        vi.type AS \"visit_type\",\n        obs_cervical_referral_reason.answer_coded\
+  \ AS \"cervical_cancer_reason_for_referral\",\n        obs_cervical_referral_reason.answer_text\
+  \ AS \"other_cervical_cancer_reason_for_referral\",\n        obs_breast_referral_reason.answer_coded\
+  \ AS \"breast_cancer_reason_for_referral\",\n        obs_breast_referral_reason.answer_text\
+  \ AS \"other_breast_cancer_reason_for_referral\",\n        CASE \n            WHEN\
+  \ referral_visit.visit_uuid IS NOT NULL THEN 'Yes'\n            ELSE 'No'\n    \
+  \    END AS \"fulfilled_referral\"\n    FROM patients pa\n    LEFT OUTER JOIN visits\
+  \ vi ON vi.visit_voided = false AND vi.patient_uuid = pa.patient_uuid\n    LEFT\
+  \ OUTER JOIN locations facility_address ON facility_address.uuid = vi.location_uuid\n\
+  \    LEFT OUTER JOIN (\n        SELECT obs1.obs_id, obs1.visit_uuid, MAX(date_created),\
+  \ STRING_AGG(obs1.answer_coded, ', ') AS answer_coded, obs1.encounter_uuid\n   \
+  \     FROM observations obs1\n        WHERE obs1.obs_voided = false AND obs1.question_uuid\
+  \ = '758b9dd8-b6d0-4ac2-b245-0e7bffb4693a' AND obs1.encounter_type = 'Cervical Cancer\
+  \ Screening'\n        GROUP BY obs1.visit_uuid, obs1.question_uuid, obs1.answer_coded,\
+  \ obs1.encounter_uuid, obs1.obs_id\n    ) AS obs_referral_centre ON obs_referral_centre.visit_uuid\
+  \ = vi.visit_uuid\n    \n    LEFT OUTER JOIN (\n        SELECT obs2.visit_uuid,\
+  \ MAX(obs2.date_created), STRING_AGG(obs2.answer_coded, ', ') AS answer_coded, obs2.encounter_uuid,\
+  \ obs_other_reason.answer_text\n        FROM observations obs2\n        LEFT OUTER\
+  \ JOIN observations obs_other_reason ON obs2.encounter_uuid = obs_other_reason.encounter_uuid\
+  \ AND obs_other_reason.question_uuid = '12f61ec2-e0b1-420d-be7b-43a95bce6e4a'\n\
+  \        WHERE obs2.obs_voided = false AND obs2.question_uuid = 'c158e3b2-edf9-4e0e-9e95-d36de1a51527'\n\
+  \        GROUP BY obs2.visit_uuid, obs2.question_uuid, obs2.answer_coded, obs2.encounter_uuid,\
+  \ obs_other_reason.answer_text\n    ) AS obs_cervical_referral_reason  ON obs_cervical_referral_reason.encounter_uuid\
+  \ = obs_referral_centre.encounter_uuid\n    \n    LEFT OUTER JOIN (\n        SELECT\
+  \ obs3.visit_uuid, MAX(obs3.date_created), obs3.answer_coded, obs3.encounter_uuid,\
+  \ obs_other_reason2.answer_text\n        FROM observations obs3\n        LEFT OUTER\
+  \ JOIN observations obs_other_reason2 ON obs_other_reason2.obs_voided = false AND\
+  \ obs3.encounter_uuid = obs_other_reason2.encounter_uuid AND obs_other_reason2.question_uuid\
+  \ = 'f984b718-d674-40c4-9ac4-8d22963e1933'\n        WHERE obs3.obs_voided = false\
+  \ AND obs3.question_uuid = 'e676ab7f-13b0-4251-84fd-9874c80133b5'\n        GROUP\
+  \ BY obs3.visit_uuid, obs3.question_uuid, obs3.answer_coded, obs3.encounter_uuid,\
+  \ obs_other_reason2.answer_text\n    ) AS obs_breast_referral_reason ON obs_breast_referral_reason.encounter_uuid\
+  \ = obs_referral_centre.encounter_uuid\n\n    LEFT OUTER JOIN visits referral_visit\
+  \ ON referral_visit.visit_voided = false AND referral_visit.patient_uuid = pa.patient_uuid\
+  \ AND DATE(referral_visit.date_started) >= DATE(vi.date_started) AND DATE(referral_visit.date_started)\
+  \ <= DATE(vi.date_started + INTERVAL '7 days') AND referral_visit.location = TRIM(BOTH\
+  \ ' ' FROM split_part(obs_referral_centre.answer_coded, '>', 3))\n\n    WHERE obs_referral_centre.answer_coded\
+  \ IS NOT NULL\n\n) AS patient_info \nWHERE patient_info.visit_type IN ('Cervical\
+  \ Cancer New Visit', 'Cervical Cancer Follow-up Visit') AND patient_info.fulfilled_referral\
+  \ = 'No'\n"
+params: null
+template_params: null
+filter_select_enabled: false
+fetch_values_predicate: null
+extra: null
+normalize_columns: false
+always_filter_main_dttm: false
+uuid: 412423af-0fdd-4e33-b15d-2b63a9e213e1
+metrics:
+- metric_name: count
+  verbose_name: null
+  metric_type: null
+  expression: count(*)
+  description: null
+  d3format: null
+  currency: null
+  extra:
+    warning_markdown: ''
+  warning_text: null
+columns:
+- column_name: Referral Facility Name
+  verbose_name: "\u1791\u17C5 - \u1798\u17BC\u179B\u178A\u17D2\u178B\u17B6\u1793\u179F\
+    \u17BB\u1781\u17B6\u1797\u17B7\u1794\u17B6\u179B (\u1780\u17BC\u178A_\u1788\u17D2\
+    \u1798\u17C4\u17C7) (To - Health facility (Code_Name))"
+  is_dttm: false
+  is_active: true
+  type: STRING
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: Referral Facility District
+  verbose_name: "\u1791\u17C5 - \u179F\u17D2\u179A\u17BB\u1780\u1794\u17D2\u179A\u178F\
+    \u17B7\u1794\u178F\u17D2\u178F\u17B7 (To - OD - Operational District)"
+  is_dttm: false
+  is_active: true
+  type: STRING
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: Breast cancer reason for referral
+  verbose_name: "\u1798\u17BC\u179B\u17A0\u17C1\u178F\u17BB\u1793\u17C3\u1780\u17B6\
+    \u179A\u1794\u1789\u17D2\u1787\u17BC\u1793 (Reason of Referral - Breast cancer)"
+  is_dttm: false
+  is_active: true
+  type: STRING
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: Cervical cancer reason for referral
+  verbose_name: "\u1798\u17BC\u179B\u17A0\u17C1\u178F\u17BB\u1793\u17C3\u1780\u17B6\
+    \u179A\u1794\u1789\u17D2\u1787\u17BC\u1793 (Reason of Referral - Cervical cancer)"
+  is_dttm: false
+  is_active: true
+  type: STRING
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: Facility Name
+  verbose_name: "\u1796\u17B8 - \u1798\u17BC\u179B\u178A\u17D2\u178B\u17B6\u1793\u179F\
+    \u17BB\u1781\u17B6\u1797\u17B7\u1794\u17B6\u179B (\u1780\u17BC\u178A_\u1788\u17D2\
+    \u1798\u17C4\u17C7) (From - Health facility (Code_Name))"
+  is_dttm: false
+  is_active: true
+  type: STRING
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: Facility District
+  verbose_name: "\u1796\u17B8 - \u179F\u17D2\u179A\u17BB\u1780\u1794\u17D2\u179A\u178F\
+    \u17B7\u1794\u178F\u17D2\u178F\u17B7 (From- OD - Operational District)"
+  is_dttm: false
+  is_active: true
+  type: STRING
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: Referral Facility Province
+  verbose_name: "\u1791\u17C5 - \u1781\u17C1\u178F\u17D2\u178F (To - Province)"
+  is_dttm: false
+  is_active: true
+  type: STRING
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: Other breast cancer reason for referral
+  verbose_name: "\"\u1795\u17D2\u179F\u17C1\u1784\u17D7\" (Other)"
+  is_dttm: false
+  is_active: true
+  type: STRING
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: Other cervical cancer reason for referral
+  verbose_name: "\"\u1795\u17D2\u179F\u17C1\u1784\u17D7\" (Other)"
+  is_dttm: false
+  is_active: true
+  type: STRING
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: OpenMRS ID
+  verbose_name: "ID \u17A2\u178F\u17B7\u1790\u17B7\u1787\u1793 (EMR) (Patient ID (EMR))"
+  is_dttm: false
+  is_active: true
+  type: STRING
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: Commune/ Sangkat
+  verbose_name: "\u17A2\u17B6\u179F\u1799\u178A\u17D2\u178B\u17B6\u1793 - \u1783\u17BB\
+    \u17C6/\u179F\u1784\u17D2\u1780\u17B6\u178F\u17CB (Address - Commune)"
+  is_dttm: false
+  is_active: true
+  type: STRING
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: Facility Province
+  verbose_name: "\u1796\u17B8 - \u1781\u17C1\u178F\u17D2\u178F (From - Province)"
+  is_dttm: false
+  is_active: true
+  type: STRING
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: Patient's name
+  verbose_name: "\u1782\u17C4\u178F\u17D2\u178F\u1793\u17B6\u1798 -\u1793\u17B6\u1798\
+    \ \u17A2\u178F\u17B7\u1790\u17B7\u1787\u1793 (Client's Surename-Name)"
+  is_dttm: false
+  is_active: true
+  type: STRING
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: Province/City
+  verbose_name: "\u17A2\u17B6\u179F\u1799\u178A\u17D2\u178B\u17B6\u1793 - \u1781\u17C1\
+    \u178F\u17D2\u178F (Address - Province)"
+  is_dttm: false
+  is_active: true
+  type: STRING
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: Village
+  verbose_name: "\u17A2\u17B6\u179F\u1799\u178A\u17D2\u178B\u17B6\u1793 - \u1797\u17BC\
+    \u1798\u17B7 (Address - Village)"
+  is_dttm: false
+  is_active: true
+  type: STRING
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: District/ Khan
+  verbose_name: "\u17A2\u17B6\u179F\u1799\u178A\u17D2\u178B\u17B6\u1793 \u179F\u17D2\
+    \u179A\u17BB\u1780 (Address - District)"
+  is_dttm: false
+  is_active: true
+  type: STRING
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: Visit date
+  verbose_name: "\u1780\u17B6\u179B\u1794\u179A\u17B7\u1785\u17D2\u1786\u17C1\u1791\
+    \u178A\u17C2\u179B\u17A2\u178F\u17B7\u1790\u17B7\u1787\u1793\u1791\u17C5\u178F\
+    \u17B6\u1798\u1780\u17B6\u179A\u1794\u1789\u17D2\u1787\u17BC\u1793 (Visit Date\
+    \ at Hospital)"
+  is_dttm: true
+  is_active: true
+  type: DATETIME
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: Age
+  verbose_name: "\u17A2\u17B6\u1799\u17BB (\u1786\u17D2\u1793\u17B6\u17C6) (Age (Years))"
+  is_dttm: false
+  is_active: true
+  type: FLOAT
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: Phone number
+  verbose_name: "\u179B\u17C1\u1781\u1791\u17BC\u179A\u179F\u17D0\u1796\u17D2\u1791\
+    \ (Phone Number)"
+  is_dttm: false
+  is_active: true
+  type: STRING
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+version: 1.0.0
+database_uuid: 42834407-4570-4111-8bf6-4f7080413333
diff --git a/base/configs/superset/assets/datasets/Analytics/HC_CCS_Report_Query-dataset.yaml b/base/configs/superset/assets/datasets/Analytics/HC_CCS_Report_Query-dataset.yaml
new file mode 100644
index 00000000..8ed2ad81
--- /dev/null
+++ b/base/configs/superset/assets/datasets/Analytics/HC_CCS_Report_Query-dataset.yaml
@@ -0,0 +1,593 @@
+table_name: HC CCS Report Query-dataset
+main_dttm_col: null
+description: null
+default_endpoint: null
+offset: 0
+cache_timeout: null
+schema: public
+sql: "SELECT\n    CASE \n        WHEN identifiers ~ '.*OpenMRS ID: (.*?)(,|$).*' THEN\
+  \ REGEXP_REPLACE(identifiers, '.*OpenMRS ID: (.*?)(,|$).*', '\\1', 'g')\n      \
+  \  ELSE ''\n    END AS \"OpenMRS ID\",\n    CASE \n        WHEN identifiers ~ '.*IDPoor:\
+  \ (.*?)(,|$).*' THEN REGEXP_REPLACE(identifiers, '.*IDPoor: (.*?)(,|$).*', '\\1',\
+  \ 'g')\n        ELSE ''\n    END AS \"ID Poor Card\",\n    CASE \n        WHEN identifiers\
+  \ ~ '.*National ID: (.*?)(,|$).*' THEN REGEXP_REPLACE(identifiers, '.*National ID:\
+  \ (.*?)(,|$).*', '\\1', 'g')\n        ELSE ''\n    END AS \"National ID Card\",\n\
+  \    CASE \n        WHEN identifiers ~ '.*PMRS ID: (.*?)(,|$).*' THEN REGEXP_REPLACE(identifiers,\
+  \ '.*PMRS ID: (.*?)(,|$).*', '\\1', 'g')\n        ELSE ''\n    END AS \"PMRS ID\
+  \ Number\",\n    COALESCE(\n        REGEXP_REPLACE(\n            REGEXP_REPLACE(\n\
+  \                identifiers, \n                '(?:OpenMRS ID|National ID|IDPoor|PMRS\
+  \ ID): [^,]*,?\\s?', \n                '', \n                'g'\n            ),\
+  \ \n            '^, |, $', \n            ''\n        ), \n        NULL\n    ) AS\
+  \ \"Other Identifiers\",\n    CONCAT_WS(' ', given_name, middle_name, family_name)\
+  \ AS \"Patient's name\",\n    DATE_PART('year', age(visit_date, birthdate)) AS \"\
+  Age\",\n    address_state_province AS \"Province/City\",\n    address_county_district\
+  \ AS \"District/ Khan\",\n    address_city AS \"Commune/ Sangkat\",\n    address_1\
+  \ AS \"Village\",\n    CASE \n        WHEN attributes ~ '.*Telephone Number: (.*?)(\\\
+  /|$).*' THEN REGEXP_REPLACE(attributes, '.*Telephone Number: (.*?)(\\/|$).*', '\\\
+  1', 'g')\n        ELSE ''\n    END AS \"Phone number\",\n    visit_date AS \"Visit\
+  \ date\",\n    visit_type AS \"Type of visit\",\n    insurance_type AS \"Payment\
+  \ type\",\n    referred_from AS \"Referred From\",\n    scj AS \"SCJ\",\n    via_test_result\
+  \ AS \"VIA test result\",\n    number_of_quadrants  AS \"If VIA(+) Number of Quadrants\
+  \ involved\",\n    acetowhite AS \"If VIA(+) % of Acetowhite site\",\n    hpv_test\
+  \ AS \"HPV Test result\",\n    hpv_type AS \"Type of HPV \",\n    cervical_treatment_coded\
+  \ As \"Treatment option\",\n    cervical_treatment_text AS \"Other treatment specified\"\
+  ,\n    self_breast_exam AS \"Self breast examination and education\",\n    breast_exam_result_coded\
+  \ AS \"Breast Examination Result\",\n    breast_exam_result_text AS \"Other Breast\
+  \ Examination Result\",\n    breast_cancer_treatment AS \"Treatment\",\n    f_province\
+  \ AS \"Facility Province\",\n    f_district AS \"Facility District\",\n    f_facility\
+  \ AS \"Facility Name\"\nFROM (\n    SELECT\n        patient_id,\n        given_name,\n\
+  \        middle_name,\n        family_name,\n        identifiers,\n        birthdate,\n\
+  \        address_state_province,\n        address_county_district,\n        address_city,\n\
+  \        address_1,\n        attributes,\n        vi.date_started AS \"visit_date\"\
+  ,\n        vi.type AS \"visit_type\",\n        CASE \n            WHEN vi.visit_attributes\
+  \ ~ '.*Insurance Type: (.*?)(\\/|$).*' THEN REGEXP_REPLACE(vi.visit_attributes,\
+  \ '.*Insurance Type: (.*?)(\\/|$).*', '\\1', 'g')\n            ELSE ''\n       \
+  \ END AS \"insurance_type\",\n        CASE \n            WHEN vi.visit_attributes\
+  \ ~ '.*Referred from: (.*?)(\\/|$).*' THEN REGEXP_REPLACE(vi.visit_attributes, '.*Referred\
+  \ from: (.*?)(\\/|$).*', '\\1', 'g')\n            ELSE ''\n        END AS \"referred_from\"\
+  ,\n        obs_scj.answer_coded AS \"scj\",\n        obs_via_test_result.answer_coded\
+  \ AS \"via_test_result\",\n        obs_number_of_quadrants.answer_coded  AS \"number_of_quadrants\"\
+  ,\n        obs_acetowhite.answer_coded AS \"acetowhite\",\n        obs_hpv_test.answer_coded\
+  \ AS \"hpv_test\",\n        obs_hpv_type.answer_coded AS \"hpv_type\",\n       \
+  \ obs_cervical_treatment.answer_coded As \"cervical_treatment_coded\",\n       \
+  \ obs_cervical_treatment.answer_text AS \"cervical_treatment_text\",\n        obs_self_breast_exam.answer_coded\
+  \ AS \"self_breast_exam\",\n        obs_breast_exam_result.answer_coded AS \"breast_exam_result_coded\"\
+  ,\n        obs_breast_exam_result.answer_text AS \"breast_exam_result_text\",\n\
+  \        obs_breast_cancer_treatment.answer_coded AS \"breast_cancer_treatment\"\
+  ,\n        facility_address.state_province AS \"f_province\",\n        facility_address.county_district\
+  \ AS \"f_district\",\n        facility_address.name AS \"f_facility\",\n       \
+  \ facility_address.location_tags AS \"l_tags\"\n    FROM patients pa\n    LEFT OUTER\
+  \ JOIN visits vi ON vi.visit_voided = false AND vi.patient_uuid = pa.patient_uuid\n\
+  \    LEFT OUTER JOIN locations facility_address ON facility_address.uuid = vi.location_uuid\n\
+  \    LEFT OUTER JOIN (\n        SELECT obs1.visit_uuid, MAX(date_created), obs1.answer_coded,\
+  \ obs1.encounter_uuid\n        FROM observations obs1\n        WHERE obs1.obs_voided\
+  \ = false AND obs1.question_uuid = 'd2ec630a-a223-492a-89f2-597266b36571'\n    \
+  \    GROUP BY obs1.visit_uuid, obs1.question_uuid, obs1.answer_coded, obs1.encounter_uuid\n\
+  \    ) AS obs_scj on obs_scj.visit_uuid = vi.visit_uuid\n    LEFT OUTER JOIN (\n\
+  \        SELECT obs2.visit_uuid, MAX(date_created), obs2.answer_coded, obs2.encounter_uuid\n\
+  \        FROM observations obs2\n        WHERE obs2.obs_voided = false AND obs2.question_uuid\
+  \ = '27912a31-4b1e-40d4-a3a0-947e0eb2e588'\n        GROUP BY obs2.visit_uuid, obs2.question_uuid,\
+  \ obs2.answer_coded, obs2.encounter_uuid\n    ) AS obs_via_test_result on obs_via_test_result.encounter_uuid\
+  \ = obs_scj.encounter_uuid\n    LEFT OUTER JOIN (\n        SELECT obs3.visit_uuid,\
+  \ MAX(date_created), obs3.answer_coded, obs3.encounter_uuid\n        FROM observations\
+  \ obs3\n        WHERE obs3.obs_voided = false AND obs3.question_uuid = '0dd61510-1ddd-49e8-838b-b4ec7fdaf95f'\n\
+  \        GROUP BY obs3.visit_uuid, obs3.question_uuid, obs3.answer_coded, obs3.encounter_uuid\n\
+  \    ) AS obs_number_of_quadrants  on obs_number_of_quadrants.encounter_uuid = obs_scj.encounter_uuid\n\
+  \    LEFT OUTER JOIN (\n        SELECT obs4.visit_uuid, MAX(date_created), obs4.answer_coded,\
+  \ obs4.encounter_uuid\n        FROM observations obs4\n        WHERE obs4.obs_voided\
+  \ = false AND obs4.question_uuid = 'a84a070a-172f-43f7-96f3-67574d42ba1b'\n    \
+  \    GROUP BY obs4.visit_uuid, obs4.question_uuid, obs4.answer_coded, obs4.encounter_uuid\n\
+  \    ) AS obs_acetowhite  on obs_acetowhite.encounter_uuid = obs_scj.encounter_uuid\n\
+  \    LEFT OUTER JOIN (\n        SELECT obs5.visit_uuid, MAX(date_created), obs5.answer_coded,\
+  \ obs5.encounter_uuid\n        FROM observations obs5\n        WHERE obs5.obs_voided\
+  \ = false AND obs5.question_uuid = 'b643325d-0d63-4ba0-9c0d-e1c0a1c9f3ce'\n    \
+  \    GROUP BY obs5.visit_uuid, obs5.question_uuid, obs5.answer_coded, obs5.encounter_uuid\n\
+  \    ) AS obs_hpv_test  on obs_hpv_test.encounter_uuid = obs_scj.encounter_uuid\n\
+  \    LEFT OUTER JOIN (\n        SELECT obs6.visit_uuid, MAX(date_created), obs6.answer_coded,\
+  \ obs6.encounter_uuid\n        FROM observations obs6\n        WHERE obs6.obs_voided\
+  \ = false AND obs6.question_uuid = '5f27683c-e4ab-4a10-922d-e34bbb560884'\n    \
+  \    GROUP BY obs6.visit_uuid, obs6.question_uuid, obs6.answer_coded, obs6.encounter_uuid\n\
+  \    ) AS obs_hpv_type  on obs_hpv_type.encounter_uuid = obs_scj.encounter_uuid\n\
+  \    LEFT OUTER JOIN (\n        SELECT obs7.visit_uuid, MAX(obs7.date_created),\
+  \ obs7.answer_coded, obs7.encounter_uuid, obs_other_treatment.answer_text\n    \
+  \    FROM observations obs7\n        LEFT OUTER JOIN observations obs_other_treatment\
+  \ ON obs_other_treatment.obs_voided = false AND obs7.encounter_uuid = obs_other_treatment.encounter_uuid\
+  \ AND obs_other_treatment.question_uuid = 'e6d18ff5-9d52-4e47-b2b2-762d9aa30604'\n\
+  \        WHERE obs7.obs_voided = false AND obs7.question_uuid = '1ca7d712-f7d7-4e09-8184-048bc4173902'\n\
+  \        GROUP BY obs7.visit_uuid, obs7.question_uuid, obs7.answer_coded, obs7.encounter_uuid,\
+  \ obs_other_treatment.answer_text\n    ) AS obs_cervical_treatment  on obs_cervical_treatment.encounter_uuid\
+  \ = obs_scj.encounter_uuid\n    LEFT OUTER JOIN (\n        SELECT obs8.visit_uuid,\
+  \ MAX(date_created), obs8.answer_coded, obs8.encounter_uuid\n        FROM observations\
+  \ obs8\n        WHERE obs8.obs_voided = false AND obs8.question_uuid = 'c208aa27-9790-4dbf-84eb-2ffc321a1230'\n\
+  \        GROUP BY obs8.visit_uuid, obs8.question_uuid, obs8.answer_coded, obs8.encounter_uuid\n\
+  \    ) AS obs_self_breast_exam  on obs_self_breast_exam.encounter_uuid = obs_scj.encounter_uuid\n\
+  \    LEFT OUTER JOIN (\n        SELECT obs9.visit_uuid, MAX(obs9.date_created),\
+  \ obs9.answer_coded, obs9.encounter_uuid, obs_other_result.answer_text\n       \
+  \ FROM observations obs9\n        LEFT OUTER JOIN observations obs_other_result\
+  \ ON obs_other_result.obs_voided = false AND obs9.encounter_uuid = obs_other_result.encounter_uuid\
+  \ AND obs_other_result.question_uuid = 'f984b718-d674-40c4-9ac4-8d22963e1933'\n\
+  \        WHERE obs9.obs_voided = false AND obs9.question_uuid = 'd1fd20ef-6363-4065-98d6-f36b8f1dc27e'\n\
+  \        GROUP BY obs9.visit_uuid, obs9.question_uuid, obs9.answer_coded, obs9.encounter_uuid,\
+  \ obs_other_result.answer_text\n    ) AS obs_breast_exam_result  on obs_breast_exam_result.encounter_uuid\
+  \ = obs_scj.encounter_uuid\n    LEFT OUTER JOIN (\n        SELECT obs10.visit_uuid,\
+  \ MAX(date_created), obs10.answer_coded, obs10.encounter_uuid\n        FROM observations\
+  \ obs10\n        WHERE obs10.obs_voided = false AND obs10.question_uuid = 'ed4d2e2f-1ebf-4ab6-b4ee-6dc6d24fca12'\n\
+  \        GROUP BY obs10.visit_uuid, obs10.question_uuid, obs10.answer_coded, obs10.encounter_uuid\n\
+  \    ) AS obs_breast_cancer_treatment  ON obs_breast_cancer_treatment.encounter_uuid\
+  \ = obs_scj.encounter_uuid\n) AS patient_info \nWHERE patient_info.visit_type IN\
+  \ ('Cervical Cancer New Visit', 'Cervical Cancer Follow-up Visit') AND patient_info.l_tags\
+  \ LIKE '%Health Center%'"
+params: null
+template_params: null
+filter_select_enabled: false
+fetch_values_predicate: null
+extra: null
+normalize_columns: false
+always_filter_main_dttm: false
+uuid: 7bbd77f5-46bc-49ef-8436-608aefbfb35e
+metrics:
+- metric_name: count
+  verbose_name: null
+  metric_type: null
+  expression: count(*)
+  description: null
+  d3format: null
+  currency: null
+  extra:
+    warning_markdown: ''
+  warning_text: null
+columns:
+- column_name: Other treatment specified
+  verbose_name: "\u1780\u17B6\u179A\u1796\u17D2\u1799\u17B6\u1794\u17B6\u179B - \u1794\
+    \u17D2\u179A\u179F\u17B7\u1793\u1794\u17BE\u1785\u1793\u17D2\u179B\u17C4\u17C7\
+    \ 22 \"\u1795\u17D2\u179F\u17C1\u1784\u17D7\" \u179F\u17BC\u1798\u1798\u17C1\u178F\
+    \u17D2\u178F\u17B6\u1794\u1789\u17D2\u1787\u17B6\u1780\u17CB (Treatment - If Column\
+    \ 22 \"Other\", Please Specify)"
+  is_dttm: false
+  is_active: true
+  type: STRING
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: If VIA(+) % of Acetowhite site
+  verbose_name: "\u1794\u17D2\u179A\u179F\u17B7\u1793\u1794\u17BE VIA(+) - \u1797\u17B6\
+    \u1782\u179A\u1799\u1793\u17C3\u178F\u17C6\u1794\u1793\u17CB\u1785\u17B6\u1794\
+    \u17CB\u1796\u178E\u17CC\u179F (If VIA(+) - % of Acetowhite site)"
+  is_dttm: false
+  is_active: true
+  type: STRING
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: If VIA(+) Number of Quadrants involved
+  verbose_name: "\u1794\u17D2\u179A\u179F\u17B7\u1793\u1794\u17BE VIA(+) - \u1785\u17C6\
+    \u1793\u17BD\u1793\u1780\u17B6\u178A\u17D2\u179A\u1784\u17CB\u1796\u17B6\u1780\
+    \u17CB\u1796\u17D0\u1793\u17D2\u1792 (If VIA(+) - Number of Quadrants involved)"
+  is_dttm: false
+  is_active: true
+  type: STRING
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: Other Breast Examination Result
+  verbose_name: "\u1794\u17D2\u179A\u179F\u17B7\u1793\u1794\u17BE\u1785\u1793\u17D2\
+    \u179B\u17C4\u17C7 29 \"\u1795\u17D2\u179F\u17C1\u1784\u17D7\" \u179F\u17BC\u1798\
+    \u1798\u17C1\u178F\u17D2\u178F\u17B6\u1794\u1789\u17D2\u1787\u17B6\u1780\u17CB\
+    \ (If Column 29 \"Other\", Please specify)"
+  is_dttm: false
+  is_active: true
+  type: STRING
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: 'Type of HPV '
+  verbose_name: "\u178F\u17C1\u179F\u17D2\u178F - \u1794\u17D2\u179A\u1797\u17C1\u1791\
+    \u179C\u17B8\u179A\u17BB\u179F HPV (HPV Test - Type of HPV)"
+  is_dttm: false
+  is_active: true
+  type: STRING
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: Self breast examination and education
+  verbose_name: "\u17A2\u1794\u17CB\u179A\u17C6 \u1793\u17B7\u1784\u178E\u17C2\u1793\
+    \u17B6\u17C6\u17A2\u17C6\u1796\u17B8\u1780\u17B6\u179A\u179F\u17D2\u1791\u17B6\
+    \u1794\u1793\u17B7\u1784\u1796\u17B7\u1793\u17B7\u178F\u17D2\u1799\u178A\u17C4\
+    \u17C7\u178A\u17C4\u1799\u1781\u17D2\u179B\u17BD\u1793\u17AF\u1784 (Self breast\
+    \ examination and education)"
+  is_dttm: false
+  is_active: true
+  type: STRING
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: Breast Examination Result
+  verbose_name: "\u179B\u1791\u17D2\u1792\u1795\u179B\u1780\u17B6\u179A\u1796\u17B7\
+    \u1793\u17B7\u178F\u17D2\u1799-\u179F\u17D2\u1791\u17B6\u1794\u178A\u17C4\u17C7\
+    \ (\u178A\u17C4\u1799\u1798\u1793\u17D2\u178F\u17D2\u179A\u17B8\u179F\u17BB\u1781\
+    \u17B6\u1797\u17B7\u1794\u17B6\u179B) (Breast Examination Result (By Health Staff))"
+  is_dttm: false
+  is_active: true
+  type: STRING
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: VIA test result
+  verbose_name: "\u178F\u17C1\u179F\u17D2\u178F VIA - \u179B\u1791\u17D2\u1792\u1795\
+    \u179B (VIA Test - Result)"
+  is_dttm: false
+  is_active: true
+  type: STRING
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: HPV Test result
+  verbose_name: "\u178F\u17C1\u179F\u17D2\u178F - \u179B\u1791\u17D2\u1792\u1795\u179B\
+    \u178F\u17C1\u179F\u17D2\u178F HPV (HPV Test - Result)"
+  is_dttm: false
+  is_active: true
+  type: STRING
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: Commune/ Sangkat
+  verbose_name: "\u17A2\u17B6\u179F\u1799\u178A\u17D2\u178B\u17B6\u1793\u1794\u1785\
+    \u17D2\u1785\u17BB\u1794\u17D2\u1794\u1793\u17D2\u1793 - \u1783\u17BB\u17C6/\u179F\
+    \u1784\u17D2\u1780\u17B6\u178F\u17CB (Current Address - Commune)"
+  is_dttm: false
+  is_active: true
+  type: STRING
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: District/ Khan
+  verbose_name: "\u17A2\u17B6\u179F\u1799\u178A\u17D2\u178B\u17B6\u1793\u1794\u1785\
+    \u17D2\u1785\u17BB\u1794\u17D2\u1794\u1793\u17D2\u1793 - \u179F\u17D2\u179A\u17BB\
+    \u1780 (Current Address - District)"
+  is_dttm: false
+  is_active: true
+  type: STRING
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: OpenMRS ID
+  verbose_name: "\u179B\u17C1\u1781\u179F\u1798\u17D2\u1782\u17B6\u179B\u17CB\u17A2\
+    \u178F\u17B7\u1790\u17B7\u1787\u1793\u1780\u17D2\u1793\u17BB\u1784\u1794\u17D2\
+    \u179A\u1796\u17D0\u1793\u17D2\u1792 EMR (Patient OpenMRS ID (EMR))"
+  is_dttm: false
+  is_active: true
+  type: STRING
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: Province/City
+  verbose_name: "\u17A2\u17B6\u179F\u1799\u178A\u17D2\u178B\u17B6\u1793\u1794\u1785\
+    \u17D2\u1785\u17BB\u1794\u17D2\u1794\u1793\u17D2\u1793 - \u1781\u17C1\u178F\u17D2\
+    \u178F (Current Address - Province)"
+  is_dttm: false
+  is_active: true
+  type: STRING
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: Village
+  verbose_name: "\u17A2\u17B6\u179F\u1799\u178A\u17D2\u178B\u17B6\u1793\u1794\u1785\
+    \u17D2\u1785\u17BB\u1794\u17D2\u1794\u1793\u17D2\u1793 - \u1797\u17BC\u1798\u17B7\
+    \ (Current Address - Village)"
+  is_dttm: false
+  is_active: true
+  type: STRING
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: Treatment option
+  verbose_name: "\u1780\u17B6\u179A\u1796\u17D2\u1799\u17B6\u1794\u17B6\u179B - \u1798\
+    \u1792\u17D2\u1799\u17C4\u1794\u17B6\u1799 (Treatment - Option)"
+  is_dttm: false
+  is_active: true
+  type: STRING
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: PMRS ID Number
+  verbose_name: "\u179B\u17C1\u1781\u179F\u1798\u17D2\u1782\u17B6\u179B\u17CB PMRS\
+    \ (PMRS ID Number)"
+  is_dttm: false
+  is_active: true
+  type: STRING
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: Treatment
+  verbose_name: "\u1780\u17B6\u179A\u1796\u17D2\u1799\u17B6\u1794\u17B6\u179B - \u1798\
+    \u1792\u17D2\u1799\u17C4\u1794\u17B6\u1799 (Treatment - Option)"
+  is_dttm: false
+  is_active: true
+  type: STRING
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: National ID Card
+  verbose_name: "\u179B\u17C1\u1781\u17A2\u178F\u17D2\u178F\u179F\u1789\u17D2\u1789\
+    \u17B6\u178E\u1794\u178E\u17D2\u178E\u1787\u17B6\u178F\u17B7 (National ID Card)"
+  is_dttm: false
+  is_active: true
+  type: STRING
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: ID Poor Card
+  verbose_name: "\u1794\u178E\u17D2\u178E\u1782\u17D2\u179A\u17BD\u179F\u17B6\u179A\
+    \u1780\u17D2\u179A\u17B8\u1780\u17D2\u179A (ID Poor Card)"
+  is_dttm: false
+  is_active: true
+  type: STRING
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: Type of visit
+  verbose_name: "\u1794\u17D2\u179A\u1797\u17C1\u1791\u1793\u17C3\u1780\u17B6\u179A\
+    \u1798\u1780\u1796\u17B7\u1793\u17B7\u178F\u17D2\u1799 (Type of Visit)"
+  is_dttm: false
+  is_active: true
+  type: STRING
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: Facility Name
+  verbose_name: "\u1788\u17D2\u1798\u17C4\u17C7\u1793\u17B7\u1784\u179B\u17C1\u1781\
+    \u1780\u17BC\u178A\u1798\u17BC\u179B\u178A\u17D2\u178B\u17B6\u1793\u179F\u17BB\
+    \u1781\u17B6\u1797\u17B7\u1794\u17B6\u179B (Health Facility's Name)"
+  is_dttm: false
+  is_active: true
+  type: STRING
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: Facility Province
+  verbose_name: "\u1798\u1793\u17D2\u1791\u17B8\u179A\u179F\u17BB\u1781\u17B6\u1797\
+    \u17B7\u1794\u17B6\u179B\u1781\u17C1\u178F\u17D2\u178F (Provincial Health Department)"
+  is_dttm: false
+  is_active: true
+  type: STRING
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: Other Identifiers
+  verbose_name: "\u1794\u17D2\u179A\u1797\u17C1\u1791\u1794\u178E\u17D2\u178E\u179F\
+    \u1798\u17D2\u1782\u17B6\u179B\u17CB\u1795\u17D2\u179F\u17C1\u1784\u17D7 (Other\
+    \ Identifier Types)"
+  is_dttm: false
+  is_active: true
+  type: STRING
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: Patient's name
+  verbose_name: "\u1788\u17D2\u1798\u17C4\u17C7\u17A2\u178F\u17B7\u1790\u17B7\u1787\
+    \u1793 (Client's name)"
+  is_dttm: false
+  is_active: true
+  type: STRING
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: Visit date
+  verbose_name: "\u1780\u17B6\u179B\u1794\u179A\u17B7\u1785\u17D2\u1786\u17C1\u1791\
+    \u1798\u1780\u1796\u17B7\u1793\u17B7\u178F\u17D2\u1799 (Visit Date)"
+  is_dttm: true
+  is_active: true
+  type: DATETIME
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: Referred From
+  verbose_name: "\u1794\u1789\u17D2\u1787\u17BC\u1793\u1798\u1780\u1796\u17B8 (Referred\
+    \ By)"
+  is_dttm: false
+  is_active: true
+  type: STRING
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: Facility District
+  verbose_name: "\u179F\u17D2\u179A\u17BB\u1780\u1794\u17D2\u179A\u178F\u17B7\u1794\
+    \u178F\u17D2\u178F\u17B7 (Operational District)"
+  is_dttm: false
+  is_active: true
+  type: STRING
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: Payment type
+  verbose_name: "\u1794\u17D2\u179A\u1797\u17C1\u1791\u1793\u17C3\u1780\u17B6\u179A\
+    \u1794\u1784\u17CB\u1790\u17D2\u179B\u17C3\u179F\u17C1\u179C\u17B6 (Payment types)"
+  is_dttm: false
+  is_active: true
+  type: STRING
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: Phone number
+  verbose_name: "\u179B\u17C1\u1781\u1791\u17BC\u179A\u179F\u17D0\u1796\u17D2\u1791\
+    \u1791\u17C6\u1793\u17B6\u1780\u17CB\u1791\u17C6\u1793\u1784 (Phone number)"
+  is_dttm: false
+  is_active: true
+  type: STRING
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: SCJ
+  verbose_name: "\u1781\u17D2\u179F\u17C2\u1794\u1793\u17D2\u1791\u17B6\u178F\u17CB\
+    \ SCJ (SCJ)"
+  is_dttm: false
+  is_active: true
+  type: STRING
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: Age
+  verbose_name: "\u17A2\u17B6\u1799\u17BB (Age)"
+  is_dttm: false
+  is_active: true
+  type: FLOAT
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+version: 1.0.0
+database_uuid: 42834407-4570-4111-8bf6-4f7080413333
diff --git a/base/configs/superset/assets/datasets/Analytics/HC_NCD_OPD_Register_Query-dataset.yaml b/base/configs/superset/assets/datasets/Analytics/HC_NCD_OPD_Register_Query-dataset.yaml
new file mode 100644
index 00000000..b15e38cd
--- /dev/null
+++ b/base/configs/superset/assets/datasets/Analytics/HC_NCD_OPD_Register_Query-dataset.yaml
@@ -0,0 +1,806 @@
+table_name: HC NCD OPD Register Query-dataset
+main_dttm_col: null
+description: null
+default_endpoint: null
+offset: 0
+cache_timeout: 300
+schema: public
+sql: "SELECT\n    f_facility AS \"Facility Name\",\n    f_district AS \"Facility District\"\
+  ,\n    f_province AS \"Facility Province\",\n    CASE \n        WHEN identifiers\
+  \ ~ '.*OpenMRS ID: (.*?)(,|$).*' THEN REGEXP_REPLACE(identifiers, '.*OpenMRS ID:\
+  \ (.*?)(,|$).*', '\\1', 'g')\n        ELSE ''\n    END AS \"OpenMRS ID\",\n    CONCAT_WS('\
+  \ ', given_name, middle_name, family_name) AS \"Patient's name\",\n    gender AS\
+  \ \"Gender\",\n    referred_from AS \"Referred By\",\n    DATE_PART('year', age(visit_date,\
+  \ birthdate)) AS \"Age\",\n    CASE \n        WHEN attributes ~ '.*Telephone Number:\
+  \ (.*?)(\\/|$).*' THEN REGEXP_REPLACE(attributes, '.*Telephone Number: (.*?)(\\\
+  /|$).*', '\\1', 'g')\n        ELSE ''\n    END AS \"Phone number\",\n    zone AS\
+  \ \"Zone\",\n    address_1 AS \"Village\",\n    address_city AS \"Commune/ Sangkat\"\
+  ,\n    address_county_district AS \"District/ Khan\",\n    address_state_province\
+  \ AS \"Province/City\",\n    visit_date AS \"Visit Date\",\n    visit_type AS \"\
+  Visit\",\n    obs_weight AS \"Weight\",\n    obs_height AS \"Height\",\n    obs_diastolic_pressure\
+  \ AS \"Diastolic Pressure\",\n    obs_temperature AS \"Temperature\",\n    obs_bmi\
+  \ AS \"BMI\",\n    obs_pulse AS \"Pulse\",\n    obs_circumference AS \"Circumference\"\
+  ,\n    obs_respiratory_rate AS \"Respiratory Rate\",\n    obs_spo2 AS \"SpO2\",\n\
+  \    obs_systolic_pressure AS \"Systolic Pressure\",\n    obs_fasting_blood_sugar\
+  \ AS \"Fasting Blood Sugar\",\n    obs_random_blood_sugar AS \"Random Blood Sugar\"\
+  ,\n    obs_ogtt AS \"OGTT\",\n    obs_hba1c AS \"HbA1c\",\n    obs_ketones AS \"\
+  Ketones\",\n    obs_albumin AS \"Albumin\",\n    obs_smoking_status AS \"Smoking\
+  \ Status\",\n    obs_physical_exercise AS \"Physical Exercise\",\n    obs_alcohol_use\
+  \ AS \"Alcohol Use\",\n    obs_cvd_risk_score AS \"CVD risk score (%)\",\n    obs_teleconsultation\
+  \ AS \"Tele-consultation with NCD unit\",\n    obs_diagnosis1 AS \"Diagnosis 1\"\
+  ,\n    obs_diagnosis2 AS \"Diagnosis 2\",\n    obs_treatment_recommendations AS\
+  \ \"Management Lifestyle\",\n    medications AS \"Management - Medications\",\n\
+  \    obs_followup_date AS \"Appointment Date\",\n    obs_followup_for AS \"Appointment\
+  \ Reason\",\n    obs_facility AS \"Referral Facility\",\n    CONCAT_WS(', ', obs_diabetes_referral_reason,\
+  \ obs_hypertension_referral_reason) AS \"Reason for referral\",\n    insurance_type\
+  \ AS \"Payment Type\",\n    '' AS \"Remarks\"\nFROM (\n    SELECT\n        facility_address.state_province\
+  \ AS \"f_province\",\n        facility_address.county_district AS \"f_district\"\
+  ,\n        facility_address.name AS \"f_facility\",\n        MAX(given_name) AS\
+  \ given_name,\n        MAX(middle_name) AS middle_name,\n        MAX(family_name)\
+  \ AS family_name,\n        MAX(identifiers) AS identifiers,\n        MAX(birthdate)\
+  \ AS birthdate,\n        MAX(gender) AS gender,\n        MAX(address_state_province)\
+  \ AS address_state_province,\n        MAX(address_county_district) AS address_county_district,\n\
+  \        MAX(address_city) AS address_city,\n        MAX(address_1) AS address_1,\n\
+  \        MAX(attributes) AS attributes,\n        MAX(vi.date_started) AS \"visit_date\"\
+  ,\n        MAX(vi.type) AS \"visit_type\",\n        MAX(CASE \n            WHEN\
+  \ vi.visit_attributes ~ '.*Address Zone: (.*?)(\\/|$).*' THEN REGEXP_REPLACE(vi.visit_attributes,\
+  \ '.*Address Zone: (.*?)(\\/|$).*', '\\1', 'g')\n            ELSE ''\n        END)\
+  \ AS \"zone\",\n        MAX(CASE \n            WHEN vi.visit_attributes ~ '.*Insurance\
+  \ Type: (.*?)(\\/|$).*' THEN REGEXP_REPLACE(vi.visit_attributes, '.*Insurance Type:\
+  \ (.*?)(\\/|$).*', '\\1', 'g')\n            ELSE ''\n        END) AS \"insurance_type\"\
+  ,\n        MAX(CASE WHEN obs.question_uuid = 'fd588078-9286-46ea-b133-36aab1b025ec'\
+  \ THEN obs.answer_coded ELSE NULL END) AS \"referred_from\",\n        MAX(CASE WHEN\
+  \ obs.question_uuid = '5089AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' THEN obs.answer_numeric\
+  \ ELSE NULL END) AS \"obs_weight\",\n        MAX(CASE WHEN obs.question_uuid = '5090AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'\
+  \ THEN obs.answer_numeric ELSE NULL END) AS \"obs_height\",\n        MAX(CASE WHEN\
+  \ obs.question_uuid = '5086AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' THEN obs.answer_numeric\
+  \ ELSE NULL END) AS \"obs_diastolic_pressure\",\n        MAX(CASE WHEN obs.question_uuid\
+  \ = '5088AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' THEN obs.answer_numeric ELSE NULL END)\
+  \ AS \"obs_temperature\",\n        MAX(CASE WHEN obs.question_uuid = 'a89c60c0-1350-11df-a1f1-0026b9348838'\
+  \ THEN obs.answer_numeric ELSE NULL END) AS \"obs_bmi\",\n        MAX(CASE WHEN\
+  \ obs.question_uuid = '5087AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' THEN obs.answer_numeric\
+  \ ELSE NULL END) AS \"obs_pulse\",\n        MAX(CASE WHEN obs.question_uuid = '1343AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'\
+  \ THEN obs.answer_numeric ELSE NULL END) AS \"obs_circumference\",\n        MAX(CASE\
+  \ WHEN obs.question_uuid = '5242AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' THEN obs.answer_numeric\
+  \ ELSE NULL END) AS \"obs_respiratory_rate\",\n        MAX(CASE WHEN obs.question_uuid\
+  \ = '5092AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' THEN obs.answer_numeric ELSE NULL END)\
+  \ AS \"obs_spo2\",\n        MAX(CASE WHEN obs.question_uuid = '5085AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'\
+  \ THEN obs.answer_numeric ELSE NULL END) AS \"obs_systolic_pressure\",\n       \
+  \ MAX(CASE WHEN obs.question_uuid = '4a6ad2db-86af-4acc-906b-b749b7f6cda6' THEN\
+  \ obs.answer_numeric ELSE NULL END) AS \"obs_fasting_blood_sugar\",\n        MAX(CASE\
+  \ WHEN obs.question_uuid = 'f52d731e-58da-4f3a-a480-77c5e9d8d2eb' THEN obs.answer_numeric\
+  \ ELSE NULL END) AS \"obs_random_blood_sugar\",\n        MAX(CASE WHEN obs.question_uuid\
+  \ = '163594AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' THEN obs.answer_numeric ELSE NULL END)\
+  \ AS \"obs_ogtt\",\n        MAX(CASE WHEN obs.question_uuid = 'a8af7520-1350-11df-a1f1-0026b9348838'\
+  \ THEN obs.answer_numeric ELSE NULL END) AS \"obs_hba1c\",\n        MAX(CASE WHEN\
+  \ obs.question_uuid = '07015405-c865-4a22-8ad1-c8863d5f005b' THEN obs.answer_numeric\
+  \ ELSE NULL END) AS \"obs_ketones\",\n        MAX(CASE WHEN obs.question_uuid =\
+  \ 'c423325e-be95-42e2-ae38-b940c2586327' THEN obs.answer_numeric ELSE NULL END)\
+  \ AS \"obs_albumin\",\n        MAX(CASE WHEN obs.question_uuid = '7533aa7e-04cb-4cfd-9c97-6ac36f114bab'\
+  \ THEN obs.answer_coded ELSE NULL END) AS \"obs_smoking_status\",\n        MAX(CASE\
+  \ WHEN obs.question_uuid = 'c31a2da0-f16b-44e3-baea-8a259d8beb31' THEN obs.answer_coded\
+  \ ELSE NULL END) AS \"obs_physical_exercise\",\n        MAX(CASE WHEN obs.question_uuid\
+  \ = 'e737c8c9-a154-47a1-aa20-ed13008d46cf' THEN obs.answer_coded ELSE NULL END)\
+  \ AS \"obs_alcohol_use\",\n        MAX(CASE WHEN obs.question_uuid = 'dff491e3-b14c-4b32-ab64-63b96966d72d'\
+  \ THEN obs.answer_coded ELSE NULL END) AS \"obs_cvd_risk_score\",\n        MAX(CASE\
+  \ WHEN obs.question_uuid = '45583478-f703-46e3-b63a-54b0a95c25f0' THEN obs.answer_coded\
+  \ ELSE NULL END) AS \"obs_diagnosis1\",\n        MAX(CASE WHEN obs.question_uuid\
+  \ = '76ca08a5-2128-4b53-afba-74227b015924' THEN obs.answer_coded ELSE NULL END)\
+  \ AS \"obs_diagnosis2\",\n        STRING_AGG(DISTINCT drug_order.drug_name, ', ')\
+  \ AS \"medications\",\n        MAX(CASE WHEN obs.question_uuid = '9f7c8739-3ea3-4f7f-8648-d6c36fef7be2'\
+  \ THEN obs.answer_coded ELSE NULL END) AS \"obs_treatment_recommendations\",\n \
+  \       MAX(CASE WHEN obs.question_uuid = '80fc2e59-8c16-40db-9767-ac9d9ffeb010'\
+  \ THEN obs.answer_coded ELSE NULL END) AS \"obs_teleconsultation\",\n        MAX(CASE\
+  \ WHEN obs.question_uuid = 'cde3716a-2b98-4f10-b619-4d5a5a55503c' THEN obs.answer_coded\
+  \ ELSE NULL END) AS \"obs_diabetes_referral_reason\",\n        MAX(CASE WHEN obs.question_uuid\
+  \ = '68f158ff-6396-4bab-8194-73255282bd23' THEN obs.answer_coded ELSE NULL END)\
+  \ AS \"obs_hypertension_referral_reason\",\n        MAX(CASE WHEN obs.question_uuid\
+  \ = '758b9dd8-b6d0-4ac2-b245-0e7bffb4693a' THEN obs.answer_coded ELSE NULL END)\
+  \ AS \"obs_facility\",\n        MAX(CASE WHEN obs.question_uuid = '2e27bbf9-d744-46a2-a7d4-cecd33c28b8a'\
+  \ THEN obs.answer_coded ELSE NULL END) AS \"obs_followup_for\",\n        MAX(CASE\
+  \ WHEN obs.question_uuid = 'e9c145c1-f4e9-4c34-b237-da069939dc38' THEN obs.answer_datetime\
+  \ ELSE NULL END) AS \"obs_followup_date\"\n    FROM patients pa\n    LEFT OUTER\
+  \ JOIN visits vi ON vi.visit_voided = false AND vi.patient_uuid = pa.patient_uuid\
+  \ AND vi.type IN ('NCD New Visit', 'NCD Follow-up Visit')\n    LEFT OUTER JOIN locations\
+  \ facility_address ON facility_address.uuid = vi.location_uuid\n    LEFT OUTER JOIN\
+  \ observations obs ON obs.obs_voided = false AND obs.visit_uuid = vi.visit_uuid\
+  \ AND obs.question_uuid IN (\n        '5089AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA', \n\
+  \        '5090AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA', \n        '5086AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA',\
+  \ \n        '5088AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA', \n        'a89c60c0-1350-11df-a1f1-0026b9348838',\
+  \ \n        '5087AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA', \n        '1343AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA',\
+  \ \n        '5242AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA', \n        '5092AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA',\
+  \ \n        '5085AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA',\n        '5086AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA',\n\
+  \        '4a6ad2db-86af-4acc-906b-b749b7f6cda6',\n        'f52d731e-58da-4f3a-a480-77c5e9d8d2eb',\n\
+  \        'a8af7520-1350-11df-a1f1-0026b9348838',\n        'fd588078-9286-46ea-b133-36aab1b025ec',\n\
+  \        '07015405-c865-4a22-8ad1-c8863d5f005b',\n        'c423325e-be95-42e2-ae38-b940c2586327',\n\
+  \        '7533aa7e-04cb-4cfd-9c97-6ac36f114bab',\n        'e737c8c9-a154-47a1-aa20-ed13008d46cf',\n\
+  \        'c31a2da0-f16b-44e3-baea-8a259d8beb31',\n        '45583478-f703-46e3-b63a-54b0a95c25f0',\n\
+  \        '80fc2e59-8c16-40db-9767-ac9d9ffeb010',\n        '9f7c8739-3ea3-4f7f-8648-d6c36fef7be2',\n\
+  \        '76ca08a5-2128-4b53-afba-74227b015924',\n        'e9c145c1-f4e9-4c34-b237-da069939dc38',\n\
+  \        '2e27bbf9-d744-46a2-a7d4-cecd33c28b8a',\n        '758b9dd8-b6d0-4ac2-b245-0e7bffb4693a',\n\
+  \        'cde3716a-2b98-4f10-b619-4d5a5a55503c',\n        '68f158ff-6396-4bab-8194-73255282bd23'\n\
+  \    ) AND obs.encounter_type IN ('Health Center - NCD Screening')\n    LEFT OUTER\
+  \ JOIN orders drug_order ON drug_order.patient_uuid = pa.patient_uuid AND (drug_order.date_activated\
+  \ >= vi.date_started\n            {% if to_dttm != undefined and to_dttm is not\
+  \ none %}\n                AND drug_order.date_activated <= '{{ to_dttm }}'\n  \
+  \          {% else %}\n                AND drug_order.date_activated <= vi.date_stopped\n\
+  \            {%- endif -%} \n            )\n    GROUP BY \n        facility_address.state_province,\
+  \ \n        facility_address.county_district, \n        facility_address.name, \n\
+  \        vi.visit_uuid\n) AS patient_info "
+params: null
+template_params: null
+filter_select_enabled: false
+fetch_values_predicate: null
+extra: null
+normalize_columns: false
+always_filter_main_dttm: false
+uuid: 262d446a-2c07-4b3b-8ab0-a792b242dea4
+metrics:
+- metric_name: count
+  verbose_name: null
+  metric_type: null
+  expression: count(*)
+  description: null
+  d3format: null
+  currency: null
+  extra:
+    warning_markdown: ''
+  warning_text: null
+columns:
+- column_name: Random Blood Sugar
+  verbose_name: "\u1780\u1798\u17D2\u179A\u17B7\u178F\u1787\u17B6\u178F\u17B7\u179F\
+    \u17D2\u1780\u179A\u1785\u17C3\u178A\u1793\u17D2\u1799 (Random (Any time Patient\
+    \ come to get BSL Test))"
+  is_dttm: false
+  is_active: true
+  type: FLOAT
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: Fasting Blood Sugar
+  verbose_name: "\u1780\u1798\u17D2\u179A\u17B7\u178F\u1787\u17B6\u178F\u17B7\u179F\
+    \u17D2\u1780\u179A\u1798\u17BB\u1793\u17A2\u17B6\u17A0\u17B6\u179A (Fasting (at\
+    \ least 8H before BSL))"
+  is_dttm: false
+  is_active: true
+  type: FLOAT
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: Referral Facility
+  verbose_name: "\u1794\u1789\u17D2\u1787\u17BC\u1793\u1791\u17C5\u1798\u17BC\u179B\
+    \u178A\u17D2\u178B\u17B6\u1793\u179F\u17BB\u1781\u17B6\u1797\u17B7\u1794\u17B6\
+    \u179B\u1788\u17D2\u1798\u17C4\u17C7 - \u1794\u1789\u17D2\u1787\u17BC\u1793\u1791\
+    \u17C5 (Referral - To facility name)"
+  is_dttm: false
+  is_active: true
+  type: STRING
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: Tele-consultation with NCD unit
+  verbose_name: "\u1796\u17B7\u1782\u17D2\u179A\u17C4\u17C7\u178F\u17C1\u179B\u17C1\
+    \u1798\u17C1\u178C\u17B8\u179F\u17CA\u17B8\u1793)\u1787\u17B6\u1798\u17BD\u1799\
+    \u17A2\u17D2\u1793\u1780\u1787\u17C6\u1793\u17B6\u1789\u1793\u17C5\u1795\u17D2\
+    \u1793\u17C2\u1780\u1787\u17C6\u1784\u17BA\u1798\u17B7\u1793\u1786\u17D2\u179B\
+    \u1784 (Teleconsultation with NCD Unit)"
+  is_dttm: false
+  is_active: true
+  type: STRING
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: Management - Medications
+  verbose_name: "\u1780\u17B6\u179A\u1782\u17D2\u179A\u1794\u17CB\u1782\u17D2\u179A\
+    \u1784 - \u1790\u17D2\u1793\u17B6\u17C6 (Management - Medicine)"
+  is_dttm: false
+  is_active: true
+  type: STRING
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: CVD risk score (%)
+  verbose_name: "CVD Risk (\u17A0\u17B6\u1793\u17B7\u1797\u17D0\u1799\u1787\u17C6\u1784\
+    \u17BA\u1794\u17C1\u17C7\u178A\u17BC\u1784 \u179F\u179A\u179F\u17C3\u1788\u17B6\
+    \u1798)"
+  is_dttm: false
+  is_active: true
+  type: STRING
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: Diagnosis 1
+  verbose_name: "\u179A\u17C4\u1782\u179C\u17B7\u1793\u17B7\u1785\u17D2\u1786\u17D0\
+    \u1799 - 1 (Diagnosis - 1)"
+  is_dttm: false
+  is_active: true
+  type: STRING
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: Diagnosis 2
+  verbose_name: "\u179A\u17C4\u1782\u179C\u17B7\u1793\u17B7\u1785\u17D2\u1786\u17D0\
+    \u1799 - 2 (Diagnosis - 2)"
+  is_dttm: false
+  is_active: true
+  type: STRING
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: Management Lifestyle
+  verbose_name: "\u1780\u17B6\u179A\u1782\u17D2\u179A\u1794\u17CB\u1782\u17D2\u179A\
+    \u1784 - \u179A\u1794\u17C0\u1794\u179A\u179F\u17CB\u1793\u17C5 (Management -\
+    \ Lifestyle)"
+  is_dttm: false
+  is_active: true
+  type: STRING
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: Albumin
+  verbose_name: "\u1791\u17B9\u1780\u1793\u17C4\u1798 - \u17A2\u17B6\u179B\u17CB\u1794\
+    \u17CA\u17BB\u1793\u1798\u17B8\u1793 (Urine - Albumin)"
+  is_dttm: false
+  is_active: true
+  type: FLOAT
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: Ketones
+  verbose_name: "\u1791\u17B9\u1780\u1793\u17C4\u1798 - \u1780\u17C1\u178F\u17BC\u1793\
+    \ (Urine - Ketone)"
+  is_dttm: false
+  is_active: true
+  type: FLOAT
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: Smoking Status
+  verbose_name: "\u178F\u17BE\u17A2\u17D2\u1793\u1780\u1787\u17C6\u1784\u17BA\u1787\
+    \u1780\u17CB\u1794\u17B6\u179A\u17B8\u178A\u17C2\u179A\u17AC\u1791\u17C1? (Does\
+    \ the patient Smoke?)"
+  is_dttm: false
+  is_active: true
+  type: STRING
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: Alcohol Use
+  verbose_name: "\u1795\u17B9\u1780\u1782\u17D2\u179A\u17BF\u1784\u179F\u17D2\u179A\
+    \u179C\u17B9\u1784\u1794\u17D2\u179A\u1780\u1794\u178A\u17C4\u1799\u1782\u17D2\
+    \u179A\u17C4\u17C7\u1790\u17D2\u1793\u17B6\u17C6 (Harmful use of alcohol)"
+  is_dttm: false
+  is_active: true
+  type: STRING
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: Reason for referral
+  verbose_name: "\u1798\u17BC\u179B\u17A0\u17C1\u178F\u17BB\u1793\u17C3\u1780\u17B6\
+    \u179A\u1794\u1789\u17D2\u1787\u17BC\u1793 (Reason for referral)"
+  is_dttm: false
+  is_active: true
+  type: STRING
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: Facility Name
+  verbose_name: "\u1788\u17D2\u1798\u17C4\u17C7\u1793\u17B7\u1784\u179B\u17C1\u1781\
+    \u1780\u17BC\u178A\u1798\u17BC\u179B\u178A\u17D2\u178B\u17B6\u1793\u179F\u17BB\
+    \u1781\u17B6\u1797\u17B7\u1794\u17B6\u179B (Health Facility's Name)"
+  is_dttm: false
+  is_active: true
+  type: STRING
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: Facility Province
+  verbose_name: "\u1798\u1793\u17D2\u1791\u17B8\u179A\u179F\u17BB\u1781\u17B6\u1797\
+    \u17B7\u1794\u17B6\u179B\u1781\u17C1\u178F\u17D2\u178F (Provincial Health Department)"
+  is_dttm: false
+  is_active: true
+  type: STRING
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: Patient's name
+  verbose_name: "\u1788\u17D2\u1798\u17C4\u17C7\u17A2\u17D2\u1793\u1780\u1787\u17C6\
+    \u1784\u17BA (Client's name)"
+  is_dttm: false
+  is_active: true
+  type: STRING
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: Appointment Reason
+  verbose_name: "\u1787\u17C6\u1784\u17BA\u1791\u17B9\u1780\u1793\u17C4\u1798\u1795\
+    \u17D2\u17A2\u17C2\u1798/\u179B\u17BE\u179F\u179F\u1798\u17D2\u1796\u17B6\u1792\
+    \u1788\u17B6\u1798 (Appointment reason)"
+  is_dttm: false
+  is_active: true
+  type: STRING
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: Appointment Date
+  verbose_name: "\u1780\u17B6\u179B\u1794\u179A\u17B7\u1785\u17D2\u1786\u1791\u178F\
+    \u17B6\u1798\u178A\u17B6\u1793 (Date Appointment)"
+  is_dttm: true
+  is_active: true
+  type: DATETIME
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: Visit Date
+  verbose_name: "\u1780\u17B6\u179B\u1794\u179A\u17B7\u1785\u17D2\u1786\u17C1\u1791\
+    \u1796\u17B7\u1793\u17B7\u178F\u17D2\u1799 (Visit Date)"
+  is_dttm: true
+  is_active: true
+  type: DATETIME
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: Respiratory Rate
+  verbose_name: "\u1787\u17B8\u1796\u1785\u179A (Pulse Rate)"
+  is_dttm: false
+  is_active: true
+  type: FLOAT
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: Referred By
+  verbose_name: "\u1794\u1789\u17D2\u1787\u17BC\u1793\u178A\u17C4\u1799 (Referred\
+    \ by)"
+  is_dttm: false
+  is_active: true
+  type: STRING
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: OpenMRS ID
+  verbose_name: "\u17A2\u178F\u17D2\u178F\u179B\u17C1\u1781\u17A2\u17D2\u1793\u1780\
+    \u1787\u17C6\u1784\u17BA (Client ID)"
+  is_dttm: false
+  is_active: true
+  type: STRING
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: Facility District
+  verbose_name: "\u179F\u17D2\u179A\u17BB\u1780\u1794\u17D2\u179A\u178F\u17B7\u1794\
+    \u178F\u17D2\u178F\u17B7 (Operational District)"
+  is_dttm: false
+  is_active: true
+  type: STRING
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: Physical Exercise
+  verbose_name: "\u17A2\u179F\u1780\u1798\u17D2\u1798\u1797\u17B6\u1796\u179A\u17B6\
+    \u1784\u1780\u17B6\u1799 (Physical inactivity)"
+  is_dttm: false
+  is_active: true
+  type: STRING
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: Phone number
+  verbose_name: "\u179B\u17C1\u1781\u1791\u17BC\u179A\u179F\u1796\u17D2\u1791 (Phone\
+    \ Number)"
+  is_dttm: false
+  is_active: true
+  type: STRING
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: Payment Type
+  verbose_name: "\u1794\u17D2\u179A\u1797\u17C1\u1791\u1780\u17B6\u179A\u1794\u1784\
+    \u17CB\u1794\u17D2\u179A\u17B6\u1780\u17CB (Payment Type)"
+  is_dttm: false
+  is_active: true
+  type: STRING
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: Circumference
+  verbose_name: "\u1791\u17C6\u17A0\u17C6\u1785\u1784\u17D2\u1780\u17C1\u17C7 (\"\
+    Waist Circumference\")"
+  is_dttm: false
+  is_active: true
+  type: FLOAT
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: Commune/ Sangkat
+  verbose_name: "\u1783\u17BB\u17C6/\u179F\u1784\u17D2\u1780\u17B6\u178F\u17CB (Commune)"
+  is_dttm: false
+  is_active: true
+  type: STRING
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: District/ Khan
+  verbose_name: "\u179F\u17D2\u179A\u17BB\u1780 (District)"
+  is_dttm: false
+  is_active: true
+  type: STRING
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: BMI
+  verbose_name: "\u1795\u179B\u1792\u17C0\u1794\u1791\u1798\u17D2\u1784\u1793\u17CB\
+    \ \u1793\u17B7\u1784\u1780\u1798\u17D2\u1796\u179F\u17CB (BMI)"
+  is_dttm: false
+  is_active: true
+  type: FLOAT
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: Diastolic Pressure
+  verbose_name: "\u178A\u17D2\u1799\u17B6\u179F\u17D2\u178F\u17BC\u179B (DBP)"
+  is_dttm: false
+  is_active: true
+  type: FLOAT
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: Systolic Pressure
+  verbose_name: "\u179F\u17CA\u17B8\u179F\u17D2\u178F\u17BC\u179B (SBP)"
+  is_dttm: false
+  is_active: true
+  type: FLOAT
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: Pulse
+  verbose_name: "\u1787\u17B8\u1796\u1785\u179A (Pulse Rate)"
+  is_dttm: false
+  is_active: true
+  type: FLOAT
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: Province/City
+  verbose_name: "\u1781\u17C1\u178F\u17D2\u178F (Province)"
+  is_dttm: false
+  is_active: true
+  type: STRING
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: Age
+  verbose_name: "\u1794\u17D2\u179A\u1797\u17C1\u1791\u1793\u17C3\u1780\u17B6\u179A\
+    \u1796\u17B7\u1793\u17B7\u178F\u17D2\u1799 (Age)"
+  is_dttm: false
+  is_active: true
+  type: FLOAT
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: OGTT
+  verbose_name: "\u1795\u17B9\u1780\u1791\u17B9\u1780\u179F\u17D2\u1780\u179A\u17E7\
+    \u17E5\u1780\u17D2\u179A (OGTT)"
+  is_dttm: false
+  is_active: true
+  type: FLOAT
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: Height
+  verbose_name: "\u1780\u1798\u17D2\u1796\u179F\u17CB (Height)"
+  is_dttm: false
+  is_active: true
+  type: FLOAT
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: Temperature
+  verbose_name: "\u1780\u1798\u17D2\u178F\u17C5 (Temperature)"
+  is_dttm: false
+  is_active: true
+  type: FLOAT
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: Weight
+  verbose_name: "\u1791\u1798\u17D2\u1784\u1793\u17CB (Weight)"
+  is_dttm: false
+  is_active: true
+  type: FLOAT
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: Gender
+  verbose_name: "\u1797\u17C1\u1791 (Gender)"
+  is_dttm: false
+  is_active: true
+  type: STRING
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: Remarks
+  verbose_name: "\u1780\u17C6\u178E\u178F\u17CB\u179F\u1798\u17D2\u1782\u17B6\u179B\
+    \u17CB (Remarks)"
+  is_dttm: false
+  is_active: true
+  type: STRING
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: Village
+  verbose_name: "\u1797\u17BC\u1798\u17B7 (Village)"
+  is_dttm: false
+  is_active: true
+  type: STRING
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: Zone
+  verbose_name: "\u178F\u17C6\u1794\u1793\u17CB (Zone)"
+  is_dttm: false
+  is_active: true
+  type: STRING
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: HbA1c
+  verbose_name: null
+  is_dttm: false
+  is_active: true
+  type: FLOAT
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: SpO2
+  verbose_name: null
+  is_dttm: false
+  is_active: true
+  type: FLOAT
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: Visit
+  verbose_name: null
+  is_dttm: false
+  is_active: true
+  type: STRING
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+version: 1.0.0
+database_uuid: 42834407-4570-4111-8bf6-4f7080413333
diff --git a/base/configs/superset/assets/datasets/Analytics/NCD_HIS_Followup_Cases_Query-dataset.yaml b/base/configs/superset/assets/datasets/Analytics/NCD_HIS_Followup_Cases_Query-dataset.yaml
new file mode 100644
index 00000000..772edfbd
--- /dev/null
+++ b/base/configs/superset/assets/datasets/Analytics/NCD_HIS_Followup_Cases_Query-dataset.yaml
@@ -0,0 +1,378 @@
+table_name: NCD HIS Followup Cases Query-dataset
+main_dttm_col: null
+description: null
+default_endpoint: null
+offset: 0
+cache_timeout: null
+schema: public
+sql: "SELECT o.answer_coded AS diagnosis,\n       CASE WHEN (o.visit_date_started\
+  \ - p.birthdate) <= interval '28 days' AND p.gender = 'M' THEN 1 ELSE 0 END AS \"\
+  ml28d\",\n       CASE WHEN (o.visit_date_started - p.birthdate) <= interval '28\
+  \ days' AND p.gender = 'F' THEN 1 ELSE 0 END AS \"fl28d\",\n       CASE WHEN (o.visit_date_started\
+  \ - p.birthdate) >= interval '29 days' AND (o.visit_date_started - p.birthdate)\
+  \ < interval '1 year' AND DATE_PART('month', (o.visit_date_started - p.birthdate))\
+  \ < 12 AND p.gender = 'M' THEN 1 ELSE 0 END AS \"ml12m\",\n       CASE WHEN (o.visit_date_started\
+  \ - p.birthdate) >= interval '29 days' AND (o.visit_date_started - p.birthdate)\
+  \ < interval '1 year' AND DATE_PART('month', (o.visit_date_started - p.birthdate))\
+  \ < 12 AND p.gender = 'F' THEN 1 ELSE 0 END AS \"fl12m\",\n       CASE WHEN (o.visit_date_started\
+  \ - p.birthdate) >= interval '1 year' AND (o.visit_date_started - p.birthdate) <\
+  \ interval '5 years' AND p.gender = 'M' THEN 1 ELSE 0 END AS \"ml4\",\n       CASE\
+  \ WHEN (o.visit_date_started - p.birthdate) >= interval '1 year' AND (o.visit_date_started\
+  \ - p.birthdate) < interval '5 years' AND p.gender = 'F' THEN 1 ELSE 0 END AS \"\
+  fl4\",\n       CASE WHEN (o.visit_date_started - p.birthdate) >= interval '5 years'\
+  \ AND (o.visit_date_started - p.birthdate) <= interval '13 years' AND p.gender =\
+  \ 'M' THEN 1 ELSE 0 END AS \"ml13\",\n       CASE WHEN (o.visit_date_started - p.birthdate)\
+  \ >= interval '5 years' AND (o.visit_date_started - p.birthdate) <= interval '13\
+  \ years' AND p.gender = 'F' THEN 1 ELSE 0 END AS \"fl13\",\n       CASE WHEN (o.visit_date_started\
+  \ - p.birthdate) >= interval '15 years' AND (o.visit_date_started - p.birthdate)\
+  \ <= interval '24 years' AND p.gender = 'M' THEN 1 ELSE 0 END AS \"ml24\",\n   \
+  \    CASE WHEN (o.visit_date_started - p.birthdate) >= interval '15 years' AND (o.visit_date_started\
+  \ - p.birthdate) <= interval '24 years' AND p.gender = 'F' THEN 1 ELSE 0 END AS\
+  \ \"fl24\",\n       CASE WHEN (o.visit_date_started - p.birthdate) >= interval '25\
+  \ years' AND (o.visit_date_started - p.birthdate) <= interval '49 years' AND p.gender\
+  \ = 'M' THEN 1 ELSE 0 END AS \"ml49\",\n       CASE WHEN (o.visit_date_started -\
+  \ p.birthdate) >= interval '25 years' AND (o.visit_date_started - p.birthdate) <=\
+  \ interval '49 years' AND p.gender = 'F' THEN 1 ELSE 0 END AS \"fl49\",\n      \
+  \ CASE WHEN (o.visit_date_started - p.birthdate) >= interval '50 years' AND (o.visit_date_started\
+  \ - p.birthdate) <= interval '64 years' AND p.gender = 'M' THEN 1 ELSE 0 END AS\
+  \ \"ml64\",\n       CASE WHEN (o.visit_date_started - p.birthdate) >= interval '50\
+  \ years' AND (o.visit_date_started - p.birthdate) <= interval '64 years' AND p.gender\
+  \ = 'F' THEN 1 ELSE 0 END AS \"fl64\",\n       CASE WHEN (o.visit_date_started -\
+  \ p.birthdate) >= interval '65 years' AND p.gender = 'M' THEN 1 ELSE 0 END AS \"\
+  mg64\",\n       CASE WHEN (o.visit_date_started - p.birthdate) >= interval '65 years'\
+  \ AND p.gender = 'F' THEN 1 ELSE 0 END AS \"fg64\",\n       facility_address.state_province\
+  \ AS \"f_province\",\n       facility_address.county_district AS \"f_district\"\
+  ,\n       facility_address.name AS \"f_name\",\n       CASE WHEN facility_address.location_tags\
+  \ LIKE '%Health Center%' THEN 'Health Center' \n            WHEN facility_address.location_tags\
+  \ LIKE '%Referral Hospital%' THEN 'Referral Hospital'\n            ELSE '' END AS\
+  \ \"f_type\",\n       o.visit_date_started AS visit_date\nFROM observations o\n\
+  INNER JOIN visits v ON v.visit_voided = false AND o.visit_uuid = v.visit_uuid\n\
+  INNER JOIN patients p ON p.person_voided = false AND p.patient_uuid = o.patient_uuid\n\
+  INNER JOIN locations facility_address ON facility_address.uuid = o.location_uuid\n\
+  WHERE o.obs_voided = false AND  o.answer_coded_uuid IN ('105903f4-7b6d-496a-b613-37ab9d0f5450',\n\
+  \                 '8b26ecd3-8726-4c8e-b042-cbe71e44a863',\n                 'af34b28a-ab67-48d8-9dec-58244a267af1',\n\
+  \                 '634f28c7-74c9-4b4e-b74d-6ac6a7a797ea',\n                 '3cd50188-26fe-102b-80cb-0017a47871b2')\n\
+  AND o.visit_type = 'NCD Follow-up Visit'"
+params: null
+template_params: null
+filter_select_enabled: false
+fetch_values_predicate: null
+extra: null
+normalize_columns: false
+always_filter_main_dttm: false
+uuid: d534a5f4-9799-40a4-8096-cfe32243edc1
+metrics:
+- metric_name: count
+  verbose_name: null
+  metric_type: null
+  expression: count(*)
+  description: null
+  d3format: null
+  currency: null
+  extra:
+    warning_markdown: ''
+  warning_text: null
+columns:
+- column_name: fl12m
+  verbose_name: "29 \u1790\u17D2\u1784\u17C3-11 \u1781\u17C2 - \u179F\u17D2\u179A\
+    \ (29 days - 11 months - F)"
+  is_dttm: false
+  is_active: true
+  type: INTEGER
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: ml12m
+  verbose_name: "29 \u1790\u17D2\u1784\u17C3-11 \u1781\u17C2 - \u1794\u17D2\u179A\
+    \ (29 days - 11 months - M)"
+  is_dttm: false
+  is_active: true
+  type: INTEGER
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: fl28d
+  verbose_name: "0-28 \u1790\u17D2\u1784\u17C3 - \u179F\u17D2\u179A (0-28 days - F)"
+  is_dttm: false
+  is_active: true
+  type: INTEGER
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: ml28d
+  verbose_name: "0-28 \u1790\u17D2\u1784\u17C3 - \u1794\u17D2\u179A (0-28 day - M)"
+  is_dttm: false
+  is_active: true
+  type: INTEGER
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: fl64
+  verbose_name: "50-64 \u1786\u17D2\u1793\u17B6\u17C6 - \u179F\u17D2\u179A (50-64\
+    \ years - F)"
+  is_dttm: false
+  is_active: true
+  type: INTEGER
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: ml64
+  verbose_name: "50-64 \u1786\u17D2\u1793\u17B6\u17C6 - \u1794\u17D2\u179A (50-64\
+    \ years - M)"
+  is_dttm: false
+  is_active: true
+  type: INTEGER
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: fl13
+  verbose_name: "5-13 \u1786\u17D2\u1793\u17B6\u17C6 - \u179F\u17D2\u179A (5-13 years\
+    \ - F)"
+  is_dttm: false
+  is_active: true
+  type: INTEGER
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: ml13
+  verbose_name: "5-13 \u1786\u17D2\u1793\u17B6\u17C6 - \u1794\u17D2\u179A (5-13 years\
+    \ - M)"
+  is_dttm: false
+  is_active: true
+  type: INTEGER
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: fl4
+  verbose_name: "1-4 \u1786\u17D2\u1793\u17B6\u17C6 - \u179F\u17D2\u179A (1-4 years\
+    \ - F)"
+  is_dttm: false
+  is_active: true
+  type: INTEGER
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: ml4
+  verbose_name: "1-4 \u1786\u17D2\u1793\u17B6\u17C6 - \u1794\u17D2\u179A (1-4 years\
+    \ - M)"
+  is_dttm: false
+  is_active: true
+  type: INTEGER
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: fl24
+  verbose_name: "6-24 \u1786\u17D2\u1793\u17B6\u17C6 - \u179F\u17D2\u179A (6-24 years\
+    \ - F)"
+  is_dttm: false
+  is_active: true
+  type: INTEGER
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: ml24
+  verbose_name: "6-24 \u1786\u17D2\u1793\u17B6\u17C6 - \u1794\u17D2\u179A (6-24 years\
+    \ - M)"
+  is_dttm: false
+  is_active: true
+  type: INTEGER
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: fl49
+  verbose_name: "25-49 \u1786\u17D2\u1793\u17B6\u17C6 - \u179F\u17D2\u179A (25-49\
+    \ years - F)"
+  is_dttm: false
+  is_active: true
+  type: INTEGER
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: ml49
+  verbose_name: "25-49 \u1786\u17D2\u1793\u17B6\u17C6 - \u1794\u17D2\u179A (25-49\
+    \ years - M)"
+  is_dttm: false
+  is_active: true
+  type: INTEGER
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: fg64
+  verbose_name: ">=65 \u1786\u17D2\u1793\u17B6\u17C6 - \u179F\u17D2\u179A (>=65 years\
+    \ - F)"
+  is_dttm: false
+  is_active: true
+  type: INTEGER
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: mg64
+  verbose_name: ">=65 \u1786\u17D2\u1793\u17B6\u17C6 - \u1794\u17D2\u179A (>=65 years\
+    \ - M)"
+  is_dttm: false
+  is_active: true
+  type: INTEGER
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: diagnosis
+  verbose_name: "\u1780\u179A\u178E\u17B8\u178F\u17B6\u1798\u178A\u17B6\u1793 (Follow-up\
+    \ case)"
+  is_dttm: false
+  is_active: true
+  type: STRING
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: visit_date
+  verbose_name: null
+  is_dttm: true
+  is_active: true
+  type: DATETIME
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: f_name
+  verbose_name: null
+  is_dttm: false
+  is_active: true
+  type: STRING
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: f_district
+  verbose_name: null
+  is_dttm: false
+  is_active: true
+  type: STRING
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: f_province
+  verbose_name: null
+  is_dttm: false
+  is_active: true
+  type: STRING
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: f_type
+  verbose_name: null
+  is_dttm: false
+  is_active: true
+  type: STRING
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+version: 1.0.0
+database_uuid: 42834407-4570-4111-8bf6-4f7080413333
diff --git a/base/configs/superset/assets/datasets/Analytics/NCD_HIS_New_Cases_Query-dataset.yaml b/base/configs/superset/assets/datasets/Analytics/NCD_HIS_New_Cases_Query-dataset.yaml
new file mode 100644
index 00000000..0a363424
--- /dev/null
+++ b/base/configs/superset/assets/datasets/Analytics/NCD_HIS_New_Cases_Query-dataset.yaml
@@ -0,0 +1,377 @@
+table_name: NCD HIS New Cases Query-dataset
+main_dttm_col: null
+description: null
+default_endpoint: null
+offset: 0
+cache_timeout: null
+schema: public
+sql: "SELECT o.answer_coded AS diagnosis,\n       CASE WHEN (o.visit_date_started\
+  \ - p.birthdate) <= interval '28 days' AND p.gender = 'M' THEN 1 ELSE 0 END AS \"\
+  ml28d\",\n       CASE WHEN (o.visit_date_started - p.birthdate) <= interval '28\
+  \ days' AND p.gender = 'F' THEN 1 ELSE 0 END AS \"fl28d\",\n       CASE WHEN (o.visit_date_started\
+  \ - p.birthdate) >= interval '29 days' AND (o.visit_date_started - p.birthdate)\
+  \ < interval '1 year' AND DATE_PART('month', (o.visit_date_started - p.birthdate))\
+  \ < 12 AND p.gender = 'M' THEN 1 ELSE 0 END AS \"ml12m\",\n       CASE WHEN (o.visit_date_started\
+  \ - p.birthdate) >= interval '29 days' AND (o.visit_date_started - p.birthdate)\
+  \ < interval '1 year' AND DATE_PART('month', (o.visit_date_started - p.birthdate))\
+  \ < 12 AND p.gender = 'F' THEN 1 ELSE 0 END AS \"fl12m\",\n       CASE WHEN (o.visit_date_started\
+  \ - p.birthdate) >= interval '1 year' AND (o.visit_date_started - p.birthdate) <\
+  \ interval '5 years' AND p.gender = 'M' THEN 1 ELSE 0 END AS \"ml4\",\n       CASE\
+  \ WHEN (o.visit_date_started - p.birthdate) >= interval '1 year' AND (o.visit_date_started\
+  \ - p.birthdate) < interval '5 years' AND p.gender = 'F' THEN 1 ELSE 0 END AS \"\
+  fl4\",\n       CASE WHEN (o.visit_date_started - p.birthdate) >= interval '5 years'\
+  \ AND (o.visit_date_started - p.birthdate) <= interval '13 years' AND p.gender =\
+  \ 'M' THEN 1 ELSE 0 END AS \"ml13\",\n       CASE WHEN (o.visit_date_started - p.birthdate)\
+  \ >= interval '5 years' AND (o.visit_date_started - p.birthdate) <= interval '13\
+  \ years' AND p.gender = 'F' THEN 1 ELSE 0 END AS \"fl13\",\n       CASE WHEN (o.visit_date_started\
+  \ - p.birthdate) >= interval '15 years' AND (o.visit_date_started - p.birthdate)\
+  \ <= interval '24 years' AND p.gender = 'M' THEN 1 ELSE 0 END AS \"ml24\",\n   \
+  \    CASE WHEN (o.visit_date_started - p.birthdate) >= interval '15 years' AND (o.visit_date_started\
+  \ - p.birthdate) <= interval '24 years' AND p.gender = 'F' THEN 1 ELSE 0 END AS\
+  \ \"fl24\",\n       CASE WHEN (o.visit_date_started - p.birthdate) >= interval '25\
+  \ years' AND (o.visit_date_started - p.birthdate) <= interval '49 years' AND p.gender\
+  \ = 'M' THEN 1 ELSE 0 END AS \"ml49\",\n       CASE WHEN (o.visit_date_started -\
+  \ p.birthdate) >= interval '25 years' AND (o.visit_date_started - p.birthdate) <=\
+  \ interval '49 years' AND p.gender = 'F' THEN 1 ELSE 0 END AS \"fl49\",\n      \
+  \ CASE WHEN (o.visit_date_started - p.birthdate) >= interval '50 years' AND (o.visit_date_started\
+  \ - p.birthdate) <= interval '64 years' AND p.gender = 'M' THEN 1 ELSE 0 END AS\
+  \ \"ml64\",\n       CASE WHEN (o.visit_date_started - p.birthdate) >= interval '50\
+  \ years' AND (o.visit_date_started - p.birthdate) <= interval '64 years' AND p.gender\
+  \ = 'F' THEN 1 ELSE 0 END AS \"fl64\",\n       CASE WHEN (o.visit_date_started -\
+  \ p.birthdate) >= interval '65 years' AND p.gender = 'M' THEN 1 ELSE 0 END AS \"\
+  mg64\",\n       CASE WHEN (o.visit_date_started - p.birthdate) >= interval '65 years'\
+  \ AND p.gender = 'F' THEN 1 ELSE 0 END AS \"fg64\",\n       facility_address.state_province\
+  \ AS \"f_province\",\n       facility_address.county_district AS \"f_district\"\
+  ,\n       facility_address.name AS \"f_name\",\n       CASE WHEN facility_address.location_tags\
+  \ LIKE '%Health Center%' THEN 'Health Center' \n            WHEN facility_address.location_tags\
+  \ LIKE '%Referral Hospital%' THEN 'Referral Hospital'\n            ELSE '' END AS\
+  \ \"f_type\",\n       o.visit_date_started AS visit_date\nFROM observations o\n\
+  INNER JOIN visits v ON v.visit_voided = false AND o.visit_uuid = v.visit_uuid\n\
+  INNER JOIN patients p ON p.person_voided = false AND p.patient_uuid = o.patient_uuid\n\
+  INNER JOIN locations facility_address ON facility_address.uuid = o.location_uuid\n\
+  WHERE o.obs_voided = false AND o.answer_coded_uuid IN ('105903f4-7b6d-496a-b613-37ab9d0f5450',\n\
+  \                 '8b26ecd3-8726-4c8e-b042-cbe71e44a863',\n                 'af34b28a-ab67-48d8-9dec-58244a267af1',\n\
+  \                 '634f28c7-74c9-4b4e-b74d-6ac6a7a797ea',\n                 '3cd50188-26fe-102b-80cb-0017a47871b2')\n\
+  AND o.visit_type = 'NCD New Visit'\n"
+params: null
+template_params: null
+filter_select_enabled: false
+fetch_values_predicate: null
+extra: null
+normalize_columns: false
+always_filter_main_dttm: false
+uuid: 48365851-d1d2-451d-b2aa-18a5ffcdd72d
+metrics:
+- metric_name: count
+  verbose_name: null
+  metric_type: null
+  expression: count(*)
+  description: null
+  d3format: null
+  currency: null
+  extra:
+    warning_markdown: ''
+  warning_text: null
+columns:
+- column_name: fl12m
+  verbose_name: "29 \u1790\u17D2\u1784\u17C3-11 \u1781\u17C2 - \u179F\u17D2\u179A\
+    \ (29 days - 11 months - F)"
+  is_dttm: false
+  is_active: true
+  type: INTEGER
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: ml12m
+  verbose_name: "29 \u1790\u17D2\u1784\u17C3-11 \u1781\u17C2 - \u1794\u17D2\u179A\
+    \ (29 days - 11 months - M)"
+  is_dttm: false
+  is_active: true
+  type: INTEGER
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: fl28d
+  verbose_name: "0-28 \u1790\u17D2\u1784\u17C3 - \u179F\u17D2\u179A (0-28 days - F)"
+  is_dttm: false
+  is_active: true
+  type: INTEGER
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: ml28d
+  verbose_name: "0-28 \u1790\u17D2\u1784\u17C3 - \u1794\u17D2\u179A (0-28 day - M)"
+  is_dttm: false
+  is_active: true
+  type: INTEGER
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: fl64
+  verbose_name: "50-64 \u1786\u17D2\u1793\u17B6\u17C6 - \u179F\u17D2\u179A (50-64\
+    \ years - F)"
+  is_dttm: false
+  is_active: true
+  type: INTEGER
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: ml64
+  verbose_name: "50-64 \u1786\u17D2\u1793\u17B6\u17C6 - \u1794\u17D2\u179A (50-64\
+    \ years - M)"
+  is_dttm: false
+  is_active: true
+  type: INTEGER
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: fl13
+  verbose_name: "5-13 \u1786\u17D2\u1793\u17B6\u17C6 - \u179F\u17D2\u179A (5-13 years\
+    \ - F)"
+  is_dttm: false
+  is_active: true
+  type: INTEGER
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: ml13
+  verbose_name: "5-13 \u1786\u17D2\u1793\u17B6\u17C6 - \u1794\u17D2\u179A (5-13 years\
+    \ - M)"
+  is_dttm: false
+  is_active: true
+  type: INTEGER
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: fl4
+  verbose_name: "1-4 \u1786\u17D2\u1793\u17B6\u17C6 - \u179F\u17D2\u179A (1-4 years\
+    \ - F)"
+  is_dttm: false
+  is_active: true
+  type: INTEGER
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: ml4
+  verbose_name: "1-4 \u1786\u17D2\u1793\u17B6\u17C6 - \u1794\u17D2\u179A (1-4 years\
+    \ - M)"
+  is_dttm: false
+  is_active: true
+  type: INTEGER
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: fl24
+  verbose_name: "6-24 \u1786\u17D2\u1793\u17B6\u17C6 - \u179F\u17D2\u179A (6-24 years\
+    \ - F)"
+  is_dttm: false
+  is_active: true
+  type: INTEGER
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: ml24
+  verbose_name: "6-24 \u1786\u17D2\u1793\u17B6\u17C6 - \u1794\u17D2\u179A (6-24 years\
+    \ - M)"
+  is_dttm: false
+  is_active: true
+  type: INTEGER
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: fl49
+  verbose_name: "25-49 \u1786\u17D2\u1793\u17B6\u17C6 - \u179F\u17D2\u179A (25-49\
+    \ years - F)"
+  is_dttm: false
+  is_active: true
+  type: INTEGER
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: ml49
+  verbose_name: "25-49 \u1786\u17D2\u1793\u17B6\u17C6 - \u1794\u17D2\u179A (25-49\
+    \ years - M)"
+  is_dttm: false
+  is_active: true
+  type: INTEGER
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: fg64
+  verbose_name: ">=65 \u1786\u17D2\u1793\u17B6\u17C6 - \u179F\u17D2\u179A (>=65 years\
+    \ - F)"
+  is_dttm: false
+  is_active: true
+  type: INTEGER
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: mg64
+  verbose_name: ">=65 \u1786\u17D2\u1793\u17B6\u17C6 - \u1794\u17D2\u179A (>=65 years\
+    \ - M)"
+  is_dttm: false
+  is_active: true
+  type: INTEGER
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: diagnosis
+  verbose_name: "\u1780\u179A\u178E\u17B8\u1790\u17D2\u1798\u17B8 (New case)"
+  is_dttm: false
+  is_active: true
+  type: STRING
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: visit_date
+  verbose_name: null
+  is_dttm: true
+  is_active: true
+  type: DATETIME
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: f_name
+  verbose_name: null
+  is_dttm: false
+  is_active: true
+  type: STRING
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: f_district
+  verbose_name: null
+  is_dttm: false
+  is_active: true
+  type: STRING
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: f_province
+  verbose_name: null
+  is_dttm: false
+  is_active: true
+  type: STRING
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: f_type
+  verbose_name: null
+  is_dttm: false
+  is_active: true
+  type: STRING
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+version: 1.0.0
+database_uuid: 42834407-4570-4111-8bf6-4f7080413333
diff --git a/base/configs/superset/assets/datasets/Analytics/NCD_Missed_Appointments_Query-dataset.yaml b/base/configs/superset/assets/datasets/Analytics/NCD_Missed_Appointments_Query-dataset.yaml
new file mode 100644
index 00000000..db85a042
--- /dev/null
+++ b/base/configs/superset/assets/datasets/Analytics/NCD_Missed_Appointments_Query-dataset.yaml
@@ -0,0 +1,287 @@
+table_name: NCD Missed Appointments Query-dataset
+main_dttm_col: null
+description: null
+default_endpoint: null
+offset: 0
+cache_timeout: null
+schema: public
+sql: "SELECT\n    f_facility AS \"Facility Name\",\n    f_district AS \"Facility District\"\
+  ,\n    f_province AS \"Facility Province\",\n    CASE \n        WHEN identifiers\
+  \ ~ '.*OpenMRS ID: (.*?)(,|$).*' THEN REGEXP_REPLACE(identifiers, '.*OpenMRS ID:\
+  \ (.*?)(,|$).*', '\\1', 'g')\n        ELSE ''\n    END AS \"OpenMRS ID\",\n    CONCAT_WS('\
+  \ ', given_name, middle_name, family_name) AS \"Patient's name\",\n    gender AS\
+  \ \"Gender\",\n    DATE_PART('year', age(visit_date, birthdate)) AS \"Age\",\n \
+  \   CASE \n        WHEN attributes ~ '.*Telephone Number: (.*?)(\\/|$).*' THEN REGEXP_REPLACE(attributes,\
+  \ '.*Telephone Number: (.*?)(\\/|$).*', '\\1', 'g')\n        ELSE ''\n    END AS\
+  \ \"Phone number\",\n    address_1 AS \"Village\",\n    address_city AS \"Commune/\
+  \ Sangkat\",\n    address_county_district AS \"District/ Khan\",\n    address_state_province\
+  \ AS \"Province/City\",\n    DATE(followup_date) AS \"Appointment date\",\n    followup_for\
+  \ AS \"Appointment/follow-up reasaon\",\n    '' AS \"Notes\"\nFROM (\n    SELECT\n\
+  \        DISTINCT obs_followup_for.obs_id,\n        facility_address.state_province\
+  \ AS \"f_province\",\n        facility_address.county_district AS \"f_district\"\
+  ,\n        facility_address.name AS \"f_facility\",\n        given_name,\n     \
+  \   middle_name,\n        family_name,\n        identifiers,\n        birthdate,\n\
+  \        gender,\n        address_state_province,\n        address_county_district,\n\
+  \        address_city,\n        address_1,\n        attributes,\n        vi.date_started\
+  \ AS \"visit_date\",\n        vi.type AS \"visit_type\",\n        obs_followup_date.answer_datetime\
+  \ AS \"followup_date\",\n        obs_followup_for.answer_coded AS \"followup_for\"\
+  ,\n        obs_appointment_notes.answers_coded AS \"appointment_notes\",\n     \
+  \   CASE \n            WHEN followup_visit.visit_uuid IS NOT NULL THEN 'Yes'\n \
+  \           ELSE 'No'\n        END AS \"fulfilled_appointment\"\n    FROM patients\
+  \ pa\n    LEFT OUTER JOIN visits vi ON vi.visit_voided = false AND vi.patient_uuid\
+  \ = pa.patient_uuid AND vi.type IN ('NCD New Visit')\n    LEFT OUTER JOIN locations\
+  \ facility_address ON facility_address.uuid = vi.location_uuid\n\n    LEFT OUTER\
+  \ JOIN (\n        SELECT obs2.visit_uuid, MAX(obs2.obs_date_time), obs2.answer_datetime,\
+  \ obs2.encounter_uuid\n        FROM observations obs2\n        WHERE obs2.obs_voided\
+  \ = false AND obs2.question_uuid = 'e9c145c1-f4e9-4c34-b237-da069939dc38' AND obs2.encounter_type\
+  \ IN ('Health Center - NCD Screening')\n        GROUP BY obs2.visit_uuid, obs2.question_uuid,\
+  \ obs2.answer_datetime, obs2.encounter_uuid\n    ) AS obs_followup_date ON obs_followup_date.visit_uuid\
+  \ = vi.visit_uuid\n\n    LEFT OUTER JOIN (\n        SELECT obs1.obs_id, obs1.visit_uuid,\
+  \ STRING_AGG(obs1.answer_coded, ', ') AS answer_coded, obs1.encounter_uuid\n   \
+  \     FROM observations obs1\n        WHERE obs1.obs_voided = false AND obs1.question_uuid\
+  \ = '2e27bbf9-d744-46a2-a7d4-cecd33c28b8a'\n        GROUP BY obs1.visit_uuid, obs1.question_uuid,\
+  \ obs1.answer_coded, obs1.encounter_uuid, obs1.obs_id\n    ) AS obs_followup_for\
+  \ ON obs_followup_date.encounter_uuid = obs_followup_for.encounter_uuid\n    \n\
+  \    LEFT OUTER JOIN (\n        SELECT obs3.visit_uuid, STRING_AGG(obs3.answer_coded,\
+  \ ', ') AS answers_coded, obs3.encounter_uuid\n        FROM observations obs3\n\
+  \        WHERE obs3.obs_voided = false AND obs3.question_uuid = '9f7c8739-3ea3-4f7f-8648-d6c36fef7be2'\n\
+  \        GROUP BY obs3.visit_uuid, obs3.encounter_uuid\n    ) AS obs_appointment_notes\
+  \  ON obs_appointment_notes.encounter_uuid = obs_followup_for.encounter_uuid\n\n\
+  \    LEFT OUTER JOIN visits followup_visit ON followup_visit.visit_voided = false\
+  \ AND followup_visit.patient_uuid = pa.patient_uuid AND DATE(followup_visit.date_started)\
+  \ >= DATE(obs_followup_date.answer_datetime) AND DATE(followup_visit.date_started)\
+  \ <= DATE(obs_followup_date.answer_datetime + INTERVAL '7 days') AND followup_visit.type\
+  \ IN ('NCD Follow-up Visit')\n\n    WHERE pa.person_voided = false AND obs_followup_for.answer_coded\
+  \ IS NOT NULL\n\n) AS patient_info\n\nWHERE patient_info.fulfilled_appointment =\
+  \ 'No'"
+params: null
+template_params: null
+filter_select_enabled: false
+fetch_values_predicate: null
+extra: null
+normalize_columns: false
+always_filter_main_dttm: false
+uuid: ffccf504-e9e6-4312-916b-51489c810249
+metrics:
+- metric_name: count
+  verbose_name: null
+  metric_type: null
+  expression: count(*)
+  description: null
+  d3format: null
+  currency: null
+  extra:
+    warning_markdown: ''
+  warning_text: null
+columns:
+- column_name: Commune/ Sangkat
+  verbose_name: "\u17A2\u17B6\u179F\u1799\u178A\u17D2\u178B\u17B6\u1793 - \u1783\u17BB\
+    \u17C6/\u179F\u1784\u17D2\u1780\u17B6\u178F\u17CB (Address - Commune)"
+  is_dttm: false
+  is_active: true
+  type: STRING
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: District/ Khan
+  verbose_name: "\u17A2\u17B6\u179F\u1799\u178A\u17D2\u178B\u17B6\u1793 - \u179F\u17D2\
+    \u179A\u17BB\u1780 (Address - District)"
+  is_dttm: false
+  is_active: true
+  type: STRING
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: Province/City
+  verbose_name: "\u17A2\u17B6\u179F\u1799\u178A\u17D2\u178B\u17B6\u1793 - \u1781\u17C1\
+    \u178F\u17D2\u178F (Address - Province)"
+  is_dttm: false
+  is_active: true
+  type: STRING
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: Village
+  verbose_name: "\u17A2\u17B6\u179F\u1799\u178A\u17D2\u178B\u17B6\u1793 - \u1797\u17BC\
+    \u1798\u17B7 (Address - Village)"
+  is_dttm: false
+  is_active: true
+  type: STRING
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: Facility Name
+  verbose_name: "\u1788\u17D2\u1798\u17C4\u17C7\u1793\u17B7\u1784\u179B\u17C1\u1781\
+    \u1780\u17BC\u178A\u1798\u17BC\u179B\u178A\u17D2\u178B\u17B6\u1793\u179F\u17BB\
+    \u1781\u17B6\u1797\u17B7\u1794\u17B6\u179B (Health Facility's Name)"
+  is_dttm: false
+  is_active: true
+  type: STRING
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: Appointment date
+  verbose_name: "\u1780\u17B6\u179A\u1794\u179A\u17B7\u1785\u17D2\u1786\u17C1\u1791\
+    \u178E\u178F\u17CB (Date Of Appointment)"
+  is_dttm: true
+  is_active: true
+  type: DATE
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: Facility Province
+  verbose_name: "\u1798\u1793\u17D2\u1791\u17B8\u179A\u179F\u17BB\u1781\u17B6\u1797\
+    \u17B7\u1794\u17B6\u179B\u1781\u17C1\u178F\u17D2\u178F (Provincial Health Department)"
+  is_dttm: false
+  is_active: true
+  type: STRING
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: Patient's name
+  verbose_name: "\u1788\u17D2\u1798\u17C4\u17C7\u17A2\u17D2\u1793\u1780\u1787\u17C6\
+    \u1784\u17BA (Patient Name)"
+  is_dttm: false
+  is_active: true
+  type: STRING
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: Appointment/follow-up reasaon
+  verbose_name: "\u1780\u17B6\u179A\u178E\u178F\u17CB\u178F\u17B6\u1798\u178A\u17B6\
+    \u1793 (Appointment/follow-up reason)"
+  is_dttm: false
+  is_active: true
+  type: STRING
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: OpenMRS ID
+  verbose_name: "\u17A2\u178F\u17D2\u178F\u179B\u17C1\u1781\u17A2\u17D2\u1793\u1780\
+    \u1787\u17C6\u1784\u17BA (Client ID)"
+  is_dttm: false
+  is_active: true
+  type: STRING
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: Facility District
+  verbose_name: "\u179F\u17D2\u179A\u17BB\u1780\u1794\u17D2\u179A\u178F\u17B7\u1794\
+    \u178F\u17D2\u178F\u17B7 (Operational District)"
+  is_dttm: false
+  is_active: true
+  type: STRING
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: Phone number
+  verbose_name: "\u179B\u17C1\u1781\u1791\u17BC\u179A\u179F\u1796\u17D2\u1791 (Phone\
+    \ number)"
+  is_dttm: false
+  is_active: true
+  type: STRING
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: Age
+  verbose_name: "\u17A2\u17B6\u1799\u17BB (Age)"
+  is_dttm: false
+  is_active: true
+  type: FLOAT
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: Gender
+  verbose_name: "\u1797\u17C1\u1791 (Gender)"
+  is_dttm: false
+  is_active: true
+  type: STRING
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: Notes
+  verbose_name: "\u1780\u17C6\u178E\u178F\u17CB\u179F\u1798\u17D2\u1782\u17B6\u179B\
+    \u17CB (Notes)"
+  is_dttm: false
+  is_active: true
+  type: STRING
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+version: 1.0.0
+database_uuid: 42834407-4570-4111-8bf6-4f7080413333
diff --git a/base/configs/superset/assets/datasets/Analytics/NCD_Referral_Status_Query-dataset.yaml b/base/configs/superset/assets/datasets/Analytics/NCD_Referral_Status_Query-dataset.yaml
new file mode 100644
index 00000000..8f3ab2c2
--- /dev/null
+++ b/base/configs/superset/assets/datasets/Analytics/NCD_Referral_Status_Query-dataset.yaml
@@ -0,0 +1,309 @@
+table_name: NCD Referral Status Query-dataset
+main_dttm_col: null
+description: null
+default_endpoint: null
+offset: 0
+cache_timeout: null
+schema: public
+sql: "SELECT\n    f_facility AS \"Facility Name\",\n    f_district AS \"Facility District\"\
+  ,\n    f_province AS \"Facility Province\",\n    referral_facility_name AS \"Referral\
+  \ Facility Name\",\n    referral_facility_district AS \"Referral Facility District\"\
+  ,\n    referral_facility_province AS \"Referral Facility Province\",\n    CASE \n\
+  \        WHEN identifiers ~ '.*OpenMRS ID: (.*?)(,|$).*' THEN REGEXP_REPLACE(identifiers,\
+  \ '.*OpenMRS ID: (.*?)(,|$).*', '\\1', 'g')\n        ELSE ''\n    END AS \"OpenMRS\
+  \ ID\",\n    CONCAT_WS(' ', given_name, middle_name, family_name) AS \"Patient's\
+  \ name\",\n    DATE_PART('year', age(referral_date, birthdate)) AS \"Age\",\n  \
+  \  CASE \n        WHEN attributes ~ '.*Telephone Number: (.*?)(\\/|$).*' THEN REGEXP_REPLACE(attributes,\
+  \ '.*Telephone Number: (.*?)(\\/|$).*', '\\1', 'g')\n        ELSE ''\n    END AS\
+  \ \"Phone number\",\n    address_1 AS \"Village\",\n    address_city AS \"Commune/\
+  \ Sangkat\",\n    address_county_district AS \"District/ Khan\",\n    address_state_province\
+  \ AS \"Province/City\",\n    CONCAT_WS(', ', diabetes_reason_for_referral, hypertension_reason_for_referral)\
+  \ AS \"Reason for referral\",\n    DATE(referral_date) AS \"Referral date\"\n\n\
+  FROM (\n    SELECT\n        DISTINCT obs_referral_centre.obs_id,\n        facility_address.state_province\
+  \ AS \"f_province\",\n        facility_address.county_district AS \"f_district\"\
+  ,\n        facility_address.name AS \"f_facility\",\n        TRIM(BOTH ' ' FROM\
+  \ split_part(obs_referral_centre.answer_coded, '>', 1)) AS referral_facility_province,\n\
+  \        TRIM(BOTH ' ' FROM split_part(obs_referral_centre.answer_coded, '>', 2))\
+  \ AS referral_facility_district,\n        TRIM(BOTH ' ' FROM split_part(obs_referral_centre.answer_coded,\
+  \ '>', 3)) AS referral_facility_name,\n        patient_id,\n        given_name,\n\
+  \        middle_name,\n        family_name,\n        identifiers,\n        birthdate,\n\
+  \        address_state_province,\n        address_county_district,\n        address_city,\n\
+  \        address_1,\n        attributes,\n        vi.date_started AS \"visit_date\"\
+  ,\n        vi.type AS \"visit_type\",\n        obs_referral_centre.obs_date_time\
+  \ AS \"referral_date\",\n        obs_diabetes_referral_reason.answer_coded AS \"\
+  diabetes_reason_for_referral\",\n        obs_hypertension_referral_reason.answer_coded\
+  \ AS \"hypertension_reason_for_referral\",\n        CASE \n            WHEN referral_visit.visit_uuid\
+  \ IS NOT NULL THEN 'Yes'\n            ELSE 'No'\n        END AS \"fulfilled_referral\"\
+  \n    FROM patients pa\n    LEFT OUTER JOIN visits vi ON vi.visit_voided = false\
+  \ AND vi.patient_uuid = pa.patient_uuid\n    LEFT OUTER JOIN locations facility_address\
+  \ ON facility_address.uuid = vi.location_uuid\n    LEFT OUTER JOIN (\n        SELECT\
+  \ obs1.obs_id, obs1.visit_uuid, MAX(obs_date_time) AS obs_date_time, STRING_AGG(obs1.answer_coded,\
+  \ ', ') AS answer_coded, obs1.encounter_uuid\n        FROM observations obs1\n \
+  \       WHERE obs1.obs_voided = false AND obs1.question_uuid = '758b9dd8-b6d0-4ac2-b245-0e7bffb4693a'\
+  \ AND obs1.encounter_type IN ('Health Center - NCD Screening', 'NCD Consultation',\
+  \ 'NCD Medical History')\n        GROUP BY obs1.visit_uuid, obs1.question_uuid,\
+  \ obs1.answer_coded, obs1.encounter_uuid, obs1.obs_id\n    ) AS obs_referral_centre\
+  \ on obs_referral_centre.visit_uuid = vi.visit_uuid\n    \n    LEFT OUTER JOIN (\n\
+  \        SELECT obs2.visit_uuid, MAX(obs2.date_created), STRING_AGG(obs2.answer_coded,\
+  \ ', ') AS answer_coded, obs2.encounter_uuid\n        FROM observations obs2\n \
+  \       WHERE obs2.obs_voided = false AND obs2.question_uuid = 'cde3716a-2b98-4f10-b619-4d5a5a55503c'\n\
+  \        GROUP BY obs2.visit_uuid, obs2.question_uuid, obs2.answer_coded, obs2.encounter_uuid\n\
+  \    ) AS obs_diabetes_referral_reason  on obs_diabetes_referral_reason.encounter_uuid\
+  \ = obs_referral_centre.encounter_uuid\n    \n    LEFT OUTER JOIN (\n        SELECT\
+  \ obs3.visit_uuid, MAX(obs3.date_created), obs3.answer_coded, obs3.encounter_uuid\n\
+  \        FROM observations obs3\n        WHERE obs3.obs_voided = false AND obs3.question_uuid\
+  \ = '68f158ff-6396-4bab-8194-73255282bd23'\n        GROUP BY obs3.visit_uuid, obs3.question_uuid,\
+  \ obs3.answer_coded, obs3.encounter_uuid\n    ) AS obs_hypertension_referral_reason\
+  \  on obs_hypertension_referral_reason.encounter_uuid = obs_referral_centre.encounter_uuid\n\
+  \n    LEFT OUTER JOIN visits referral_visit ON referral_visit.visit_voided = false\
+  \ AND referral_visit.patient_uuid = pa.patient_uuid AND DATE(referral_visit.date_started)\
+  \ >= DATE(vi.date_started) AND DATE(referral_visit.date_started) <= DATE(vi.date_started\
+  \ + INTERVAL '7 days') AND referral_visit.location = TRIM(BOTH ' ' FROM split_part(obs_referral_centre.answer_coded,\
+  \ '>', 3))\n\n    WHERE pa.person_voided = false AND obs_referral_centre.answer_coded\
+  \ IS NOT NULL\n\n) AS patient_info \nWHERE patient_info.visit_type IN ('NCD New\
+  \ Visit', 'NCD Follow-up Visit')  AND patient_info.fulfilled_referral = 'No'\n"
+params: null
+template_params: null
+filter_select_enabled: false
+fetch_values_predicate: null
+extra: null
+normalize_columns: false
+always_filter_main_dttm: false
+uuid: e7351329-6fdc-4bb7-9aaa-66cab8efeeb1
+metrics:
+- metric_name: count
+  verbose_name: null
+  metric_type: null
+  expression: count(*)
+  description: null
+  d3format: null
+  currency: null
+  extra:
+    warning_markdown: ''
+  warning_text: null
+columns:
+- column_name: Referral Facility Name
+  verbose_name: "\u1791\u17C5 - \u1798\u17BC\u179B\u178A\u17D2\u178B\u17B6\u1793\u179F\
+    \u17BB\u1781\u17B6\u1797\u17B7\u1794\u17B6\u179B (\u1780\u17BC\u178A_\u1788\u17D2\
+    \u1798\u17C4\u17C7) (To - Health facility (Code_Name))"
+  is_dttm: false
+  is_active: true
+  type: STRING
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: Referral Facility District
+  verbose_name: "\u1791\u17C5 - \u179F\u17D2\u179A\u17BB\u1780\u1794\u17D2\u179A\u178F\
+    \u17B7\u1794\u178F\u17D2\u178F\u17B7 (To - OD - Operational District)"
+  is_dttm: false
+  is_active: true
+  type: STRING
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: Facility Name
+  verbose_name: "\u1796\u17B8 - \u1798\u17BC\u179B\u178A\u17D2\u178B\u17B6\u1793\u179F\
+    \u17BB\u1781\u17B6\u1797\u17B7\u1794\u17B6\u179B (\u1780\u17BC\u178A_\u1788\u17D2\
+    \u1798\u17C4\u17C7) (From - Health facility (Code_Name))"
+  is_dttm: false
+  is_active: true
+  type: STRING
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: Facility District
+  verbose_name: "\u1796\u17B8 - \u179F\u17D2\u179A\u17BB\u1780\u1794\u17D2\u179A\u178F\
+    \u17B7\u1794\u178F\u17D2\u178F\u17B7 (From- OD - Operational District)"
+  is_dttm: false
+  is_active: true
+  type: STRING
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: Referral Facility Province
+  verbose_name: "\u1791\u17C5 - \u1781\u17C1\u178F\u17D2\u178F (To - Province)"
+  is_dttm: false
+  is_active: true
+  type: STRING
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: Commune/ Sangkat
+  verbose_name: "\u17A2\u17B6\u179F\u1799\u178A\u17D2\u178B\u17B6\u1793 - \u1783\u17BB\
+    \u17C6/\u179F\u1784\u17D2\u1780\u17B6\u178F\u17CB (Address - Commune)"
+  is_dttm: false
+  is_active: true
+  type: STRING
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: Facility Province
+  verbose_name: "\u1796\u17B8 - \u1781\u17C1\u178F\u17D2\u178F (From - Province)"
+  is_dttm: false
+  is_active: true
+  type: STRING
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: Province/City
+  verbose_name: "\u17A2\u17B6\u179F\u1799\u178A\u17D2\u178B\u17B6\u1793 - \u1781\u17C1\
+    \u178F\u17D2\u178F (Address - Province)"
+  is_dttm: false
+  is_active: true
+  type: STRING
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: Village
+  verbose_name: "\u17A2\u17B6\u179F\u1799\u178A\u17D2\u178B\u17B6\u1793 - \u1797\u17BC\
+    \u1798\u17B7 (Address - Village)"
+  is_dttm: false
+  is_active: true
+  type: STRING
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: District/ Khan
+  verbose_name: "\u17A2\u17B6\u179F\u1799\u178A\u17D2\u178B\u17B6\u1793 \u179F\u17D2\
+    \u179A\u17BB\u1780 (Address - District)"
+  is_dttm: false
+  is_active: true
+  type: STRING
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: Reason for referral
+  verbose_name: "\u1794\u1789\u17D2\u17A0\u17B6\u1780\u17B6\u179A\u1794\u1789\u17D2\
+    \u1787\u17BC\u1793 (Reason for referral)"
+  is_dttm: false
+  is_active: true
+  type: STRING
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: Patient's name
+  verbose_name: "\u1788\u17D2\u1798\u17C4\u17C7\u17A2\u17D2\u1793\u1780\u1787\u17C6\
+    \u1784\u17BA (Patient Name)"
+  is_dttm: false
+  is_active: true
+  type: STRING
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: Referral date
+  verbose_name: "\u1780\u17B6\u179A\u1794\u179A\u17B7\u1785\u17D2\u1786\u17C1\u1791\
+    \u1794\u1789\u17D2\u1787\u17BC\u1793 (Referral Date)"
+  is_dttm: true
+  is_active: true
+  type: DATE
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: OpenMRS ID
+  verbose_name: "\u17A2\u178F\u17D2\u178F\u179B\u17C1\u1781\u17A2\u17D2\u1793\u1780\
+    \u1787\u17C6\u1784\u17BA (Client ID)"
+  is_dttm: false
+  is_active: true
+  type: STRING
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: Phone number
+  verbose_name: "\u179B\u17C1\u1781\u1791\u17BC\u179A\u179F\u1796\u17D2\u1791 (Phone\
+    \ number)"
+  is_dttm: false
+  is_active: true
+  type: STRING
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: Age
+  verbose_name: "\u17A2\u17B6\u1799\u17BB (Age)"
+  is_dttm: false
+  is_active: true
+  type: FLOAT
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+version: 1.0.0
+database_uuid: 42834407-4570-4111-8bf6-4f7080413333
diff --git a/base/configs/superset/assets/datasets/Analytics/Patients_Screened_For_NCD_For_The_First_Time_Query-dataset.yaml b/base/configs/superset/assets/datasets/Analytics/Patients_Screened_For_NCD_For_The_First_Time_Query-dataset.yaml
new file mode 100644
index 00000000..f9c3ad50
--- /dev/null
+++ b/base/configs/superset/assets/datasets/Analytics/Patients_Screened_For_NCD_For_The_First_Time_Query-dataset.yaml
@@ -0,0 +1,770 @@
+table_name: Patients Screened For NCD For The First Time Query-dataset
+main_dttm_col: Visit Start date
+description: null
+default_endpoint: null
+offset: 0
+cache_timeout: null
+schema: public
+sql: "SELECT \"Facility Name\" AS \"Facility Name\",\n       \"Facility District\"\
+  \ AS \"Facility District\",\n       \"Facility Province\" AS \"Facility Province\"\
+  ,\n       \"OpenMRS ID\" AS \"OpenMRS ID\",\n       \"Patient's First name\" AS\
+  \ \"Patient's First name\",\n       \"Patient's Last name\" AS \"Patient's Last\
+  \ name\",\n       \"Patient's Gender\" AS \"Patient's Gender\",\n       \"Patient's\
+  \ Birthdate\" AS \"Patient's Birthdate\",\n       \"Patient Address\" AS \"Patient\
+  \ Address\",\n       \"Phone number\" AS \"Phone number\",\n       \"Other Identifiers\"\
+  \ AS \"Other Identifiers\",\n       \"Visit Start date\" AS \"Visit Start date\"\
+  ,\n       \"Visit End date\" AS \"Visit End date\",\n       \"Visit Type\" AS \"\
+  Visit Type\",\n       \"Referral source\" AS \"Referral source\",\n       \"Insurance\
+  \ type\" AS \"Insurance type\",\n       \"Known Diabetes\" AS \"Known Diabetes\"\
+  ,\n       \"Known Hypertension\" AS \"Known Hypertension\",\n       \"Weight\" AS\
+  \ \"Weight\",\n       \"Height\" AS \"Height\",\n       \"Circumference\" AS \"\
+  Circumference\",\n       \"Systolic Pressure\" AS \"Systolic Pressure\",\n     \
+  \  \"Diastolic Pressure\" AS \"Diastolic Pressure\",\n       \"BMI\" AS \"BMI\"\
+  ,\n       \"Pulse\" AS \"Pulse\",\n       \"Temperature\" AS \"Temperature\",\n\
+  \       \"Fasting Blood Sugar\" AS \"Fasting Blood Sugar\",\n       \"Random Blood\
+  \ Sugar\" AS \"Random Blood Sugar\",\n       \"OGTT\" AS \"OGTT\",\n       \"HbA1c\"\
+  \ AS \"HbA1c\",\n       \"Albumin\" AS \"Albumin\",\n       \"Ketones\" AS \"Ketones\"\
+  ,\n       \"Diagnosis 1\" AS \"Diagnosis 1\",\n       \"Diagnosis 2\" AS \"Diagnosis\
+  \ 2\",\n       \"Referral Facility\" AS \"Referral Facility\",\n       \"Has a Referral\
+  \ Letter\" AS \"Has a Referral Letter\",\n       \"CVD Risk Score\" AS \"CVD Risk\
+  \ Score\",\n       \"Follow-Up For\" AS \"Follow-Up For\",\n       \"Follow-Up Date\"\
+  \ AS \"Follow-Up Date\",\n       \"Started on Medication\" AS \"Started on Medication\"\
+  ,\n       \"Drug Names\" AS \"Drug Names\",\n       CASE \n            WHEN (raw_data_set.diagnosis_1_answer_uuid\
+  \ = '105903f4-7b6d-496a-b613-37ab9d0f5450' OR raw_data_set.diagnosis_1_answer_uuid\
+  \ = '8b26ecd3-8726-4c8e-b042-cbe71e44a863' OR raw_data_set.diagnosis_1_answer_uuid=\
+  \ '117399AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA') AND raw_data_set.max_medication_duration_in_weeks\
+  \ >= 4 \n                THEN '80-pecent-followup-with-hypertension-iabetes-and-medication'\n\
+  \            ELSE 'patients-aged-40-above-with-first-time ncd-screening'\n     \
+  \   END AS \"indicator\"\nFROM\n    (SELECT \n        l.name AS \"Facility Name\"\
+  ,\n        l.county_district AS \"Facility District\",\n        l.state_province\
+  \ AS \"Facility Province\",\n        CASE \n            WHEN p.identifiers ~ '.*OpenMRS\
+  \ ID: (.*?)(,|$).*' THEN REGEXP_REPLACE(p.identifiers, '.*OpenMRS ID: (.*?)(,|$).*',\
+  \ '\\1', 'g')\n            ELSE ''\n        END AS \"OpenMRS ID\",\n        MAX(p.given_name)\
+  \ AS \"Patient's First name\",\n        MAX(p.family_name) AS \"Patient's Last name\"\
+  ,\n        MAX(p.birthdate) AS \"Patient's Birthdate\",\n        MAX(p.gender) AS\
+  \ \"Patient's Gender\",\n        MAX(CONCAT_WS(' > ', p.address_state_province,\
+  \ p.address_county_district, p.address_city, p.address_1)) AS \"Patient Address\"\
+  ,\n        MAX(CASE \n            WHEN p.attributes ~ '.*Telephone Number: (.*?)(\\\
+  /|$).*' THEN REGEXP_REPLACE(p.attributes, '.*Telephone Number: (.*?)(\\/|$).*',\
+  \ '\\1', 'g')\n            ELSE ''\n        END) AS \"Phone number\",\n        COALESCE(\n\
+  \            REGEXP_REPLACE(\n                REGEXP_REPLACE(\n                \
+  \    MAX(p.identifiers), \n                    '(?:OpenMRS ID): [^,]*,?\\s?', \n\
+  \                    '', \n                    'g'\n                ), \n      \
+  \          '^, |, $', \n                ''\n            ), \n            NULL\n\
+  \        ) AS \"Other Identifiers\",\n        MAX(v.date_started) AS \"Visit Start\
+  \ date\",\n        MAX(v.date_stopped) AS \"Visit End date\",\n        MAX(v.type)\
+  \ AS \"Visit Type\",\n        MAX(CASE \n            WHEN v.visit_attributes ~ '.*Referred\
+  \ from: (.*?)(\\/|$).*' THEN REGEXP_REPLACE(v.visit_attributes, '.*Referred from:\
+  \ (.*?)(\\/|$).*', '\\1', 'g')\n            ELSE ''\n        END) AS \"Referral\
+  \ source\",\n        MAX(CASE \n            WHEN v.visit_attributes ~ '.*Insurance\
+  \ Type: (.*?)(\\/|$).*' THEN REGEXP_REPLACE(v.visit_attributes, '.*Insurance Type:\
+  \ (.*?)(\\/|$).*', '\\1', 'g')\n            ELSE ''\n        END) AS \"Insurance\
+  \ type\",\n        MAX(CASE WHEN o.question_uuid = 'b8edfbde-5f94-421e-8b25-e86afe35d0f7'\
+  \ THEN o.answer_coded ELSE NULL END) AS \"Known Diabetes\",\n        MAX(CASE WHEN\
+  \ o.question_uuid = 'f8fd0782-a9fc-4c02-b556-72740853bc18' THEN o.answer_coded ELSE\
+  \ NULL END) AS \"Known Hypertension\",\n        MAX(CASE WHEN o.question_uuid =\
+  \ '5089AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' THEN o.answer_numeric ELSE NULL END) AS\
+  \ \"Weight\",\n        MAX(CASE WHEN o.question_uuid = '5090AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'\
+  \ THEN o.answer_numeric ELSE NULL END) AS \"Height\",\n        MAX(CASE WHEN o.question_uuid\
+  \ = '1343AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' THEN o.answer_numeric ELSE NULL END)\
+  \ AS \"Circumference\",\n        MAX(CASE WHEN o.question_uuid = '5085AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'\
+  \ THEN o.answer_numeric ELSE NULL END) AS \"Systolic Pressure\",\n        MAX(CASE\
+  \ WHEN o.question_uuid = '5086AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' THEN o.answer_numeric\
+  \ ELSE NULL END) AS \"Diastolic Pressure\",\n        MAX(CASE WHEN o.question_uuid\
+  \ = 'a89c60c0-1350-11df-a1f1-0026b9348838' THEN o.answer_numeric ELSE NULL END)\
+  \ AS \"BMI\",\n        MAX(CASE WHEN o.question_uuid = '5087AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'\
+  \ THEN o.answer_numeric ELSE NULL END) AS \"Pulse\",\n        MAX(CASE WHEN o.question_uuid\
+  \ = '5088AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' THEN o.answer_numeric ELSE NULL END)\
+  \ AS \"Temperature\",\n        MAX(CASE WHEN o.question_uuid = '4a6ad2db-86af-4acc-906b-b749b7f6cda6'\
+  \ THEN o.answer_numeric ELSE NULL END) AS \"Fasting Blood Sugar\",\n        MAX(CASE\
+  \ WHEN o.question_uuid = 'f52d731e-58da-4f3a-a480-77c5e9d8d2eb' THEN o.answer_numeric\
+  \ ELSE NULL END) AS \"Random Blood Sugar\",\n        MAX(CASE WHEN o.question_uuid\
+  \ = '163594AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' THEN o.answer_numeric ELSE NULL END)\
+  \ AS \"OGTT\",\n        MAX(CASE WHEN o.question_uuid = 'a8af7520-1350-11df-a1f1-0026b9348838'\
+  \ THEN o.answer_numeric ELSE NULL END) AS \"HbA1c\",\n        MAX(CASE WHEN o.question_uuid\
+  \ = 'c423325e-be95-42e2-ae38-b940c2586327' THEN o.answer_numeric ELSE NULL END)\
+  \ AS \"Albumin\",\n        MAX(CASE WHEN o.question_uuid = '07015405-c865-4a22-8ad1-c8863d5f005b'\
+  \ THEN o.answer_numeric ELSE NULL END) AS \"Ketones\",\n        MAX(CASE WHEN o.question_uuid\
+  \ = '45583478-f703-46e3-b63a-54b0a95c25f0' THEN o.answer_coded ELSE NULL END) AS\
+  \ \"Diagnosis 1\",\n        MAX(CASE WHEN o.question_uuid = '45583478-f703-46e3-b63a-54b0a95c25f0'\
+  \ THEN o.answer_coded_uuid ELSE NULL END) AS \"diagnosis_1_answer_uuid\",\n    \
+  \    MAX(CASE WHEN o.question_uuid = '76ca08a5-2128-4b53-afba-74227b015924' THEN\
+  \ o.answer_coded ELSE NULL END) AS \"Diagnosis 2\",\n        MAX(CASE WHEN o.question_uuid\
+  \ = '758b9dd8-b6d0-4ac2-b245-0e7bffb4693a' THEN o.answer_coded ELSE NULL END) AS\
+  \ \"Referral Facility\",\n        MAX(CASE \n            WHEN v.visit_attributes\
+  \ ~ '.*Has a referral letter ?: (.*?)(\\/|$).*' THEN REGEXP_REPLACE(v.visit_attributes,\
+  \ '.*Has a referral letter ?: (.*?)(\\/|$).*', '\\1', 'g')\n            ELSE ''\n\
+  \        END) AS \"Has a Referral Letter\",\n        MAX(CASE WHEN o.question_uuid\
+  \ = 'dff491e3-b14c-4b32-ab64-63b96966d72d' THEN o.answer_coded ELSE NULL END) AS\
+  \ \"CVD Risk Score\",\n        MAX(CASE WHEN o.question_uuid = '2e27bbf9-d744-46a2-a7d4-cecd33c28b8a'\
+  \ THEN o.answer_coded ELSE NULL END) AS \"Follow-Up For\",\n        MAX(CASE WHEN\
+  \ o.question_uuid = 'e9c145c1-f4e9-4c34-b237-da069939dc38' THEN o.answer_datetime\
+  \ ELSE NULL END) AS \"Follow-Up Date\",\n        MAX(CASE WHEN o.question_uuid =\
+  \ '805c3a0b-cd38-4ed6-b4f8-f3af0fc118ad' THEN o.answer_coded ELSE NULL END) AS \"\
+  Started on Medication\",\n        STRING_AGG(DISTINCT medications.drug_name, ',\
+  \ ') AS \"Drug Names\",\n        MAX(medications.medication_duration_in_weeks) AS\
+  \ max_medication_duration_in_weeks\n    FROM \n        encounters e \n    LEFT JOIN\
+  \ \n        patients p ON e.patient_uuid = p.patient_uuid AND p.person_voided =\
+  \ false\n    LEFT JOIN \n        visits v ON e.visit_uuid = v.visit_uuid AND v.visit_voided\
+  \ = false\n    LEFT JOIN \n        observations o ON o.obs_voided = false AND e.encounter_uuid\
+  \ = o.encounter_uuid AND o.question_uuid IN (\n            'b8edfbde-5f94-421e-8b25-e86afe35d0f7',\n\
+  \            'f8fd0782-a9fc-4c02-b556-72740853bc18',\n            '5089AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA',\n\
+  \            '5090AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA',\n            '1343AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA',\n\
+  \            '5085AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA',\n            '5086AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA',\n\
+  \            'a89c60c0-1350-11df-a1f1-0026b9348838',\n            '5087AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA',\n\
+  \            '5088AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA',\n            '4a6ad2db-86af-4acc-906b-b749b7f6cda6',\n\
+  \            'f52d731e-58da-4f3a-a480-77c5e9d8d2eb',\n            '163594AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA',\n\
+  \            'a8af7520-1350-11df-a1f1-0026b9348838',\n            'c423325e-be95-42e2-ae38-b940c2586327',\n\
+  \            '07015405-c865-4a22-8ad1-c8863d5f005b',\n            '45583478-f703-46e3-b63a-54b0a95c25f0',\n\
+  \            '76ca08a5-2128-4b53-afba-74227b015924',\n            '758b9dd8-b6d0-4ac2-b245-0e7bffb4693a',\n\
+  \            'dff491e3-b14c-4b32-ab64-63b96966d72d',\n            '2e27bbf9-d744-46a2-a7d4-cecd33c28b8a',\n\
+  \            'e9c145c1-f4e9-4c34-b237-da069939dc38',\n            '805c3a0b-cd38-4ed6-b4f8-f3af0fc118ad'\n\
+  \        )\n    LEFT JOIN \n        locations l ON e.location_uuid = l.uuid\n  \
+  \  LEFT JOIN \n        (\n            SELECT \n                CASE \n         \
+  \           WHEN d_o.duration_unit_uuid = '1822AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'\
+  \ THEN (d_o.duration / 672)\n                    WHEN d_o.duration_unit_uuid = '1072AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'\
+  \ THEN (d_o.duration / 7)\n                    WHEN d_o.duration_unit_uuid = '1073AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'\
+  \ THEN d_o.duration\n                    WHEN d_o.duration_unit_uuid = '1074AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'\
+  \ THEN (d_o.duration * 4.34524)\n                    WHEN d_o.duration_unit_uuid\
+  \ = '1734AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' THEN (d_o.duration * 52.1429)\n     \
+  \               ELSE 0\n                END AS \"medication_duration_in_weeks\"\
+  ,\n                d_o.encounter_uuid,\n                d_o.patient_uuid,\n    \
+  \            d_o.drug_name,\n                d_o.date_activated\n            FROM\
+  \ \n                orders d_o\n        ) medications ON medications.patient_uuid\
+  \ = p.patient_uuid AND (medications.date_activated >= v.date_started\n         \
+  \   {% if to_dttm != undefined and to_dttm is not none %}\n                AND medications.date_activated\
+  \ <= '{{ to_dttm }}'\n            {% else %}\n                AND medications.date_activated\
+  \ <= v.date_stopped\n            {%- endif -%} \n            )\n    WHERE \n   \
+  \     e.encounter_voided = false AND e.encounter_type IN ('Health Center - NCD Screening')\n\
+  \        AND (e.encounter_datetime - p.birthdate) >= interval '40 years'\n     \
+  \   AND e.patient_uuid NOT IN (\n            SELECT \n                patient_uuid\
+  \ \n            FROM \n                encounters previous_e\n            WHERE\
+  \ \n                previous_e.encounter_voided = false AND previous_e.patient_uuid\
+  \ = e.patient_uuid AND previous_e.encounter_type IN ('Health Center - NCD Screening')\
+  \ \n                {% if from_dttm != undefined and from_dttm is not none %}\n\
+  \                    AND DATE(previous_e.encounter_datetime) <= '{{ from_dttm }}'\n\
+  \                {% else %}\n                    AND 1=0\n                {%- endif\
+  \ -%}\n        )\n    GROUP BY \n        \"Facility Name\", \"Facility District\"\
+  , \"Facility Province\", \"OpenMRS ID\", e.encounter_uuid\n    ) raw_data_set"
+params: null
+template_params: null
+filter_select_enabled: false
+fetch_values_predicate: null
+extra: null
+normalize_columns: false
+always_filter_main_dttm: false
+uuid: 54c5a8fb-66f7-4279-8498-abebf5d65e7f
+metrics:
+- metric_name: count
+  verbose_name: null
+  metric_type: null
+  expression: count(*)
+  description: null
+  d3format: null
+  currency: null
+  extra:
+    warning_markdown: ''
+  warning_text: null
+columns:
+- column_name: Other Identifiers
+  verbose_name: "\u1794\u17D2\u179A\u1797\u17C1\u1791\u179B\u17C1\u1781\u179F\u1798\
+    \u17D2\u1782\u17B6\u179B\u17CB\u1795\u17D2\u179F\u17C1\u1784\u1791\u17C0\u178F\
+    \ (\u1788\u17D2\u1798\u17C4\u17C7\u178A\u17C4\u1799\u17A1\u17C2\u1780\u1796\u17B8\
+    \u1782\u17D2\u1793\u17B6\u178A\u17C4\u1799\u179F\u1789\u17D2\u1789\u17B6\u1780\
+    \u17D2\u1794\u17C0\u179F) (Other ID types (comma separated names)) : \u179B\u17C1\
+    \u1781\u179F\u1798\u17D2\u1782\u17B6\u179B\u17CB\u1795\u17D2\u179F\u17C1\u1784\
+    \u1791\u17C0\u178F (\u179B\u17C1\u1781\u1794\u17C6\u1794\u17C2\u1780\u178A\u17C4\
+    \u1799\u179F\u1789\u17D2\u1789\u17B6\u1780\u17D2\u1794\u17C0\u179F) (Other ID\
+    \ Values (comma separated values))"
+  is_dttm: false
+  is_active: true
+  type: STRING
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: ''
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: CVD Risk Score
+  verbose_name: "\u1780\u17B6\u179A\u178E\u17B6\u178F\u17CB\u178F\u17B6\u1798\u178A\
+    \u17B6\u1793\u17A0\u17B6\u1793\u17B7\u1797\u17D0\u1799\u1787\u17C6\u1784\u17BA\
+    \u1794\u17C1\u17C7\u178A\u17BC\u1784 \u179F\u179A\u179F\u17C3\u1788\u17B6\u1798\
+    \ (F/U Screening CVD Risk Factors)"
+  is_dttm: false
+  is_active: true
+  type: STRING
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: ''
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: Patient's Birthdate
+  verbose_name: "\u1790\u17D2\u1784\u17C3 \u1781\u17C2 \u1786\u17D2\u1793\u17B6\u17C6\
+    \u1780\u17C6\u178E\u17BE\u178F (Date of Birth)"
+  is_dttm: true
+  is_active: true
+  type: DATE
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: Random Blood Sugar
+  verbose_name: "\u1780\u1798\u17D2\u179A\u17B7\u178F\u1787\u17B6\u178F\u17B7\u179F\
+    \u17D2\u1780\u179A\u1785\u17C3\u178A\u1793\u17D2\u1799/\u1780\u17C6\u179A\u17B7\
+    \u178F\u1787\u17B6\u178F\u17B7\u179F\u17D2\u1780\u179A\u1780\u17D2\u1793\u17BB\
+    \u1784\u1788\u17B6\u1798\u1780\u17D2\u179A\u17C4\u1799\u17A2\u17B6\u17A0\u17B6\
+    \u179A (Random Blood Sugar)"
+  is_dttm: false
+  is_active: true
+  type: FLOAT
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: ''
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: Fasting Blood Sugar
+  verbose_name: "\u1780\u1798\u17D2\u179A\u17B7\u178F\u1787\u17B6\u178F\u17B7\u179F\
+    \u17D2\u1780\u179A\u1780\u17D2\u1793\u17BB\u1784\u1788\u17B6\u1798\u1798\u17BB\
+    \u1793\u17A2\u17B6\u17A0\u17B6\u179A (Fasting Blood Sugar)"
+  is_dttm: false
+  is_active: true
+  type: FLOAT
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: ''
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: Visit End date
+  verbose_name: "\u1780\u17B6\u179B\u1794\u179A\u17B7\u1785\u17D2\u1786\u17C1\u1791\
+    \u1794\u1789\u17D2\u1785\u1794\u17CB\u1780\u17B6\u179A\u1796\u17B7\u1793\u17B7\
+    \u178F\u17D2\u1799\u1787\u17C6\u1784\u17BA (Visit End Date)"
+  is_dttm: true
+  is_active: true
+  type: DATETIME
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: ''
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: Visit Start date
+  verbose_name: "\u1780\u17B6\u179B\u1794\u179A\u17B7\u1785\u17D2\u1786\u17C1\u1791\
+    \u1785\u17B6\u1794\u17CB\u1795\u17D2\u178F\u17BE\u1798\u1796\u17B7\u1793\u17B7\
+    \u178F\u17D2\u1799\u1787\u17C6\u1784\u17BA (Visit Start Date)"
+  is_dttm: true
+  is_active: true
+  type: DATETIME
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: ''
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: Has a Referral Letter
+  verbose_name: "\u1794\u17D0\u178E\u17D2\u178E\u1794\u1789\u17D2\u1787\u17BC\u1793\
+    \ (Referral Letter)"
+  is_dttm: false
+  is_active: true
+  type: STRING
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: ''
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: Started on Medication
+  verbose_name: "\u1785\u17B6\u1794\u17CB\u1795\u17D2\u178F\u17BE\u1798\u1794\u17D2\
+    \u179A\u17BE\u17B1\u179F\u1790 (Started on Medication)"
+  is_dttm: false
+  is_active: true
+  type: STRING
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: ''
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: Patient's First name
+  verbose_name: "\u1793\u17B6\u1798\u200B\u1782\u17C4\u178F\u17D2\u178F\u1793\u17B6\
+    \u1798 (First Name)"
+  is_dttm: false
+  is_active: true
+  type: STRING
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: ''
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: Facility Name
+  verbose_name: "\u1788\u17D2\u1798\u17C4\u17C7\u1793\u17B7\u1784\u179B\u17C1\u1781\
+    \u1780\u17BC\u178A\u1798\u17BC\u179B\u178A\u17D2\u178B\u17B6\u1793\u179F\u17BB\
+    \u1781\u17B6\u1797\u17B7\u1794\u17B6\u179B (Health Facility's Name)"
+  is_dttm: false
+  is_active: true
+  type: STRING
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: ''
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: Patient's Last name
+  verbose_name: "\u1793\u17B6\u1798\u178F\u17D2\u179A\u1780\u17BC\u179B (Last Name)"
+  is_dttm: false
+  is_active: true
+  type: STRING
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: ''
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: Diagnosis 1
+  verbose_name: "\u179A\u17C4\u1782\u179C\u17B7\u1793\u17B7\u1785\u17D2\u1786\u17D0\
+    \u1799\u1791\u17B8 \u17E1 (Diagnosis 1)"
+  is_dttm: false
+  is_active: true
+  type: STRING
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: ''
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: Diagnosis 2
+  verbose_name: "\u179A\u17C4\u1782\u179C\u17B7\u1793\u17B7\u1785\u17D2\u1786\u17D0\
+    \u1799\u1791\u17B8 \u17E2 (Diagnosis 2)"
+  is_dttm: false
+  is_active: true
+  type: STRING
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: ''
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: Facility Province
+  verbose_name: "\u1798\u1793\u17D2\u1791\u17B8\u179A\u179F\u17BB\u1781\u17B6\u1797\
+    \u17B7\u1794\u17B6\u179B\u1781\u17C1\u178F\u17D2\u178F (Provincial Health Department)"
+  is_dttm: false
+  is_active: true
+  type: STRING
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: ''
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: Albumin
+  verbose_name: "\u17A2\u17B6\u179B\u17CB\u1794\u17CA\u17BB\u1799\u1798\u17B8\u1793\
+    \ (\u1791\u17B9\u1780\u1793\u17C4\u1798) (Albumin (Urine))"
+  is_dttm: false
+  is_active: true
+  type: FLOAT
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: ''
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: Ketones
+  verbose_name: "\u1780\u17C1\u178F\u17BC\u1793 (\u1791\u17B9\u1780\u1793\u17C4\u1798\
+    ) (Ketones (Urine))"
+  is_dttm: false
+  is_active: true
+  type: FLOAT
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: ''
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: Follow-Up Date
+  verbose_name: "\u1780\u17B6\u179A\u1794\u179A\u17B7\u1785\u17D2\u1786\u17C1\u1791\
+    \u178E\u17B6\u178F\u17CB\u178F\u17B6\u1798\u178A\u17B6\u1793 (Follow-up date)"
+  is_dttm: true
+  is_active: true
+  type: DATETIME
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: ''
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: Follow-Up For
+  verbose_name: "\u1798\u17BC\u179B\u17A0\u17C1\u178F\u17BB\u1793\u17C3\u1780\u17B6\
+    \u179A\u178F\u17B6\u1798\u178A\u17B6\u1793 (Follow-up Reason)"
+  is_dttm: false
+  is_active: true
+  type: STRING
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: ''
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: Diastolic Pressure
+  verbose_name: "\u179F\u1798\u17D2\u1796\u17B6\u1792\u1788\u17B6\u1798\u178A\u17D2\
+    \u1799\u17B6\u179F\u17D2\u178F\u17BC\u179B (Diastolic BP)"
+  is_dttm: false
+  is_active: true
+  type: FLOAT
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: ''
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: Systolic Pressure
+  verbose_name: "\u179F\u1798\u17D2\u1796\u17B6\u1792\u1788\u17B6\u1798\u179F\u17CA\
+    \u17B8\u179F\u17D2\u178F\u17BC\u179B (Systolic BP)"
+  is_dttm: false
+  is_active: true
+  type: FLOAT
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: ''
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: Facility District
+  verbose_name: "\u179F\u17D2\u179A\u17BB\u1780\u1794\u17D2\u179A\u178F\u17B7\u1794\
+    \u178F\u17D2\u178F\u17B7 (Operational District)"
+  is_dttm: false
+  is_active: true
+  type: STRING
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: ''
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: OpenMRS ID
+  verbose_name: "\u179B\u17C1\u1781\u179F\u1798\u17D2\u1782\u17B6\u179B\u17CB\u17A2\
+    \u178F\u17B7\u1790\u17B7\u1787\u1793 (Patient ID)"
+  is_dttm: false
+  is_active: true
+  type: STRING
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: ''
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: Known Diabetes
+  verbose_name: "\u178A\u17B9\u1784\u1790\u17B6\u1798\u17B6\u1793\u1787\u17C6\u1784\
+    \u17BA\u1791\u17B9\u1780\u1793\u17C4\u1798\u1795\u17D2\u17A2\u17C2\u1798 (Known\
+    \ Diabetes)"
+  is_dttm: false
+  is_active: true
+  type: STRING
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: ''
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: Known Hypertension
+  verbose_name: "\u178A\u17B9\u1784\u1790\u17B6\u1798\u17B6\u1793\u1787\u17C6\u1784\
+    \u17BA\u179B\u17BE\u179F\u179F\u1798\u17D2\u1796\u17B6\u1792\u1788\u17B6\u1798\
+    \ (Known Hypertension)"
+  is_dttm: false
+  is_active: true
+  type: STRING
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: ''
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: Insurance type
+  verbose_name: "\u1794\u17D2\u179A\u1797\u17C1\u1791\u1793\u17C3\u1780\u17B6\u179A\
+    \u1794\u1784\u17CB\u1790\u17D2\u179B\u17C3\u179F\u17C1\u179C\u17B6 (Insurance\
+    \ Type)"
+  is_dttm: false
+  is_active: true
+  type: STRING
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: ''
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: Phone number
+  verbose_name: "\u179B\u17C1\u1781\u1791\u17BC\u179A\u179F\u17D0\u1796\u17D2\u1791\
+    \ (Phone Number)"
+  is_dttm: false
+  is_active: true
+  type: STRING
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: ''
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: Referral source
+  verbose_name: "\u1794\u1789\u17D2\u1787\u17BC\u1793\u1798\u1780\u1796\u17B8 (Referral\
+    \ Source)"
+  is_dttm: false
+  is_active: true
+  type: STRING
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: ''
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: Visit Type
+  verbose_name: "\u1794\u17D2\u179A\u1797\u17C1\u1791\u1793\u17C3\u1780\u17B6\u179A\
+    \u1796\u17B7\u1793\u17B7\u178F\u17D2\u1799 (Visit Type)"
+  is_dttm: false
+  is_active: true
+  type: STRING
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: ''
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: Referral Facility
+  verbose_name: "\u1794\u1789\u17D2\u1787\u17BC\u1793\u1791\u17C5\u1798\u17BC\u179B\
+    \u178A\u17D2\u178B\u17B6\u1793\u179F\u17BB\u1781\u17B6\u1797\u17B7\u1794\u17B6\
+    \u179B (Referral Facility)"
+  is_dttm: false
+  is_active: true
+  type: STRING
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: Patient's Gender
+  verbose_name: "\u1797\u17C1\u1791 (Sex)"
+  is_dttm: false
+  is_active: true
+  type: STRING
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: HbA1c
+  verbose_name: "HbA1c (\u17A2\u17C1\u1798\u17C9\u17BC\u1780\u17D2\u179B\u17BC\u1794\
+    \u17CA\u17B8\u1793\u17A2\u17C1\u179C\u17D0\u1793\u179F\u17CA\u17B8) (HbA1c)"
+  is_dttm: false
+  is_active: true
+  type: FLOAT
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: ''
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: Patient Address
+  verbose_name: "\u17A2\u17B6\u179F\u1799\u178A\u17D2\u178B\u17B6\u1793 (Address)"
+  is_dttm: false
+  is_active: true
+  type: STRING
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: ''
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: Circumference
+  verbose_name: "\u179A\u1784\u17D2\u179C\u17B6\u179F\u17CB\u1787\u17BB\u17C6\u179C\
+    \u17B7\u1789\u1780\u17D2\u1794\u17B6\u179B\u1796\u17C4\u17C7 (Waist Circumference)"
+  is_dttm: false
+  is_active: true
+  type: FLOAT
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: ''
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: OGTT
+  verbose_name: "OGTT \u178F\u17C1\u179F\u17D2\u178F\u1795\u17B9\u1780\u1791\u17B9\
+    \u1780\u179F\u17D2\u1780\u179A (OGTT)"
+  is_dttm: false
+  is_active: true
+  type: FLOAT
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: ''
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: Drug Names
+  verbose_name: "\u17B1\u179F\u1790\u178A\u17C2\u179B\u1794\u17B6\u1793\u1794\u17D2\
+    \u179A\u17BE (Medications)"
+  is_dttm: false
+  is_active: true
+  type: STRING
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: ''
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: Height
+  verbose_name: "\u1780\u1798\u17D2\u1796\u179F\u17CB (Height)"
+  is_dttm: false
+  is_active: true
+  type: FLOAT
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: ''
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: Pulse
+  verbose_name: "\u1787\u17B8\u1796\u1785\u179A (Pulse)"
+  is_dttm: false
+  is_active: true
+  type: FLOAT
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: ''
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: Temperature
+  verbose_name: "\u179F\u17B8\u178F\u17BB\u178E\u17D2\u17A0\u1797\u17B6\u1796 (Temperature)"
+  is_dttm: false
+  is_active: true
+  type: FLOAT
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: ''
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: Weight
+  verbose_name: "\u1791\u1798\u17D2\u1784\u1793\u17CB (Weight)"
+  is_dttm: false
+  is_active: true
+  type: FLOAT
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: ''
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: BMI
+  verbose_name: "\u179F\u1793\u17D2\u1791\u179F\u17D2\u179F\u1793\u17CD\u1798\u17C9\
+    \u17B6\u179F\u179A\u17B6\u1784\u1780\u17B6\u1799 (BMI"
+  is_dttm: false
+  is_active: true
+  type: FLOAT
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: ''
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: indicator
+  verbose_name: null
+  is_dttm: false
+  is_active: true
+  type: STRING
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: ''
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+version: 1.0.0
+database_uuid: 42834407-4570-4111-8bf6-4f7080413333
diff --git a/base/configs/superset/assets/datasets/Analytics/Patients_Screened_for_CVD_Risk_Diabetes_and_Hypertension.yaml b/base/configs/superset/assets/datasets/Analytics/Patients_Screened_for_CVD_Risk_Diabetes_and_Hypertension.yaml
new file mode 100644
index 00000000..c751125b
--- /dev/null
+++ b/base/configs/superset/assets/datasets/Analytics/Patients_Screened_for_CVD_Risk_Diabetes_and_Hypertension.yaml
@@ -0,0 +1,1110 @@
+table_name: Patients Screened for CVD Risk, Diabetes and Hypertension
+main_dttm_col: null
+description: null
+default_endpoint: null
+offset: 0
+cache_timeout: null
+schema: null
+sql: "SELECT\n  MAX(current_v.date_started) AS date_started,\n  MAX(t3.postal_code)\
+  \ AS health_facility_code,\n  MAX(t3.name) AS health_facility_name,\n  MAX(t3.county_district)\
+  \ AS health_facility_district,\n  MAX(t3.state_province) AS health_facility_province,\n\
+  \  MAX(t2.patient_uuid) AS patient_uuid,\n  MAX(\n    DATE_PART ('year', age (current_v.date_started,\
+  \ t2.birthdate))\n  ) AS age,\n  MAX(t2.gender) AS gender,\n  MAX(current_v.type)\
+  \ AS type,\n  MAX(t4.encounter_type) AS encounter_type,\n  MAX(obs1.cvd_score) AS\
+  \ cvd_score,\n  MAX(current_v.type) AS visit_type,\n  MAX(obs2.diagnosis_one) AS\
+  \ diagnosis_one,\n  MAX(obs3.diagnosis_two) AS diagnosis_two,\n  MAX(obs4.started_on_medicine)\
+  \ AS started_on_medicine,\n  -- Diagnosis\n  MAX(\n    CASE\n      WHEN (\n    \
+  \    (\n          obs2.diagnosis_one_uuid IN (\n            '105903f4-7b6d-496a-b613-37ab9d0f5450',\n\
+  \            '8b26ecd3-8726-4c8e-b042-cbe71e44a863'\n          )\n          OR obs3.diagnosis_two_uuid\
+  \ IN (\n            '105903f4-7b6d-496a-b613-37ab9d0f5450',\n            '8b26ecd3-8726-4c8e-b042-cbe71e44a863'\n\
+  \          )\n        )\n        AND (\n          obs2.diagnosis_one_uuid NOT IN\
+  \ ('3cd50188-26fe-102b-80cb-0017a47871b2')\n          OR obs3.diagnosis_two_uuid\
+  \ NOT IN ('3cd50188-26fe-102b-80cb-0017a47871b2')\n        )\n      ) THEN 1\n \
+  \     ELSE 0\n    END\n  ) AS is_diagnosed_with_dm,\n  MAX(\n    CASE\n      WHEN\
+  \ (\n        obs2.diagnosis_one_uuid='3cd50188-26fe-102b-80cb-0017a47871b2'\n  \
+  \      OR obs3.diagnosis_two_uuid='3cd50188-26fe-102b-80cb-0017a47871b2'\n     \
+  \ ) THEN 1\n      ELSE 0\n    END\n  ) AS is_diagnosed_with_hbp,\n  MAX(\n    CASE\n\
+  \      WHEN (\n        (\n          obs2.diagnosis_one_uuid IN (\n            '105903f4-7b6d-496a-b613-37ab9d0f5450',\n\
+  \            '8b26ecd3-8726-4c8e-b042-cbe71e44a863'\n          )\n          OR obs3.diagnosis_two_uuid\
+  \ IN (\n            '105903f4-7b6d-496a-b613-37ab9d0f5450',\n            '8b26ecd3-8726-4c8e-b042-cbe71e44a863'\n\
+  \          )\n        )\n        AND (\n          obs2.diagnosis_one_uuid='3cd50188-26fe-102b-80cb-0017a47871b2'\n\
+  \          OR obs3.diagnosis_two_uuid='3cd50188-26fe-102b-80cb-0017a47871b2'\n \
+  \       )\n      ) THEN 1\n      ELSE 0\n    END\n  ) AS is_diagnosed_with_dm_and_hbp,\n\
+  \  -- Diagnosis and Treatment\n  MAX(\n    CASE\n      WHEN (\n        (\n     \
+  \     obs2.diagnosis_one_uuid IN (\n            '105903f4-7b6d-496a-b613-37ab9d0f5450',\n\
+  \            '8b26ecd3-8726-4c8e-b042-cbe71e44a863'\n          )\n          OR obs3.diagnosis_two_uuid\
+  \ IN (\n            '105903f4-7b6d-496a-b613-37ab9d0f5450',\n            '8b26ecd3-8726-4c8e-b042-cbe71e44a863'\n\
+  \          )\n        )\n        AND (\n          obs2.diagnosis_one_uuid NOT IN\
+  \ ('3cd50188-26fe-102b-80cb-0017a47871b2')\n          OR obs3.diagnosis_two_uuid\
+  \ NOT IN ('3cd50188-26fe-102b-80cb-0017a47871b2')\n        )\n        AND obs4.started_on_medicine_uuid='1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'\n\
+  \      ) THEN 1\n      ELSE 0\n    END\n  ) AS diagnosed_with_dm_and_treated,\n\
+  \  MAX(\n    CASE\n      WHEN (\n        obs2.diagnosis_one_uuid='3cd50188-26fe-102b-80cb-0017a47871b2'\n\
+  \        OR obs3.diagnosis_two_uuid='3cd50188-26fe-102b-80cb-0017a47871b2'\n   \
+  \   )\n      AND obs4.started_on_medicine_uuid='1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'\
+  \ THEN 1\n      ELSE 0\n    END\n  ) AS diagnosed_with_hbp_and_treated,\n  MAX(\n\
+  \    CASE\n      WHEN (\n        (\n          obs2.diagnosis_one_uuid IN (\n   \
+  \         '105903f4-7b6d-496a-b613-37ab9d0f5450',\n            '8b26ecd3-8726-4c8e-b042-cbe71e44a863'\n\
+  \          )\n          OR obs3.diagnosis_two_uuid IN (\n            '105903f4-7b6d-496a-b613-37ab9d0f5450',\n\
+  \            '8b26ecd3-8726-4c8e-b042-cbe71e44a863'\n          )\n        )\n  \
+  \      AND (\n          obs2.diagnosis_one_uuid='3cd50188-26fe-102b-80cb-0017a47871b2'\n\
+  \          OR obs3.diagnosis_two_uuid='3cd50188-26fe-102b-80cb-0017a47871b2'\n \
+  \       )\n        AND obs4.started_on_medicine_uuid='1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'\n\
+  \      ) THEN 1\n      ELSE 0\n    END\n  ) AS diagnosed_with_dm_and_hbp_and_treated,\n\
+  \  -- Dropout within 30 days\n  MAX(\n    CASE\n      WHEN (\n        (\n      \
+  \    obs2.diagnosis_one_uuid IN (\n            '105903f4-7b6d-496a-b613-37ab9d0f5450',\n\
+  \            '8b26ecd3-8726-4c8e-b042-cbe71e44a863'\n          )\n          OR obs3.diagnosis_two_uuid\
+  \ IN (\n            '105903f4-7b6d-496a-b613-37ab9d0f5450',\n            '8b26ecd3-8726-4c8e-b042-cbe71e44a863'\n\
+  \          )\n        )\n        AND (\n          obs2.diagnosis_one_uuid NOT IN\
+  \ ('3cd50188-26fe-102b-80cb-0017a47871b2')\n          OR obs3.diagnosis_two_uuid\
+  \ NOT IN ('3cd50188-26fe-102b-80cb-0017a47871b2')\n        )\n        AND obs4.started_on_medicine_uuid='1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'\n\
+  \        AND CURRENT_DATE-current_v.date_started>INTERVAL '30 days'\n      ) THEN\
+  \ 1\n      ELSE 0\n    END\n  ) AS dm_dropout_30,\n  MAX(\n    CASE\n      WHEN\
+  \ (\n        obs2.diagnosis_one_uuid='3cd50188-26fe-102b-80cb-0017a47871b2'\n  \
+  \      OR obs3.diagnosis_two_uuid='3cd50188-26fe-102b-80cb-0017a47871b2'\n     \
+  \ )\n      AND obs4.started_on_medicine_uuid='1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'\n\
+  \      AND CURRENT_DATE-current_v.date_started>INTERVAL '30 days' THEN 1\n     \
+  \ ELSE 0\n    END\n  ) AS hbp_dropout_30,\n  MAX(\n    CASE\n      WHEN (\n    \
+  \    (\n          obs2.diagnosis_one_uuid IN (\n            '105903f4-7b6d-496a-b613-37ab9d0f5450',\n\
+  \            '8b26ecd3-8726-4c8e-b042-cbe71e44a863'\n          )\n          OR obs3.diagnosis_two_uuid\
+  \ IN (\n            '105903f4-7b6d-496a-b613-37ab9d0f5450',\n            '8b26ecd3-8726-4c8e-b042-cbe71e44a863'\n\
+  \          )\n        )\n        AND (\n          obs2.diagnosis_one_uuid='3cd50188-26fe-102b-80cb-0017a47871b2'\n\
+  \          OR obs3.diagnosis_two_uuid='3cd50188-26fe-102b-80cb-0017a47871b2'\n \
+  \       )\n        AND obs4.started_on_medicine_uuid='1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'\n\
+  \        AND CURRENT_DATE-current_v.date_started>INTERVAL '30 days'\n      ) THEN\
+  \ 1\n      ELSE 0\n    END\n  ) AS dm_and_hbp_dropout_30,\n  -- Dropout within 90\
+  \ days\n  MAX(\n    CASE\n      WHEN (\n        (\n          obs2.diagnosis_one_uuid\
+  \ IN (\n            '105903f4-7b6d-496a-b613-37ab9d0f5450',\n            '8b26ecd3-8726-4c8e-b042-cbe71e44a863'\n\
+  \          )\n          OR obs3.diagnosis_two_uuid IN (\n            '105903f4-7b6d-496a-b613-37ab9d0f5450',\n\
+  \            '8b26ecd3-8726-4c8e-b042-cbe71e44a863'\n          )\n        )\n  \
+  \      AND (\n          obs2.diagnosis_one_uuid NOT IN ('3cd50188-26fe-102b-80cb-0017a47871b2')\n\
+  \          OR obs3.diagnosis_two_uuid NOT IN ('3cd50188-26fe-102b-80cb-0017a47871b2')\n\
+  \        )\n        AND obs4.started_on_medicine_uuid='1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'\n\
+  \        AND CURRENT_DATE-current_v.date_started>INTERVAL '90 days'\n      ) THEN\
+  \ 1\n      ELSE 0\n    END\n  ) AS dm_dropout_90,\n  MAX(\n    CASE\n      WHEN\
+  \ (\n        obs2.diagnosis_one_uuid='3cd50188-26fe-102b-80cb-0017a47871b2'\n  \
+  \      OR obs3.diagnosis_two_uuid='3cd50188-26fe-102b-80cb-0017a47871b2'\n     \
+  \ )\n      AND obs4.started_on_medicine_uuid='1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'\n\
+  \      AND CURRENT_DATE-current_v.date_started>INTERVAL '90 days' THEN 1\n     \
+  \ ELSE 0\n    END\n  ) AS hbp_dropout_90,\n  MAX(\n    CASE\n      WHEN (\n    \
+  \    (\n          obs2.diagnosis_one_uuid IN (\n            '105903f4-7b6d-496a-b613-37ab9d0f5450',\n\
+  \            '8b26ecd3-8726-4c8e-b042-cbe71e44a863'\n          )\n          OR obs3.diagnosis_two_uuid\
+  \ IN (\n            '105903f4-7b6d-496a-b613-37ab9d0f5450',\n            '8b26ecd3-8726-4c8e-b042-cbe71e44a863'\n\
+  \          )\n        )\n        AND (\n          obs2.diagnosis_one_uuid='3cd50188-26fe-102b-80cb-0017a47871b2'\n\
+  \          OR obs3.diagnosis_two_uuid='3cd50188-26fe-102b-80cb-0017a47871b2'\n \
+  \       )\n        AND obs4.started_on_medicine_uuid='1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'\n\
+  \        AND CURRENT_DATE-current_v.date_started>INTERVAL '90 days'\n      ) THEN\
+  \ 1\n      ELSE 0\n    END\n  ) AS dm_and_hbp_dropout_90,\n  MAX(\n    CASE\n  \
+  \    WHEN obs5.visit_uuid IS NOT NULL AND follow_up_v.visit_uuid IS NOT NULL THEN\
+  \ 1\n      ELSE 0\n    END\n  ) AS fulfilled_follow_up,\n  MAX(\n    CASE\n    \
+  \  WHEN obs5.visit_uuid IS NOT NULL AND follow_up_v_30.visit_uuid IS NULL AND (\
+  \ CURRENT_DATE - obs5.follow_up_date > INTERVAL '30 days') THEN 1\n      ELSE 0\n\
+  \    END\n  ) AS did_not_showup_30_days_after_appointment\nFROM\n  visits current_v\n\
+  \  LEFT JOIN patients t2 ON (current_v.patient_uuid=t2.patient_uuid)\n  LEFT JOIN\
+  \ locations t3 ON (current_v.location_uuid=t3.uuid)\n  LEFT JOIN encounters t4 ON\
+  \ (\n    current_v.visit_uuid=t4.visit_uuid\n    AND t4.visit_uuid IS NOT NULL\n\
+  \  )\n  LEFT JOIN (\n    SELECT\n      MAX(o.date_created),\n      o.encounter_uuid,\n\
+  \      o.visit_uuid,\n      o.answer_numeric AS cvd_score\n    FROM\n      observations\
+  \ o\n    WHERE\n      o.question_uuid='dff491e3-b14c-4b32-ab64-63b96966d72d'\n \
+  \     AND o.obs_voided IS FALSE\n    GROUP BY\n      o.encounter_uuid,\n      o.visit_uuid,\n\
+  \      o.answer_numeric\n  ) obs1 ON (\n    obs1.visit_uuid=current_v.visit_uuid\n\
+  \    AND obs1.visit_uuid IS NOT NULL\n  )\n  LEFT JOIN (\n    SELECT\n      MAX(o.date_created),\n\
+  \      o.encounter_uuid,\n      o.visit_uuid,\n      o.answer_coded AS diagnosis_one,\n\
+  \      o.answer_coded_uuid AS diagnosis_one_uuid\n    FROM\n      observations o\n\
+  \    WHERE\n      o.question_uuid='45583478-f703-46e3-b63a-54b0a95c25f0'\n     \
+  \ AND o.obs_voided IS FALSE\n    GROUP BY\n      o.encounter_uuid,\n      o.visit_uuid,\n\
+  \      o.answer_coded,\n      o.answer_coded_uuid\n  ) obs2 ON (\n    obs2.visit_uuid=current_v.visit_uuid\n\
+  \    AND obs2.visit_uuid IS NOT NULL\n  )\n  LEFT JOIN (\n    SELECT\n      MAX(o.date_created),\n\
+  \      o.encounter_uuid,\n      o.visit_uuid,\n      o.answer_coded AS diagnosis_two,\n\
+  \      o.answer_coded_uuid AS diagnosis_two_uuid\n    FROM\n      observations o\n\
+  \    WHERE\n      o.question_uuid='76ca08a5-2128-4b53-afba-74227b015924'\n     \
+  \ AND o.obs_voided IS FALSE\n    GROUP BY\n      o.encounter_uuid,\n      o.visit_uuid,\n\
+  \      o.answer_coded,\n      o.answer_coded_uuid\n  ) obs3 ON (\n    obs3.visit_uuid=current_v.visit_uuid\n\
+  \    AND obs3.visit_uuid IS NOT NULL\n  )\n  LEFT JOIN (\n    SELECT\n      MAX(o.date_created),\n\
+  \      o.encounter_uuid,\n      o.visit_uuid,\n      o.answer_coded AS started_on_medicine,\n\
+  \      o.answer_coded_uuid AS started_on_medicine_uuid\n    FROM\n      observations\
+  \ o\n    WHERE\n      o.question_uuid='805c3a0b-cd38-4ed6-b4f8-f3af0fc118ad'\n \
+  \     AND o.obs_voided IS FALSE\n    GROUP BY\n      o.encounter_uuid,\n      o.visit_uuid,\n\
+  \      o.answer_coded,\n      o.answer_coded_uuid\n  ) obs4 ON (\n    obs4.visit_uuid=current_v.visit_uuid\n\
+  \    AND obs4.visit_uuid IS NOT NULL\n  )\n  LEFT JOIN (\n    SELECT\n      MAX(o.date_created),\n\
+  \      o.encounter_uuid,\n      o.visit_uuid,\n      o.answer_datetime AS follow_up_date\n\
+  \    FROM\n      observations o\n    WHERE\n      o.question_uuid='e9c145c1-f4e9-4c34-b237-da069939dc38'\n\
+  \      AND o.obs_voided IS FALSE\n    GROUP BY\n      o.encounter_uuid,\n      o.visit_uuid,\n\
+  \      o.answer_datetime\n  ) obs5 ON (\n    obs5.visit_uuid=current_v.visit_uuid\n\
+  \    AND obs5.visit_uuid IS NOT NULL\n  )\n  LEFT JOIN visits follow_up_v ON (current_v.patient_uuid\
+  \ = follow_up_v.patient_uuid AND follow_up_v.date_started > current_v.date_started\
+  \ AND follow_up_v.date_started < NOW() AND ( follow_up_v.date_started - obs5.follow_up_date\
+  \ <= INTERVAL '7 days'))\n  LEFT JOIN visits follow_up_v_30 ON (current_v.patient_uuid\
+  \ = follow_up_v_30.patient_uuid AND follow_up_v_30.date_started > current_v.date_started\
+  \ AND follow_up_v_30.date_started < NOW() AND ( follow_up_v_30.date_started - obs5.follow_up_date\
+  \ <= INTERVAL '30 days'))\nWHERE\n  -- NCD New Visit & Follow-up Visit\n  current_v.visit_type_uuid\
+  \ IN (\n    '5f4975a7-1af8-4a0b-9bbb-c4cfc22f2aab',\n    '54da8fbc-b92f-4251-b53a-feedc8e8c594'\n\
+  \  )\n  -- NCD Screening and NCD consultation\n  AND t4.encounter_type_uuid IN (\n\
+  \    '422b7e0c-b8f3-4748-8e60-d6684315f141',\n    'b870b6bb-9441-4664-9087-3d3477174213'\n\
+  \  )\n  AND current_v.visit_voided IS FALSE\n  AND t2.person_voided IS FALSE\n \
+  \ AND t2.patient_uuid IS NOT NULL\n  -- Aged 40 and above\n  AND DATE_PART ('year',\
+  \ age (current_v.date_started, t2.birthdate)) >= 40\nGROUP BY\n  t2.patient_uuid,\
+  \ current_v.visit_uuid"
+params: null
+template_params: null
+filter_select_enabled: false
+fetch_values_predicate: null
+extra: null
+normalize_columns: false
+always_filter_main_dttm: false
+uuid: aee334cc-f803-4296-8aad-948f4560bc0a
+metrics:
+- metric_name: percentage_diag_dm_hbp_treated_no_showup_after_30d_of_app
+  verbose_name: "\u1797\u17B6\u1782\u179A\u1799(%) \u17A2\u17D2\u1793\u1780\u1787\u17C6\
+    \u1784\u17BA\u179B\u17BE\u179F\u179F\u1798\u17D2\u1796\u17B6\u1792\u1788\u17B6\
+    \u1798 \u1793\u17B7\u1784\u17A2\u17D2\u1793\u1780\u1787\u17C6\u1784\u17BA\u1791\
+    \u17B9\u1780\u1793\u17C4\u1798\u1795\u17D2\u17A2\u17C2\u1798 \u178A\u17C2\u179B\
+    \u1794\u17B6\u1793\u1798\u1780\u1791\u1791\u17BD\u179B\u1780\u17B6\u179A\u1796\
+    \u17D2\u1799\u17B6\u1794\u17B6\u179B\u1794\u1793\u17D2\u178F\u1799\u17BA\u178F\
+    \u1796\u17C1\u179B\u1793\u17C5\u1780\u17D2\u1793\u17BB\u1784\u17A2\u17C6\u17A1\
+    \u17BB\u1784\u1796\u17C1\u179B\u179A\u17B6\u1799\u1780\u17B6\u179A\u178E\u17CD\
+    \ (Percentage of diabetes and hypertension patient with late follow-up treatment\
+    \ during the reporting period)"
+  metric_type: null
+  expression: "CONCAT(ROUND((COUNT(DISTINCT\n  CASE \n    WHEN diagnosed_with_dm_and_hbp_and_treated\
+    \ = 1 AND did_not_showup_30_days_after_appointment = 1 THEN patient_uuid \n  \
+    \  ELSE NULL \n  END\n)::decimal / NULLIF(COUNT(DISTINCT\n  CASE \n    WHEN diagnosed_with_dm_and_hbp_and_treated\
+    \ = 1 THEN patient_uuid \n    ELSE NULL \n  END\n), 0)) * 100, 2),'%')\n"
+  description: null
+  d3format: null
+  currency: null
+  extra:
+    warning_markdown: ''
+  warning_text: null
+- metric_name: percentage_diag_with_dm_treated_fulfilled_followup
+  verbose_name: "\u1797\u17B6\u1782\u179A\u1799 (%) \u17A2\u17D2\u1793\u1780\u1787\
+    \u17C6\u1784\u17BA\u1791\u17B9\u1780\u1793\u17C4\u1798\u1795\u17D2\u17A2\u17C2\
+    \u1798\u178A\u17C2\u179B\u1798\u1780\u1791\u1791\u17BD\u179B\u1780\u17B6\u179A\
+    \u178F\u17B6\u1798\u178A\u17B6\u1793\u200B   \u179F\u17BB\u1781\u1797\u17B6\u1796\
+    \u1793\u17C5\u1798\u178E\u17D2\u178C\u179B\u179F\u17BB\u1781\u1797\u17B6\u1796\
+    \u1794\u1793\u17D2\u178F\u178F\u17B6\u1798\u1780\u17B6\u179A\u178E\u17B6\u178F\
+    \u17CB\u1787\u17B6\u1791\u17C0\u1784\u1791\u17B6\u178F\u17CB  (Percentage of diabetes\
+    \ patient with regular follow-up at health centre)"
+  metric_type: null
+  expression: "CONCAT(ROUND((COUNT(DISTINCT\n  CASE \n    WHEN diagnosed_with_dm_and_treated\
+    \ = 1 AND fulfilled_follow_up = 1 THEN patient_uuid \n    ELSE NULL \n  END\n\
+    )::decimal / NULLIF(COUNT(DISTINCT\n  CASE \n    WHEN diagnosed_with_dm_and_treated\
+    \ = 1 THEN patient_uuid \n    ELSE NULL \n  END\n), 0)) * 100, 2),'%')\n"
+  description: null
+  d3format: null
+  currency: null
+  extra:
+    warning_markdown: ''
+  warning_text: null
+- metric_name: percentage_dm_with_hbp_dropout_90
+  verbose_name: "\u1797\u17B6\u1782\u179A\u1799\u1793\u17C3\u17A2\u17D2\u1793\u1780\
+    \u1787\u17C6\u1784\u17BA\u1791\u17B9\u1780\u1793\u17C4\u1798\u1795\u17D2\u17A2\
+    \u17C2\u1798 \u1793\u17B7\u1784\u179B\u17BE\u179F\u179F\u1798\u17D2\u1796\u17B6\
+    \u1792\u1788\u17B6\u1798\u178F\u17D2\u179A\u17BC\u179C\u1794\u17B6\u1793\u1794\
+    \u17C4\u17C7\u1794\u1784\u17CB\u1785\u17C4\u179B\u1780\u17B6\u179A\u1790\u17C2\
+    \u1791\u17B6\u17C6\u1793\u17B7\u1784\u1796\u17D2\u1799\u17B6\u1794\u17B6\u179B\
+    \u1793\u17C5\u1798\u17BC\u179B\u178A\u17D2\u178B\u17B6\u1793\u179F\u17BB\u1781\
+    \u17B6\u1797\u17B7\u1794\u17B6\u179B\u179F\u17B6\u1792\u17B6\u179A\u178E\u17C8\
+    \u1780\u17D2\u1793\u17BB\u1784\u179A\u1799\u17C8\u1796\u17C1\u179B\u17E1\u17E2\
+    \ \u1781\u17C2 (Percentage of hypertensions and diabes patients dropped out from\
+    \ the public health facility in the last 12 months)"
+  metric_type: null
+  expression: "CONCAT(ROUND((COUNT(DISTINCT\n  CASE \n    WHEN dm_and_hbp_dropout_90\
+    \ = 1 THEN patient_uuid \n    ELSE NULL \n  END\n)::decimal / NULLIF(COUNT(DISTINCT\n\
+    \  CASE \n    WHEN diagnosed_with_dm_and_hbp_and_treated = 1 THEN patient_uuid\
+    \ \n    ELSE NULL \n  END\n), 0)) * 100, 2),'%')\n"
+  description: null
+  d3format: null
+  currency: null
+  extra:
+    warning_markdown: ''
+  warning_text: null
+- metric_name: percentage_diagnosed_with_dm_and_hbp_and_treated
+  verbose_name: "\u1797\u17B6\u1782\u179A\u1799\u1793\u17C3\u1794\u17BB\u1782\u17D2\
+    \u1782\u179B\u178A\u17C2\u179B\u178F\u17D2\u179A\u17BC\u179C\u1794\u17B6\u1793\
+    \u1792\u17D2\u179C\u17BE\u179A\u17C4\u1782\u179C\u17B7\u1793\u17B7\u1785\u17D2\
+    \u1786\u17D0\u1799\u1790\u17B6\u1798\u17B6\u1793\u1787\u17C6\u1784\u17BA\u1791\
+    \u17B9\u1780\u1793\u17C4\u1798\u1795\u17D2\u17A2\u17C2\u1798\u1793\u17B7\u1784\
+    \u179B\u17BE\u179F\u179F\u1798\u17D2\u1796\u17B6\u1792\u1788\u17B6\u1798\u178F\
+    \u17D2\u179A\u17BC\u179C\u1794\u17B6\u1793\u1792\u17D2\u179C\u17BE\u1780\u17B6\
+    \u179A\u1790\u17C2\u1791\u17B6\u17C6\u1793\u17B7\u1784\u1796\u17D2\u1799\u17B6\
+    \u1794\u17B6\u179B\u1793\u17C5\u1798\u17BC\u179B\u178A\u17D2\u178B\u17B6\u1793\
+    \u179F\u17BB\u1781\u17B6\u1797\u17B7\u1794\u17B6\u179B\u179F\u17B6\u1792\u17B6\
+    \u179A\u178E\u17C8\u1780\u17D2\u1793\u17BB\u1784\u179A\u1799\u17C8\u1796\u17C1\
+    \u179B\u17E1\u17E2 \u1781\u17C2 (Percentage of individuals diagnosed with hypertension\
+    \ and diabetes treated at the public health facility in the last 12 months)"
+  metric_type: null
+  expression: "CONCAT(ROUND((COUNT(DISTINCT\n  CASE \n    WHEN diagnosed_with_dm_and_hbp_and_treated\
+    \ = 1 THEN patient_uuid \n    ELSE NULL \n  END\n)::decimal / NULLIF(COUNT(DISTINCT\n\
+    \  CASE \n    WHEN is_diagnosed_with_dm_and_hbp = 1 THEN patient_uuid \n    ELSE\
+    \ NULL \n  END\n)\n, 0)) * 100, 2),'%')\n"
+  description: null
+  d3format: null
+  currency: null
+  extra:
+    warning_markdown: ''
+  warning_text: null
+- metric_name: percentage_diag_dm_treated_no_showup_after_30d_of_app
+  verbose_name: "\u1797\u17B6\u1782\u179A\u1799(%)\u17A2\u17D2\u1793\u1780\u1787\u17C6\
+    \u1784\u17BA\u1791\u17B9\u1780\u1793\u17C4\u1798\u1795\u17D2\u17A2\u17C2\u1798\
+    \u178A\u17C2\u179B\u1794\u17B6\u1793\u1798\u1780\u1791\u1791\u17BD\u179B\u1780\
+    \u17B6\u179A\u1796\u17D2\u1799\u17B6\u1794\u17B6\u179B\u1794\u1793\u17D2\u178F\
+    \u1799\u17BA\u178F\u1796\u17C1\u179B\u1793\u17C5\u1780\u17D2\u1793\u17BB\u1784\
+    \u17A2\u17C6\u17A1\u17BB\u1784\u1796\u17C1\u179B   \u179A\u17B6\u1799\u1780\u17B6\
+    \u179A\u178E\u17CD (Percentage of diabetes patients with late follow-up treatment\
+    \ during the reporting period)"
+  metric_type: null
+  expression: "CONCAT(ROUND((COUNT(DISTINCT\n  CASE \n    WHEN diagnosed_with_dm_and_treated\
+    \ = 1 AND did_not_showup_30_days_after_appointment = 1 THEN patient_uuid \n  \
+    \  ELSE NULL \n  END\n)::decimal / NULLIF(COUNT(DISTINCT\n  CASE \n    WHEN diagnosed_with_dm_and_treated\
+    \ = 1 THEN patient_uuid \n    ELSE NULL \n  END\n), 0)) * 100, 2),'%')\n"
+  description: null
+  d3format: null
+  currency: null
+  extra:
+    warning_markdown: ''
+  warning_text: null
+- metric_name: percentage_diag_with_hbp_treated_fulfilled_followup
+  verbose_name: "\u1797\u17B6\u1782\u179A\u1799 (%) \u17A2\u17D2\u1793\u1780\u1787\
+    \u17C6\u1784\u17BA\u179B\u17BE\u179F\u179F\u1798\u17D2\u1796\u17B6\u1792\u1788\
+    \u17B6\u1798 \u178A\u17C2\u179B\u1798\u1780\u1791\u1791\u17BD\u179B\u1780\u17B6\
+    \u179A\u1796\u17D2\u1799\u17B6\u1794\u17B6\u179B\u1794\u1793\u17D2\u178F\u1793\
+    \u17C5\u1798\u178E\u17D2\u178C\u179B\u179F\u17BB\u1781\u1797\u17B6\u1796\u178F\
+    \u17B6\u1798\u1780\u17B6\u179A\u178E\u17B6\u178F\u17CB\u1787\u17B6\u1791\u17C0\
+    \u1784\u1791\u17B6\u178F\u17CB (Percentage of hypertension patient with regular\
+    \ follow-up treatment at health centre)"
+  metric_type: null
+  expression: "CONCAT(ROUND((COUNT(DISTINCT\n  CASE \n    WHEN diagnosed_with_hbp_and_treated\
+    \ = 1 AND fulfilled_follow_up = 1 THEN patient_uuid \n    ELSE NULL \n  END\n\
+    )::decimal / NULLIF(COUNT(DISTINCT\n  CASE \n    WHEN diagnosed_with_hbp_and_treated\
+    \ = 1 THEN patient_uuid \n    ELSE NULL \n  END\n), 0)) * 100, 2),'%')\n"
+  description: null
+  d3format: null
+  currency: null
+  extra:
+    warning_markdown: ''
+  warning_text: null
+- metric_name: percentage_dm_dropout_90
+  verbose_name: " \u1797\u17B6\u1782\u179A\u1799\u1793\u17C3\u17A2\u17D2\u1793\u1780\
+    \u1787\u17C6\u1784\u17BA\u1791\u17B9\u1780\u1793\u17C4\u1798\u1795\u17D2\u17A2\
+    \u17C2\u1798\u178F\u17D2\u179A\u17BC\u179C\u1794\u17B6\u1793\u1794\u17C4\u17C7\
+    \u1794\u1784\u17CB\u1785\u17C4\u179B\u1780\u17B6\u179A\u1790\u17C2\u1791\u17B6\
+    \u17C6\u1793\u17B7\u1784\u1796\u17D2\u1799\u17B6\u1794\u17B6\u179B\u1793\u17C5\
+    \u1798\u17BC\u179B\u178A\u17D2\u178B\u17B6\u1793\u179F\u17BB\u1781\u17B6\u1797\
+    \u17B7\u1794\u17B6\u179B\u179F\u17B6\u1792\u17B6\u179A\u178E\u17C8\u1780\u17D2\
+    \u1793\u17BB\u1784\u179A\u1799\u17C8\u1796\u17C1\u179B\u17E1\u17E2 \u1781\u17C2\
+    \ (Percentage of diabetes patients dropped out from the public health facility\
+    \ in the last 12 months)"
+  metric_type: null
+  expression: "CONCAT(ROUND((COUNT(DISTINCT\n  CASE \n    WHEN dm_dropout_90 = 1 THEN\
+    \ patient_uuid \n    ELSE NULL \n  END\n)::decimal / NULLIF(COUNT(DISTINCT\n \
+    \ CASE \n    WHEN diagnosed_with_dm_and_treated = 1 THEN patient_uuid \n    ELSE\
+    \ NULL \n  END\n), 0)) * 100, 2),'%')\n"
+  description: null
+  d3format: null
+  currency: null
+  extra:
+    warning_markdown: ''
+  warning_text: null
+- metric_name: percentage_diagnosed_with_hbp_and_treated
+  verbose_name: "\u1797\u17B6\u1782\u179A\u1799\u1793\u17C3\u1794\u17BB\u1782\u17D2\
+    \u1782\u179B\u178A\u17C2\u179B\u178F\u17D2\u179A\u17BC\u179C\u1794\u17B6\u1793\
+    \u1792\u17D2\u179C\u17BE\u179A\u17C4\u1782\u179C\u17B7\u1793\u17B7\u1785\u17D2\
+    \u1786\u17D0\u1799\u1790\u17B6\u1798\u17B6\u1793\u17A2\u17D2\u1793\u1780\u1787\
+    \u17C6\u1784\u17BA\u179B\u17BE\u179F\u179F\u1798\u17D2\u1796\u17B6\u1792\u1788\
+    \u17B6\u1798\u178F\u17D2\u179A\u17BC\u179C\u1794\u17B6\u1793\u1792\u17D2\u179C\
+    \u17BE\u1780\u17B6\u179A\u1790\u17C2\u1791\u17B6\u17C6\u1793\u17B7\u1784\u1796\
+    \u17D2\u1799\u17B6\u1794\u17B6\u179B\u1793\u17C5\u1798\u17BC\u179B\u178A\u17D2\
+    \u178B\u17B6\u1793\u179F\u17BB\u1781\u17B6\u1797\u17B7\u1794\u17B6\u179B\u179F\
+    \u17B6\u1792\u17B6\u179A\u178E\u17C8\u1780\u17D2\u1793\u17BB\u1784\u179A\u1799\
+    \u17C8\u1796\u17C1\u179B\u17E1\u17E2 \u1781\u17C2 (Percentage of individuals diagnosed\
+    \ with hypertensions treated at the public health facility in the last 12 months)"
+  metric_type: null
+  expression: "\tCONCAT(ROUND((COUNT(DISTINCT\n  CASE \n    WHEN diagnosed_with_hbp_and_treated\
+    \ = 1 THEN patient_uuid \n    ELSE NULL \n  END\n)::decimal / NULLIF(COUNT(DISTINCT\n\
+    \  CASE \n    WHEN is_diagnosed_with_hbp = 1 THEN patient_uuid \n    ELSE NULL\
+    \ \n  END\n), 0)) * 100, 2),'%')\n"
+  description: null
+  d3format: null
+  currency: null
+  extra:
+    warning_markdown: ''
+  warning_text: null
+- metric_name: percentage_diagnosed_with_dm_and_treated
+  verbose_name: "\u1797\u17B6\u1782\u179A\u1799\u1793\u17C3\u1794\u17BB\u1782\u17D2\
+    \u1782\u179B\u178A\u17C2\u179B\u178F\u17D2\u179A\u17BC\u179C\u1794\u17B6\u1793\
+    \u1792\u17D2\u179C\u17BE\u179A\u17C4\u1782\u179C\u17B7\u1793\u17B7\u1785\u17D2\
+    \u1786\u17D0\u1799\u1790\u17B6\u1798\u17B6\u1793\u1787\u17C6\u1784\u17BA\u1791\
+    \u17B9\u1780\u1793\u17C4\u1798\u1795\u17D2\u17A2\u17C2\u1798\u178F\u17D2\u179A\
+    \u17BC\u179C\u1794\u17B6\u1793\u1792\u17D2\u179C\u17BE\u1780\u17B6\u179A\u1790\
+    \u17C2\u1791\u17B6\u17C6\u1793\u17B7\u1784\u1796\u17D2\u1799\u17B6\u1794\u17B6\
+    \u179B\u1793\u17C5\u1798\u17BC\u179B\u178A\u17D2\u178B\u17B6\u1793\u179F\u17BB\
+    \u1781\u17B6\u1797\u17B7\u1794\u17B6\u179B\u179F\u17B6\u1792\u17B6\u179A\u178E\
+    \u17C8\u1780\u17D2\u1793\u17BB\u1784\u179A\u1799\u17C8\u1796\u17C1\u179B\u17E1\
+    \u17E2 \u1781\u17C2 (Percentage of individuals diagnosed with diabetes treated\
+    \ at the public health facility in the last 12 months)"
+  metric_type: null
+  expression: "CONCAT(ROUND((COUNT(DISTINCT\n  CASE \n    WHEN diagnosed_with_dm_and_treated\
+    \ = 1 THEN patient_uuid \n    ELSE NULL \n  END\n)::decimal / NULLIF(COUNT(DISTINCT\n\
+    \  CASE \n    WHEN is_diagnosed_with_dm = 1 THEN patient_uuid \n    ELSE NULL\
+    \ \n  END\n), 0)) * 100, 2),'%')\n"
+  description: null
+  d3format: null
+  currency: null
+  extra:
+    warning_markdown: ''
+  warning_text: null
+- metric_name: percentage_hbp_dropout_90
+  verbose_name: "\u1797\u17B6\u1782\u179A\u1799\u1793\u17C3\u17A2\u17D2\u1793\u1780\
+    \u1787\u17C6\u1784\u17BA\u179B\u17BE\u179F\u179F\u1798\u17D2\u1796\u17B6\u1792\
+    \u1788\u17B6\u1798\u178F\u17D2\u179A\u17BC\u179C\u1794\u17B6\u1793\u1794\u17C4\
+    \u17C7\u1794\u1784\u17CB\u1785\u17C4\u179B\u1780\u17B6\u179A\u1790\u17C2\u1791\
+    \u17B6\u17C6\u1793\u17B7\u1784\u1796\u17D2\u1799\u17B6\u1794\u17B6\u179B\u1793\
+    \u17C5\u1798\u17BC\u179B\u178A\u17D2\u178B\u17B6\u1793\u179F\u17BB\u1781\u17B6\
+    \u1797\u17B7\u1794\u17B6\u179B\u179F\u17B6\u1792\u17B6\u179A\u178E\u17C8\u1780\
+    \u17D2\u1793\u17BB\u1784\u179A\u1799\u17C8\u1796\u17C1\u179B\u17E1\u17E2 \u1781\
+    \u17C2 (Percentage of hypertensions patients dropped out from the public health\
+    \ facility in the last 12 months)"
+  metric_type: null
+  expression: "CONCAT(ROUND((COUNT(DISTINCT\n  CASE \n    WHEN hbp_dropout_90 = 1\
+    \ THEN patient_uuid \n    ELSE NULL \n  END\n)::decimal / NULLIF(COUNT(DISTINCT\n\
+    \  CASE \n    WHEN diagnosed_with_hbp_and_treated = 1 THEN patient_uuid \n   \
+    \ ELSE NULL \n  END\n), 0)) * 100, 2),'%')\n"
+  description: null
+  d3format: null
+  currency: null
+  extra:
+    warning_markdown: ''
+  warning_text: null
+- metric_name: percentage_diag_hbp_treated_no_showup_after_30d_of_app
+  verbose_name: "\u1797\u17B6\u1782\u179A\u1799(%)\u17A2\u17D2\u1793\u1780\u1787\u17C6\
+    \u1784\u17BA\u179B\u17BE\u179F\u179F\u1798\u17D2\u1796\u17B6\u1792\u1788\u17B6\
+    \u1798\u178A\u17C2\u179B\u178A\u17C2\u179B\u1794\u17B6\u1793\u1798\u1780\u1791\
+    \u1791\u17BD\u179B\u1780\u17B6\u179A\u1796\u17D2\u1799\u17B6\u1794\u17B6\u179B\
+    \u1794\u1793\u17D2\u178F\u1799\u17BA\u178F\u1796\u17C1\u179B\u1793\u17C5\u1780\
+    \u17D2\u1793\u17BB\u1784\u17A2\u17C6\u17A1\u17BB\u1784\u1796\u17C1\u179B\u179A\
+    \u17B6\u1799\u1780\u17B6\u179A\u178E\u17CD (Percentage of hypertension patients\
+    \ with late follow-up treatment during the reporting period)"
+  metric_type: null
+  expression: "CONCAT(ROUND((COUNT(DISTINCT\n  CASE \n    WHEN diagnosed_with_hbp_and_treated\
+    \ = 1 AND did_not_showup_30_days_after_appointment = 1 THEN patient_uuid \n  \
+    \  ELSE NULL \n  END\n)::decimal / NULLIF(COUNT(DISTINCT\n  CASE \n    WHEN diagnosed_with_hbp_and_treated\
+    \ = 1 THEN patient_uuid \n    ELSE NULL \n  END\n), 0)) * 100, 2),'%')\n"
+  description: null
+  d3format: null
+  currency: null
+  extra:
+    warning_markdown: ''
+  warning_text: null
+- metric_name: percentage_patients_diagnosed_with_dm_and_hbp
+  verbose_name: "\u1797\u17B6\u1782\u179A\u1799\u1793\u17C3\u1794\u17BB\u1782\u17D2\
+    \u1782\u179B\u178A\u17C2\u179B\u178F\u17D2\u179A\u17BC\u179C\u1794\u17B6\u1793\
+    \u1792\u17D2\u179C\u17BE\u179A\u17C4\u1782\u179C\u17B7\u1793\u17B7\u1785\u17D2\
+    \u1786\u17D0\u1799\u1790\u17B6\u1798\u17B6\u1793\u1787\u17C6\u1784\u17BA\u1791\
+    \u17B9\u1780\u1793\u17C4\u1798\u1795\u17D2\u17A2\u17C2\u1798 \u1793\u17B7\u1784\
+    \u179B\u17BE\u179F\u179F\u1798\u17D2\u1796\u17B6\u1792\u1788\u17B6\u1798\u1780\
+    \u17D2\u1793\u17BB\u1784\u1785\u17C6\u178E\u17C4\u1798\u1794\u17D2\u179A\u1787\
+    \u17B6\u1787\u1793\u178A\u17C2\u179B\u1798\u17B6\u1793\u17A2\u17B6\u1799\u17BB\
+    \u1785\u17B6\u1794\u17CB\u1796\u17B8 40 \u1786\u17D2\u1793\u17B6\u17C6\u17A1\u17BE\
+    \u1784\u1791\u17C5\u1794\u17B6\u1793\u1798\u1780\u1796\u17B7\u1793\u17B7\u178F\
+    \u17D2\u1799\u179A\u1780\u1798\u17BE\u179B \u1787\u17C6\u1784\u17BA\u179B\u17BE\
+    \u179F\u1788\u17B6\u1798 \u1793\u17B7\u1784\u1787\u17C6\u1784\u17BA\u1791\u17B9\
+    \u1780\u1793\u17C4\u1798\u1795\u17D2\u17A2\u17C2\u1798\u1780\u17D2\u1793\u17BB\
+    \u1784\u179A\u1799\u17C8\u1796\u17C1\u179B \u17E1\u17E2 \u1781\u17C2 (Percentage\
+    \ of individuals diagnosed with hypertension and diabetes among people aged 40\
+    \ and above was screened for hypertension and diabetes in the last 12 months)"
+  metric_type: null
+  expression: "CONCAT(ROUND((COUNT(DISTINCT\n  CASE \n    WHEN is_diagnosed_with_dm_and_hbp\
+    \ = 1 THEN patient_uuid \n    ELSE NULL \n  END\n)\n::decimal / NULLIF(COUNT(DISTINCT\
+    \ patient_uuid), 0)) * 100, 2),'%')\n"
+  description: null
+  d3format: null
+  currency: null
+  extra:
+    warning_markdown: ''
+  warning_text: null
+- metric_name: percentage_patients_diagnosed_with_dm
+  verbose_name: "\u1797\u17B6\u1782\u179A\u1799\u1793\u17C3\u1794\u17BB\u1782\u17D2\
+    \u1782\u179B\u178A\u17C2\u179B\u178F\u17D2\u179A\u17BC\u179C\u1794\u17B6\u1793\
+    \u1792\u17D2\u179C\u17BE\u179A\u17C4\u1782\u179C\u17B7\u1793\u17B7\u1785\u17D2\
+    \u1786\u17D0\u1799\u1790\u17B6\u1798\u17B6\u1793\u1787\u17C6\u1784\u17BA\u1791\
+    \u17B9\u1780\u1793\u17C4\u1798\u1795\u17D2\u17A2\u17C2\u1798\u1780\u17D2\u1793\
+    \u17BB\u1784\u1785\u17C6\u178E\u17C4\u1798\u1794\u17D2\u179A\u1787\u17B6\u1787\
+    \u1793\u178A\u17C2\u179B\u1798\u17B6\u1793\u17A2\u17B6\u1799\u17BB\u1785\u17B6\
+    \u1794\u17CB\u1796\u17B8 40 \u1786\u17D2\u1793\u17B6\u17C6\u17A1\u17BE\u1784\u1791\
+    \u17C5\u1794\u17B6\u1793\u1798\u1780\u1796\u17B7\u1793\u17B7\u178F\u17D2\u1799\
+    \u179A\u1780\u1798\u17BE\u179B \u1787\u17C6\u1784\u17BA\u179B\u17BE\u179F\u179F\
+    \u1798\u17D2\u1796\u17B6\u1792\u1788\u17B6\u1798 \u1793\u17B7\u1784\u1787\u17C6\
+    \u1784\u17BA\u1791\u17B9\u1780\u1793\u17C4\u1798\u1795\u17D2\u17A2\u17C2\u1798\
+    \u1780\u17D2\u1793\u17BB\u1784\u179A\u1799\u17C8\u1796\u17C1\u179B \u17E1\u17E2\
+    \ \u1781\u17C2 (Percentage of individuals diagnosed with diabetes among people\
+    \ aged 40 and above was screened for hypertension and diabetes in the last 12\
+    \ months)"
+  metric_type: null
+  expression: "CONCAT(ROUND((COUNT(DISTINCT\n  CASE \n    WHEN is_diagnosed_with_dm\
+    \ = 1 THEN patient_uuid \n    ELSE NULL \n  END\n)::decimal / NULLIF(COUNT(DISTINCT\
+    \ patient_uuid), 0)) * 100, 2),'%')\n"
+  description: null
+  d3format: null
+  currency: null
+  extra:
+    warning_markdown: ''
+  warning_text: null
+- metric_name: percentage_patients_diagnosed_with_hbp
+  verbose_name: "\u1797\u17B6\u1782\u179A\u1799\u1793\u17C3\u1794\u17BB\u1782\u17D2\
+    \u1782\u179B\u178A\u17C2\u179B\u178F\u17D2\u179A\u17BC\u179C\u1794\u17B6\u1793\
+    \u1792\u17D2\u179C\u17BE\u179A\u17C4\u1782\u179C\u17B7\u1793\u17B7\u1785\u17D2\
+    \u1786\u17D0\u1799\u1790\u17B6\u1798\u17B6\u1793\u1787\u17C6\u1784\u17BA\u179B\
+    \u17BE\u179F\u179F\u1798\u17D2\u1796\u17B6\u1792\u1788\u17B6\u1798\u1780\u17D2\
+    \u1793\u17BB\u1784\u1785\u17C6\u178E\u17C4\u1798\u1794\u17D2\u179A\u1787\u17B6\
+    \u1787\u1793\u178A\u17C2\u179B\u1798\u17B6\u1793\u17A2\u17B6\u1799\u17BB\u1785\
+    \u17B6\u1794\u17CB\u1796\u17B8 40 \u1786\u17D2\u1793\u17B6\u17C6\u17A1\u17BE\u1784\
+    \u1791\u17C5\u1794\u17B6\u1793\u1798\u1780\u1796\u17B7\u1793\u17B7\u178F\u17D2\
+    \u1799\u179A\u1780\u1798\u17BE\u179B \u1787\u17C6\u1784\u17BA\u179B\u17BE\u179F\
+    \u1788\u17B6\u1798 \u1793\u17B7\u1784\u1787\u17C6\u1784\u17BA\u1791\u17B9\u1780\
+    \u1793\u17C4\u1798\u1795\u17D2\u17A2\u17C2\u1798\u1780\u17D2\u1793\u17BB\u1784\
+    \u179A\u1799\u17C8\u1796\u17C1\u179B \u17E1\u17E2\u1781\u17C2 (Percentage of individuals\
+    \ diagnosed with hypertension among people aged 40 and above was screened for\
+    \ hypertension and diabetes in the last 12 months)"
+  metric_type: null
+  expression: "CONCAT(ROUND((COUNT(DISTINCT\n  CASE \n    WHEN is_diagnosed_with_hbp\
+    \ = 1 THEN patient_uuid \n    ELSE NULL \n  END\n)::decimal / NULLIF(COUNT(DISTINCT\
+    \ patient_uuid), 0)) * 100, 2),'%')\n"
+  description: null
+  d3format: null
+  currency: null
+  extra:
+    warning_markdown: ''
+  warning_text: null
+- metric_name: dist_count_patients_diagnosed_with_dm_and_hbp
+  verbose_name: "\u1785\u17C6\u1793\u17BD\u1793\u1794\u17D2\u179A\u1787\u17B6\u1787\
+    \u1793\u1782\u17C4\u179B\u178A\u17C5\u178A\u17C2\u179B\u1798\u17B6\u1793\u17A2\
+    \u17B6\u1799\u17BB\u1785\u17B6\u1794\u17CB\u1796\u17B8 40 \u1786\u17D2\u1793\u17B6\
+    \u17C6\u17A1\u17BE\u1784\u1791\u17C5\u1794\u17B6\u1793\u1792\u17D2\u179C\u17BE\
+    \u179A\u17C4\u1782\u179C\u17B7\u1793\u17B7\u1785\u17D2\u1786\u17D0\u1799\u1783\
+    \u17BE\u1789\u1790\u17B6\u1798\u17B6\u1793\u1787\u17C6\u1784\u17BA\u1791\u17B9\
+    \u1780\u1793\u17C4\u1798\u1795\u17D2\u17A2\u17C2\u1798 \u1793\u17B7\u1784\u200B\
+    \ \u179B\u17BE\u179F\u179F\u1798\u17D2\u1796\u17B6\u1792\u1788\u17B6\u1798\u1780\
+    \u17D2\u1793\u17BB\u1784\u179A\u1799\u17C8\u1796\u17C1\u179B\u17E1\u17E2\u1781\
+    \u17C3 (   \t Number of individuals target population aged 40 and above  was diagnosed\
+    \ with diabetes and hypertension in the last 12 months)"
+  metric_type: null
+  expression: "COUNT(DISTINCT\n  CASE \n    WHEN is_diagnosed_with_dm_and_hbp = 1\
+    \ THEN patient_uuid \n    ELSE NULL \n  END\n)\n"
+  description: null
+  d3format: null
+  currency: null
+  extra:
+    warning_markdown: ''
+  warning_text: null
+- metric_name: dist_count_diag_dm_hbp_treated_no_showup_after_30d_of_app
+  verbose_name: "\u1785\u17C6\u1793\u17BD\u1793\u179F\u179A\u17BB\u1794\u17A2\u17D2\
+    \u1793\u1780\u1787\u17C6\u1784\u17BA\u179B\u17BE\u179F\u179F\u1798\u17D2\u1796\
+    \u17B6\u1792\u1788\u17B6\u1798   \u1793\u17B7\u1784\u17A2\u17D2\u1793\u1780\u1787\
+    \u17C6\u1784\u17BA\u1791\u17B9\u1780\u1793\u17C4\u1798\u1795\u17D2\u17A2\u17C2\
+    \u1798 \u178A\u17C2\u179B\u1798\u17B7\u1793\u1794\u17B6\u1793\u1785\u17BC\u179B\
+    \u1798\u1780\u1798\u178E\u17D2\u178C\u179B\u179F\u17BB\u1781\u1797\u17B6\u1796\
+    \u179B\u17BE\u179F\u1796\u17B8 \u17E3\u17E0\u1790\u17D2\u1784\u17C3 (Total number\
+    \ of diabetes and hypertension patients who have not shown up at the health centre\
+    \ over 30 days)"
+  metric_type: null
+  expression: "COUNT(DISTINCT\n  CASE \n    WHEN diagnosed_with_dm_and_hbp_and_treated\
+    \ = 1 AND did_not_showup_30_days_after_appointment = 1 THEN patient_uuid \n  \
+    \  ELSE NULL \n  END\n)"
+  description: null
+  d3format: null
+  currency: null
+  extra:
+    warning_markdown: ''
+  warning_text: null
+- metric_name: dist_count_diag_with_dm_treated_fulfilled_followup
+  verbose_name: "\u1785\u17C6\u1793\u17BD\u1793\u17A2\u17D2\u1793\u1780\u1787\u17C6\
+    \u1784\u17BA\u1791\u17B9\u1780\u1793\u17C4\u1798\u1795\u17D2\u17A2\u17C2\u1798\
+    \ \u178A\u17C2\u179B\u1791\u1791\u17BD\u179B\u1780\u17B6\u179A\u1796\u17D2\u1799\
+    \u17B6\u1794\u17B6\u179B\u1794\u1793\u17D2\u178F\u1793\u17C5\u1798\u178E\u17D2\
+    \u178C\u179B\u179F\u17BB\u1781\u1797\u17B6\u1796\u179A\u1799\u17C8\u1796\u17C1\
+    \u179B\u1798\u17B7\u1793\u179B\u17BE\u179F\u1796\u17B8 \u17E7\u1790\u17D2\u1784\
+    \u17C3 \u1793\u17C3\u1780\u17B6\u179B\u1794\u179A\u17B7\u1785\u17D2\u1786\u17C1\
+    \u1791\u178F\u17B6\u1798\u178A\u17B6\u1793 (Number of diabetes patient receiving\
+    \ treatment in health centres no later than 7 days of follow up/appointment date)"
+  metric_type: null
+  expression: "COUNT(DISTINCT\n  CASE \n    WHEN diagnosed_with_dm_and_treated = 1\
+    \ AND fulfilled_follow_up = 1 THEN patient_uuid \n    ELSE NULL \n  END\n)"
+  description: null
+  d3format: null
+  currency: null
+  extra:
+    warning_markdown: ''
+  warning_text: null
+- metric_name: dist_count_patients_diagnosed_with_hbp
+  verbose_name: "\u1785\u17C6\u1793\u17BD\u1793\u1794\u17D2\u179A\u1787\u17B6\u1787\
+    \u1793\u1782\u17C4\u179B\u178A\u17C5\u178A\u17C2\u179B\u1798\u17B6\u1793\u17A2\
+    \u17B6\u1799\u17BB\u1785\u17B6\u1794\u17CB\u1796\u17B8 40 \u1786\u17D2\u1793\u17B6\
+    \u17C6\u17A1\u17BE\u1784\u1791\u17C5\u1794\u17B6\u1793\u1792\u17D2\u179C\u17BE\
+    \  \u179A\u17C4\u1782\u179C\u17B7\u1793\u17B7\u1785\u17D2\u1786\u17D0\u1799\u1783\
+    \u17BE\u1789\u1790\u17B6\u1798\u17B6\u1793\u179B\u17BE\u179F\u179F\u1798\u17D2\
+    \u1796\u17B6\u1792\u1788\u17B6\u1798\u1780\u17D2\u1793\u17BB\u1784\u179A\u1799\
+    \u17C8\u1796\u17C1\u179B\u17E1\u17E2 \u1781\u17C2\u1798\u17BB\u1793 (Number of\
+    \ individuals target population aged 40 and above  was diagnosed with hypertension\
+    \ in the last 12 months)"
+  metric_type: null
+  expression: "COUNT(DISTINCT\n  CASE \n    WHEN is_diagnosed_with_hbp = 1 THEN patient_uuid\
+    \ \n    ELSE NULL \n  END\n)"
+  description: null
+  d3format: null
+  currency: null
+  extra:
+    warning_markdown: ''
+  warning_text: null
+- metric_name: dist_count_diag_dm_treated_no_showup_after_30d_of_app
+  verbose_name: "\u1785\u17C6\u1793\u17BD\u1793\u179F\u179A\u17BB\u1794\u17A2\u17D2\
+    \u1793\u1780\u1787\u17C6\u1784\u17BA\u1791\u17B9\u1780\u1793\u17C4\u1798\u1795\
+    \u17D2\u17A2\u17C2\u1798 \u178A\u17C2\u179B\u1798\u17B7\u1793\u1794\u17B6\u1793\
+    \u1798\u1780\u1791\u1791\u17BD\u179B\u1780\u17B6\u179A\u1796\u17D2\u1799\u17B6\
+    \u1794\u17B6\u179B\u1793\u17C5\u1798\u178E\u17D2\u178C\u179B\u179F\u17BB\u1781\
+    \u1797\u17B6\u1796\u179B\u17BE\u179F\u1796\u17B8 \u17E3\u17E0\u1790\u17D2\u1784\
+    \u17C3 (Total number of diabetes patients who have not shown up at the health\
+    \ centre over 30 days)"
+  metric_type: null
+  expression: "COUNT(DISTINCT\n  CASE \n    WHEN diagnosed_with_dm_and_treated = 1\
+    \ AND did_not_showup_30_days_after_appointment = 1 THEN patient_uuid \n    ELSE\
+    \ NULL \n  END\n)"
+  description: null
+  d3format: null
+  currency: null
+  extra:
+    warning_markdown: ''
+  warning_text: null
+- metric_name: dist_count_diag_hbp_treated_no_showup_after_30d_of_app
+  verbose_name: "\u1785\u17C6\u1793\u17BD\u1793\u179F\u179A\u17BB\u1794\u17A2\u17D2\
+    \u1793\u1780\u1787\u17C6\u1784\u17BA\u179B\u17BE\u179F\u179F\u1798\u17D2\u1796\
+    \u17B6\u1792\u1788\u17B6\u1798 \u178A\u17C2\u179B\u1798\u17B7\u1793\u1794\u17B6\
+    \u1793\u1785\u17BC\u179B\u1798\u1780\u1798\u178E\u17D2\u178C\u179B\u179F\u17BB\
+    \u1781\u1797\u17B6\u1796\u179A\u1799\u17C8\u1796\u17C1\u179B\u179B\u17BE\u179F\
+    \u1796\u17B8 \u17E3\u17E0\u1790\u17D2\u1784\u17C3 (Total number of hypertension\
+    \ patients who have not shown up at the HCs over 30 days)"
+  metric_type: null
+  expression: "COUNT(DISTINCT\n  CASE \n    WHEN diagnosed_with_hbp_and_treated =\
+    \ 1 AND did_not_showup_30_days_after_appointment = 1 THEN patient_uuid \n    ELSE\
+    \ NULL \n  END\n)"
+  description: null
+  d3format: null
+  currency: null
+  extra:
+    warning_markdown: ''
+  warning_text: null
+- metric_name: dist_count_patients_diagnosed_with_dm
+  verbose_name: "\u1785\u17C6\u1793\u17BD\u1793\u1794\u17D2\u179A\u1787\u17B6\u1787\
+    \u1793\u1782\u17C4\u179B\u178A\u17C5\u178A\u17C2\u179B\u1798\u17B6\u1793\u17A2\
+    \u17B6\u1799\u17BB\u1785\u17B6\u1794\u17CB\u1796\u17B8 40 \u1786\u17D2\u1793\u17B6\
+    \u17C6\u17A1\u17BE\u1784\u1791\u17C5\u1794\u17B6\u1793\u1792\u17D2\u179C\u17BE\
+    \ \u179A\u17C4\u1782\u179C\u17B7\u1793\u17B7\u1785\u17D2\u1786\u17D0\u1799\u1783\
+    \u17BE\u1789\u1790\u17B6\u1798\u17B6\u1793\u1787\u17C6\u1784\u17BA\u1791\u17B9\
+    \u1780\u1793\u17C4\u1798\u1795\u17D2\u17A2\u17C2\u1798\u1780\u17D2\u1793\u17BB\
+    \u1784\u179A\u1799\u17C8\u1796\u17C1\u179B\u17E1\u17E2 \u1781\u17C2 (Number of\
+    \ individuals target population aged 40 and above was diagnosed with diabetes\
+    \ in the last 12 months)"
+  metric_type: null
+  expression: "COUNT(DISTINCT\n  CASE \n    WHEN is_diagnosed_with_dm = 1 THEN patient_uuid\
+    \ \n    ELSE NULL \n  END\n)"
+  description: null
+  d3format: null
+  currency: null
+  extra:
+    warning_markdown: ''
+  warning_text: null
+- metric_name: dist_count_diagnosed_with_dm_and_hbp_and_treated
+  verbose_name: "\u1785\u17C6\u1793\u17BD\u1793\u17A2\u17D2\u1793\u1780\u1787\u17C6\
+    \u1784\u17BA\u1791\u17B9\u1780\u1793\u17C4\u1798\u1795\u17D2\u17A2\u17C2\u1798\
+    \u1793\u17B7\u1784\u179B\u17BE\u179F\u179F\u1798\u17D2\u1796\u17B6\u1792\u1788\
+    \u17B6\u1798\u178F\u17D2\u179A\u17BC\u179C\u1794\u17B6\u1793\u1792\u17D2\u179C\
+    \u17BE\u1780\u17B6\u179A\u1790\u17C2\u1791\u17B6\u17C6\u1793\u17B7\u1784\u1796\
+    \u17D2\u1799\u17B6\u1794\u17B6\u179B\u1793\u17C5 \u1798\u17BC\u179B\u178A\u17D2\
+    \u178B\u17B6\u1793\u179F\u17BB\u1781\u17B6\u1797\u17B7\u1794\u17B6\u179B\u179F\
+    \u17B6\u1792\u17B6\u179A\u178E\u17C8\u1780\u17D2\u1793\u17BB\u1784\u179A\u1799\
+    \u17C8\u1796\u17C1\u179B\u17E1\u17E2 \u1781\u17C2 (Number of individuals hypertensions\
+    \ and diabetes patients receiving treatment at the public health facility in the\
+    \ last 12 months)"
+  metric_type: null
+  expression: "COUNT(DISTINCT\n  CASE \n    WHEN diagnosed_with_dm_and_hbp_and_treated\
+    \ = 1 THEN patient_uuid \n    ELSE NULL \n  END\n)"
+  description: null
+  d3format: null
+  currency: null
+  extra:
+    warning_markdown: ''
+  warning_text: null
+- metric_name: dist_count_diagnosed_with_dm_and_treated
+  verbose_name: "\u1785\u17C6\u1793\u17BD\u1793\u17A2\u17D2\u1793\u1780\u1787\u17C6\
+    \u1784\u17BA\u1791\u17B9\u1780\u1793\u17C4\u1798\u1795\u17D2\u17A2\u17C2\u1798\
+    \u178F\u17D2\u179A\u17BC\u179C\u1794\u17B6\u1793\u1792\u17D2\u179C\u17BE\u1780\
+    \u17B6\u179A\u1790\u17C2\u1791\u17B6\u17C6\u1793\u17B7\u1784\u1796\u17D2\u1799\
+    \u17B6\u1794\u17B6\u179B\u1793\u17C5\u1798\u17BC\u179B\u178A\u17D2\u178B\u17B6\
+    \u1793\u179F\u17BB\u1781\u17B6\u1797\u17B7\u1794\u17B6\u179B   \u179F\u17B6\u1792\
+    \u17B6\u179A\u178E\u17C8\u1780\u17D2\u1793\u17BB\u1784\u179A\u1799\u17C8\u1796\
+    \u17C1\u179B\u17E1\u17E2 \u1781\u17C2\u1798\u17BB\u1793 (Number of individuals\
+    \ diabetes patient receiving treatment at the public health facility in the last\
+    \ 12 months)"
+  metric_type: null
+  expression: "COUNT(DISTINCT\n  CASE \n    WHEN diagnosed_with_dm_and_treated = 1\
+    \ THEN patient_uuid \n    ELSE NULL \n  END\n)"
+  description: null
+  d3format: null
+  currency: null
+  extra:
+    warning_markdown: ''
+  warning_text: null
+- metric_name: dist_count_diag_with_hbp_treated_fulfilled_followup
+  verbose_name: "\u1785\u17C6\u1793\u17BD\u1793\u17A2\u17D2\u1793\u1780\u1787\u17C6\
+    \u1784\u17BA\u179B\u17BE\u179F\u179F\u1798\u17D2\u1796\u17B6\u1792\u1788\u17B6\
+    \u1798 \u178A\u17C2\u179B\u1791\u1791\u17BD\u179B\u1794\u17B6\u1793\u1780\u17B6\
+    \u179A\u178F\u17B6\u1798\u178A\u17B6\u1793 \u1793\u17B7\u1784\u1780\u17B6\u179A\
+    \u1796\u17D2\u1799\u17B6\u1794\u17B6\u179B\u1794\u1793\u17D2\u178F\u1793\u17C5\
+    \u1798\u178E\u17D2\u178C\u179B\u179F\u17BB\u1781\u1797\u17B6\u1796\u1791\u17B6\
+    \u1793\u17CB\u1796\u17C1\u179B/\u178F\u17B6\u1798\u1780\u17B6\u179A\u178E\u17B6\
+    \u178F\u17CB (Number of individuals with hypertension receiving follow-up treatment\
+    \ in health centres on time/appointment date)"
+  metric_type: null
+  expression: "COUNT(DISTINCT\n  CASE \n    WHEN diagnosed_with_hbp_and_treated =\
+    \ 1 AND fulfilled_follow_up = 1 THEN patient_uuid \n    ELSE NULL \n  END\n)"
+  description: null
+  d3format: null
+  currency: null
+  extra:
+    warning_markdown: ''
+  warning_text: null
+- metric_name: dist_count_dm_with_hbp_dropout_90
+  verbose_name: "\u1785\u17C6\u1793\u17BD\u1793\u1787\u17C6\u1784\u17BA\u1791\u17B9\
+    \u1780\u1793\u17C4\u1798\u1795\u17D2\u17A2\u17C2\u1798\u1793\u17B7\u1784\u179B\
+    \u17BE\u179F\u179F\u1798\u17D2\u1796\u17B6\u1792\u1788\u17B6\u1798\u178A\u17C2\
+    \u179B\u1798\u17B7\u1793\u1794\u17B6\u1793\u1798\u1780\u1792\u17D2\u179C\u17BE\
+    \u1780\u17B6\u179A\u1790\u17C2\u1791\u17B6\u17C6\u1793\u17B7\u1784\u1796\u17D2\
+    \u1799\u17B6\u1794\u17B6\u179B\u1793\u17C5\u1798\u178E\u17D2\u178C\u179B\u179F\
+    \u17BB\u1781\u1797\u17B6\u1796\u1780\u17D2\u1793\u17BB\u1784\u179A\u1799\u17C8\
+    \u1796\u17C1\u179B\u17E1\u17E2\u1781\u17C2 \u1799\u17C9\u17B6\u1784\u178F\u17B7\
+    \u1785\u17E1\u17E2\u1781\u17C2\u1785\u17B6\u1794\u17CB\u1796\u17B8\u1780\u17B6\
+    \u179A\u1790\u17C2\u1791\u17B6\u17C6\u1793\u17B7\u1784\u1796\u17D2\u1799\u17B6\
+    \u1794\u17B6\u179B\u1785\u17BB\u1784\u1780\u17D2\u179A\u17C4\u1799\u1782\u17C1\
+    \ (Total number of hypertension and diabetes patients who have not shown up at\
+    \ the HCs over 90 days)"
+  metric_type: null
+  expression: "COUNT(DISTINCT\n  CASE \n    WHEN dm_and_hbp_dropout_90 = 1 THEN patient_uuid\
+    \ \n    ELSE NULL \n  END\n)"
+  description: null
+  d3format: null
+  currency: null
+  extra:
+    warning_markdown: ''
+  warning_text: null
+- metric_name: dist_count_hbp_dropout_90
+  verbose_name: " \u1785\u17C6\u1793\u17BD\u1793\u179F\u179A\u17BB\u1794\u17A2\u17D2\
+    \u1793\u1780\u1787\u17C6\u1784\u17BA\u179B\u17BE\u179F\u179F\u1798\u17D2\u1796\
+    \u17B6\u1792\u1788\u17B6\u1798 \u178A\u17C2\u179B\u1798\u17B7\u1793\u1794\u17B6\
+    \u1793\u1785\u17BC\u179B\u1798\u1780\u1798\u178E\u17D2\u178C\u179B\u179F\u17BB\
+    \u1781\u1797\u17B6\u1796\u179A\u1799\u17C8\u1796\u17C1\u179B\u179B\u17BE\u179F\
+    \u1796\u17B8 \u17E9\u17E0\u1790\u17D2\u1784\u17C3 (Total number of hypertension\
+    \ patients who have not shown up at the HCs over 90 days)"
+  metric_type: null
+  expression: "COUNT(DISTINCT\n  CASE \n    WHEN hbp_dropout_90 = 1 THEN patient_uuid\
+    \ \n    ELSE NULL \n  END\n)"
+  description: null
+  d3format: null
+  currency: null
+  extra:
+    warning_markdown: ''
+  warning_text: null
+- metric_name: dist_count_diagnosed_with_hbp_and_treated
+  verbose_name: "\u1785\u17C6\u1793\u17BD\u1793\u17A2\u17D2\u1793\u1780\u1787\u17C6\
+    \u1784\u17BA\u179B\u17BE\u179F\u179F\u1798\u17D2\u1796\u17B6\u1792\u1788\u17B6\
+    \u1798\u178F\u17D2\u179A\u17BC\u179C\u1794\u17B6\u1793\u1792\u17D2\u179C\u17BE\
+    \u1780\u17B6\u179A\u1790\u17C2\u1791\u17B6\u17C6\u1793\u17B7\u1784\u1796\u17D2\
+    \u1799\u17B6\u1794\u17B6\u179B\u1793\u17C5\u1798\u17BC\u179B\u178A\u17D2\u178B\
+    \u17B6\u1793\u179F\u17BB\u1781\u17B6\u1797\u17B7\u1794\u17B6\u179B\u179F\u17B6\
+    \u1792\u17B6\u179A\u178E\u17C8\u1798\u178E\u17D2\u178C\u179B\u179F\u17BB\u1781\
+    \u1797\u17B6\u1796\u1780\u17D2\u1793\u17BB\u1784\u179A\u1799\u17C8\u1796\u17C1\
+    \u179B\u17E1\u17E2 \u1781\u17C2 (Number of individuals hypertensions patients\
+    \ receiving treatment at the public health facility in the last 12 months) "
+  metric_type: null
+  expression: "COUNT(DISTINCT\n  CASE \n    WHEN diagnosed_with_hbp_and_treated =\
+    \ 1 THEN patient_uuid \n    ELSE NULL \n  END\n)"
+  description: null
+  d3format: null
+  currency: null
+  extra:
+    warning_markdown: ''
+  warning_text: null
+- metric_name: dist_count_dm_dropout_90
+  verbose_name: "\u1785\u17C6\u1793\u17BD\u1793\u179F\u179A\u17BB\u1794\u17A2\u17D2\
+    \u1793\u1780\u1787\u17C6\u1784\u17BA\u1791\u17B9\u1780\u1793\u17C4\u1798\u1795\
+    \u17D2\u17A2\u17C2\u1798 \u178A\u17C2\u179B\u1798\u17B7\u1793\u1794\u17B6\u1793\
+    \u1798\u1780\u1791\u1791\u17BD\u179B\u1780\u17B6\u179A\u1796\u17D2\u1799\u17B6\
+    \u1794\u17B6\u179B\u1793\u17C5\u1798\u178E\u17D2\u178C\u179B\u179F\u17BB\u1781\
+    \u1797\u17B6\u1796\u179B\u17BE\u179F\u1796\u17B8\u17E9\u17E0\u1790\u17D2\u1784\
+    \u17C3 (Total number of diabetes patients who have not shown up at the HCs over\
+    \ 90 days)"
+  metric_type: null
+  expression: "COUNT(DISTINCT\n  CASE \n    WHEN dm_dropout_90 = 1 THEN patient_uuid\
+    \ \n    ELSE NULL \n  END\n)"
+  description: null
+  d3format: null
+  currency: null
+  extra:
+    warning_markdown: ''
+  warning_text: null
+- metric_name: dist_count_patient_screened
+  verbose_name: "\u1785\u17C6\u1793\u17BD\u1793\u1794\u17D2\u179A\u1787\u17B6\u1787\
+    \u1793\u1782\u17C4\u179B\u178A\u17C5\u178A\u17C2\u179B\u1798\u17B6\u1793\u17A2\
+    \u17B6\u1799\u17BB\u1785\u17B6\u1794\u17CB\u1796\u17B8 40 \u1786\u17D2\u1793\u17B6\
+    \u17C6\u17A1\u17BE\u1784\u1791\u17C5\u178F\u17D2\u179A\u17BC\u179C\u1794\u17B6\
+    \u1793\u1796\u17B7\u1793\u17B7\u178F\u17D2\u1799\u179A\u1780\u1798\u17BE\u179B\
+    \u1787\u17C6\u1784\u17BA\u1791\u17B9\u1780\u1793\u17C4\u1798\u1795\u17D2\u17A2\
+    \u17C2\u1798 \u1793\u17B7\u1784\u179B\u17BE\u179F\u179F\u1798\u17D2\u1796\u17B6\
+    \u1792\u1788\u17B6\u1798\u1780\u17D2\u1793\u17BB\u1784\u179A\u1799\u17C8\u1796\
+    \u17C1\u179B \u17E1\u17E2 \u1781\u17C2 (Number of people aged 40 and above was\
+    \ screened for hypertension and diabetes in the last 12 months)"
+  metric_type: null
+  expression: COUNT(DISTINCT patient_uuid)
+  description: null
+  d3format: null
+  currency: null
+  extra:
+    warning_markdown: ''
+  warning_text: null
+columns:
+- column_name: dm_and_hbp_dropout_30
+  verbose_name: null
+  is_dttm: false
+  is_active: true
+  type: INTEGER
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra: {}
+- column_name: hbp_dropout_30
+  verbose_name: null
+  is_dttm: false
+  is_active: true
+  type: INTEGER
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra: {}
+- column_name: dm_dropout_30
+  verbose_name: null
+  is_dttm: false
+  is_active: true
+  type: INTEGER
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra: {}
+- column_name: dm_and_hbp_dropout_90
+  verbose_name: null
+  is_dttm: false
+  is_active: true
+  type: INTEGER
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra: {}
+- column_name: hbp_dropout_90
+  verbose_name: null
+  is_dttm: false
+  is_active: true
+  type: INTEGER
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra: {}
+- column_name: dm_dropout_90
+  verbose_name: null
+  is_dttm: false
+  is_active: true
+  type: INTEGER
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra: {}
+- column_name: date_started
+  verbose_name: null
+  is_dttm: true
+  is_active: true
+  type: DATETIME
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra: {}
+- column_name: cvd_score
+  verbose_name: null
+  is_dttm: false
+  is_active: true
+  type: FLOAT
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra: {}
+- column_name: age
+  verbose_name: null
+  is_dttm: false
+  is_active: true
+  type: FLOAT
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra: {}
+- column_name: diagnosed_with_dm_and_hbp_and_treated
+  verbose_name: null
+  is_dttm: false
+  is_active: true
+  type: INTEGER
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra: {}
+- column_name: is_diagnosed_with_dm_and_hbp
+  verbose_name: null
+  is_dttm: false
+  is_active: true
+  type: INTEGER
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra: {}
+- column_name: diagnosed_with_hbp_and_treated
+  verbose_name: null
+  is_dttm: false
+  is_active: true
+  type: INTEGER
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra: {}
+- column_name: diagnosed_with_dm_and_treated
+  verbose_name: null
+  is_dttm: false
+  is_active: true
+  type: INTEGER
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra: {}
+- column_name: is_diagnosed_with_hbp
+  verbose_name: null
+  is_dttm: false
+  is_active: true
+  type: INTEGER
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra: {}
+- column_name: is_diagnosed_with_dm
+  verbose_name: null
+  is_dttm: false
+  is_active: true
+  type: INTEGER
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra: {}
+- column_name: fulfilled_follow_up
+  verbose_name: null
+  is_dttm: false
+  is_active: true
+  type: INTEGER
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra: {}
+- column_name: health_facility_name
+  verbose_name: null
+  is_dttm: false
+  is_active: true
+  type: STRING
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra: {}
+- column_name: health_facility_code
+  verbose_name: null
+  is_dttm: false
+  is_active: true
+  type: STRING
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra: {}
+- column_name: health_facility_district
+  verbose_name: null
+  is_dttm: false
+  is_active: true
+  type: STRING
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra: {}
+- column_name: health_facility_province
+  verbose_name: null
+  is_dttm: false
+  is_active: true
+  type: STRING
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra: {}
+- column_name: started_on_medicine
+  verbose_name: null
+  is_dttm: false
+  is_active: true
+  type: STRING
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra: {}
+- column_name: diagnosis_one
+  verbose_name: null
+  is_dttm: false
+  is_active: true
+  type: STRING
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra: {}
+- column_name: patient_uuid
+  verbose_name: null
+  is_dttm: false
+  is_active: true
+  type: STRING
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra: {}
+- column_name: diagnosis_two
+  verbose_name: null
+  is_dttm: false
+  is_active: true
+  type: STRING
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra: {}
+- column_name: encounter_type
+  verbose_name: null
+  is_dttm: false
+  is_active: true
+  type: STRING
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra: {}
+- column_name: visit_type
+  verbose_name: null
+  is_dttm: false
+  is_active: true
+  type: STRING
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra: {}
+- column_name: gender
+  verbose_name: null
+  is_dttm: false
+  is_active: true
+  type: STRING
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra: {}
+- column_name: type
+  verbose_name: null
+  is_dttm: false
+  is_active: true
+  type: STRING
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra: {}
+version: 1.0.0
+database_uuid: 42834407-4570-4111-8bf6-4f7080413333
diff --git a/base/configs/superset/assets/datasets/Analytics/RC_CCS_Report_Query-dataset.yaml b/base/configs/superset/assets/datasets/Analytics/RC_CCS_Report_Query-dataset.yaml
new file mode 100644
index 00000000..2feae84d
--- /dev/null
+++ b/base/configs/superset/assets/datasets/Analytics/RC_CCS_Report_Query-dataset.yaml
@@ -0,0 +1,593 @@
+table_name: RC CCS Report Query-dataset
+main_dttm_col: null
+description: null
+default_endpoint: null
+offset: 0
+cache_timeout: null
+schema: public
+sql: "SELECT\n    CASE \n        WHEN identifiers ~ '.*OpenMRS ID: (.*?)(,|$).*' THEN\
+  \ REGEXP_REPLACE(identifiers, '.*OpenMRS ID: (.*?)(,|$).*', '\\1', 'g')\n      \
+  \  ELSE ''\n    END AS \"OpenMRS ID\",\n    CASE \n        WHEN identifiers ~ '.*IDPoor:\
+  \ (.*?)(,|$).*' THEN REGEXP_REPLACE(identifiers, '.*IDPoor: (.*?)(,|$).*', '\\1',\
+  \ 'g')\n        ELSE ''\n    END AS \"ID Poor Card\",\n    CASE \n        WHEN identifiers\
+  \ ~ '.*National ID: (.*?)(,|$).*' THEN REGEXP_REPLACE(identifiers, '.*National ID:\
+  \ (.*?)(,|$).*', '\\1', 'g')\n        ELSE ''\n    END AS \"National ID Card\",\n\
+  \    CASE \n        WHEN identifiers ~ '.*PMRS ID: (.*?)(,|$).*' THEN REGEXP_REPLACE(identifiers,\
+  \ '.*PMRS ID: (.*?)(,|$).*', '\\1', 'g')\n        ELSE ''\n    END AS \"PMRS ID\
+  \ Number\",\n    COALESCE(\n        REGEXP_REPLACE(\n            REGEXP_REPLACE(\n\
+  \                identifiers, \n                '(?:OpenMRS ID|National ID|IDPoor|PMRS\
+  \ ID): [^,]*,?\\s?', \n                '', \n                'g'\n            ),\
+  \ \n            '^, |, $', \n            ''\n        ), \n        NULL\n    ) AS\
+  \ \"Other Identifiers\",\n    CONCAT_WS(' ', given_name, middle_name, family_name)\
+  \ AS \"Patient's name\",\n    DATE_PART('year', age(visit_date, birthdate)) AS \"\
+  Age\",\n    address_state_province AS \"Province/City\",\n    address_county_district\
+  \ AS \"District/ Khan\",\n    address_city AS \"Commune/ Sangkat\",\n    address_1\
+  \ AS \"Village\",\n    CASE \n        WHEN attributes ~ '.*Telephone Number: (.*?)(\\\
+  /|$).*' THEN REGEXP_REPLACE(attributes, '.*Telephone Number: (.*?)(\\/|$).*', '\\\
+  1', 'g')\n        ELSE ''\n    END AS \"Phone number\",\n    visit_date AS \"Visit\
+  \ date\",\n    visit_type AS \"Type of visit\",\n    insurance_type AS \"Payment\
+  \ type\",\n    referred_from AS \"Referred From\",\n    scj AS \"SCJ\",\n    via_test_result\
+  \ AS \"VIA test result\",\n    number_of_quadrants  AS \"If VIA(+) Number of Quadrants\
+  \ involved\",\n    acetowhite AS \"If VIA(+) % of Acetowhite site\",\n    hpv_test\
+  \ AS \"HPV Test result\",\n    hpv_type AS \"Type of HPV \",\n    cervical_treatment_coded\
+  \ As \"Treatment option\",\n    cervical_treatment_text AS \"Other treatment specified\"\
+  ,\n    self_breast_exam AS \"Self breast examination and education\",\n    breast_exam_result_coded\
+  \ AS \"Breast Examination Result\",\n    breast_exam_result_text AS \"Other Breast\
+  \ Examination Result\",\n    breast_cancer_treatment AS \"Treatment\",\n    f_province\
+  \ AS \"Facility Province\",\n    f_district AS \"Facility District\",\n    f_facility\
+  \ AS \"Facility Name\"\nFROM (\n    SELECT\n        patient_id,\n        given_name,\n\
+  \        middle_name,\n        family_name,\n        identifiers,\n        birthdate,\n\
+  \        address_state_province,\n        address_county_district,\n        address_city,\n\
+  \        address_1,\n        attributes,\n        vi.date_started AS \"visit_date\"\
+  ,\n        vi.type AS \"visit_type\",\n        CASE \n            WHEN vi.visit_attributes\
+  \ ~ '.*Insurance Type: (.*?)(\\/|$).*' THEN REGEXP_REPLACE(vi.visit_attributes,\
+  \ '.*Insurance Type: (.*?)(\\/|$).*', '\\1', 'g')\n            ELSE ''\n       \
+  \ END AS \"insurance_type\",\n        CASE \n            WHEN vi.visit_attributes\
+  \ ~ '.*Referred from: (.*?)(\\/|$).*' THEN REGEXP_REPLACE(vi.visit_attributes, '.*Referred\
+  \ from: (.*?)(\\/|$).*', '\\1', 'g')\n            ELSE ''\n        END AS \"referred_from\"\
+  ,\n        obs_scj.answer_coded AS \"scj\",\n        obs_via_test_result.answer_coded\
+  \ AS \"via_test_result\",\n        obs_number_of_quadrants.answer_coded  AS \"number_of_quadrants\"\
+  ,\n        obs_acetowhite.answer_coded AS \"acetowhite\",\n        obs_hpv_test.answer_coded\
+  \ AS \"hpv_test\",\n        obs_hpv_type.answer_coded AS \"hpv_type\",\n       \
+  \ obs_cervical_treatment.answer_coded As \"cervical_treatment_coded\",\n       \
+  \ obs_cervical_treatment.answer_text AS \"cervical_treatment_text\",\n        obs_self_breast_exam.answer_coded\
+  \ AS \"self_breast_exam\",\n        obs_breast_exam_result.answer_coded AS \"breast_exam_result_coded\"\
+  ,\n        obs_breast_exam_result.answer_text AS \"breast_exam_result_text\",\n\
+  \        obs_breast_cancer_treatment.answer_coded AS \"breast_cancer_treatment\"\
+  ,\n        facility_address.state_province AS \"f_province\",\n        facility_address.county_district\
+  \ AS \"f_district\",\n        facility_address.name AS \"f_facility\",\n       \
+  \ facility_address.location_tags AS \"l_tags\"\n    FROM patients pa\n    LEFT OUTER\
+  \ JOIN visits vi ON vi.visit_voided = false AND vi.patient_uuid = pa.patient_uuid\n\
+  \    LEFT OUTER JOIN locations facility_address ON facility_address.uuid = vi.location_uuid\n\
+  \    LEFT OUTER JOIN (\n        SELECT obs1.visit_uuid, MAX(date_created), obs1.answer_coded,\
+  \ obs1.encounter_uuid\n        FROM observations obs1\n        WHERE obs1.obs_voided\
+  \ = false AND obs1.question_uuid = 'd2ec630a-a223-492a-89f2-597266b36571'\n    \
+  \    GROUP BY obs1.visit_uuid, obs1.question_uuid, obs1.answer_coded, obs1.encounter_uuid\n\
+  \    ) AS obs_scj on obs_scj.visit_uuid = vi.visit_uuid\n    LEFT OUTER JOIN (\n\
+  \        SELECT obs2.visit_uuid, MAX(date_created), obs2.answer_coded, obs2.encounter_uuid\n\
+  \        FROM observations obs2\n        WHERE obs2.obs_voided = false AND obs2.question_uuid\
+  \ = '27912a31-4b1e-40d4-a3a0-947e0eb2e588'\n        GROUP BY obs2.visit_uuid, obs2.question_uuid,\
+  \ obs2.answer_coded, obs2.encounter_uuid\n    ) AS obs_via_test_result on obs_via_test_result.encounter_uuid\
+  \ = obs_scj.encounter_uuid\n    LEFT OUTER JOIN (\n        SELECT obs3.visit_uuid,\
+  \ MAX(date_created), obs3.answer_coded, obs3.encounter_uuid\n        FROM observations\
+  \ obs3\n        WHERE obs3.obs_voided = false AND obs3.question_uuid = '0dd61510-1ddd-49e8-838b-b4ec7fdaf95f'\n\
+  \        GROUP BY obs3.visit_uuid, obs3.question_uuid, obs3.answer_coded, obs3.encounter_uuid\n\
+  \    ) AS obs_number_of_quadrants  on obs_number_of_quadrants.encounter_uuid = obs_scj.encounter_uuid\n\
+  \    LEFT OUTER JOIN (\n        SELECT obs4.visit_uuid, MAX(date_created), obs4.answer_coded,\
+  \ obs4.encounter_uuid\n        FROM observations obs4\n        WHERE obs4.obs_voided\
+  \ = false AND obs4.question_uuid = 'a84a070a-172f-43f7-96f3-67574d42ba1b'\n    \
+  \    GROUP BY obs4.visit_uuid, obs4.question_uuid, obs4.answer_coded, obs4.encounter_uuid\n\
+  \    ) AS obs_acetowhite  on obs_acetowhite.encounter_uuid = obs_scj.encounter_uuid\n\
+  \    LEFT OUTER JOIN (\n        SELECT obs5.visit_uuid, MAX(date_created), obs5.answer_coded,\
+  \ obs5.encounter_uuid\n        FROM observations obs5\n        WHERE obs5.obs_voided\
+  \ = false AND obs5.question_uuid = 'b643325d-0d63-4ba0-9c0d-e1c0a1c9f3ce'\n    \
+  \    GROUP BY obs5.visit_uuid, obs5.question_uuid, obs5.answer_coded, obs5.encounter_uuid\n\
+  \    ) AS obs_hpv_test  on obs_hpv_test.encounter_uuid = obs_scj.encounter_uuid\n\
+  \    LEFT OUTER JOIN (\n        SELECT obs6.visit_uuid, MAX(date_created), obs6.answer_coded,\
+  \ obs6.encounter_uuid\n        FROM observations obs6\n        WHERE obs6.obs_voided\
+  \ = false AND obs6.question_uuid = '5f27683c-e4ab-4a10-922d-e34bbb560884'\n    \
+  \    GROUP BY obs6.visit_uuid, obs6.question_uuid, obs6.answer_coded, obs6.encounter_uuid\n\
+  \    ) AS obs_hpv_type  on obs_hpv_type.encounter_uuid = obs_scj.encounter_uuid\n\
+  \    LEFT OUTER JOIN (\n        SELECT obs7.visit_uuid, MAX(obs7.date_created),\
+  \ obs7.answer_coded, obs7.encounter_uuid, obs_other_treatment.answer_text\n    \
+  \    FROM observations obs7\n        LEFT OUTER JOIN observations obs_other_treatment\
+  \ ON obs_other_treatment.obs_voided = false AND obs7.encounter_uuid = obs_other_treatment.encounter_uuid\
+  \ AND obs_other_treatment.question_uuid = 'e6d18ff5-9d52-4e47-b2b2-762d9aa30604'\n\
+  \        WHERE obs7.obs_voided = false AND obs7.question_uuid = '1ca7d712-f7d7-4e09-8184-048bc4173902'\n\
+  \        GROUP BY obs7.visit_uuid, obs7.question_uuid, obs7.answer_coded, obs7.encounter_uuid,\
+  \ obs_other_treatment.answer_text\n    ) AS obs_cervical_treatment  on obs_cervical_treatment.encounter_uuid\
+  \ = obs_scj.encounter_uuid\n    LEFT OUTER JOIN (\n        SELECT obs8.visit_uuid,\
+  \ MAX(date_created), obs8.answer_coded, obs8.encounter_uuid\n        FROM observations\
+  \ obs8\n        WHERE obs8.obs_voided = false AND obs8.question_uuid = 'c208aa27-9790-4dbf-84eb-2ffc321a1230'\n\
+  \        GROUP BY obs8.visit_uuid, obs8.question_uuid, obs8.answer_coded, obs8.encounter_uuid\n\
+  \    ) AS obs_self_breast_exam  ON obs_self_breast_exam.encounter_uuid = obs_scj.encounter_uuid\n\
+  \    LEFT OUTER JOIN (\n        SELECT obs9.visit_uuid, MAX(obs9.date_created),\
+  \ obs9.answer_coded, obs9.encounter_uuid, obs_other_result.answer_text\n       \
+  \ FROM observations obs9\n        LEFT OUTER JOIN observations obs_other_result\
+  \ ON obs_other_result.obs_voided = false AND obs9.encounter_uuid = obs_other_result.encounter_uuid\
+  \ AND obs_other_result.question_uuid = 'f984b718-d674-40c4-9ac4-8d22963e1933'\n\
+  \        WHERE obs9.obs_voided = false AND obs9.question_uuid = 'd1fd20ef-6363-4065-98d6-f36b8f1dc27e'\n\
+  \        GROUP BY obs9.visit_uuid, obs9.question_uuid, obs9.answer_coded, obs9.encounter_uuid,\
+  \ obs_other_result.answer_text\n    ) AS obs_breast_exam_result  on obs_breast_exam_result.encounter_uuid\
+  \ = obs_scj.encounter_uuid\n    LEFT OUTER JOIN (\n        SELECT obs10.visit_uuid,\
+  \ MAX(date_created), obs10.answer_coded, obs10.encounter_uuid\n        FROM observations\
+  \ obs10\n        WHERE obs10.obs_voided = false AND obs10.question_uuid = 'ed4d2e2f-1ebf-4ab6-b4ee-6dc6d24fca12'\n\
+  \        GROUP BY obs10.visit_uuid, obs10.question_uuid, obs10.answer_coded, obs10.encounter_uuid\n\
+  \    ) AS obs_breast_cancer_treatment  ON obs_breast_cancer_treatment.encounter_uuid\
+  \ = obs_scj.encounter_uuid\n) AS patient_info \nWHERE patient_info.visit_type IN\
+  \ ('Cervical Cancer New Visit', 'Cervical Cancer Follow-up Visit') AND patient_info.l_tags\
+  \ LIKE '%Referral Hospital%'"
+params: null
+template_params: null
+filter_select_enabled: false
+fetch_values_predicate: null
+extra: null
+normalize_columns: false
+always_filter_main_dttm: false
+uuid: ec4ccb14-7449-490e-acb4-20bac3bd9935
+metrics:
+- metric_name: count
+  verbose_name: null
+  metric_type: null
+  expression: count(*)
+  description: null
+  d3format: null
+  currency: null
+  extra:
+    warning_markdown: ''
+  warning_text: null
+columns:
+- column_name: Other treatment specified
+  verbose_name: "\u1780\u17B6\u179A\u1796\u17D2\u1799\u17B6\u1794\u17B6\u179B - \u1794\
+    \u17D2\u179A\u179F\u17B7\u1793\u1794\u17BE\u1785\u1793\u17D2\u179B\u17C4\u17C7\
+    \ 22 \"\u1795\u17D2\u179F\u17C1\u1784\u17D7\" \u179F\u17BC\u1798\u1798\u17C1\u178F\
+    \u17D2\u178F\u17B6\u1794\u1789\u17D2\u1787\u17B6\u1780\u17CB (Treatment - If Column\
+    \ 22 \"Other\", Please Specify)"
+  is_dttm: false
+  is_active: true
+  type: STRING
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: If VIA(+) % of Acetowhite site
+  verbose_name: "\u1794\u17D2\u179A\u179F\u17B7\u1793\u1794\u17BE VIA(+) - \u1797\u17B6\
+    \u1782\u179A\u1799\u1793\u17C3\u178F\u17C6\u1794\u1793\u17CB\u1785\u17B6\u1794\
+    \u17CB\u1796\u178E\u17CC\u179F (If VIA(+) - % of Acetowhite site)"
+  is_dttm: false
+  is_active: true
+  type: STRING
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: If VIA(+) Number of Quadrants involved
+  verbose_name: "\u1794\u17D2\u179A\u179F\u17B7\u1793\u1794\u17BE VIA(+) - \u1785\u17C6\
+    \u1793\u17BD\u1793\u1780\u17B6\u178A\u17D2\u179A\u1784\u17CB\u1796\u17B6\u1780\
+    \u17CB\u1796\u17D0\u1793\u17D2\u1792 (If VIA(+) - Number of Quadrants involved)"
+  is_dttm: false
+  is_active: true
+  type: STRING
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: Other Breast Examination Result
+  verbose_name: "\u1794\u17D2\u179A\u179F\u17B7\u1793\u1794\u17BE\u1785\u1793\u17D2\
+    \u179B\u17C4\u17C7 29 \"\u1795\u17D2\u179F\u17C1\u1784\u17D7\" \u179F\u17BC\u1798\
+    \u1798\u17C1\u178F\u17D2\u178F\u17B6\u1794\u1789\u17D2\u1787\u17B6\u1780\u17CB\
+    \ (If Column 29 \"Other\", Please specify)"
+  is_dttm: false
+  is_active: true
+  type: STRING
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: 'Type of HPV '
+  verbose_name: "\u178F\u17C1\u179F\u17D2\u178F - \u1794\u17D2\u179A\u1797\u17C1\u1791\
+    \u179C\u17B8\u179A\u17BB\u179F HPV (HPV Test - Type of HPV)"
+  is_dttm: false
+  is_active: true
+  type: STRING
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: Self breast examination and education
+  verbose_name: "\u17A2\u1794\u17CB\u179A\u17C6 \u1793\u17B7\u1784\u178E\u17C2\u1793\
+    \u17B6\u17C6\u17A2\u17C6\u1796\u17B8\u1780\u17B6\u179A\u179F\u17D2\u1791\u17B6\
+    \u1794\u1793\u17B7\u1784\u1796\u17B7\u1793\u17B7\u178F\u17D2\u1799\u178A\u17C4\
+    \u17C7\u178A\u17C4\u1799\u1781\u17D2\u179B\u17BD\u1793\u17AF\u1784 (Self breast\
+    \ examination and education)"
+  is_dttm: false
+  is_active: true
+  type: STRING
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: Breast Examination Result
+  verbose_name: "\u179B\u1791\u17D2\u1792\u1795\u179B\u1780\u17B6\u179A\u1796\u17B7\
+    \u1793\u17B7\u178F\u17D2\u1799-\u179F\u17D2\u1791\u17B6\u1794\u178A\u17C4\u17C7\
+    \ (\u178A\u17C4\u1799\u1798\u1793\u17D2\u178F\u17D2\u179A\u17B8\u179F\u17BB\u1781\
+    \u17B6\u1797\u17B7\u1794\u17B6\u179B) (Breast Examination Result (By Health Staff))"
+  is_dttm: false
+  is_active: true
+  type: STRING
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: VIA test result
+  verbose_name: "\u178F\u17C1\u179F\u17D2\u178F VIA - \u179B\u1791\u17D2\u1792\u1795\
+    \u179B (VIA Test - Result)"
+  is_dttm: false
+  is_active: true
+  type: STRING
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: HPV Test result
+  verbose_name: "\u178F\u17C1\u179F\u17D2\u178F - \u179B\u1791\u17D2\u1792\u1795\u179B\
+    \u178F\u17C1\u179F\u17D2\u178F HPV (HPV Test - Result)"
+  is_dttm: false
+  is_active: true
+  type: STRING
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: Commune/ Sangkat
+  verbose_name: "\u17A2\u17B6\u179F\u1799\u178A\u17D2\u178B\u17B6\u1793\u1794\u1785\
+    \u17D2\u1785\u17BB\u1794\u17D2\u1794\u1793\u17D2\u1793 - \u1783\u17BB\u17C6/\u179F\
+    \u1784\u17D2\u1780\u17B6\u178F\u17CB (Current Address - Commune)"
+  is_dttm: false
+  is_active: true
+  type: STRING
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: District/ Khan
+  verbose_name: "\u17A2\u17B6\u179F\u1799\u178A\u17D2\u178B\u17B6\u1793\u1794\u1785\
+    \u17D2\u1785\u17BB\u1794\u17D2\u1794\u1793\u17D2\u1793 - \u179F\u17D2\u179A\u17BB\
+    \u1780 (Current Address - District)"
+  is_dttm: false
+  is_active: true
+  type: STRING
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: OpenMRS ID
+  verbose_name: "\u179B\u17C1\u1781\u179F\u1798\u17D2\u1782\u17B6\u179B\u17CB\u17A2\
+    \u178F\u17B7\u1790\u17B7\u1787\u1793\u1780\u17D2\u1793\u17BB\u1784\u1794\u17D2\
+    \u179A\u1796\u17D0\u1793\u17D2\u1792 EMR (Patient OpenMRS ID (EMR))"
+  is_dttm: false
+  is_active: true
+  type: STRING
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: Province/City
+  verbose_name: "\u17A2\u17B6\u179F\u1799\u178A\u17D2\u178B\u17B6\u1793\u1794\u1785\
+    \u17D2\u1785\u17BB\u1794\u17D2\u1794\u1793\u17D2\u1793 - \u1781\u17C1\u178F\u17D2\
+    \u178F (Current Address - Province)"
+  is_dttm: false
+  is_active: true
+  type: STRING
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: Village
+  verbose_name: "\u17A2\u17B6\u179F\u1799\u178A\u17D2\u178B\u17B6\u1793\u1794\u1785\
+    \u17D2\u1785\u17BB\u1794\u17D2\u1794\u1793\u17D2\u1793 - \u1797\u17BC\u1798\u17B7\
+    \ (Current Address - Village)"
+  is_dttm: false
+  is_active: true
+  type: STRING
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: Treatment option
+  verbose_name: "\u1780\u17B6\u179A\u1796\u17D2\u1799\u17B6\u1794\u17B6\u179B - \u1798\
+    \u1792\u17D2\u1799\u17C4\u1794\u17B6\u1799 (Treatment - Option)"
+  is_dttm: false
+  is_active: true
+  type: STRING
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: PMRS ID Number
+  verbose_name: "\u179B\u17C1\u1781\u179F\u1798\u17D2\u1782\u17B6\u179B\u17CB PMRS\
+    \ (PMRS ID Number)"
+  is_dttm: false
+  is_active: true
+  type: STRING
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: Treatment
+  verbose_name: "\u1780\u17B6\u179A\u1796\u17D2\u1799\u17B6\u1794\u17B6\u179B - \u1798\
+    \u1792\u17D2\u1799\u17C4\u1794\u17B6\u1799 (Treatment - Option)"
+  is_dttm: false
+  is_active: true
+  type: STRING
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: National ID Card
+  verbose_name: "\u179B\u17C1\u1781\u17A2\u178F\u17D2\u178F\u179F\u1789\u17D2\u1789\
+    \u17B6\u178E\u1794\u178E\u17D2\u178E\u1787\u17B6\u178F\u17B7 (National ID Card)"
+  is_dttm: false
+  is_active: true
+  type: STRING
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: ID Poor Card
+  verbose_name: "\u1794\u178E\u17D2\u178E\u1782\u17D2\u179A\u17BD\u179F\u17B6\u179A\
+    \u1780\u17D2\u179A\u17B8\u1780\u17D2\u179A (ID Poor Card)"
+  is_dttm: false
+  is_active: true
+  type: STRING
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: Type of visit
+  verbose_name: "\u1794\u17D2\u179A\u1797\u17C1\u1791\u1793\u17C3\u1780\u17B6\u179A\
+    \u1798\u1780\u1796\u17B7\u1793\u17B7\u178F\u17D2\u1799 (Type of Visit)"
+  is_dttm: false
+  is_active: true
+  type: STRING
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: Facility Name
+  verbose_name: "\u1788\u17D2\u1798\u17C4\u17C7\u1793\u17B7\u1784\u179B\u17C1\u1781\
+    \u1780\u17BC\u178A\u1798\u17BC\u179B\u178A\u17D2\u178B\u17B6\u1793\u179F\u17BB\
+    \u1781\u17B6\u1797\u17B7\u1794\u17B6\u179B (Health Facility's Name)"
+  is_dttm: false
+  is_active: true
+  type: STRING
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: Facility Province
+  verbose_name: "\u1798\u1793\u17D2\u1791\u17B8\u179A\u179F\u17BB\u1781\u17B6\u1797\
+    \u17B7\u1794\u17B6\u179B\u1781\u17C1\u178F\u17D2\u178F (Provincial Health Department)"
+  is_dttm: false
+  is_active: true
+  type: STRING
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: Other Identifiers
+  verbose_name: "\u1794\u17D2\u179A\u1797\u17C1\u1791\u1794\u178E\u17D2\u178E\u179F\
+    \u1798\u17D2\u1782\u17B6\u179B\u17CB\u1795\u17D2\u179F\u17C1\u1784\u17D7 (Other\
+    \ Identifier Types)"
+  is_dttm: false
+  is_active: true
+  type: STRING
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: Patient's name
+  verbose_name: "\u1788\u17D2\u1798\u17C4\u17C7\u17A2\u178F\u17B7\u1790\u17B7\u1787\
+    \u1793 (Client's name)"
+  is_dttm: false
+  is_active: true
+  type: STRING
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: Visit date
+  verbose_name: "\u1780\u17B6\u179B\u1794\u179A\u17B7\u1785\u17D2\u1786\u17C1\u1791\
+    \u1798\u1780\u1796\u17B7\u1793\u17B7\u178F\u17D2\u1799 (Visit Date)"
+  is_dttm: true
+  is_active: true
+  type: DATETIME
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: Referred From
+  verbose_name: "\u1794\u1789\u17D2\u1787\u17BC\u1793\u1798\u1780\u1796\u17B8 (Referred\
+    \ By)"
+  is_dttm: false
+  is_active: true
+  type: STRING
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: Facility District
+  verbose_name: "\u179F\u17D2\u179A\u17BB\u1780\u1794\u17D2\u179A\u178F\u17B7\u1794\
+    \u178F\u17D2\u178F\u17B7 (Operational District)"
+  is_dttm: false
+  is_active: true
+  type: STRING
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: Payment type
+  verbose_name: "\u1794\u17D2\u179A\u1797\u17C1\u1791\u1793\u17C3\u1780\u17B6\u179A\
+    \u1794\u1784\u17CB\u1790\u17D2\u179B\u17C3\u179F\u17C1\u179C\u17B6 (Payment types)"
+  is_dttm: false
+  is_active: true
+  type: STRING
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: Phone number
+  verbose_name: "\u179B\u17C1\u1781\u1791\u17BC\u179A\u179F\u17D0\u1796\u17D2\u1791\
+    \u1791\u17C6\u1793\u17B6\u1780\u17CB\u1791\u17C6\u1793\u1784 (Phone number)"
+  is_dttm: false
+  is_active: true
+  type: STRING
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: SCJ
+  verbose_name: "\u1781\u17D2\u179F\u17C2\u1794\u1793\u17D2\u1791\u17B6\u178F\u17CB\
+    \ SCJ (SCJ)"
+  is_dttm: false
+  is_active: true
+  type: STRING
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: Age
+  verbose_name: "\u17A2\u17B6\u1799\u17BB (Age)"
+  is_dttm: false
+  is_active: true
+  type: FLOAT
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+version: 1.0.0
+database_uuid: 42834407-4570-4111-8bf6-4f7080413333
diff --git a/base/configs/superset/assets/datasets/Analytics/RH_NCD_OPD_Register_Query-dataset.yaml b/base/configs/superset/assets/datasets/Analytics/RH_NCD_OPD_Register_Query-dataset.yaml
new file mode 100644
index 00000000..a44ebd01
--- /dev/null
+++ b/base/configs/superset/assets/datasets/Analytics/RH_NCD_OPD_Register_Query-dataset.yaml
@@ -0,0 +1,819 @@
+table_name: RH NCD OPD Register Query-dataset
+main_dttm_col: null
+description: null
+default_endpoint: null
+offset: 0
+cache_timeout: null
+schema: public
+sql: "SELECT\n    f_facility AS \"Facility Name\",\n    f_district AS \"Facility District\"\
+  ,\n    f_province AS \"Facility Province\",\n    CASE \n        WHEN identifiers\
+  \ ~ '.*OpenMRS ID: (.*?)(,|$).*' THEN REGEXP_REPLACE(identifiers, '.*OpenMRS ID:\
+  \ (.*?)(,|$).*', '\\1', 'g')\n        ELSE ''\n    END AS \"OpenMRS ID\",\n    CONCAT_WS('\
+  \ ', given_name, middle_name, family_name) AS \"Patient's name\",\n    gender AS\
+  \ \"Gender\",\n    referred_from AS \"Referred By\",\n    DATE_PART('year', age(visit_date,\
+  \ birthdate)) AS \"Age\",\n    CASE \n        WHEN attributes ~ '.*Telephone Number:\
+  \ (.*?)(\\/|$).*' THEN REGEXP_REPLACE(attributes, '.*Telephone Number: (.*?)(\\\
+  /|$).*', '\\1', 'g')\n        ELSE ''\n    END AS \"Phone number\",\n    zone AS\
+  \ \"Zone\",\n    address_1 AS \"Village\",\n    address_city AS \"Commune/ Sangkat\"\
+  ,\n    address_county_district AS \"District/ Khan\",\n    address_state_province\
+  \ AS \"Province/City\",\n    visit_date AS \"Visit Date\",\n    visit_type AS \"\
+  Visit\",\n    obs_weight AS \"Weight\",\n    obs_height AS \"Height\",\n    obs_diastolic_pressure\
+  \ AS \"Diastolic Pressure\",\n    obs_temperature AS \"Temperature\",\n    obs_bmi\
+  \ AS \"BMI\",\n    obs_pulse AS \"Pulse\",\n    obs_circumference AS \"Circumference\"\
+  ,\n    obs_respiratory_rate AS \"Respiratory Rate\",\n    obs_spo2 AS \"SpO2\",\n\
+  \    obs_systolic_pressure AS \"Systolic Pressure\",\n    obs_fasting_blood_sugar\
+  \ AS \"Fasting Blood Sugar\",\n    obs_random_blood_sugar AS \"Random Blood Sugar\"\
+  ,\n    obs_ogtt_1hour AS \"OGTT 1 Hour\",\n    obs_ogtt_2hours AS \"OGTT 2 Hours\"\
+  ,\n    obs_hba1c AS \"HbA1c\",\n    obs_ketones AS \"Ketones\",\n    obs_albumin\
+  \ AS \"Albumin\",\n    obs_smoking_status AS \"Smoking Status\",\n    obs_physical_exercise\
+  \ AS \"Physical Exercise\",\n    obs_alcohol_use AS \"Alcohol Use\",\n    obs_cvd_risk_score\
+  \ AS \"CVD risk score (%)\",\n    obs_diagnosis1 AS \"Diagnosis 1\",\n    obs_diagnosis2\
+  \ AS \"Diagnosis 2\",\n    obs_complications AS \"Complications\",\n    obs_treatment_recommendations\
+  \ AS \"Management - Lifestlye\",\n    medications AS \"Management - Medications\"\
+  ,\n    obs_followup_date AS \"Appointment Date\",\n    obs_followup_for AS \"Appointment\
+  \ Reason\",\n    obs_facility AS \"Referral Facility\",\n    obs_reason_for_referral\
+  \ AS \"Reason For Referral\",\n    insurance_type AS \"Payment Type\",\n    '' AS\
+  \ \"Remarks\"\nFROM (\n    SELECT\n        facility_address.state_province AS \"\
+  f_province\",\n        facility_address.county_district AS \"f_district\",\n   \
+  \     facility_address.name AS \"f_facility\",\n        MAX(given_name) AS given_name,\n\
+  \        MAX(middle_name) AS middle_name,\n        MAX(family_name) AS family_name,\n\
+  \        MAX(identifiers) AS identifiers,\n        MAX(birthdate) AS birthdate,\n\
+  \        MAX(gender) AS gender,\n        MAX(address_state_province) AS address_state_province,\n\
+  \        MAX(address_county_district) AS address_county_district,\n        MAX(address_city)\
+  \ AS address_city,\n        MAX(address_1) AS address_1,\n        MAX(attributes)\
+  \ AS attributes,\n        MAX(vi.date_started) AS \"visit_date\",\n        MAX(vi.type)\
+  \ AS \"visit_type\",\n        MAX(CASE \n            WHEN vi.visit_attributes ~\
+  \ '.*Address Zone: (.*?)(\\/|$).*' THEN REGEXP_REPLACE(vi.visit_attributes, '.*Address\
+  \ Zone: (.*?)(\\/|$).*', '\\1', 'g')\n            ELSE ''\n        END) AS \"zone\"\
+  ,\n        MAX(CASE \n            WHEN vi.visit_attributes ~ '.*Insurance Type:\
+  \ (.*?)(\\/|$).*' THEN REGEXP_REPLACE(vi.visit_attributes, '.*Insurance Type: (.*?)(\\\
+  /|$).*', '\\1', 'g')\n            ELSE ''\n        END) AS \"insurance_type\",\n\
+  \        MAX(CASE WHEN obs.question_uuid = 'fd588078-9286-46ea-b133-36aab1b025ec'\
+  \ THEN obs.answer_coded ELSE NULL END) AS \"referred_from\",\n        MAX(CASE WHEN\
+  \ obs.question_uuid = '5089AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' THEN obs.answer_numeric\
+  \ ELSE NULL END) AS \"obs_weight\",\n        MAX(CASE WHEN obs.question_uuid = '5090AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'\
+  \ THEN obs.answer_numeric ELSE NULL END) AS \"obs_height\",\n        MAX(CASE WHEN\
+  \ obs.question_uuid = '5086AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' THEN obs.answer_numeric\
+  \ ELSE NULL END) AS \"obs_diastolic_pressure\",\n        MAX(CASE WHEN obs.question_uuid\
+  \ = '5088AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' THEN obs.answer_numeric ELSE NULL END)\
+  \ AS \"obs_temperature\",\n        MAX(CASE WHEN obs.question_uuid = 'a89c60c0-1350-11df-a1f1-0026b9348838'\
+  \ THEN obs.answer_numeric ELSE NULL END) AS \"obs_bmi\",\n        MAX(CASE WHEN\
+  \ obs.question_uuid = '5087AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' THEN obs.answer_numeric\
+  \ ELSE NULL END) AS \"obs_pulse\",\n        MAX(CASE WHEN obs.question_uuid = '1343AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'\
+  \ THEN obs.answer_numeric ELSE NULL END) AS \"obs_circumference\",\n        MAX(CASE\
+  \ WHEN obs.question_uuid = '5242AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' THEN obs.answer_numeric\
+  \ ELSE NULL END) AS \"obs_respiratory_rate\",\n        MAX(CASE WHEN obs.question_uuid\
+  \ = '5092AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' THEN obs.answer_numeric ELSE NULL END)\
+  \ AS \"obs_spo2\",\n        MAX(CASE WHEN obs.question_uuid = '5085AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'\
+  \ THEN obs.answer_numeric ELSE NULL END) AS \"obs_systolic_pressure\",\n       \
+  \ MAX(CASE WHEN obs.question_uuid = '4a6ad2db-86af-4acc-906b-b749b7f6cda6' THEN\
+  \ obs.answer_numeric ELSE NULL END) AS \"obs_fasting_blood_sugar\",\n        MAX(CASE\
+  \ WHEN obs.question_uuid = 'f52d731e-58da-4f3a-a480-77c5e9d8d2eb' THEN obs.answer_numeric\
+  \ ELSE NULL END) AS \"obs_random_blood_sugar\",\n        MAX(CASE WHEN obs.question_uuid\
+  \ = '3c884cd2-4aba-41e0-a535-e3e7bc70b5ee' THEN obs.answer_numeric ELSE NULL END)\
+  \ AS \"obs_ogtt_1hour\",\n        MAX(CASE WHEN obs.question_uuid = '1941f03b-9a5e-4285-b66a-c10880a3362d'\
+  \ THEN obs.answer_numeric ELSE NULL END) AS \"obs_ogtt_2hours\",\n        MAX(CASE\
+  \ WHEN obs.question_uuid = 'a8af7520-1350-11df-a1f1-0026b9348838' THEN obs.answer_numeric\
+  \ ELSE NULL END) AS \"obs_hba1c\",\n        MAX(CASE WHEN obs.question_uuid = '07015405-c865-4a22-8ad1-c8863d5f005b'\
+  \ THEN obs.answer_numeric ELSE NULL END) AS \"obs_ketones\",\n        MAX(CASE WHEN\
+  \ obs.question_uuid = 'c423325e-be95-42e2-ae38-b940c2586327' THEN obs.answer_numeric\
+  \ ELSE NULL END) AS \"obs_albumin\",\n        MAX(CASE WHEN obs.question_uuid =\
+  \ '7533aa7e-04cb-4cfd-9c97-6ac36f114bab' THEN obs.answer_coded ELSE NULL END) AS\
+  \ \"obs_smoking_status\",\n        MAX(CASE WHEN obs.question_uuid = 'c31a2da0-f16b-44e3-baea-8a259d8beb31'\
+  \ THEN obs.answer_coded ELSE NULL END) AS \"obs_physical_exercise\",\n        MAX(CASE\
+  \ WHEN obs.question_uuid = 'e737c8c9-a154-47a1-aa20-ed13008d46cf' THEN obs.answer_coded\
+  \ ELSE NULL END) AS \"obs_alcohol_use\",\n        MAX(CASE WHEN obs.question_uuid\
+  \ = 'dff491e3-b14c-4b32-ab64-63b96966d72d' THEN obs.answer_coded ELSE NULL END)\
+  \ AS \"obs_cvd_risk_score\",\n        MAX(CASE WHEN obs.question_uuid = '45583478-f703-46e3-b63a-54b0a95c25f0'\
+  \ THEN obs.answer_coded ELSE NULL END) AS \"obs_diagnosis1\",\n        MAX(CASE\
+  \ WHEN obs.question_uuid = '76ca08a5-2128-4b53-afba-74227b015924' THEN obs.answer_coded\
+  \ ELSE NULL END) AS \"obs_diagnosis2\",\n        MAX(CASE WHEN obs.question_uuid\
+  \ = '3f36a039-eac3-46bd-8798-102c55639d49' THEN obs.answer_coded ELSE NULL END)\
+  \ AS \"obs_complications\",\n        STRING_AGG(DISTINCT drug_order.drug_name, ',\
+  \ ') AS \"medications\",\n        MAX(CASE WHEN obs.question_uuid = 'dee2db0c-5a06-4b1e-8be6-0f327fe6158d'\
+  \ THEN obs.answer_coded ELSE NULL END) AS \"obs_reason_for_referral\",\n       \
+  \ MAX(CASE WHEN obs.question_uuid = '9f7c8739-3ea3-4f7f-8648-d6c36fef7be2' THEN\
+  \ obs.answer_coded ELSE NULL END) AS \"obs_treatment_recommendations\",\n      \
+  \  MAX(CASE WHEN obs.question_uuid = '758b9dd8-b6d0-4ac2-b245-0e7bffb4693a' THEN\
+  \ obs.answer_coded ELSE NULL END) AS \"obs_facility\",\n        MAX(CASE WHEN obs.question_uuid\
+  \ = '2e27bbf9-d744-46a2-a7d4-cecd33c28b8a' THEN obs.answer_coded ELSE NULL END)\
+  \ AS \"obs_followup_for\",\n        MAX(CASE WHEN obs.question_uuid = 'e9c145c1-f4e9-4c34-b237-da069939dc38'\
+  \ THEN obs.answer_datetime ELSE NULL END) AS \"obs_followup_date\"\n    FROM patients\
+  \ pa\n    LEFT OUTER JOIN visits vi ON vi.visit_voided = false AND vi.patient_uuid\
+  \ = pa.patient_uuid AND vi.type IN ('NCD New Visit', 'NCD Follow-up Visit')\n  \
+  \  LEFT OUTER JOIN locations facility_address ON facility_address.uuid = vi.location_uuid\n\
+  \    LEFT OUTER JOIN observations obs ON obs.obs_voided = false AND obs.visit_uuid\
+  \ = vi.visit_uuid AND obs.question_uuid IN (\n        '5089AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA',\
+  \ \n        '5090AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA', \n        '5086AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA',\
+  \ \n        '5088AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA', \n        'a89c60c0-1350-11df-a1f1-0026b9348838',\
+  \ \n        '5087AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA', \n        '1343AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA',\
+  \ \n        '5242AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA', \n        '5092AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA',\
+  \ \n        '5085AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA',\n        '5086AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA',\n\
+  \        '4a6ad2db-86af-4acc-906b-b749b7f6cda6',\n        'f52d731e-58da-4f3a-a480-77c5e9d8d2eb',\n\
+  \        '3c884cd2-4aba-41e0-a535-e3e7bc70b5ee',\n        '1941f03b-9a5e-4285-b66a-c10880a3362d',\n\
+  \        'a8af7520-1350-11df-a1f1-0026b9348838',\n        '07015405-c865-4a22-8ad1-c8863d5f005b',\n\
+  \        'fd588078-9286-46ea-b133-36aab1b025ec',\n        'c423325e-be95-42e2-ae38-b940c2586327',\n\
+  \        '7533aa7e-04cb-4cfd-9c97-6ac36f114bab',\n        'e737c8c9-a154-47a1-aa20-ed13008d46cf',\n\
+  \        'c31a2da0-f16b-44e3-baea-8a259d8beb31',\n        '45583478-f703-46e3-b63a-54b0a95c25f0',\n\
+  \        '76ca08a5-2128-4b53-afba-74227b015924',\n        '9f7c8739-3ea3-4f7f-8648-d6c36fef7be2',\n\
+  \        'e9c145c1-f4e9-4c34-b237-da069939dc38',\n        '2e27bbf9-d744-46a2-a7d4-cecd33c28b8a',\n\
+  \        '758b9dd8-b6d0-4ac2-b245-0e7bffb4693a'\n    ) AND obs.encounter_type IN\
+  \ ('NCD Consultation')\n    LEFT OUTER JOIN orders drug_order ON drug_order.patient_uuid\
+  \ = pa.patient_uuid AND (drug_order.date_activated >= vi.date_started\n        \
+  \    {% if to_dttm != undefined and to_dttm is not none %}\n                AND\
+  \ drug_order.date_activated <= '{{ to_dttm }}'\n            {% else %}\n       \
+  \         AND drug_order.date_activated <= vi.date_stopped\n            {%- endif\
+  \ -%} \n            )\n    GROUP BY \n        facility_address.state_province, \n\
+  \        facility_address.county_district, \n        facility_address.name, \n \
+  \       vi.visit_uuid\n) AS patient_info "
+params: null
+template_params: null
+filter_select_enabled: false
+fetch_values_predicate: null
+extra: null
+normalize_columns: false
+always_filter_main_dttm: false
+uuid: eae4ea82-b387-41fd-be9c-39bce338d4fa
+metrics:
+- metric_name: count
+  verbose_name: null
+  metric_type: null
+  expression: count(*)
+  description: null
+  d3format: null
+  currency: null
+  extra:
+    warning_markdown: ''
+  warning_text: null
+columns:
+- column_name: CVD risk score (%)
+  verbose_name: "\u1796\u17B7\u1793\u17D2\u1791\u17BB\u1793\u17C3\u1780\u17B6\u179A\
+    \u179C\u17B6\u1799\u178F\u1798\u17D2\u179B\u17C3\u17A0\u17B6\u1793\u17B7\u1797\
+    \u17D0\u1799\u1787\u17C6\u1784\u17BA\u179F\u179A\u179F\u17C3\u1788\u17B6\u1798\
+    -\u1794\u17C1\u17C7\u178A\u17BC\u1784 (%) (CVD Risk Score (Percentage))"
+  is_dttm: false
+  is_active: true
+  type: STRING
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: Referral Facility
+  verbose_name: "\u1794\u1789\u17D2\u1787\u17BC\u1793\u1791\u17C5\u1798\u17BC\u179B\
+    \u178A\u17D2\u178B\u17B6\u1793\u179F\u17BB\u1781\u17B6\u1797\u17B7\u1794\u17B6\
+    \u179B\u1788\u17D2\u1798\u17C4\u17C7 - \u1794\u1789\u17D2\u1787\u17BC\u1793\u1791\
+    \u17C5 (Referral - To facility name)"
+  is_dttm: false
+  is_active: true
+  type: STRING
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: Management - Lifestlye
+  verbose_name: "\u1780\u17B6\u179A\u1782\u17D2\u179A\u1794\u17CB\u1782\u17D2\u179A\
+    \u1784 - \u179A\u1794\u17C0\u1794\u179A\u179F\u17CB\u1793\u17C5 (Management -\
+    \ Lifestyle)"
+  is_dttm: false
+  is_active: true
+  type: STRING
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: OGTT 1 Hour
+  verbose_name: "\u1795\u17B9\u1780\u1791\u17B9\u1780\u179F\u17D2\u1780\u179A\u17E7\
+    \u17E5\u1780\u17D2\u179A - \u1780\u17D2\u179A\u17C4\u1799\u17E1\u1798\u17C9\u17C4\
+    \u1784 (OGTT - 1H)"
+  is_dttm: false
+  is_active: true
+  type: FLOAT
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: OGTT 2 Hours
+  verbose_name: "\u1795\u17B9\u1780\u1791\u17B9\u1780\u179F\u17D2\u1780\u179A\u17E7\
+    \u17E5\u1780\u17D2\u179A - \u1780\u17D2\u179A\u17C4\u1799\u17E2\u1798\u17C9\u17C4\
+    \u1784 (OGTT - 2H)"
+  is_dttm: false
+  is_active: true
+  type: FLOAT
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: Management - Medications
+  verbose_name: "\u1780\u17B6\u179A\u1782\u17D2\u179A\u1794\u17CB\u1782\u17D2\u179A\
+    \u1784 - \u1790\u17D2\u1793\u17B6\u17C6(Management - Medicine)"
+  is_dttm: false
+  is_active: true
+  type: STRING
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: Diagnosis 1
+  verbose_name: "\u179A\u17C4\u1782\u179C\u17B7\u1793\u17B7\u1785\u17D2\u1786\u17D0\
+    \u1799 - 1 (Diagnosis - 1)"
+  is_dttm: false
+  is_active: true
+  type: STRING
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: Diagnosis 2
+  verbose_name: "\u179A\u17C4\u1782\u179C\u17B7\u1793\u17B7\u1785\u17D2\u1786\u17D0\
+    \u1799 - 2 (Diagnosis - 2)"
+  is_dttm: false
+  is_active: true
+  type: STRING
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: Diastolic Pressure
+  verbose_name: "\u179F\u1798\u17D2\u1796\u17B6\u1792\u1788\u17B6\u1798 - \u178A\u17D2\
+    \u1799\u17B6\u179F\u17D2\u178F\u17BC\u179B (BP - Diastolic)"
+  is_dttm: false
+  is_active: true
+  type: FLOAT
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: Systolic Pressure
+  verbose_name: "\u179F\u1798\u17D2\u1796\u17B6\u1792\u1788\u17B6\u1798 - \u179F\u17CA\
+    \u17B8\u179F\u17D2\u178F\u17BC\u179B (BP - Systolic)"
+  is_dttm: false
+  is_active: true
+  type: FLOAT
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: Albumin
+  verbose_name: "\u1791\u17B9\u1780\u1793\u17C4\u1798 - \u17A2\u17B6\u179B\u17CB\u1794\
+    \u17CA\u17BB\u1793\u1798\u17B8\u1793 (Urine - Albumin)"
+  is_dttm: false
+  is_active: true
+  type: FLOAT
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: Ketones
+  verbose_name: "\u1791\u17B9\u1780\u1793\u17C4\u1798 - \u1780\u17C1\u178F\u17BC\u1793\
+    \ (Urine - Ketone)"
+  is_dttm: false
+  is_active: true
+  type: FLOAT
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: Smoking Status
+  verbose_name: "\u178F\u17BE\u17A2\u17D2\u1793\u1780\u1787\u17C6\u1784\u17BA\u1787\
+    \u1780\u17CB\u1794\u17B6\u179A\u17B8\u178A\u17C2\u179A\u17AC\u1791\u17C1? (Does\
+    \ the patient Smoke?)"
+  is_dttm: false
+  is_active: true
+  type: STRING
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: Alcohol Use
+  verbose_name: "\u1795\u17B9\u1780\u1782\u17D2\u179A\u17BF\u1784\u179F\u17D2\u179A\
+    \u179C\u17B9\u1784\u1794\u17D2\u179A\u1780\u1794\u178A\u17C4\u1799\u1782\u17D2\
+    \u179A\u17C4\u17C7\u1790\u17D2\u1793\u17B6\u17C6 (Harmful use of alcohol)"
+  is_dttm: false
+  is_active: true
+  type: STRING
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: Reason For Referral
+  verbose_name: "\u1798\u17BC\u179B\u17A0\u17C1\u178F\u17BB\u1793\u17C3\u1780\u17B6\
+    \u179A\u1794\u1789\u17D2\u1787\u17BC\u1793 (Reason for referral)"
+  is_dttm: false
+  is_active: true
+  type: STRING
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: Facility Name
+  verbose_name: "\u1788\u17D2\u1798\u17C4\u17C7\u1793\u17B7\u1784\u179B\u17C1\u1781\
+    \u1780\u17BC\u178A\u1798\u17BC\u179B\u178A\u17D2\u178B\u17B6\u1793\u179F\u17BB\
+    \u1781\u17B6\u1797\u17B7\u1794\u17B6\u179B (Health Facility's Name)"
+  is_dttm: false
+  is_active: true
+  type: STRING
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: Appointment Reason
+  verbose_name: "\u1787\u17C6\u1784\u17BA\u1791\u17B9\u1780\u1793\u17C4\u1798\u1795\
+    \u17D2\u17A2\u17C2\u1798/\u179B\u17BE\u179F\u179F\u1798\u17D2\u1796\u17B6\u1792\
+    \u1788\u17B6\u1798 (Appointment follow reason)"
+  is_dttm: false
+  is_active: true
+  type: STRING
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: Facility Province
+  verbose_name: "\u1798\u1793\u17D2\u1791\u17B8\u179A\u179F\u17BB\u1781\u17B6\u1797\
+    \u17B7\u1794\u17B6\u179B\u1781\u17C1\u178F\u17D2\u178F (Provincial Health Department)"
+  is_dttm: false
+  is_active: true
+  type: STRING
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: Patient's name
+  verbose_name: "\u1788\u17D2\u1798\u17C4\u17C7\u17A2\u17D2\u1793\u1780\u1787\u17C6\
+    \u1784\u17BA (Client's name)"
+  is_dttm: false
+  is_active: true
+  type: STRING
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: Appointment Date
+  verbose_name: "\u1780\u17B6\u179B\u1794\u179A\u17B7\u1785\u17D2\u1786\u1791\u178F\
+    \u17B6\u1798\u178A\u17B6\u1793 (Date Appointment)"
+  is_dttm: true
+  is_active: true
+  type: DATETIME
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: Fasting Blood Sugar
+  verbose_name: "\u1780\u1798\u17D2\u179A\u17B7\u178F\u1787\u17B6\u178F\u17B7\u179F\
+    \u17D2\u1780\u179A\u1798\u17BB\u1793\u17A2\u17B6\u17A0\u17B6\u179A (Fasting)"
+  is_dttm: false
+  is_active: true
+  type: FLOAT
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: Random Blood Sugar
+  verbose_name: "\u1780\u1798\u17D2\u179A\u17B7\u178F\u1787\u17B6\u178F\u17B7\u179F\
+    \u17D2\u1780\u179A\u1785\u17C3\u178A\u1793\u17D2\u1799 (Random)"
+  is_dttm: false
+  is_active: true
+  type: FLOAT
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: Visit Date
+  verbose_name: "\u1780\u17B6\u179B\u1794\u179A\u17B7\u1785\u17D2\u1786\u17C1\u1791\
+    \u1796\u17B7\u1793\u17B7\u178F\u17D2\u1799 (Visit Date)"
+  is_dttm: true
+  is_active: true
+  type: DATETIME
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: Respiratory Rate
+  verbose_name: "\u1785\u1784\u17D2\u179C\u17B6\u1780\u17CB\u178A\u1784\u17D2\u17A0\
+    \u17BE\u1798 (Respiratory Rate)"
+  is_dttm: false
+  is_active: true
+  type: FLOAT
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: OpenMRS ID
+  verbose_name: "\u17A2\u178F\u17D2\u178F\u179B\u17C1\u1781\u17A2\u17D2\u1793\u1780\
+    \u1787\u17C6\u1784\u17BA (Client ID)"
+  is_dttm: false
+  is_active: true
+  type: STRING
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: Facility District
+  verbose_name: "\u179F\u17D2\u179A\u17BB\u1780\u1794\u17D2\u179A\u178F\u17B7\u1794\
+    \u178F\u17D2\u178F\u17B7 (Operational District)"
+  is_dttm: false
+  is_active: true
+  type: STRING
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: Physical Exercise
+  verbose_name: "\u17A2\u179F\u1780\u1798\u17D2\u1798\u1797\u17B6\u1796\u179A\u17B6\
+    \u1784\u1780\u17B6\u1799 (Physical inactivity)"
+  is_dttm: false
+  is_active: true
+  type: STRING
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: Phone number
+  verbose_name: "\u179B\u17C1\u1781\u1791\u17BC\u179A\u179F\u1796\u17D2\u1791 (Phone\
+    \ Number)"
+  is_dttm: false
+  is_active: true
+  type: STRING
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: Payment Type
+  verbose_name: "\u1794\u17D2\u179A\u1797\u17C1\u1791\u1780\u17B6\u179A\u1794\u1784\
+    \u17CB\u1794\u17D2\u179A\u17B6\u1780\u17CB (Payment Type)"
+  is_dttm: false
+  is_active: true
+  type: STRING
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: Circumference
+  verbose_name: "\u1791\u17C6\u17A0\u17C6\u1785\u1784\u17D2\u1780\u17C1\u17C7 (\"\
+    Waist Circumference\")"
+  is_dttm: false
+  is_active: true
+  type: FLOAT
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: Commune/ Sangkat
+  verbose_name: "\u1783\u17BB\u17C6/\u179F\u1784\u17D2\u1780\u17B6\u178F\u17CB (Commune)"
+  is_dttm: false
+  is_active: true
+  type: STRING
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: District/ Khan
+  verbose_name: "\u179F\u17D2\u179A\u17BB\u1780 (District)"
+  is_dttm: false
+  is_active: true
+  type: STRING
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: BMI
+  verbose_name: "\u1795\u179B\u1792\u17C0\u1794\u1791\u1798\u17D2\u1784\u1793\u17CB\
+    \ \u1793\u17B7\u1784\u1780\u1798\u17D2\u1796\u179F\u17CB (BMI)"
+  is_dttm: false
+  is_active: true
+  type: FLOAT
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: Pulse
+  verbose_name: "\u1787\u17B8\u1796\u1785\u179A (Pulse Rate)"
+  is_dttm: false
+  is_active: true
+  type: FLOAT
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: Province/City
+  verbose_name: "\u1781\u17C1\u178F\u17D2\u178F (Province)"
+  is_dttm: false
+  is_active: true
+  type: STRING
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: SpO2
+  verbose_name: "\u1780\u17C6\u17A0\u17B6\u1794\u17CB\u17A2\u17BB\u1780\u179F\u17CA\
+    \u17B8\u179F\u17C2\u1793 (SpO2)"
+  is_dttm: false
+  is_active: true
+  type: FLOAT
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: Age
+  verbose_name: "\u1794\u17D2\u179A\u1797\u17C1\u1791\u1793\u17C3\u1780\u17B6\u179A\
+    \u1796\u17B7\u1793\u17B7\u178F\u17D2\u1799 (Age)"
+  is_dttm: false
+  is_active: true
+  type: FLOAT
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: Height
+  verbose_name: "\u1780\u1798\u17D2\u1796\u179F\u17CB (Height)"
+  is_dttm: false
+  is_active: true
+  type: FLOAT
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: Temperature
+  verbose_name: "\u1780\u1798\u17D2\u178F\u17C5 (Temperature)"
+  is_dttm: false
+  is_active: true
+  type: FLOAT
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: Weight
+  verbose_name: "\u1791\u1798\u17D2\u1784\u1793\u17CB (Weight)"
+  is_dttm: false
+  is_active: true
+  type: FLOAT
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: Complications
+  verbose_name: "\u1795\u179B\u179B\u17C6\u1794\u17B6\u1780 (Complication)"
+  is_dttm: false
+  is_active: true
+  type: STRING
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: Gender
+  verbose_name: "\u1797\u17C1\u1791 (Gender)"
+  is_dttm: false
+  is_active: true
+  type: STRING
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: Remarks
+  verbose_name: "\u1780\u17C6\u178E\u178F\u17CB\u179F\u1798\u17D2\u1782\u17B6\u179B\
+    \u17CB (Remarks)"
+  is_dttm: false
+  is_active: true
+  type: STRING
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: Village
+  verbose_name: "\u1797\u17BC\u1798\u17B7 (Village)"
+  is_dttm: false
+  is_active: true
+  type: STRING
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: Zone
+  verbose_name: "\u178F\u17C6\u1794\u1793\u17CB (Zone)"
+  is_dttm: false
+  is_active: true
+  type: STRING
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: Referred By
+  verbose_name: null
+  is_dttm: false
+  is_active: true
+  type: STRING
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: HbA1c
+  verbose_name: null
+  is_dttm: false
+  is_active: true
+  type: FLOAT
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: Visit
+  verbose_name: null
+  is_dttm: false
+  is_active: true
+  type: STRING
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+version: 1.0.0
+database_uuid: 42834407-4570-4111-8bf6-4f7080413333
diff --git a/base/configs/superset/assets/datasets/Analytics/Women_Screened_For_Cervical_Cancer_For_The_First_Time_Query-dataset.yaml b/base/configs/superset/assets/datasets/Analytics/Women_Screened_For_Cervical_Cancer_For_The_First_Time_Query-dataset.yaml
new file mode 100644
index 00000000..af33c228
--- /dev/null
+++ b/base/configs/superset/assets/datasets/Analytics/Women_Screened_For_Cervical_Cancer_For_The_First_Time_Query-dataset.yaml
@@ -0,0 +1,571 @@
+table_name: Women Screened For Cervical Cancer For The First Time Query-dataset
+main_dttm_col: Visit Start date
+description: null
+default_endpoint: null
+offset: 0
+cache_timeout: null
+schema: public
+sql: "SELECT \n        \"Facility Name\" AS \"Facility Name\",\n        \"Facility\
+  \ District\" AS \"Facility District\",\n        \"Facility Province\" AS \"Facility\
+  \ Province\",\n        \"OpenMRS ID\" AS \"OpenMRS ID\",\n        \"Patient's First\
+  \ name\" AS \"Patient's First name\",\n        \"Patient's Last name\" AS \"Patient's\
+  \ Last name\",\n        \"Patient's Gender\" AS \"Patient's Gender\",\n        \"\
+  Patient's Birthdate\" AS \"Patient's Birthdate\",\n        \"Patient Address\" AS\
+  \ \"Patient Address\",\n        \"Phone number\" AS \"Phone number\",\n        \"\
+  Other Identifiers\" AS \"Other Identifiers\",\n        \"Visit Start date\" AS \"\
+  Visit Start date\",\n        \"Visit End date\" AS \"Visit End date\",\n       \
+  \ \"Visit Type\" AS \"Visit Type\",\n        \"Referral source\" AS \"Referral source\"\
+  ,\n        \"Insurance type\" AS \"Insurance type\",\n        \"First Screening?\"\
+  \ AS \"First Screening?\",\n        \"HPV Test\" AS \"HPV Test\",\n        \"Visibility\
+  \ of SCJ\" AS \"Visibility of SCJ\",\n        \"VIA Test Result\" AS \"VIA Test\
+  \ Result\",\n        \"Number of Quadrants\" AS \"Number of Quadrants\",\n     \
+  \   \"Area of ectocervix\" AS \"Area of ectocervix\",\n        \"Colposcopy\" AS\
+  \ \"Colposcopy\",\n        \"Cervical Biopsy\" AS \"Cervical Biopsy\",\n       \
+  \ \"Pap Smear\" AS \"Pap Smear\",\n        \"Referral Facility\" AS \"Referral Facility\"\
+  ,\n        \"CC Reason for Referral\" AS \"CC Reason for Referral\",\n        \"\
+  CC Treatment\" AS \"CC Treatment\",\n        \"CC Follow-up date\" AS \"CC Follow-up\
+  \ date\",\n        \"Encounter date and time\" AS \"Encounter date and time\",\n\
+  \        CASE \n            WHEN (raw_data_set.via_result_answer_uuid = '703AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA')\
+  \ AND (raw_data_set.cc_reason_referral_answer_uuid= '7d469a03-a56b-4c51-a421-0e5787556630'\
+  \ OR raw_data_set.cc_reason_referral_answer_uuid = 'fc3909e3-9ddb-46e3-b4f7-6905732d977b')\n\
+  \                THEN '80-percent-women-aged-30-49-years-with-ccs-screening-first-time-via-positive-referred'\n\
+  \            ELSE 'women-aged-30-49-years-with-ccs-screening-first-time'\n     \
+  \   END AS \"indicator\"\nFROM\n    (SELECT \n        l.name AS \"Facility Name\"\
+  ,\n        l.county_district AS \"Facility District\",\n        l.state_province\
+  \ AS \"Facility Province\",\n        CASE \n            WHEN p.identifiers ~ '.*OpenMRS\
+  \ ID: (.*?)(,|$).*' THEN REGEXP_REPLACE(p.identifiers, '.*OpenMRS ID: (.*?)(,|$).*',\
+  \ '\\1', 'g')\n            ELSE ''\n        END AS \"OpenMRS ID\",\n        MAX(p.given_name)\
+  \ AS \"Patient's First name\",\n        MAX(p.family_name) AS \"Patient's Last name\"\
+  ,\n        MAX(p.birthdate) AS \"Patient's Birthdate\",\n        MAX(p.gender) AS\
+  \ \"Patient's Gender\",\n        MAX(CONCAT_WS(' > ', p.address_state_province,\
+  \ p.address_county_district, p.address_city, p.address_1)) AS \"Patient Address\"\
+  ,\n        MAX(CASE \n            WHEN p.attributes ~ '.*Telephone Number: (.*?)(\\\
+  /|$).*' THEN REGEXP_REPLACE(p.attributes, '.*Telephone Number: (.*?)(\\/|$).*',\
+  \ '\\1', 'g')\n            ELSE ''\n        END) AS \"Phone number\",\n        COALESCE(\n\
+  \            REGEXP_REPLACE(\n                REGEXP_REPLACE(\n                \
+  \    MAX(p.identifiers), \n                    '(?:OpenMRS ID): [^,]*,?\\s?', \n\
+  \                    '', \n                    'g'\n                ), \n      \
+  \          '^, |, $', \n                ''\n            ), \n            NULL\n\
+  \        ) AS \"Other Identifiers\",\n        MAX(v.date_started) AS \"Visit Start\
+  \ date\",\n        MAX(v.date_stopped) AS \"Visit End date\",\n        MAX(v.type)\
+  \ AS \"Visit Type\",\n        MAX(CASE \n            WHEN v.visit_attributes ~ '.*Referred\
+  \ from: (.*?)(\\/|$).*' THEN REGEXP_REPLACE(v.visit_attributes, '.*Referred from:\
+  \ (.*?)(\\/|$).*', '\\1', 'g')\n            ELSE ''\n        END) AS \"Referral\
+  \ source\",\n        MAX(CASE \n            WHEN v.visit_attributes ~ '.*Insurance\
+  \ Type: (.*?)(\\/|$).*' THEN REGEXP_REPLACE(v.visit_attributes, '.*Insurance Type:\
+  \ (.*?)(\\/|$).*', '\\1', 'g')\n            ELSE ''\n        END) AS \"Insurance\
+  \ type\",\n        MAX(CASE WHEN o.question_uuid = '75681e39-683c-4de9-9ca7-5b55b736bfa7'\
+  \ THEN o.answer_coded ELSE NULL END) AS \"First Screening?\",\n        MAX(CASE\
+  \ WHEN o.question_uuid = '5f27683c-e4ab-4a10-922d-e34bbb560884' THEN o.answer_coded\
+  \ ELSE NULL END) AS \"HPV Test\",\n        MAX(CASE WHEN o.question_uuid = 'd2ec630a-a223-492a-89f2-597266b36571'\
+  \ THEN o.answer_coded ELSE NULL END) AS \"Visibility of SCJ\",\n        MAX(CASE\
+  \ WHEN o.question_uuid = '27912a31-4b1e-40d4-a3a0-947e0eb2e588' THEN o.answer_coded\
+  \ ELSE NULL END) AS \"VIA Test Result\",\n        MAX(CASE WHEN o.question_uuid\
+  \ = '27912a31-4b1e-40d4-a3a0-947e0eb2e588' THEN o.answer_coded_uuid ELSE NULL END)\
+  \ AS \"via_result_answer_uuid\",\n        MAX(CASE WHEN o.question_uuid = '0dd61510-1ddd-49e8-838b-b4ec7fdaf95f'\
+  \ THEN o.answer_coded ELSE NULL END) AS \"Number of Quadrants\",\n        MAX(CASE\
+  \ WHEN o.question_uuid = 'a84a070a-172f-43f7-96f3-67574d42ba1b' THEN o.answer_coded\
+  \ ELSE NULL END) AS \"Area of ectocervix\",\n        MAX(CASE WHEN o.question_uuid\
+  \ = 'c0027068-fe1b-4401-aad5-d70e4437362c' THEN o.answer_coded ELSE NULL END) AS\
+  \ \"Colposcopy\",\n        MAX(CASE WHEN o.question_uuid = 'df802805-a937-4031-928d-8ce7b69aefc7'\
+  \ THEN o.answer_coded ELSE NULL END) AS \"Cervical Biopsy\",\n        MAX(CASE WHEN\
+  \ o.question_uuid = '863d4bf3-310d-472a-990d-8467e543ebab' THEN o.answer_coded ELSE\
+  \ NULL END) AS \"Pap Smear\",\n        MAX(CASE WHEN o.question_uuid = '758b9dd8-b6d0-4ac2-b245-0e7bffb4693a'\
+  \ THEN o.answer_coded ELSE NULL END) AS \"Referral Facility\",\n        MAX(CASE\
+  \ WHEN o.question_uuid = 'c158e3b2-edf9-4e0e-9e95-d36de1a51527' THEN o.answer_coded\
+  \ ELSE NULL END) AS \"CC Reason for Referral\",\n        MAX(CASE WHEN o.question_uuid\
+  \ = 'c158e3b2-edf9-4e0e-9e95-d36de1a51527' THEN o.answer_coded_uuid ELSE NULL END)\
+  \ AS \"cc_reason_referral_answer_uuid\",\n        MAX(CASE WHEN o.question_uuid\
+  \ = '1ca7d712-f7d7-4e09-8184-048bc4173902' THEN o.answer_coded ELSE NULL END) AS\
+  \ \"CC Treatment\",\n        MAX(CASE WHEN o.question_uuid = 'f6a3e29c-9ecc-4583-9768-359c77529635'\
+  \ THEN o.answer_coded ELSE NULL END) AS \"CC Follow-up date\",\n        MAX(e.encounter_datetime)\
+  \ AS \"Encounter date and time\"\n    FROM \n        encounters e \n    LEFT JOIN\
+  \ \n        patients p ON e.patient_uuid = p.patient_uuid AND p.person_voided =\
+  \ false\n    LEFT JOIN \n        visits v ON e.visit_uuid = v.visit_uuid AND v.visit_voided\
+  \ = false\n    LEFT JOIN \n        observations o ON o.obs_voided = false AND e.encounter_uuid\
+  \ = o.encounter_uuid  AND o.question_uuid IN (\n        '75681e39-683c-4de9-9ca7-5b55b736bfa7',\n\
+  \        '5f27683c-e4ab-4a10-922d-e34bbb560884',\n        'd2ec630a-a223-492a-89f2-597266b36571',\n\
+  \        '27912a31-4b1e-40d4-a3a0-947e0eb2e588',\n        '0dd61510-1ddd-49e8-838b-b4ec7fdaf95f',\n\
+  \        'a84a070a-172f-43f7-96f3-67574d42ba1b',\n        'c0027068-fe1b-4401-aad5-d70e4437362c',\n\
+  \        'df802805-a937-4031-928d-8ce7b69aefc7',\n        '863d4bf3-310d-472a-990d-8467e543ebab',\n\
+  \        '758b9dd8-b6d0-4ac2-b245-0e7bffb4693a',\n        'c158e3b2-edf9-4e0e-9e95-d36de1a51527',\n\
+  \        '1ca7d712-f7d7-4e09-8184-048bc4173902',\n        'f6a3e29c-9ecc-4583-9768-359c77529635'\n\
+  \        )\n    LEFT JOIN \n        locations l ON e.location_uuid = l.uuid\n  \
+  \  WHERE \n        e.encounter_voided = false AND e.encounter_type IN ('Cervical\
+  \ Cancer Screening')\n        AND (e.encounter_datetime - p.birthdate) >= interval\
+  \ '30 years' AND (e.encounter_datetime - p.birthdate) <= interval '49 years'\n \
+  \       AND e.patient_uuid NOT IN (\n            SELECT \n                patient_uuid\
+  \ \n            FROM \n                encounters previous_e\n            WHERE\
+  \ \n                previous_e.encounter_voided = false AND previous_e.patient_uuid\
+  \ = e.patient_uuid AND previous_e.encounter_type IN ('Cervical Cancer Screening')\
+  \ \n                {% if from_dttm != undefined and from_dttm is not none %}\n\
+  \                    AND DATE(previous_e.encounter_datetime) <= '{{ from_dttm }}'\n\
+  \                {% else %}\n                    AND 1=0\n                {%- endif\
+  \ -%}\n        )\n    GROUP BY \n        \"Facility Name\", \"Facility District\"\
+  , \"Facility Province\", \"OpenMRS ID\", e.encounter_uuid\n    ) raw_data_set\n"
+params: null
+template_params: null
+filter_select_enabled: false
+fetch_values_predicate: null
+extra: null
+normalize_columns: false
+always_filter_main_dttm: false
+uuid: 3680ccf7-bec7-45bc-8e9d-8afaba18b508
+metrics:
+- metric_name: count
+  verbose_name: null
+  metric_type: null
+  expression: count(*)
+  description: null
+  d3format: null
+  currency: null
+  extra:
+    warning_markdown: ''
+  warning_text: null
+columns:
+- column_name: Other Identifiers
+  verbose_name: "\u1794\u17D2\u179A\u1797\u17C1\u1791\u179B\u17C1\u1781\u179F\u1798\
+    \u17D2\u1782\u17B6\u179B\u17CB\u1795\u17D2\u179F\u17C1\u1784\u1791\u17C0\u178F\
+    \ (\u1788\u17D2\u1798\u17C4\u17C7\u178A\u17C4\u1799\u17A1\u17C2\u1780\u1796\u17B8\
+    \u1782\u17D2\u1793\u17B6\u178A\u17C4\u1799\u179F\u1789\u17D2\u1789\u17B6\u1780\
+    \u17D2\u1794\u17C0\u179F) (Other ID types (comma separated names)) : \u179B\u17C1\
+    \u1781\u179F\u1798\u17D2\u1782\u17B6\u179B\u17CB\u1795\u17D2\u179F\u17C1\u1784\
+    \u1791\u17C0\u178F (\u179B\u17C1\u1781\u1794\u17C6\u1794\u17C2\u1780\u178A\u17C4\
+    \u1799\u179F\u1789\u17D2\u1789\u17B6\u1780\u17D2\u1794\u17C0\u179F) (Other ID\
+    \ Values (comma separated values))"
+  is_dttm: false
+  is_active: true
+  type: STRING
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: ''
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: VIA Test Result
+  verbose_name: "\u179B\u1791\u17D2\u1792\u1795\u179B \u178F\u17C1\u179F\u17D2\u178F\
+    \ \u179C\u17B8 \u17A2\u17B6\u1799 \u17A2\u17C1 (VIA Test Result)"
+  is_dttm: false
+  is_active: true
+  type: STRING
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: ''
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: CC Reason for Referral
+  verbose_name: "\u1798\u17BC\u179B\u17A0\u17C1\u178F\u17BB\u1793\u17C3\u1780\u17B6\
+    \u179A\u1794\u1789\u17D2\u1787\u17BC\u1793 (CC Reason for Referral)"
+  is_dttm: false
+  is_active: true
+  type: STRING
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: ''
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: Number of Quadrants
+  verbose_name: "\u1785\u17C6\u1793\u17BD\u1793 quadrants \u178A\u17C2\u179B\u1796\
+    \u17B6\u1780\u17CB\u1796\u17D0\u1793\u17D2\u1792 (Number of Quadrants)"
+  is_dttm: false
+  is_active: true
+  type: STRING
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: ''
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: Patient's Birthdate
+  verbose_name: "\u1790\u17D2\u1784\u17C3 \u1781\u17C2 \u1786\u17D2\u1793\u17B6\u17C6\
+    \u1780\u17C6\u178E\u17BE\u178F (Date of Birth)"
+  is_dttm: true
+  is_active: true
+  type: DATE
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: Visibility of SCJ
+  verbose_name: "\u1796\u17B7\u1793\u17B7\u178F\u17D2\u1799\u1781\u17D2\u179F\u17C2\
+    \ SCJ (Visibility of SCJ)"
+  is_dttm: false
+  is_active: true
+  type: STRING
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: ''
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: HPV Test
+  verbose_name: "\u178F\u17C1\u179F\u17D2\u178F \u17A2\u17C1\u1785 \u1797\u17B8 \u179C\
+    \u17B8 (HPV Test)"
+  is_dttm: false
+  is_active: true
+  type: STRING
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: ''
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: CC Follow-up date
+  verbose_name: "\u1780\u17B6\u179B\u1794\u179A\u17B7\u1785\u17D2\u1786\u17C1\u1791\
+    \u178F\u17B6\u1798\u178A\u17B6\u1793\u1798\u17A0\u17B6\u179A\u17B8\u1780\u1798\
+    \u17B6\u178F\u17CB\u179F\u17D2\u1794\u17BC\u1793 (CC Follow-up date)"
+  is_dttm: false
+  is_active: true
+  type: STRING
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: ''
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: Area of ectocervix
+  verbose_name: "\u178F\u17C6\u1794\u1793\u17CB\u1795\u17D2\u1791\u17C3\u1793\u17C3\
+    \u1798\u17B6\u178F\u17CB\u179F\u17D2\u1794\u17BC\u1793\u1781\u17B6\u1784\u1780\
+    \u17D2\u179A\u17C5\u1798\u17B6\u1793\u1780\u17C4\u179F\u17B7\u1780\u17B6\u1785\
+    \u17B6\u1794\u17CB\u1796\u178E\u17CC\u179F (Area of ectocervix)"
+  is_dttm: false
+  is_active: true
+  type: STRING
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: ''
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: Visit End date
+  verbose_name: "\u1780\u17B6\u179B\u1794\u179A\u17B7\u1785\u17D2\u1786\u17C1\u1791\
+    \u1794\u1789\u17D2\u1785\u1794\u17CB\u1780\u17B6\u179A\u1796\u17B7\u1793\u17B7\
+    \u178F\u17D2\u1799\u1787\u17C6\u1784\u17BA (Visit End Date)"
+  is_dttm: true
+  is_active: true
+  type: DATETIME
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: ''
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: Visit Start date
+  verbose_name: "\u1780\u17B6\u179B\u1794\u179A\u17B7\u1785\u17D2\u1786\u17C1\u1791\
+    \u1785\u17B6\u1794\u17CB\u1795\u17D2\u178F\u17BE\u1798\u1796\u17B7\u1793\u17B7\
+    \u178F\u17D2\u1799\u1787\u17C6\u1784\u17BA (Visit Start Date)"
+  is_dttm: true
+  is_active: true
+  type: DATETIME
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: ''
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: Patient's First name
+  verbose_name: "\u1793\u17B6\u1798\u200B\u1782\u17C4\u178F\u17D2\u178F\u1793\u17B6\
+    \u1798 (First Name)"
+  is_dttm: false
+  is_active: true
+  type: STRING
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: ''
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: Facility Name
+  verbose_name: "\u1788\u17D2\u1798\u17C4\u17C7\u1793\u17B7\u1784\u179B\u17C1\u1781\
+    \u1780\u17BC\u178A\u1798\u17BC\u179B\u178A\u17D2\u178B\u17B6\u1793\u179F\u17BB\
+    \u1781\u17B6\u1797\u17B7\u1794\u17B6\u179B (Health Facility's Name)"
+  is_dttm: false
+  is_active: true
+  type: STRING
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: ''
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: Patient's Last name
+  verbose_name: "\u1793\u17B6\u1798\u178F\u17D2\u179A\u1780\u17BC\u179B (Last Name)"
+  is_dttm: false
+  is_active: true
+  type: STRING
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: ''
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: Facility Province
+  verbose_name: "\u1798\u1793\u17D2\u1791\u17B8\u179A\u179F\u17BB\u1781\u17B6\u1797\
+    \u17B7\u1794\u17B6\u179B\u1781\u17C1\u178F\u17D2\u178F (Provincial Health Department)"
+  is_dttm: false
+  is_active: true
+  type: STRING
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: ''
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: First Screening?
+  verbose_name: "\u1780\u17B6\u179A\u1796\u17B7\u1793\u17B7\u178F\u17D2\u1799\u178A\
+    \u17C6\u1794\u17BC\u1784 (First Screening?)"
+  is_dttm: false
+  is_active: true
+  type: STRING
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: ''
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: Cervical Biopsy
+  verbose_name: "\u1785\u17D2\u179A\u17B9\u1794\u179F\u17B6\u1785\u17CB\u1798\u17B6\
+    \u178F\u17CB\u179F\u17D2\u1794\u17BC\u1793 (Cervical Biopsy)"
+  is_dttm: false
+  is_active: true
+  type: STRING
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: ''
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: CC Treatment
+  verbose_name: "\u1780\u17B6\u179A\u1796\u17D2\u1799\u17B6\u1794\u17B6\u179B\u1798\
+    \u17B6\u178F\u17CB\u179F\u17D2\u1794\u17BC\u1793 (CC Treatment)"
+  is_dttm: false
+  is_active: true
+  type: STRING
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: ''
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: Facility District
+  verbose_name: "\u179F\u17D2\u179A\u17BB\u1780\u1794\u17D2\u179A\u178F\u17B7\u1794\
+    \u178F\u17D2\u178F\u17B7 (Operational District)"
+  is_dttm: false
+  is_active: true
+  type: STRING
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: ''
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: OpenMRS ID
+  verbose_name: "\u179B\u17C1\u1781\u179F\u1798\u17D2\u1782\u17B6\u179B\u17CB\u17A2\
+    \u178F\u17B7\u1790\u17B7\u1787\u1793 (Patient ID)"
+  is_dttm: false
+  is_active: true
+  type: STRING
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: ''
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: Referral Facility
+  verbose_name: "\u1794\u1789\u17D2\u1787\u17BC\u1793\u1791\u17C5\u1798\u17BC\u179B\
+    \u178A\u17D2\u178B\u17B6\u1793\u179F\u17BB\u1781\u17B6\u1797\u17B7\u1794\u17B6\
+    \u179B (Referral Facility)"
+  is_dttm: false
+  is_active: true
+  type: STRING
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: ''
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: Insurance type
+  verbose_name: "\u1794\u17D2\u179A\u1797\u17C1\u1791\u1793\u17C3\u1780\u17B6\u179A\
+    \u1794\u1784\u17CB\u1790\u17D2\u179B\u17C3\u179F\u17C1\u179C\u17B6 (Insurance\
+    \ Type)"
+  is_dttm: false
+  is_active: true
+  type: STRING
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: ''
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: Phone number
+  verbose_name: "\u179B\u17C1\u1781\u1791\u17BC\u179A\u179F\u17D0\u1796\u17D2\u1791\
+    \ (Phone Number)"
+  is_dttm: false
+  is_active: true
+  type: STRING
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: ''
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: Pap Smear
+  verbose_name: "\u178F\u17C1\u179F\u17D2\u178F\u1782\u17C6\u1793\u17C0\u179A\u1798\
+    \u17B6\u178F\u17CB\u179F\u17D2\u1794\u17BC\u1793 (Pap Smear)"
+  is_dttm: false
+  is_active: true
+  type: STRING
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: ''
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: Referral source
+  verbose_name: "\u1794\u1789\u17D2\u1787\u17BC\u1793\u1798\u1780\u1796\u17B8 (Referral\
+    \ Source)"
+  is_dttm: false
+  is_active: true
+  type: STRING
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: ''
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: Visit Type
+  verbose_name: "\u1794\u17D2\u179A\u1797\u17C1\u1791\u1793\u17C3\u1780\u17B6\u179A\
+    \u1796\u17B7\u1793\u17B7\u178F\u17D2\u1799 (Visit Type)"
+  is_dttm: false
+  is_active: true
+  type: STRING
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: ''
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: Encounter date and time
+  verbose_name: null
+  is_dttm: true
+  is_active: true
+  type: DATETIME
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: ''
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: Patient's Gender
+  verbose_name: "\u1797\u17C1\u1791 (Sex)"
+  is_dttm: false
+  is_active: true
+  type: STRING
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: null
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: Patient Address
+  verbose_name: "\u17A2\u17B6\u179F\u1799\u178A\u17D2\u178B\u17B6\u1793 (Address)"
+  is_dttm: false
+  is_active: true
+  type: STRING
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: ''
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: Colposcopy
+  verbose_name: "\u1780\u17B6\u179A\u1790\u178F\u1786\u17D2\u179B\u17BB\u17C7\u1798\
+    \u17B6\u178F\u17CB\u179F\u17D2\u1794\u17BC\u1793 (Colposcopy)"
+  is_dttm: false
+  is_active: true
+  type: STRING
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: ''
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+- column_name: indicator
+  verbose_name: null
+  is_dttm: false
+  is_active: true
+  type: STRING
+  advanced_data_type: null
+  groupby: true
+  filterable: true
+  expression: ''
+  description: null
+  python_date_format: null
+  extra:
+    warning_markdown: null
+version: 1.0.0
+database_uuid: 42834407-4570-4111-8bf6-4f7080413333
diff --git a/base/configs/superset/assets/metadata.yaml b/base/configs/superset/assets/metadata.yaml
new file mode 100644
index 00000000..87694552
--- /dev/null
+++ b/base/configs/superset/assets/metadata.yaml
@@ -0,0 +1,3 @@
+version: 1.0.0
+type: Slice
+timestamp: '2024-06-12T07:24:07.152240+00:00'