From 5ab2341df734dfdb7668c19a731e50e2f9506254 Mon Sep 17 00:00:00 2001
From: sainingo <nickmentor421@gmail.com>
Date: Tue, 30 Jul 2024 10:58:31 +0300
Subject: [PATCH 1/2] Add Enhanced Adherence Encounter Form and AMPATH POC
 Oncology form to the list of forms under ANC and PNC visits

---
 programs/patient-program-config.json | 36 ++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)

diff --git a/programs/patient-program-config.json b/programs/patient-program-config.json
index 5ff8ba47d..1435dad35 100755
--- a/programs/patient-program-config.json
+++ b/programs/patient-program-config.json
@@ -5508,6 +5508,15 @@
           {
             "uuid": "04bdcb6e-63df-42dc-a78c-b6afb155aa89",
             "display": "MATERNAL DEATH NOTIFICATION"
+          },
+          {
+            "uuid": "2226e81f-38fc-4672-a615-1d37e1c8e637",
+            "display": "ADHERENCE"
+          },
+          {
+            "uuid": "238625fc-8a25-44b2-aa5a-8bf48fa0e18d",
+            "display": "ONCOLOGYVIA",
+            "allowedIf": "age >= 15 && age <= 65 && gender === 'F'"
           }
         ]
       },
@@ -5527,6 +5536,15 @@
           {
             "uuid": "04bdcb6e-63df-42dc-a78c-b6afb155aa89",
             "display": "MATERNAL DEATH NOTIFICATION"
+          },
+          {
+            "uuid": "2226e81f-38fc-4672-a615-1d37e1c8e637",
+            "display": "ADHERENCE"
+          },
+          {
+            "uuid": "238625fc-8a25-44b2-aa5a-8bf48fa0e18d",
+            "display": "ONCOLOGYVIA",
+            "allowedIf": "age >= 15 && age <= 65 && gender === 'F'"
           }
         ]
       }
@@ -5582,6 +5600,15 @@
           {
             "uuid": "7bdd1e6b-1157-41fb-8daa-994277780b2b",
             "display": "MNCH IMMUNIZATION"
+          },
+          {
+            "uuid": "2226e81f-38fc-4672-a615-1d37e1c8e637",
+            "display": "ADHERENCE"
+          },
+          {
+            "uuid": "238625fc-8a25-44b2-aa5a-8bf48fa0e18d",
+            "display": "ONCOLOGYVIA",
+            "allowedIf": "age >= 15 && age <= 65 && gender === 'F'"
           }
         ]
       },
@@ -5605,6 +5632,15 @@
           {
             "uuid": "7bdd1e6b-1157-41fb-8daa-994277780b2b",
             "display": "MNCH IMMUNIZATION"
+          },
+          {
+            "uuid": "2226e81f-38fc-4672-a615-1d37e1c8e637",
+            "display": "ADHERENCE"
+          },
+          {
+            "uuid": "238625fc-8a25-44b2-aa5a-8bf48fa0e18d",
+            "display": "ONCOLOGYVIA",
+            "allowedIf": "age >= 15 && age <= 65 && gender === 'F'"
           }
         ]
       }

From 0bfc4cae9f74227273d58a1ff511ed02baf42399 Mon Sep 17 00:00:00 2001
From: sainingo <nickmentor421@gmail.com>
Date: Tue, 30 Jul 2024 12:33:02 +0300
Subject: [PATCH 2/2] Re-arrange forms

---
 programs/patient-program-config.json | 32 ++++++++++++++--------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/programs/patient-program-config.json b/programs/patient-program-config.json
index 1435dad35..ee1369d51 100755
--- a/programs/patient-program-config.json
+++ b/programs/patient-program-config.json
@@ -5497,14 +5497,14 @@
         "name": "ANC Initial Visit",
         "allowedIf": "programLocation === intendedVisitLocationUuid && isFirstANCVisit && gender==='F' && isFirstAMPATHHIVVisit",
         "encounterTypes": [
-          {
-            "uuid": "f5702679-6a16-43bd-8629-4b44c7a78ff1",
-            "display": "ANC INITIAL"
-          },
           {
             "uuid": "af5c40e8-8c74-4194-a068-0d5e30664777",
             "display": "MNCH TRIAGE"
           },
+          {
+            "uuid": "f5702679-6a16-43bd-8629-4b44c7a78ff1",
+            "display": "ANC INITIAL"
+          },
           {
             "uuid": "04bdcb6e-63df-42dc-a78c-b6afb155aa89",
             "display": "MATERNAL DEATH NOTIFICATION"
@@ -5525,14 +5525,14 @@
         "name": "ANC Return Visit",
         "allowedIf": "programLocation === intendedVisitLocationUuid && (!isFirstAMPATHHIVVisit || !isFirstANCVisit)  && gender==='F'",
         "encounterTypes": [
-          {
-            "uuid": "26bfc6b7-28d0-41ab-90c5-e101af46d06d",
-            "display": "ANC RETURN"
-          },
           {
             "uuid": "af5c40e8-8c74-4194-a068-0d5e30664777",
             "display": "MNCH TRIAGE"
           },
+          {
+            "uuid": "26bfc6b7-28d0-41ab-90c5-e101af46d06d",
+            "display": "ANC RETURN"
+          },
           {
             "uuid": "04bdcb6e-63df-42dc-a78c-b6afb155aa89",
             "display": "MATERNAL DEATH NOTIFICATION"
@@ -5585,14 +5585,14 @@
         "name": "PMTCT Postnatal Initial Visit",
         "allowedIf": "programLocation === intendedVisitLocationUuid && isFirstPNCVisit && gender==='F' && isFirstAMPATHHIVVisit",
         "encounterTypes": [
-          {
-            "uuid": "ded4ecf7-8129-4a9e-8aa3-a21a7adb7759",
-            "display": "PNC ADULT INITIAL"
-          },
           {
             "uuid": "af5c40e8-8c74-4194-a068-0d5e30664777",
             "display": "MNCH TRIAGE"
           },
+          {
+            "uuid": "ded4ecf7-8129-4a9e-8aa3-a21a7adb7759",
+            "display": "PNC ADULT INITIAL"
+          },
           {
             "uuid": "85533bd0-163b-45bd-b703-d5d4816e6282",
             "display": "PERINATAL DEATH NOTIFICATION"
@@ -5617,14 +5617,14 @@
         "name": "PMTCT Postnatal Return Visit",
         "allowedIf": "programLocation === intendedVisitLocationUuid && (!isFirstAMPATHHIVVisit || !isFirstPNCVisit) && gender==='F'",
         "encounterTypes": [
-          {
-            "uuid": "db215741-de99-424a-a109-1f23eb3b680b",
-            "display": "PNC ADULTRETURN"
-          },
           {
             "uuid": "af5c40e8-8c74-4194-a068-0d5e30664777",
             "display": "MNCH TRIAGE"
           },
+          {
+            "uuid": "db215741-de99-424a-a109-1f23eb3b680b",
+            "display": "PNC ADULTRETURN"
+          },
           {
             "uuid": "85533bd0-163b-45bd-b703-d5d4816e6282",
             "display": "PERINATAL DEATH NOTIFICATION"