From 2b490fbd3c8d043d31299f764d7a6ee669f861ab Mon Sep 17 00:00:00 2001 From: sainingo Date: Mon, 15 Jul 2024 17:17:12 +0300 Subject: [PATCH 1/3] POC-807: Revise Cervical Cancer Screening Age --- programs/patient-program-config.json | 38 ++++++++++++++-------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/programs/patient-program-config.json b/programs/patient-program-config.json index bbe8faff7..34312dc63 100755 --- a/programs/patient-program-config.json +++ b/programs/patient-program-config.json @@ -98,7 +98,7 @@ { "uuid": "238625fc-8a25-44b2-aa5a-8bf48fa0e18d", "display": "ONCOLOGYVIA", - "allowedIf": "age >= 25 && age <= 49 && gender === 'F'" + "allowedIf": "age >= 15 && age <= 65 && gender === 'F'" }, { "uuid": "ae35ed69-e07c-4209-93ce-f23733aa816b", @@ -159,7 +159,7 @@ { "uuid": "238625fc-8a25-44b2-aa5a-8bf48fa0e18d", "display": "ONCOLOGYVIA", - "allowedIf": "age >= 25 && age <= 49 && gender === 'F'" + "allowedIf": "age >= 15 && age <= 65 && gender === 'F'" }, { "uuid": "cb5c0abd-0817-40e3-9413-8669561fadb9", @@ -224,7 +224,7 @@ { "uuid": "238625fc-8a25-44b2-aa5a-8bf48fa0e18d", "display": "ONCOLOGYVIA", - "allowedIf": "age >= 25 && age <= 49 && gender === 'F'" + "allowedIf": "age >= 15 && age <= 65 && gender === 'F'" }, { "uuid": "cb5c0abd-0817-40e3-9413-8669561fadb9", @@ -660,7 +660,7 @@ { "uuid": "238625fc-8a25-44b2-aa5a-8bf48fa0e18d", "display": "ONCOLOGYVIA", - "allowedIf": "age >= 25 && age <= 49 && gender === 'F'" + "allowedIf": "age >= 15 && age <= 65 && gender === 'F'" }, { "uuid": "ae35ed69-e07c-4209-93ce-f23733aa816b", @@ -1369,7 +1369,7 @@ { "uuid": "238625fc-8a25-44b2-aa5a-8bf48fa0e18d", "display": "ONCOLOGYVIA", - "allowedIf": "age >= 25 && age <= 49 && gender === 'F'" + "allowedIf": "age >= 15 && age <= 65 && gender === 'F'" }, { "uuid": "cb5c0abd-0817-40e3-9413-8669561fadb9", @@ -1446,7 +1446,7 @@ { "uuid": "238625fc-8a25-44b2-aa5a-8bf48fa0e18d", "display": "ONCOLOGYVIA", - "allowedIf": "age >= 25 && age <= 49 && gender === 'F'" + "allowedIf": "age >= 15 && age <= 65 && gender === 'F'" }, { "uuid": "cb5c0abd-0817-40e3-9413-8669561fadb9", @@ -1523,7 +1523,7 @@ { "uuid": "238625fc-8a25-44b2-aa5a-8bf48fa0e18d", "display": "ONCOLOGYVIA", - "allowedIf": "age >= 25 && age <= 49 && gender === 'F'" + "allowedIf": "age >= 15 && age <= 65 && gender === 'F'" }, { "uuid": "ae35ed69-e07c-4209-93ce-f23733aa816b", @@ -1596,7 +1596,7 @@ { "uuid": "238625fc-8a25-44b2-aa5a-8bf48fa0e18d", "display": "ONCOLOGYVIA", - "allowedIf": "age >= 25 && age <= 49 && gender === 'F'" + "allowedIf": "age >= 15 && age <= 65 && gender === 'F'" }, { "uuid": "cb5c0abd-0817-40e3-9413-8669561fadb9", @@ -1677,7 +1677,7 @@ { "uuid": "238625fc-8a25-44b2-aa5a-8bf48fa0e18d", "display": "ONCOLOGYVIA", - "allowedIf": "age >= 25 && age <= 49 && gender === 'F'" + "allowedIf": "age >= 15 && age <= 65 && gender === 'F'" }, { "uuid": "ae35ed69-e07c-4209-93ce-f23733aa816b", @@ -1746,7 +1746,7 @@ { "uuid": "238625fc-8a25-44b2-aa5a-8bf48fa0e18d", "display": "ONCOLOGYVIA", - "allowedIf": "age >= 25 && age <= 49 && gender === 'F'" + "allowedIf": "age >= 15 && age <= 65 && gender === 'F'" }, { "uuid": "cb5c0abd-0817-40e3-9413-8669561fadb9", @@ -1847,7 +1847,7 @@ { "uuid": "238625fc-8a25-44b2-aa5a-8bf48fa0e18d", "display": "ONCOLOGYVIA", - "allowedIf": "age >= 25 && age <= 49 && gender === 'F'" + "allowedIf": "age >= 15 && age <= 65 && gender === 'F'" }, { "uuid": "ae35ed69-e07c-4209-93ce-f23733aa816b", @@ -2713,7 +2713,7 @@ { "uuid": "238625fc-8a25-44b2-aa5a-8bf48fa0e18d", "display": "ONCOLOGYVIA", - "allowedIf": "age >= 25 && age <= 49 && gender === 'F'" + "allowedIf": "age >= 15 && age <= 65 && gender === 'F'" }, { "uuid": "cb5c0abd-0817-40e3-9413-8669561fadb9", @@ -2974,7 +2974,7 @@ { "uuid": "238625fc-8a25-44b2-aa5a-8bf48fa0e18d", "display": "ONCOLOGYVIA", - "allowedIf": "age >= 25 && age <= 49 && gender === 'F'" + "allowedIf": "age >= 15 && age <= 65 && gender === 'F'" }, { "uuid": "5ef97eed-18f5-40f6-9fbf-a11b1f06484a", @@ -3071,7 +3071,7 @@ { "uuid": "238625fc-8a25-44b2-aa5a-8bf48fa0e18d", "display": "ONCOLOGYVIA", - "allowedIf": "age >= 25 && age <= 49 && gender === 'F'" + "allowedIf": "age >= 15 && age <= 65 && gender === 'F'" }, { "uuid": "cb5c0abd-0817-40e3-9413-8669561fadb9", @@ -3133,7 +3133,7 @@ { "uuid": "238625fc-8a25-44b2-aa5a-8bf48fa0e18d", "display": "ONCOLOGYVIA", - "allowedIf": "age >= 25 && age <= 49 && gender === 'F'" + "allowedIf": "age >= 15 && age <= 65 && gender === 'F'" }, { "uuid": "ae35ed69-e07c-4209-93ce-f23733aa816b", @@ -3988,7 +3988,7 @@ { "uuid": "238625fc-8a25-44b2-aa5a-8bf48fa0e18d", "display": "ONCOLOGYVIA", - "allowedIf": "age >= 25 && age <= 49 && gender === 'F'" + "allowedIf": "age >= 15 && age <= 65 && gender === 'F'" }, { "uuid": "466d6707-8429-4e61-b5a0-d63444f5ad35", @@ -4027,7 +4027,7 @@ { "uuid": "238625fc-8a25-44b2-aa5a-8bf48fa0e18d", "display": "ONCOLOGYVIA", - "allowedIf": "age >= 25 && age <= 49 && gender === 'F'" + "allowedIf": "age >= 15 && age <= 65 && gender === 'F'" }, { "uuid": "ae35ed69-e07c-4209-93ce-f23733aa816b", @@ -4543,7 +4543,7 @@ { "uuid": "238625fc-8a25-44b2-aa5a-8bf48fa0e18d", "display": "ONCOLOGYVIA", - "allowedIf": "age >= 25 && age <= 49 && gender === 'F'" + "allowedIf": "age >= 15 && age <= 65 && gender === 'F'" }, { "uuid": "cb5c0abd-0817-40e3-9413-8669561fadb9", @@ -4609,7 +4609,7 @@ { "uuid": "238625fc-8a25-44b2-aa5a-8bf48fa0e18d", "display": "ONCOLOGYVIA", - "allowedIf": "age >= 25 && age <= 49 && gender === 'F'" + "allowedIf": "age >= 15 && age <= 65 && gender === 'F'" }, { "uuid": "ae35ed69-e07c-4209-93ce-f23733aa816b", From cf2a50ab5b704616b2dc86421f5a6f348b1cb65c Mon Sep 17 00:00:00 2001 From: sainingo Date: Tue, 16 Jul 2024 10:09:45 +0300 Subject: [PATCH 2/3] Revise Cervical Cancer Screening Age --- programs/patient-program-config.json | 30 ++++++++++++++-------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/programs/patient-program-config.json b/programs/patient-program-config.json index 34312dc63..dccdeac4e 100755 --- a/programs/patient-program-config.json +++ b/programs/patient-program-config.json @@ -1369,7 +1369,7 @@ { "uuid": "238625fc-8a25-44b2-aa5a-8bf48fa0e18d", "display": "ONCOLOGYVIA", - "allowedIf": "age >= 15 && age <= 65 && gender === 'F'" + "allowedIf": "age >= 24 && age <= 49 && gender === 'F'" }, { "uuid": "cb5c0abd-0817-40e3-9413-8669561fadb9", @@ -1446,7 +1446,7 @@ { "uuid": "238625fc-8a25-44b2-aa5a-8bf48fa0e18d", "display": "ONCOLOGYVIA", - "allowedIf": "age >= 15 && age <= 65 && gender === 'F'" + "allowedIf": "age >= 24 && age <= 49 && gender === 'F'" }, { "uuid": "cb5c0abd-0817-40e3-9413-8669561fadb9", @@ -1523,7 +1523,7 @@ { "uuid": "238625fc-8a25-44b2-aa5a-8bf48fa0e18d", "display": "ONCOLOGYVIA", - "allowedIf": "age >= 15 && age <= 65 && gender === 'F'" + "allowedIf": "age >= 24 && age <= 49 && gender === 'F'" }, { "uuid": "ae35ed69-e07c-4209-93ce-f23733aa816b", @@ -1596,7 +1596,7 @@ { "uuid": "238625fc-8a25-44b2-aa5a-8bf48fa0e18d", "display": "ONCOLOGYVIA", - "allowedIf": "age >= 15 && age <= 65 && gender === 'F'" + "allowedIf": "age >= 24 && age <= 49 && gender === 'F'" }, { "uuid": "cb5c0abd-0817-40e3-9413-8669561fadb9", @@ -1677,7 +1677,7 @@ { "uuid": "238625fc-8a25-44b2-aa5a-8bf48fa0e18d", "display": "ONCOLOGYVIA", - "allowedIf": "age >= 15 && age <= 65 && gender === 'F'" + "allowedIf": "age >= 24 && age <= 49 && gender === 'F'" }, { "uuid": "ae35ed69-e07c-4209-93ce-f23733aa816b", @@ -1746,7 +1746,7 @@ { "uuid": "238625fc-8a25-44b2-aa5a-8bf48fa0e18d", "display": "ONCOLOGYVIA", - "allowedIf": "age >= 15 && age <= 65 && gender === 'F'" + "allowedIf": "age >= 24 && age <= 49 && gender === 'F'" }, { "uuid": "cb5c0abd-0817-40e3-9413-8669561fadb9", @@ -1847,7 +1847,7 @@ { "uuid": "238625fc-8a25-44b2-aa5a-8bf48fa0e18d", "display": "ONCOLOGYVIA", - "allowedIf": "age >= 15 && age <= 65 && gender === 'F'" + "allowedIf": "age >= 24 && age <= 49 && gender === 'F'" }, { "uuid": "ae35ed69-e07c-4209-93ce-f23733aa816b", @@ -2713,7 +2713,7 @@ { "uuid": "238625fc-8a25-44b2-aa5a-8bf48fa0e18d", "display": "ONCOLOGYVIA", - "allowedIf": "age >= 15 && age <= 65 && gender === 'F'" + "allowedIf": "age >= 24 && age <= 49 && gender === 'F'" }, { "uuid": "cb5c0abd-0817-40e3-9413-8669561fadb9", @@ -2974,7 +2974,7 @@ { "uuid": "238625fc-8a25-44b2-aa5a-8bf48fa0e18d", "display": "ONCOLOGYVIA", - "allowedIf": "age >= 15 && age <= 65 && gender === 'F'" + "allowedIf": "age >= 24 && age <= 49 && gender === 'F'" }, { "uuid": "5ef97eed-18f5-40f6-9fbf-a11b1f06484a", @@ -3071,7 +3071,7 @@ { "uuid": "238625fc-8a25-44b2-aa5a-8bf48fa0e18d", "display": "ONCOLOGYVIA", - "allowedIf": "age >= 15 && age <= 65 && gender === 'F'" + "allowedIf": "age >= 24 && age <= 49 && gender === 'F'" }, { "uuid": "cb5c0abd-0817-40e3-9413-8669561fadb9", @@ -3133,7 +3133,7 @@ { "uuid": "238625fc-8a25-44b2-aa5a-8bf48fa0e18d", "display": "ONCOLOGYVIA", - "allowedIf": "age >= 15 && age <= 65 && gender === 'F'" + "allowedIf": "age >= 24 && age <= 49 && gender === 'F'" }, { "uuid": "ae35ed69-e07c-4209-93ce-f23733aa816b", @@ -3988,7 +3988,7 @@ { "uuid": "238625fc-8a25-44b2-aa5a-8bf48fa0e18d", "display": "ONCOLOGYVIA", - "allowedIf": "age >= 15 && age <= 65 && gender === 'F'" + "allowedIf": "age >= 24 && age <= 49 && gender === 'F'" }, { "uuid": "466d6707-8429-4e61-b5a0-d63444f5ad35", @@ -4027,7 +4027,7 @@ { "uuid": "238625fc-8a25-44b2-aa5a-8bf48fa0e18d", "display": "ONCOLOGYVIA", - "allowedIf": "age >= 15 && age <= 65 && gender === 'F'" + "allowedIf": "age >= 24 && age <= 49 && gender === 'F'" }, { "uuid": "ae35ed69-e07c-4209-93ce-f23733aa816b", @@ -4543,7 +4543,7 @@ { "uuid": "238625fc-8a25-44b2-aa5a-8bf48fa0e18d", "display": "ONCOLOGYVIA", - "allowedIf": "age >= 15 && age <= 65 && gender === 'F'" + "allowedIf": "age >= 24 && age <= 49 && gender === 'F'" }, { "uuid": "cb5c0abd-0817-40e3-9413-8669561fadb9", @@ -4609,7 +4609,7 @@ { "uuid": "238625fc-8a25-44b2-aa5a-8bf48fa0e18d", "display": "ONCOLOGYVIA", - "allowedIf": "age >= 15 && age <= 65 && gender === 'F'" + "allowedIf": "age >= 24 && age <= 49 && gender === 'F'" }, { "uuid": "ae35ed69-e07c-4209-93ce-f23733aa816b", From ef8023e84628fde832a00c3a0ccc8b18947024de Mon Sep 17 00:00:00 2001 From: sainingo Date: Wed, 17 Jul 2024 16:07:56 +0300 Subject: [PATCH 3/3] Add cervical cancer screening age validation to all programs --- programs/patient-program-config.json | 30 ++++++++++++++-------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/programs/patient-program-config.json b/programs/patient-program-config.json index dccdeac4e..34312dc63 100755 --- a/programs/patient-program-config.json +++ b/programs/patient-program-config.json @@ -1369,7 +1369,7 @@ { "uuid": "238625fc-8a25-44b2-aa5a-8bf48fa0e18d", "display": "ONCOLOGYVIA", - "allowedIf": "age >= 24 && age <= 49 && gender === 'F'" + "allowedIf": "age >= 15 && age <= 65 && gender === 'F'" }, { "uuid": "cb5c0abd-0817-40e3-9413-8669561fadb9", @@ -1446,7 +1446,7 @@ { "uuid": "238625fc-8a25-44b2-aa5a-8bf48fa0e18d", "display": "ONCOLOGYVIA", - "allowedIf": "age >= 24 && age <= 49 && gender === 'F'" + "allowedIf": "age >= 15 && age <= 65 && gender === 'F'" }, { "uuid": "cb5c0abd-0817-40e3-9413-8669561fadb9", @@ -1523,7 +1523,7 @@ { "uuid": "238625fc-8a25-44b2-aa5a-8bf48fa0e18d", "display": "ONCOLOGYVIA", - "allowedIf": "age >= 24 && age <= 49 && gender === 'F'" + "allowedIf": "age >= 15 && age <= 65 && gender === 'F'" }, { "uuid": "ae35ed69-e07c-4209-93ce-f23733aa816b", @@ -1596,7 +1596,7 @@ { "uuid": "238625fc-8a25-44b2-aa5a-8bf48fa0e18d", "display": "ONCOLOGYVIA", - "allowedIf": "age >= 24 && age <= 49 && gender === 'F'" + "allowedIf": "age >= 15 && age <= 65 && gender === 'F'" }, { "uuid": "cb5c0abd-0817-40e3-9413-8669561fadb9", @@ -1677,7 +1677,7 @@ { "uuid": "238625fc-8a25-44b2-aa5a-8bf48fa0e18d", "display": "ONCOLOGYVIA", - "allowedIf": "age >= 24 && age <= 49 && gender === 'F'" + "allowedIf": "age >= 15 && age <= 65 && gender === 'F'" }, { "uuid": "ae35ed69-e07c-4209-93ce-f23733aa816b", @@ -1746,7 +1746,7 @@ { "uuid": "238625fc-8a25-44b2-aa5a-8bf48fa0e18d", "display": "ONCOLOGYVIA", - "allowedIf": "age >= 24 && age <= 49 && gender === 'F'" + "allowedIf": "age >= 15 && age <= 65 && gender === 'F'" }, { "uuid": "cb5c0abd-0817-40e3-9413-8669561fadb9", @@ -1847,7 +1847,7 @@ { "uuid": "238625fc-8a25-44b2-aa5a-8bf48fa0e18d", "display": "ONCOLOGYVIA", - "allowedIf": "age >= 24 && age <= 49 && gender === 'F'" + "allowedIf": "age >= 15 && age <= 65 && gender === 'F'" }, { "uuid": "ae35ed69-e07c-4209-93ce-f23733aa816b", @@ -2713,7 +2713,7 @@ { "uuid": "238625fc-8a25-44b2-aa5a-8bf48fa0e18d", "display": "ONCOLOGYVIA", - "allowedIf": "age >= 24 && age <= 49 && gender === 'F'" + "allowedIf": "age >= 15 && age <= 65 && gender === 'F'" }, { "uuid": "cb5c0abd-0817-40e3-9413-8669561fadb9", @@ -2974,7 +2974,7 @@ { "uuid": "238625fc-8a25-44b2-aa5a-8bf48fa0e18d", "display": "ONCOLOGYVIA", - "allowedIf": "age >= 24 && age <= 49 && gender === 'F'" + "allowedIf": "age >= 15 && age <= 65 && gender === 'F'" }, { "uuid": "5ef97eed-18f5-40f6-9fbf-a11b1f06484a", @@ -3071,7 +3071,7 @@ { "uuid": "238625fc-8a25-44b2-aa5a-8bf48fa0e18d", "display": "ONCOLOGYVIA", - "allowedIf": "age >= 24 && age <= 49 && gender === 'F'" + "allowedIf": "age >= 15 && age <= 65 && gender === 'F'" }, { "uuid": "cb5c0abd-0817-40e3-9413-8669561fadb9", @@ -3133,7 +3133,7 @@ { "uuid": "238625fc-8a25-44b2-aa5a-8bf48fa0e18d", "display": "ONCOLOGYVIA", - "allowedIf": "age >= 24 && age <= 49 && gender === 'F'" + "allowedIf": "age >= 15 && age <= 65 && gender === 'F'" }, { "uuid": "ae35ed69-e07c-4209-93ce-f23733aa816b", @@ -3988,7 +3988,7 @@ { "uuid": "238625fc-8a25-44b2-aa5a-8bf48fa0e18d", "display": "ONCOLOGYVIA", - "allowedIf": "age >= 24 && age <= 49 && gender === 'F'" + "allowedIf": "age >= 15 && age <= 65 && gender === 'F'" }, { "uuid": "466d6707-8429-4e61-b5a0-d63444f5ad35", @@ -4027,7 +4027,7 @@ { "uuid": "238625fc-8a25-44b2-aa5a-8bf48fa0e18d", "display": "ONCOLOGYVIA", - "allowedIf": "age >= 24 && age <= 49 && gender === 'F'" + "allowedIf": "age >= 15 && age <= 65 && gender === 'F'" }, { "uuid": "ae35ed69-e07c-4209-93ce-f23733aa816b", @@ -4543,7 +4543,7 @@ { "uuid": "238625fc-8a25-44b2-aa5a-8bf48fa0e18d", "display": "ONCOLOGYVIA", - "allowedIf": "age >= 24 && age <= 49 && gender === 'F'" + "allowedIf": "age >= 15 && age <= 65 && gender === 'F'" }, { "uuid": "cb5c0abd-0817-40e3-9413-8669561fadb9", @@ -4609,7 +4609,7 @@ { "uuid": "238625fc-8a25-44b2-aa5a-8bf48fa0e18d", "display": "ONCOLOGYVIA", - "allowedIf": "age >= 24 && age <= 49 && gender === 'F'" + "allowedIf": "age >= 15 && age <= 65 && gender === 'F'" }, { "uuid": "ae35ed69-e07c-4209-93ce-f23733aa816b",