Merge branch 'openmrs:main' into feat/billing-mvp

openmrs · May 3, 2024 · 25ad670 · 25ad670
2 parents 13d4060 + 77de00a
commit 25ad670
Show file tree

Hide file tree

Showing 11 changed files with 1,423 additions and 369 deletions.
diff --git a/distro/configuration/ampathforms/TestResultsEntryFormv2-core_demo.json b/distro/configuration/ampathforms/TestResultsEntryFormv2-core_demo.json
@@ -1,6 +1,6 @@
 {
   "name": "Laboratory Test Results",
-  "version": "2",
+  "version": "3",
   "published": true,
   "retired": false,
   "encounter": "Lab Results",
@@ -119,6 +119,7 @@
               "required": false,
               "id": "ManualEntryPlatelets",
               "questionOptions": {
+                "disallowDecimals": true,
                 "rendering": "number",
                 "concept": "729AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
                 "conceptMappings": [
@@ -172,6 +173,7 @@
               "required": false,
               "id": "ManualEntryNeutrophilsMicroscopic",
               "questionOptions": {
+                "disallowDecimals": true,
                 "rendering": "number",
                 "concept": "1336AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
                 "conceptMappings": [
@@ -210,6 +212,7 @@
               "required": false,
               "id": "ManualEntryMCV",
               "questionOptions": {
+                "disallowDecimals": true,
                 "rendering": "number",
                 "concept": "851AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
                 "conceptMappings": [
@@ -324,6 +327,7 @@
               "required": false,
               "id": "ManualEntryLymphocytesMicroscopic",
               "questionOptions": {
+                "disallowDecimals": true,
                 "rendering": "number",
                 "concept": "1338AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
                 "conceptMappings": [
@@ -459,6 +463,7 @@
               "required": false,
               "id": "ManualEntryCombinedPercentageMonocytesEosinophilsBasophils",
               "questionOptions": {
+                "disallowDecimals": true,
                 "rendering": "number",
                 "concept": "163426AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
                 "conceptMappings": [
@@ -543,6 +548,7 @@
               "required": false,
               "id": "ManualEntryAmylase",
               "questionOptions": {
+                "disallowDecimals": true,
                 "rendering": "number",
                 "concept": "1299AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
                 "conceptMappings": [
@@ -802,6 +808,7 @@
               "required": false,
               "id": "manualEntrySerumSodium",
               "questionOptions": {
+                "disallowDecimals": true,
                 "rendering": "number",
                 "concept": "1132AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
                 "conceptMappings": [
@@ -878,6 +885,7 @@
               "required": false,
               "id": "manualEntryTotalProtein",
               "questionOptions": {
+                "disallowDecimals": true,
                 "rendering": "number",
                 "concept": "717AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
                 "conceptMappings": [
@@ -911,6 +919,7 @@
               "required": false,
               "id": "manualEntrySerumGlucosemgdl",
               "questionOptions": {
+                "disallowDecimals": true,
                 "rendering": "number",
                 "concept": "887AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
                 "conceptMappings": [
@@ -1020,6 +1029,7 @@
               "required": false,
               "id": "manualEntrySerumGlutamicOxaloaceticTransaminase",
               "questionOptions": {
+                "disallowDecimals": true,
                 "rendering": "number",
                 "concept": "653AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
                 "conceptMappings": [
@@ -1058,6 +1068,7 @@
               "required": false,
               "id": "manualEntryAlkalinePhosphastase",
               "questionOptions": {
+                "disallowDecimals": true,
                 "rendering": "number",
                 "concept": "785AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
                 "conceptMappings": [
@@ -1214,60 +1225,13 @@
                 "answers": []
               }
             },
-            {
-              "label": "Amylase (IU/L)",
-              "type": "obs",
-              "required": false,
-              "id": "manualEntryAmylase",
-              "questionOptions": {
-                "rendering": "number",
-                "concept": "1299AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
-                "conceptMappings": [
-                  {
-                    "relationship": "SAME-AS",
-                    "type": "IMO ProcedureIT",
-                    "value": "601338"
-                  },
-                  {
-                    "relationship": "BROADER-THAN",
-                    "type": "LOINC",
-                    "value": "1798-8"
-                  },
-                  {
-                    "relationship": "SAME-AS",
-                    "type": "CIEL",
-                    "value": "1299"
-                  },
-                  {
-                    "relationship": "SAME-AS",
-                    "type": "IMO ProcedureIT",
-                    "value": "31004384"
-                  },
-                  {
-                    "relationship": "SAME-AS",
-                    "type": "PIH",
-                    "value": "3054"
-                  },
-                  {
-                    "relationship": "SAME-AS",
-                    "type": "SNOMED CT",
-                    "value": "64435009"
-                  },
-                  {
-                    "relationship": "SAME-AS",
-                    "type": "AMPATH",
-                    "value": "1299"
-                  }
-                ],
-                "answers": []
-              }
-            },
             {
               "label": "Serum Carbon Dioxide CO2 (mmol/L)",
               "type": "obs",
               "required": false,
               "id": "manualEntrySerumCarbonDioxide",
               "questionOptions": {
+                "disallowDecimals": true,
                 "rendering": "number",
                 "concept": "1135AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
                 "conceptMappings": [

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
@@ -1,5 +1,5 @@
 {
-	"name": "ampath_poc_adult_return_visit_form_v1.6",
+	"name": "Adult HIV Return Visit Form",
 	"uuid": "xxxx",
 	"description": "Ampath POC adult return visit form",
 	"version": "1",