Bugfix

diff --git a/www/autocomplete/investigation.json b/www/autocomplete/investigation.json
index 737de8a5a5d2f6f70e04ab77ab9fb3f055d73775..30e9becfc83bd6d737af14d65fdd9a9379993fff 100644 (file)
--- a/www/autocomplete/investigation.json
+++ b/www/autocomplete/investigation.json
@@ -10,7 +10,7 @@
         "virology",
         "protozoology",
         "mycology",
-        "pathology",
-        "other"
+        "parasitology",
+        "pathology"
     ]
 }

diff --git a/www/forms/report-fluid-ascitic.schema.json b/www/forms/report-fluid-ascitic.schema.json
index 24fff7caa6c926fab6d214e39b86084dc3ee95da..5f8f7988b4f2fe9d882094037a2446f65d9d6184 100644 (file)
--- a/www/forms/report-fluid-ascitic.schema.json
+++ b/www/forms/report-fluid-ascitic.schema.json
@@ -1,7 +1,7 @@
 {
     "$schema": "http://json-schema.org/draft/2020-12/schema",
-    "title": "fluid_study",
-    "description": "Fluid Study",
+    "title": "ascitic_fluid_study",
+    "description": "Ascitic Fluid Study",
     "type": "object",
 
     "properties": {

diff --git a/www/forms/report-fluid-csf.schema.json b/www/forms/report-fluid-csf.schema.json
index 24fff7caa6c926fab6d214e39b86084dc3ee95da..794ab8656c08401ef5c1e68d910aac85e1b8c066 100644 (file)
--- a/www/forms/report-fluid-csf.schema.json
+++ b/www/forms/report-fluid-csf.schema.json
@@ -1,7 +1,7 @@
 {
     "$schema": "http://json-schema.org/draft/2020-12/schema",
-    "title": "fluid_study",
-    "description": "Fluid Study",
+    "title": "csf_fluid_study",
+    "description": "CSF Fluid Study",
     "type": "object",
 
     "properties": {

diff --git a/www/forms/report-fluid-pleural.schema.json b/www/forms/report-fluid-pleural.schema.json
index 24fff7caa6c926fab6d214e39b86084dc3ee95da..b82821f8d3b164b34e5da50f4b03ef536fb3afcb 100644 (file)
--- a/www/forms/report-fluid-pleural.schema.json
+++ b/www/forms/report-fluid-pleural.schema.json
@@ -1,7 +1,7 @@
 {
     "$schema": "http://json-schema.org/draft/2020-12/schema",
-    "title": "fluid_study",
-    "description": "Fluid Study",
+    "title": "pleural_fluid_study",
+    "description": "Pleural Fluid Study",
     "type": "object",
 
     "properties": {

diff --git a/www/forms/report-fluid-synovial.schema.json b/www/forms/report-fluid-synovial.schema.json
index 24fff7caa6c926fab6d214e39b86084dc3ee95da..f4f1b6c11a4ac2765efc812c7b4ad38aaac49141 100644 (file)
--- a/www/forms/report-fluid-synovial.schema.json
+++ b/www/forms/report-fluid-synovial.schema.json
@@ -1,7 +1,7 @@
 {
     "$schema": "http://json-schema.org/draft/2020-12/schema",
-    "title": "fluid_study",
-    "description": "Fluid Study",
+    "title": "synovial_fluid_study",
+    "description": "Synovial Fluid Study",
     "type": "object",
 
     "properties": {

diff --git a/www/forms/report-fluid.schema.json b/www/forms/report-fluid.schema.json
deleted file mode 100644 (file)
index 24fff7c..0000000
--- a/www/forms/report-fluid.schema.json
+++ /dev/null
@@ -1,60 +0,0 @@
-{
-    "$schema": "http://json-schema.org/draft/2020-12/schema",
-    "title": "fluid_study",
-    "description": "Fluid Study",
-    "type": "object",
-
-    "properties": {
-        "date": {
-            "description": "Date",
-            "type": "string",
-            "format": "date"
-        },
-        "time": {
-            "description": "Time",
-            "type": "string",
-            "format": "time"
-        },
-        "cellCount": {
-            "description": "Cell Count",
-            "type": "integer"
-        },
-        "cellType": {
-            "description": "Cell Type",
-            "type": "string"
-        },
-        "protein": {
-            "description": "Protein",
-            "type": "integer"
-        },
-        "sugar": {
-            "description": "Sugar",
-            "type": "integer"
-        },
-        "ldh": {
-            "description": "LDH",
-            "type": "integer"
-        },
-        "gram": {
-            "description": "Gram Stain",
-            "type": "string"
-        },
-        "afb": {
-            "description": "AFB Stain",
-            "type": "string"
-        },
-        "fungal": {
-            "description": "Fungal Stain",
-            "type": "string"
-        },
-        "cs": {
-            "description": "Culture/Sensitivity",
-            "type": "string"
-        },
-        "cbnaat": {
-            "description": "CBNAAT",
-            "type": "string"
-        }
-    },
-    "required": ["date"]
-}

diff --git a/www/requisition.php b/www/requisition.php
index 2f51b152901bad0ea69cd65d314517f7b4416dba..247df454ffac7b4390ed9f5807220535e66eb80f 100644 (file)
--- a/www/requisition.php
+++ b/www/requisition.php
@@ -29,7 +29,7 @@ if(isSet($_GET["pid"])){
   foreach($inv->rooms as $r){
     $roomList=$roomList."<option>".$r."</option>";
   }
-  $roomList=$roomList."<option selected='selected'>Other</option>";
+  $roomList=$roomList."<option selected='selected'>other</option>";
 
   $reqList=$db->getRequisitions($pid);
   $list="";