Added disk-diffusion report

diff --git a/www/forms/reportx-dd.schema.json b/www/forms/reportx-dd.schema.json
new file mode 100644 (file)
index 0000000..cbeee8e
--- /dev/null
+++ b/www/forms/reportx-dd.schema.json
@@ -0,0 +1,132 @@
+{
+    "$schema": "http://json-schema.org/draft/2020-12/schema",
+    "title": "disk_diffusion",
+    "description": "Culture Sensitivity by Disk Diffusion",
+    "type": "object",
+
+    "properties": {
+        "date": {
+            "description": "Date",
+            "type": "string",
+            "format": "date"
+        },
+        "time": {
+            "description": "Time",
+            "type": "string",
+            "format": "time"
+        },
+        "sample": {
+            "description": "Sample",
+            "type": "string"
+        },
+        "organism": {
+            "description": "Organism",
+            "type": "string"
+        },
+        "amoxyclav": {
+            "description": "Amoxyclav",
+            "type": "string"
+        },
+        "piperacillintazobactum": {
+            "description": "Piperacillin/Tazobactum",
+            "type": "string"
+        },
+        "ticarcillinclavulinic": {
+            "description": "Ticarcillin/Clavulinic Acid",
+            "type": "string"
+        },
+        "oxacillin": {
+            "description": "Oxacillin",
+            "type": "string"
+        },
+        "azithromycin": {
+            "description": "Azithromycin",
+            "type": "string"
+        },
+        "cotrimoxazole": {
+            "description": "Cotrimoxazole",
+            "type": "string"
+        },
+        "doxycycline": {
+            "description": "Doxycycline",
+            "type": "string"
+        },
+        "chloramphenicol": {
+            "description": "Chloramphenicol",
+            "type": "string"
+        },
+        "nitrofurantoin": {
+            "description": "Nitrofurantoin",
+            "type": "string"
+        },
+        "norfloxacin": {
+            "description": "Norfloxacin",
+            "type": "string"
+        },
+        "ciprofloxacin": {
+            "description": "Ciprofloxacin",
+            "type": "string"
+        },
+        "ofloxacin": {
+            "description": "Ofloxacin",
+            "type": "string"
+        },
+        "sparfloxacin": {
+            "description": "Sparfloxacin",
+            "type": "string"
+        },
+        "levofloxacin": {
+            "description": "Levofloxacin",
+            "type": "string"
+        },
+        "gatifloxacin": {
+            "description": "Gatifloxacin",
+            "type": "string"
+        },
+        "cefadroxyl": {
+            "description": "Cefadroxyl",
+            "type": "string"
+        },
+        "cefixime": {
+            "description": "Cefixime",
+            "type": "string"
+        },
+        "ceftriaxone": {
+            "description": "Ceftriaxone",
+            "type": "string"
+        },
+        "ceftazidime": {
+            "description": "Ceftazidime",
+            "type": "string"
+        },
+        "cefepime": {
+            "description": "Cefepime",
+            "type": "string"
+        },
+        "cefoperazonesulbactam": {
+            "description": "Cefoperazone/Sulbactum",
+            "type": "string"
+        },
+        "gentamicin": {
+            "description": "Gentamicin",
+            "type": "string"
+        },
+        "amikacin": {
+            "description": "Amikacin",
+            "type": "string"
+        },
+        "vancomycin": {
+            "description": "Vancomycin",
+            "type": "string"
+        },
+        "meropenem": {
+            "description": "Meropenem",
+            "type": "string"
+        },
+        "linezolid": {
+            "description": "Linezolid",
+            "type": "string"
+        }
+    },
+    "required": ["date"]
+}

diff --git a/www/laboratory.php b/www/laboratory.php
index 75e27d6b41f29498fe9f714bcb9de54268b6fab2..9d9f287a6808c2b6a999aa4315daef3360305f2d 100644 (file)
--- a/www/laboratory.php
+++ b/www/laboratory.php
@@ -2,7 +2,7 @@
 require(dirname(__DIR__)."/require.php");
 $list="";
 if(isSet($_GET["pid"])){
-  foreach(glob("forms/report*.json") as $file){
+  foreach(glob("forms/report-*.json") as $file){
     $pid=$_GET["pid"];
     $form=json_decode(file_get_contents($file));
     if($form->title=="culture_sensitivity"){

diff --git a/www/requisition.php b/www/requisition.php
index f45faa2381059cd7f25e5e09808e8d24b368855e..dd5634382b89c28380ae03848e02c53856289f44 100644 (file)
--- a/www/requisition.php
+++ b/www/requisition.php
@@ -18,7 +18,7 @@ if(isSet($_GET["pid"])){
   }
   $inv=json_decode(file_get_contents("autocomplete/investigation.json"));
   $testList="";
-  foreach(glob("forms/report*.json") as $file){
+  foreach(glob("forms/report-*.json") as $file){
     $form=json_decode(file_get_contents($file));
     $testList=$testList."<option value='".$file."'>".$form->description."</option>";
   }

diff --git a/www/vitek.php b/www/vitek.php
index a72ee205d934ddc0244b2497928e5e103d4de9fd..8dbf6cee125bf4863eb5cd02ac24a1cabbcceedf 100644 (file)
--- a/www/vitek.php
+++ b/www/vitek.php
@@ -43,6 +43,7 @@ else{
             <li class="list-group-item"><a href="antibiogram.php?pid=<?php echo $pid;?>&form=report-as-grampos<?php echo $req;?><?php echo $sample;?><?php echo $time;?><?php echo $src;?>">Vitek Report (Gram Positive)</a></li>
             <li class="list-group-item"><a href="antibiogram.php?pid=<?php echo $pid;?>&form=report-as-gramneg<?php echo $req;?><?php echo $sample;?><?php echo $time;?><?php echo $src;?>">Vitek Report (Gram Negative)</a></li>
             <li class="list-group-item"><a href="antibiogram.php?pid=<?php echo $pid;?>&form=report-as-fungal<?php echo $req;?><?php echo $sample;?><?php echo $time;?><?php echo $src;?>">Vitek Report (Fungal)</a></li>
+            <li class="list-group-item"><a href="report.php?pid=<?php echo $pid;?>&form=report-dd<?php echo $req;?><?php echo $sample;?><?php echo $time;?><?php echo $src;?>">Disk Diffusion</a></li>
           </ul>
         </div>
       </div>