Merge pull request #819 from mohuganda/refactor-cervical-cancer-pre-treatment-form

U4X-776: Refactor Cervical Cancer Pre Treatment Form

Author: Daphne210

omod/src/main/webapp/resources/jsonforms/HMIS-ACP-Cervical-Cancer-Pre-TreatmentForm.json

@@ -1,16 +1,13 @@
 {
   "encounterType": "6d647bd4-33d6-4d04-a04a-595d2159b456",
-  "name": "HMIS ACP: Cervical Cancer Pre-Treatment Form",
+  "name": "HMIS ACP 044: Cervical Cancer Pre-Treatment Form",
   "processor": "EncounterFormProcessor",
   "referencedForms": [],
   "uuid": "9bc7f745-b61f-4553-ad77-7208238a7068",
-  "version": "4.1.0",
-  "description": "Cervical Cancer Treatment Form",
-  "published": true,
-  "retired": false,
+  "version": "4.1.1",
   "pages": [
     {
-      "label": "HMIS ACP: Cervical Cancer Pre-Treatment Form",
+      "label": "HMIS ACP 044: Cervical Cancer Pre-Treatment Form",
       "sections": [
         {
           "label": "Visit Details",
@@ -38,27 +35,31 @@
                 "answers": [
                   {
                     "concept": "07fb055d-d0f9-4c37-8b3c-f2e0ea38efec",
-                    "label": "Initial Screening"
+                    "label": "1 - Initial Screening"
+                  },
+                  {
+                    "concept": "17a3df6d-dbf9-4f10-b7e9-16cac3cac832",
+                    "label": "2a - Rescreening at 3years"
                   },
                   {
                     "concept": "9c41ebad-4daf-4534-8d7c-07a1495c29f0",
-                    "label": "Rescreening at 5years"
+                    "label": "2b - Rescreening at 5years"
                   },
                   {
                     "concept": "6125d47f-fecf-45fa-872f-70718b67b6c1",
-                    "label": "Post treatment follow up at 6 weeks"
+                    "label": "3 - Post treatment follow up at 6 weeks"
                   },
                   {
                     "concept": "1192c629-8d6d-4cda-ae14-2a631946c2e4",
-                    "label": "Post treatment follow up at 1 year"
+                    "label": "4a - Post treatment follow up at 1 year"
                   },
                   {
                     "concept": "0cf325c6-ff6c-4264-9864-9fb421be3503",
-                    "label": "Cancer Suspect investigation and Management"
+                    "label": "4b - Cancer Suspect investigation and Management"
                   },
                   {
                     "concept": "dcd68a88-30ab-102d-86b0-7a5022ba4115",
-                    "label": "Other Specify"
+                    "label": "5 - Other Specify"
                   }
                 ]
               },
@@ -247,15 +248,15 @@
                 "answers": [
                   {
                     "concept": "dc9816bd-30ab-102d-86b0-7a5022ba4115",
-                    "label": "N- Normal"
+                    "label": "N - Normal"
                   },
                   {
                     "concept": "ece7dfa9-532a-48da-a882-111b7f05e9c3",
-                    "label": "LG- Low grade"
+                    "label": "LG - Low grade"
                   },
                   {
                     "concept": "06986846-90f8-43ad-beaa-eea8fb268196",
-                    "label": "HG- High grade"
+                    "label": "HG - High grade"
                   },
                   {
                     "concept": "f77261c7-d35b-4a00-9da5-15afd49ba44b",
@@ -305,31 +306,31 @@
                 "answers": [
                   {
                     "concept": "821568d1-e0bf-4b5f-836a-569230d1985e",
-                    "label": "Cervical Intra-epithelial Neoplasia 1"
+                    "label": "CIN1 - Cervical Intra-epithelial Neoplasia 1"
                   },
                   {
                     "concept": "2d5b4e9d-a507-49a9-bb71-ace04c551235",
-                    "label": "Cervical Intra-epithelial Neoplasia 2"
+                    "label": "CIN2 - Cervical Intra-epithelial Neoplasia 2"
                   },
                   {
                     "concept": "c6ed05a2-b32d-4e6f-98c5-d3b0b9118aea",
-                    "label": "Cervical Intra-epithelial Neoplasia 3"
+                    "label": "CIN3 - Cervical Intra-epithelial Neoplasia 3"
                   },
                   {
-                    "concept": "6f3bcf5f-f113-4950-949b-2af0926b8110",
-                    "label": "No evidence of Malignancy"
+                    "concept": "155424AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
+                    "label": "CaCx - Invasive Cancer"
                   },
                   {
-                    "concept": "155424AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
-                    "label": "carcinoma of uterine cervix, invasive"
+                    "concept": "6f3bcf5f-f113-4950-949b-2af0926b8110",
+                    "label": "Normal - No Malignancy Seen"
                   },
                   {
                     "concept": "cbb28015-8f77-4e02-ab1e-8b945a3774c1",
-                    "label": "A typical Squamous Cells of Undermined Significance"
+                    "label": "ASCUS - A typical Squamous Cells of Undermined Significance"
                   },
                   {
                     "concept": "0938b2d0-b453-493f-a950-17524ba57720",
-                    "label": "Atypical Squamous Cells of High grade"
+                    "label": "ASC-H - Atypical Squamous Cells of High grade"
                   }
                 ]
               },
@@ -363,10 +364,30 @@
                   {
                     "concept": "dcb2fba9-30ab-102d-86b0-7a5022ba4115",
                     "label": "Hysterectomy"
+                  },
+                  {
+                    "concept": "dcd68a88-30ab-102d-86b0-7a5022ba4115",
+                    "label": "Other Specify",
+                    "conceptMappings": []
                   }
                 ]
               },
               "validators": []
+            },
+            {
+              "label": "Other Recommended Treatment",
+              "type": "obs",
+              "id": "otherTreatmentProvided",
+              "questionOptions": {
+                "rendering": "text",
+                "concept": "5f539165-2ca5-4ac2-a68d-f9e7579531f7",
+                "conceptMappings": [],
+                "answers": []
+              },
+              "validators": [],
+              "hide": {
+                "hideWhenExpression": "treatmentProvided !== 'dcd68a88-30ab-102d-86b0-7a5022ba4115'"
+              }
             }
           ]
         },
@@ -393,7 +414,7 @@
                   },
                   {
                     "concept": "6442c9f6-25e8-4c8e-af8a-e9f6845ceaed",
-                    "label": "Ref out"
+                    "label": "Referred"
                   }
                 ]
               },
@@ -410,7 +431,7 @@
                 "answers": [
                   {
                     "concept": "463415bf-db51-4c3b-b028-264934309580",
-                    "label": "No supplies/equipment"
+                    "label": "Lack of supplies"
                   },
                   {
                     "concept": "a36a353b-0193-4077-a0f6-97a868ad9004",
@@ -432,7 +453,7 @@
               }
             },
             {
-              "label": "Other Reasons for Postponing",
+              "label": "Observations and Complications",
               "type": "obs",
               "required": false,
               "id": "otherReasonsForPostponing",
@@ -663,5 +684,5 @@
       ]
     }
   ],
-  "referencedForms": []
+  "description": "Cervical Cancer Treatment Form"
 }