(chore) Sync fork with distro ref app(#30)

* Update the billing concepts to add service types ConvSet (openmrs#857) Co-authored-by: Amos Laboso <[email protected]> * Bump attachments to 3.5.0-SNAPSHOT * (feat) O3-3886: Demo Ward App in the Ref App (openmrs#851) * Update patient photo concept * Update stuctured_soap_note.json (openmrs#860) * (feat) O3-3886: Demo Ward App in the Ref App (openmrs#862) * update to latest release of EMR API and REST web services * Bump the legacyui module to 1.19.0-SNAPSHOT * Switch the legacyui module to version 1.19.0 * Switch the attachments module to version 3.5.0 * Bump the legacyui module to version 1.20.0 * (chore) set restrictByVisitLocationTag parameter to true (openmrs#869) * Finalize version updates * (feat) O3-4185: Add form for IPD admission (openmrs#864) * Bump openmrs core to version 2.6.10-SNAPSHOT * Bumping the legacyui module to 1.22.0-SNAPSHOT * Moving global properties in the globalproperties-core_demo.xml into the globalProperties tag (openmrs#872) * (chore) Add HIV forms and encounter types * (chore): Update frontend modules (#9) * (chore): Update logo and favicon (#15) * (chore): Revert to dev * (chore): Update translations and forms * (fix) Revert version updates and fix form logic (#28) * (fix) Revert version updates * (fix) Remove patient labs app * (fix) Fix logic in forms * (fix) Update global properties tag * Fixed versions that I messed up in the merge * Update forms * Update locations * Update version of core --------- Co-authored-by: Amos Laboso <[email protected]> Co-authored-by: Amos Laboso <[email protected]> Co-authored-by: dkayiwa <[email protected]> Co-authored-by: Mark Goodrich <[email protected]> Co-authored-by: Ian <[email protected]> Co-authored-by: Wamathaga Kamau <[email protected]> Co-authored-by: mogoodrich <[email protected]> Co-authored-by: Vineet Sharma <[email protected]> Co-authored-by: Wikum Weerakutti <[email protected]>
openmrs · Dec 17, 2024 · b9761bb · b9761bb
1 parent 8184862
commit b9761bb
Show file tree

Hide file tree

Showing 50 changed files with 20,647 additions and 79 deletions.
diff --git a/distro/configuration/ampathforms/DRC - DIAGNOSTICS.json b/distro/configuration/ampathforms/DRC - DIAGNOSTICS.json
@@ -271,4 +271,4 @@
   "encounter": "Adult Visit",
   "allowUnspecifiedAll": false,
   "description": "This section captures HIV related diagnostics and other diagnostics"
-}
+}
diff --git a/distro/configuration/ampathforms/DRC Case Contact Form v1.1.json b/distro/configuration/ampathforms/DRC Case Contact Form v1.1.json
@@ -1140,4 +1140,4 @@
   "encounter": "Contact Tracing Form",
   "allowUnspecifiedAll": true,
   "description": "A form used to collect case contact information"
-}
+}
diff --git a/distro/configuration/ampathforms/DRC Clinical Visit Form v2.2.json b/distro/configuration/ampathforms/DRC Clinical Visit Form v2.2.json
@@ -9296,4 +9296,4 @@
   "encounter": "Clinical Visit",
   "allowUnspecifiedAll": true,
   "description": "DRC POC Clinical Visit Form v2 revised - embedded forms removed "
-}
+}
diff --git a/distro/configuration/ampathforms/DRC HIV Enrolment Form v1.2.json b/distro/configuration/ampathforms/DRC HIV Enrolment Form v1.2.json
@@ -2052,4 +2052,4 @@
   "encounter": "Care and Treatment Service Enrolment",
   "allowUnspecifiedAll": false,
   "description": "HIV information"
-}
+}
diff --git a/distro/configuration/ampathforms/DRC Mini Dossier.json b/distro/configuration/ampathforms/DRC Mini Dossier.json
@@ -200,4 +200,4 @@
   "referencedForms": [],
   "uuid": "a49a563c-3636-437f-b319-c8106ad8f0f0",
   "description": "This form captures info about the client around psychosocial care"
-}
+}
diff --git a/distro/configuration/ampathforms/GOO1 DRC HIV Enrolment Form v1.3.1.json b/distro/configuration/ampathforms/GOO1 DRC HIV Enrolment Form v1.3.1.json
@@ -788,42 +788,77 @@
               "label": "Stade clinique du patient",
               "type": "obs",
               "required": true,
-              "id": "stade_clinic",
+              "id": "stadeClinic",
               "questionOptions": {
                 "rendering": "select",
-                "concept": "153b1513-4c90-4a72-9de4-65895eabd901",
+                "concept": "5356AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
                 "conceptMappings": [
                   {
-                    "relationship": "NARROWER-THAN",
+                    "relationship": "SAME-AS",
+                    "type": "PIH",
+                    "value": "1480"
+                  },
+                  {
+                    "relationship": "SAME-AS",
+                    "type": "PIH-Malawi",
+                    "value": "7562"
+                  },
+                  {
+                    "relationship": "SAME-AS",
                     "type": "SNOMED CT",
-                    "value": "363787002"
+                    "value": "385354005"
                   },
                   {
                     "relationship": "SAME-AS",
                     "type": "CIEL",
-                    "value": "169422"
+                    "value": "5356"
+                  },
+                  {
+                    "relationship": "SAME-AS",
+                    "type": "AMPATH",
+                    "value": "5356"
+                  },
+                  {
+                    "relationship": "BROADER-THAN",
+                    "type": "LOINC",
+                    "value": "45233-4"
                   }
                 ],
                 "answers": [
                   {
-                    "concept": "3ac694b2-df54-4b8c-9b45-439f0a9efc7d",
-                    "label": "Full HIV disclosure, stage 1"
+                    "concept": "1220AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
+                    "label": "WHO stage 1 peds"
+                  },
+                  {
+                    "concept": "1204AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
+                    "label": "WHO stage 1 adult"
+                  },
+                  {
+                    "concept": "1205AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
+                    "label": "WHO stage 2 adult"
                   },
                   {
-                    "concept": "384dab1e-6d65-465b-9c7a-d9be9d088686",
-                    "label": "Full HIV disclosure, stage 2"
+                    "concept": "1221AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
+                    "label": "WHO stage 2 peds"
                   },
                   {
-                    "concept": "7a9c374f-4728-4ed8-9c85-f5b5b5b7e364",
-                    "label": "Full HIV disclosure, stage 3"
+                    "concept": "1206AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
+                    "label": "WHO stage 3 adult"
                   },
                   {
-                    "concept": "35a41383-a33a-4be5-93fc-038170776558",
-                    "label": "Full HIV disclosure, stage 4"
+                    "concept": "1222AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
+                    "label": "WHO stage 3 peds"
+                  },
+                  {
+                    "concept": "1207AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
+                    "label": "WHO stage 4 adult"
+                  },
+                  {
+                    "concept": "1223AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
+                    "label": "WHO stage 4 peds"
                   }
                 ]
-              },
-              "validators": []
+              }
             }
           ]
         }

diff --git a/distro/configuration/ampathforms/Patient Registration_Test_DRC.json b/distro/configuration/ampathforms/Patient Registration_Test_DRC.json
@@ -188,4 +188,4 @@
   "referencedForms": [],
   "uuid": "1f11a80b-2fd2-425e-9294-7e4905a56e36",
   "description": "captures patient data"
-}
+}
diff --git a/distro/configuration/ampathforms/TestResultsEntryFormv2-core_demo.json b/distro/configuration/ampathforms/TestResultsEntryFormv2-core_demo.json
@@ -2202,4 +2202,4 @@
   "encounterType": "",
   "referencedForms": [],
   "uuid": ""
-}
+}
diff --git a/distro/configuration/ampathforms/ampath_poc_adult_return_visit_form_v1.6_core-demo.json b/distro/configuration/ampathforms/ampath_poc_adult_return_visit_form_v1.6_core-demo.json
@@ -7822,4 +7822,4 @@
 			]
 		}
 	]
-}
+}
diff --git a/distro/configuration/ampathforms/covid19-core_demo.json b/distro/configuration/ampathforms/covid19-core_demo.json
@@ -197,4 +197,4 @@
       ]
     }
   ]
-}
+}
diff --git a/distro/configuration/ampathforms/ct_art_therapy_v1.0.json b/distro/configuration/ampathforms/ct_art_therapy_v1.0.json
@@ -2568,4 +2568,4 @@
   "encounterType": "74bf4fe6-8fdb-4228-be39-680a93a9cf6d",
   "encounter": "ART Therapy",
   "allowUnspecifiedAll": true
-}
+}
diff --git a/distro/configuration/ampathforms/ct_cd4_lab_results_v1.0.json b/distro/configuration/ampathforms/ct_cd4_lab_results_v1.0.json
@@ -164,4 +164,4 @@
   "encounter": "CD4 Lab results",
   "allowUnspecifiedAll": true,
   "description": "A form used to collect CD4 lab results"
-}
+}
-Original file line number
+Diff line change
@@ Expand Up / @@ -7822,4 +7822,4 @@ @@
     			]
     		}
     	]
-    }
+    }