diff --git a/app/reporting-framework/hiv/moh-412.json b/app/reporting-framework/hiv/moh-412.json index ff982137e..3db4478b9 100644 --- a/app/reporting-framework/hiv/moh-412.json +++ b/app/reporting-framework/hiv/moh-412.json @@ -57,7 +57,122 @@ "indicator": "screened_via_or_via_vili_initial_visit_hiv_negative" } ] + } + ] + }, + { + "name": "HPV", + "body": [ + { + "title": "HIV Positive", + "indicators": [ + { + "label": " < 25 yrs", + "ref": "", + "indicator": "dc__screening_visit_type__initial__age_range__less_than_25__hiv_status__positive__screened_hpv" + }, + { + "label": " 25-49 yrs", + "ref": "", + "indicator": "dc__screening_visit_type__initial__age_range__25_to_49__hiv_status__positive__screened_hpv" + }, + { + "label": "50 yrs and above", + "ref": "", + "indicator": "dc__screening_visit_type__initial__age_range__50_and_above__hiv_status__positive__screened_hpv" + }, + { + "label": "Total", + "ref": "", + "indicator": "screened_hpv_initial_visit_hiv_positive" + } + ] + }, + { + "title": "HIV Negative", + "indicators": [ + { + "label": " < 25 yrs", + "ref": "HV02-44", + "indicator": "dc__screening_visit_type__initial__age_range__less_than_25__hiv_status__negative__screened_hpv" + }, + { + "label": " 25-49 yrs", + "ref": "HV02-44", + "indicator": "dc__screening_visit_type__initial__age_range__25_to_49__hiv_status__negative__screened_hpv" + }, + { + "label": " 50 yrs and above", + "ref": "HV02-44", + "indicator": "dc__screening_visit_type__initial__age_range__50_and_above__hiv_status__negative__screened_hpv" + }, + { + "label": "Total", + "ref": "", + "indicator": "screened_hpv_initial_visit_hiv_negative" + } + ] + } + ] + }, + { + "name": "Colposcopy", + "body": [ + { + "title": "HIV Positive", + "indicators": [ + { + "label": " < 25 yrs", + "ref": "", + "indicator": "dc__screening_visit_type__initial__age_range__less_than_25__hiv_status__positive__screened_colposcopy" + }, + { + "label": " 25-49 yrs", + "ref": "", + "indicator": "dc__screening_visit_type__initial__age_range__25_to_49__hiv_status__positive__screened_colposcopy" + }, + { + "label": "50 yrs and above", + "ref": "", + "indicator": "dc__screening_visit_type__initial__age_range__50_and_above__hiv_status__positive__screened_colposcopy" + }, + { + "label": "Total", + "ref": "", + "indicator": "screened_colposcopy_initial_visit_hiv_positive" + } + ] }, + { + "title": "HIV Negative", + "indicators": [ + { + "label": " < 25 yrs", + "ref": "HV02-44", + "indicator": "dc__screening_visit_type__initial__age_range__less_than_25__hiv_status__negative__screened_colposcopy" + }, + { + "label": " 25-49 yrs", + "ref": "HV02-44", + "indicator": "dc__screening_visit_type__initial__age_range__25_to_49__hiv_status__negative__screened_colposcopy" + }, + { + "label": " 50 yrs and above", + "ref": "HV02-44", + "indicator": "dc__screening_visit_type__initial__age_range__50_and_above__hiv_status__negative__screened_colposcopy" + }, + { + "label": "Total", + "ref": "", + "indicator": "screened_colposcopy_initial_visit_hiv_negative" + } + ] + } + ] + }, + { + "name": "VIA OR VIA/VILI + HPV + Colposcopy", + "body": [ { "title": "Total", "indicators": [ @@ -127,7 +242,122 @@ "indicator": "screened_via_or_via_vili_routine_visit_hiv_negative" } ] + } + ] + }, + { + "name": "HPV", + "body": [ + { + "title": "HIV Positive", + "indicators": [ + { + "label": " < 25 yrs", + "ref": "", + "indicator": "dc__screening_visit_type__routine__age_range__less_than_25__hiv_status__positive__screened_hpv" + }, + { + "label": " 25-49 yrs", + "ref": "", + "indicator": "dc__screening_visit_type__routine__age_range__25_to_49__hiv_status__positive__screened_hpv" + }, + { + "label": "50 yrs and above", + "ref": "", + "indicator": "dc__screening_visit_type__routine__age_range__50_and_above__hiv_status__positive__screened_hpv" + }, + { + "label": "Total", + "ref": "", + "indicator": "screened_hpv_routine_visit_hiv_positive" + } + ] }, + { + "title": "HIV Negative", + "indicators": [ + { + "label": " < 25 yrs", + "ref": "", + "indicator": "dc__screening_visit_type__routine__age_range__less_than_25__hiv_status__negative__screened_hpv" + }, + { + "label": " 25-49 yrs", + "ref": "", + "indicator": "dc__screening_visit_type__routine__age_range__25_to_49__hiv_status__negative__screened_hpv" + }, + { + "label": "50 yrs and above", + "ref": "", + "indicator": "dc__screening_visit_type__routine__age_range__50_and_above__hiv_status__negative__screened_hpv" + }, + { + "label": "Total", + "ref": "", + "indicator": "screened_hpv_routine_visit_hiv_negative" + } + ] + } + ] + }, + { + "name": "Colposcopy", + "body": [ + { + "title": "HIV Positive", + "indicators": [ + { + "label": " < 25 yrs", + "ref": "", + "indicator": "dc__screening_visit_type__routine__age_range__less_than_25__hiv_status__positive__screened_colposcopy" + }, + { + "label": " 25-49 yrs", + "ref": "", + "indicator": "dc__screening_visit_type__routine__age_range__25_to_49__hiv_status__positive__screened_colposcopy" + }, + { + "label": "50 yrs and above", + "ref": "", + "indicator": "dc__screening_visit_type__routine__age_range__50_and_above__hiv_status__positive__screened_colposcopy" + }, + { + "label": "Total", + "ref": "", + "indicator": "screened_colposcopy_routine_visit_hiv_positive" + } + ] + }, + { + "title": "HIV Negative", + "indicators": [ + { + "label": " < 25 yrs", + "ref": "", + "indicator": "dc__screening_visit_type__routine__age_range__less_than_25__hiv_status__negative__screened_colposcopy" + }, + { + "label": " 25-49 yrs", + "ref": "", + "indicator": "dc__screening_visit_type__routine__age_range__25_to_49__hiv_status__negative__screened_colposcopy" + }, + { + "label": "50 yrs and above", + "ref": "", + "indicator": "dc__screening_visit_type__routine__age_range__50_and_above__hiv_status__negative__screened_colposcopy" + }, + { + "label": "Total", + "ref": "", + "indicator": "screened_colposcopy_routine_visit_hiv_negative" + } + ] + } + ] + }, + { + "name": "VIA OR VIA/VILI + HPV + Colposcopy", + "body": [ { "title": "Total", "indicators": [ @@ -197,14 +427,129 @@ "indicator": "screened_via_or_via_vili_post_treatment_visit_hiv_negative" } ] + } + ] + }, + { + "name": "HPV", + "body": [ + { + "title": "HIV Positive", + "indicators": [ + { + "label": " < 25 yrs", + "ref": "", + "indicator": "dc__screening_visit_type__post_treatment__age_range__less_than_25__hiv_status__positive__screened_hpv" + }, + { + "label": " 25-49 yrs", + "ref": "", + "indicator": "dc__screening_visit_type__post_treatment__age_range__25_to_49__hiv_status__positive__screened_hpv" + }, + { + "label": "50 yrs and above", + "ref": "", + "indicator": "dc__screening_visit_type__post_treatment__age_range__50_and_above__hiv_status__positive__screened_hpv" + }, + { + "label": "Total", + "ref": "", + "indicator": "screened_hpv_post_treatment_visit_hiv_positive" + } + ] }, + { + "title": "HIV Negative", + "indicators": [ + { + "label": " < 25 yrs", + "ref": "HV02-44", + "indicator": "dc__screening_visit_type__post_treatment__age_range__less_than_25__hiv_status__negative__screened_hpv" + }, + { + "label": " 25-49 yrs", + "ref": "HV02-44", + "indicator": "dc__screening_visit_type__post_treatment__age_range__25_to_49__hiv_status__negative__screened_hpv" + }, + { + "label": "50 yrs and above", + "ref": "HV02-44", + "indicator": "dc__screening_visit_type__post_treatment__age_range__50_and_above__hiv_status__negative__screened_hpv" + }, + { + "label": "Total", + "ref": "", + "indicator": "screened_hpv_post_treatment_visit_hiv_negative" + } + ] + } + ] + }, + { + "name": "Colposcopy", + "body": [ + { + "title": "HIV Positive", + "indicators": [ + { + "label": " < 25 yrs", + "ref": "", + "indicator": "dc__screening_visit_type__post_treatment__age_range__less_than_25__hiv_status__positive__screened_colposcopy" + }, + { + "label": " 25-49 yrs", + "ref": "", + "indicator": "dc__screening_visit_type__post_treatment__age_range__25_to_49__hiv_status__positive__screened_colposcopy" + }, + { + "label": "50 yrs and above", + "ref": "", + "indicator": "dc__screening_visit_type__post_treatment__age_range__50_and_above__hiv_status__positive__screened_colposcopy" + }, + { + "label": "Total", + "ref": "", + "indicator": "screened_colposcopy_post_treatment_visit_hiv_positive" + } + ] + }, + { + "title": "HIV Negative", + "indicators": [ + { + "label": " < 25 yrs", + "ref": "HV02-44", + "indicator": "dc__screening_visit_type__post_treatment__age_range__less_than_25__hiv_status__negative__screened_colposcopy" + }, + { + "label": " 25-49 yrs", + "ref": "HV02-44", + "indicator": "dc__screening_visit_type__post_treatment__age_range__25_to_49__hiv_status__negative__screened_colposcopy" + }, + { + "label": "50 yrs and above", + "ref": "HV02-44", + "indicator": "dc__screening_visit_type__post_treatment__age_range__50_and_above__hiv_status__negative__screened_colposcopy" + }, + { + "label": "Total", + "ref": "", + "indicator": "screened_colposcopy_post_treatment_visit_hiv_negative" + } + ] + } + ] + }, + { + "name": "VIA OR VIA/VILI + HPV + Colposcopy", + "body": [ { "title": "Total", "indicators": [ { "label": "Total", "ref": "", - "indicator": "screened_via_or_via_vili_post_treatment_visit" + "indicator": "screened_post_treatment_visit" } ] } @@ -229,6 +574,51 @@ ] } ] + }, + { + "name": "HPV", + "body": [ + { + "title": "Total", + "indicators": [ + { + "label": "Total", + "ref": "", + "indicator": "screened_hpv_all_visit" + } + ] + } + ] + }, + { + "name": "Colposcopy", + "body": [ + { + "title": "Total", + "indicators": [ + { + "label": "Total", + "ref": "", + "indicator": "screened_colposcopy_all_visit" + } + ] + } + ] + }, + { + "name": "VIA OR VIA/VILI + HPV + Colposcopy", + "body": [ + { + "title": "Total", + "indicators": [ + { + "label": "Total", + "ref": "", + "indicator": "screened_all_visit" + } + ] + } + ] } ] } diff --git a/app/reporting-framework/json-reports/hiv-cervical-cancer-screening-monthly-aggregate.json b/app/reporting-framework/json-reports/hiv-cervical-cancer-screening-monthly-aggregate.json index 462611f9b..141648205 100644 --- a/app/reporting-framework/json-reports/hiv-cervical-cancer-screening-monthly-aggregate.json +++ b/app/reporting-framework/json-reports/hiv-cervical-cancer-screening-monthly-aggregate.json @@ -75,6 +75,14 @@ "expressionOptions": { "expression": "COUNT(hc.screened_hpv)" } + }, + { + "type": "derived_column", + "alias": "screened_colposcopy", + "expressionType": "simple_expression", + "expressionOptions": { + "expression": "COUNT(hc.screened_colposcopy)" + } } ], "groupBy": { diff --git a/app/reporting-framework/json-reports/hiv-cervical-cancer-screening-monthly-base.json b/app/reporting-framework/json-reports/hiv-cervical-cancer-screening-monthly-base.json index ce269e389..269a35585 100644 --- a/app/reporting-framework/json-reports/hiv-cervical-cancer-screening-monthly-base.json +++ b/app/reporting-framework/json-reports/hiv-cervical-cancer-screening-monthly-base.json @@ -199,7 +199,11 @@ }, { "condition": "c.screening_method = 2322", - "value": "hpv" + "value": "HPV" + }, + { + "condition": "c.screening_method = 7383", + "value": "Colposcopy" } ] } @@ -228,6 +232,14 @@ "expression": "IF(c.screening_method in (2322),1,NULL)" } }, + { + "type": "derived_column", + "alias": "screened_colposcopy", + "expressionType": "simple_expression", + "expressionOptions": { + "expression": "IF(c.screening_method in (7383),1,NULL)" + } + }, { "type": "derived_column", "alias": "treatment_method", diff --git a/app/reporting-framework/json-reports/hiv-cervical-cancer-screening-monthly-main-dataset-aggregate.json b/app/reporting-framework/json-reports/hiv-cervical-cancer-screening-monthly-main-dataset-aggregate.json index 15054bd89..349d9b525 100644 --- a/app/reporting-framework/json-reports/hiv-cervical-cancer-screening-monthly-main-dataset-aggregate.json +++ b/app/reporting-framework/json-reports/hiv-cervical-cancer-screening-monthly-main-dataset-aggregate.json @@ -81,6 +81,22 @@ "expression": "COUNT(hc.screened_via_or_via_vili_initial_visit_hiv_positive)" } }, + { + "type": "derived_column", + "alias": "screened_hpv_initial_visit_hiv_positive", + "expressionType": "simple_expression", + "expressionOptions": { + "expression": "COUNT(hc.screened_hpv_initial_visit_hiv_positive)" + } + }, + { + "type": "derived_column", + "alias": "screened_colposcopy_initial_visit_hiv_positive", + "expressionType": "simple_expression", + "expressionOptions": { + "expression": "COUNT(hc.screened_colposcopy_initial_visit_hiv_positive)" + } + }, { "type": "derived_column", "alias": "screened_via_or_via_vili_initial_visit_hiv_negative", @@ -89,6 +105,22 @@ "expression": "COUNT(hc.screened_via_or_via_vili_initial_visit_hiv_negative)" } }, + { + "type": "derived_column", + "alias": "screened_hpv_initial_visit_hiv_negative", + "expressionType": "simple_expression", + "expressionOptions": { + "expression": "COUNT(hc.screened_hpv_initial_visit_hiv_negative)" + } + }, + { + "type": "derived_column", + "alias": "screened_colposcopy_initial_visit_hiv_negative", + "expressionType": "simple_expression", + "expressionOptions": { + "expression": "COUNT(hc.screened_colposcopy_initial_visit_hiv_negative)" + } + }, { "type": "derived_column", "alias": "screened_routine_visit", @@ -113,6 +145,22 @@ "expression": "COUNT(hc.screened_via_or_via_vili_routine_visit_hiv_positive)" } }, + { + "type": "derived_column", + "alias": "screened_hpv_routine_visit_hiv_positive", + "expressionType": "simple_expression", + "expressionOptions": { + "expression": "COUNT(hc.screened_hpv_routine_visit_hiv_positive)" + } + }, + { + "type": "derived_column", + "alias": "screened_colposcopy_routine_visit_hiv_positive", + "expressionType": "simple_expression", + "expressionOptions": { + "expression": "COUNT(hc.screened_colposcopy_routine_visit_hiv_positive)" + } + }, { "type": "derived_column", "alias": "screened_via_or_via_vili_routine_visit_hiv_negative", @@ -121,6 +169,22 @@ "expression": "COUNT(hc.screened_via_or_via_vili_routine_visit_hiv_negative)" } }, + { + "type": "derived_column", + "alias": "screened_hpv_routine_visit_hiv_negative", + "expressionType": "simple_expression", + "expressionOptions": { + "expression": "COUNT(hc.screened_hpv_routine_visit_hiv_negative)" + } + }, + { + "type": "derived_column", + "alias": "screened_colposcopy_routine_visit_hiv_negative", + "expressionType": "simple_expression", + "expressionOptions": { + "expression": "COUNT(hc.screened_colposcopy_routine_visit_hiv_negative)" + } + }, { "type": "derived_column", "alias": "screened_post_treatment_visit", @@ -145,6 +209,22 @@ "expression": "COUNT(hc.screened_via_or_via_vili_post_treatment_visit_hiv_positive)" } }, + { + "type": "derived_column", + "alias": "screened_hpv_post_treatment_visit_hiv_positive", + "expressionType": "simple_expression", + "expressionOptions": { + "expression": "COUNT(hc.screened_hpv_post_treatment_visit_hiv_positive)" + } + }, + { + "type": "derived_column", + "alias": "screened_colposcopy_post_treatment_visit_hiv_positive", + "expressionType": "simple_expression", + "expressionOptions": { + "expression": "COUNT(hc.screened_colposcopy_post_treatment_visit_hiv_positive)" + } + }, { "type": "derived_column", "alias": "screened_via_or_via_vili_post_treatment_visit_hiv_negative", @@ -153,6 +233,22 @@ "expression": "COUNT(hc.screened_via_or_via_vili_post_treatment_visit_hiv_negative)" } }, + { + "type": "derived_column", + "alias": "screened_hpv_post_treatment_visit_hiv_negative", + "expressionType": "simple_expression", + "expressionOptions": { + "expression": "COUNT(hc.screened_hpv_post_treatment_visit_hiv_negative)" + } + }, + { + "type": "derived_column", + "alias": "screened_colposcopy_post_treatment_visit_hiv_negative", + "expressionType": "simple_expression", + "expressionOptions": { + "expression": "COUNT(hc.screened_colposcopy_post_treatment_visit_hiv_negative)" + } + }, { "type": "derived_column", "alias": "screened_positive_via_or_via_vili_initial_visit_hiv_positive", @@ -545,6 +641,30 @@ "expression": "COUNT(hc.screened_via_or_via_vili_all_visit)" } }, + { + "type": "derived_column", + "alias": "screened_hpv_all_visit", + "expressionType": "simple_expression", + "expressionOptions": { + "expression": "COUNT(hc.screened_hpv_all_visit)" + } + }, + { + "type": "derived_column", + "alias": "screened_colposcopy_all_visit", + "expressionType": "simple_expression", + "expressionOptions": { + "expression": "COUNT(hc.screened_colposcopy_all_visit)" + } + }, + { + "type": "derived_column", + "alias": "screened_all_visit", + "expressionType": "simple_expression", + "expressionOptions": { + "expression": "COUNT(hc.screened_all_visit)" + } + }, { "type": "derived_column", "alias": "screened_positive_via_or_via_vili_all_visit", diff --git a/app/reporting-framework/json-reports/hiv-cervical-cancer-screening-monthly-main-dataset-base.json b/app/reporting-framework/json-reports/hiv-cervical-cancer-screening-monthly-main-dataset-base.json index 1a6a72dc4..6fb2e0e74 100644 --- a/app/reporting-framework/json-reports/hiv-cervical-cancer-screening-monthly-main-dataset-base.json +++ b/app/reporting-framework/json-reports/hiv-cervical-cancer-screening-monthly-main-dataset-base.json @@ -137,6 +137,68 @@ ] } }, + { + "type": "derived_column", + "alias": "hpv_test_result", + "expressionType": "case_statement", + "expressionOptions": { + "caseOptions": [ + { + "condition": "c.hpv_test_result = 1", + "value": "Negative" + }, + { + "condition": "c.hpv_test_result = 2", + "value": "Positive" + }, + { + "condition": "c.hpv_test_result = 3", + "value": "Indeterminate" + } + ] + } + }, + { + "type": "derived_column", + "alias": "colposcopy_test_result", + "expressionType": "case_statement", + "expressionOptions": { + "caseOptions": [ + { + "condition": "c.colposcopy_test_result = 1", + "value": "Normal" + }, + { + "condition": "c.colposcopy_test_result = 2", + "value": "Abnormal" + }, + { + "condition": "c.colposcopy_test_result = 3", + "value": "Acetowhite Lesion" + }, + { + "condition": "c.colposcopy_test_result = 4", + "value": "Punctuated Capillaries" + }, + { + "condition": "c.colposcopy_test_result = 5", + "value": "Mosaicism" + }, + { + "condition": "c.colposcopy_test_result = 6", + "value": "Atypical blood vessels" + }, + { + "condition": "c.colposcopy_test_result = 7", + "value": "Internal Border within Cervical Lesion" + }, + { + "condition": "c.colposcopy_test_result = 8", + "value": "Do not know" + } + ] + } + }, { "type": "derived_column", "alias": "screening_visit_type", @@ -195,7 +257,11 @@ }, { "condition": "c.screening_method = 2322", - "value": "hpv" + "value": "HPV" + }, + { + "condition": "c.screening_method = 7383", + "value": "Colposcopy" } ] } @@ -205,7 +271,7 @@ "alias": "screened_initial_visit", "expressionType": "simple_expression", "expressionOptions": { - "expression": "IF(c.screening_method in (9434,10420,885,2322) AND c.reasons_for_current_visit = 1,1,NULL)" + "expression": "IF(c.screening_method in (9434,10420,885,2322,7383) AND c.reasons_for_current_visit = 1,1,NULL)" } }, { @@ -224,6 +290,22 @@ "expression": "IF(c.screening_method in (9434,10420) AND c.reasons_for_current_visit = 1 AND c.hiv_status = 2,1,NULL)" } }, + { + "type": "derived_column", + "alias": "screened_hpv_initial_visit_hiv_positive", + "expressionType": "simple_expression", + "expressionOptions": { + "expression": "IF(c.screening_method in (2322) AND c.reasons_for_current_visit = 1 AND c.hiv_status = 2,1,NULL)" + } + }, + { + "type": "derived_column", + "alias": "screened_colposcopy_initial_visit_hiv_positive", + "expressionType": "simple_expression", + "expressionOptions": { + "expression": "IF(c.screening_method in (7383) AND c.reasons_for_current_visit = 1 AND c.hiv_status = 2,1,NULL)" + } + }, { "type": "derived_column", "alias": "screened_via_or_via_vili_initial_visit_hiv_negative", @@ -232,12 +314,28 @@ "expression": "IF(c.screening_method in (9434,10420) AND c.reasons_for_current_visit = 1 AND c.hiv_status = 1,1,NULL)" } }, + { + "type": "derived_column", + "alias": "screened_hpv_initial_visit_hiv_negative", + "expressionType": "simple_expression", + "expressionOptions": { + "expression": "IF(c.screening_method in (2322) AND c.reasons_for_current_visit = 1 AND c.hiv_status = 1,1,NULL)" + } + }, + { + "type": "derived_column", + "alias": "screened_colposcopy_initial_visit_hiv_negative", + "expressionType": "simple_expression", + "expressionOptions": { + "expression": "IF(c.screening_method in (7383) AND c.reasons_for_current_visit = 1 AND c.hiv_status = 1,1,NULL)" + } + }, { "type": "derived_column", "alias": "screened_routine_visit", "expressionType": "simple_expression", "expressionOptions": { - "expression": "IF(c.screening_method in (9434,10420,885,2322) AND c.reasons_for_current_visit = 2,1,NULL)" + "expression": "IF(c.screening_method in (9434,10420,885,2322,7383) AND c.reasons_for_current_visit = 2,1,NULL)" } }, { @@ -256,6 +354,22 @@ "expression": "IF(c.screening_method in (9434,10420) AND c.reasons_for_current_visit = 2 AND c.hiv_status = 2,1,NULL)" } }, + { + "type": "derived_column", + "alias": "screened_hpv_routine_visit_hiv_positive", + "expressionType": "simple_expression", + "expressionOptions": { + "expression": "IF(c.screening_method in (2322) AND c.reasons_for_current_visit = 2 AND c.hiv_status = 2,1,NULL)" + } + }, + { + "type": "derived_column", + "alias": "screened_colposcopy_routine_visit_hiv_positive", + "expressionType": "simple_expression", + "expressionOptions": { + "expression": "IF(c.screening_method in (7383) AND c.reasons_for_current_visit = 2 AND c.hiv_status = 2,1,NULL)" + } + }, { "type": "derived_column", "alias": "screened_via_or_via_vili_routine_visit_hiv_negative", @@ -264,12 +378,28 @@ "expression": "IF(c.screening_method in (9434,10420) AND c.reasons_for_current_visit = 2 AND c.hiv_status = 1,1,NULL)" } }, + { + "type": "derived_column", + "alias": "screened_hpv_routine_visit_hiv_negative", + "expressionType": "simple_expression", + "expressionOptions": { + "expression": "IF(c.screening_method in (2322) AND c.reasons_for_current_visit = 2 AND c.hiv_status = 1,1,NULL)" + } + }, + { + "type": "derived_column", + "alias": "screened_colposcopy_routine_visit_hiv_negative", + "expressionType": "simple_expression", + "expressionOptions": { + "expression": "IF(c.screening_method in (7383) AND c.reasons_for_current_visit = 2 AND c.hiv_status = 1,1,NULL)" + } + }, { "type": "derived_column", "alias": "screened_post_treatment_visit", "expressionType": "simple_expression", "expressionOptions": { - "expression": "IF(c.screening_method in (9434,10420,885,2322) AND c.reasons_for_current_visit = 3 ,1,NULL)" + "expression": "IF(c.screening_method in (9434,10420,885,2322,7383) AND c.reasons_for_current_visit = 3 ,1,NULL)" } }, { @@ -288,6 +418,22 @@ "expression": "IF(c.screening_method in (9434,10420) AND c.reasons_for_current_visit = 3 AND c.hiv_status = 2,1,NULL)" } }, + { + "type": "derived_column", + "alias": "screened_hpv_post_treatment_visit_hiv_positive", + "expressionType": "simple_expression", + "expressionOptions": { + "expression": "IF(c.screening_method in (2322) AND c.reasons_for_current_visit = 3 AND c.hiv_status = 2,1,NULL)" + } + }, + { + "type": "derived_column", + "alias": "screened_colposcopy_post_treatment_visit_hiv_positive", + "expressionType": "simple_expression", + "expressionOptions": { + "expression": "IF(c.screening_method in (7383) AND c.reasons_for_current_visit = 3 AND c.hiv_status = 2,1,NULL)" + } + }, { "type": "derived_column", "alias": "screened_via_or_via_vili_post_treatment_visit_hiv_negative", @@ -296,6 +442,22 @@ "expression": "IF(c.screening_method in (9434,10420) AND c.reasons_for_current_visit = 3 AND c.hiv_status = 1,1,NULL)" } }, + { + "type": "derived_column", + "alias": "screened_hpv_post_treatment_visit_hiv_negative", + "expressionType": "simple_expression", + "expressionOptions": { + "expression": "IF(c.screening_method in (2322) AND c.reasons_for_current_visit = 3 AND c.hiv_status = 1,1,NULL)" + } + }, + { + "type": "derived_column", + "alias": "screened_colposcopy_post_treatment_visit_hiv_negative", + "expressionType": "simple_expression", + "expressionOptions": { + "expression": "IF(c.screening_method in (7383) AND c.reasons_for_current_visit = 3 AND c.hiv_status = 1,1,NULL)" + } + }, { "type": "derived_column", "alias": "screened_positive_via_or_via_vili_initial_visit_hiv_positive", @@ -688,6 +850,30 @@ "expression": "IF(c.screening_method in (9434,10420),1,NULL)" } }, + { + "type": "derived_column", + "alias": "screened_hpv_all_visit", + "expressionType": "simple_expression", + "expressionOptions": { + "expression": "IF(c.screening_method in (2322),1,NULL)" + } + }, + { + "type": "derived_column", + "alias": "screened_colposcopy_all_visit", + "expressionType": "simple_expression", + "expressionOptions": { + "expression": "IF(c.screening_method in (7383),1,NULL)" + } + }, + { + "type": "derived_column", + "alias": "screened_all_visit", + "expressionType": "simple_expression", + "expressionOptions": { + "expression": "IF(c.screening_method in (9434,10420,885,2322,7383),1,NULL)" + } + }, { "type": "derived_column", "alias": "screened_positive_via_or_via_vili_all_visit",