From ca3d919de1a868c47998aff2364d1289c6b3c2e7 Mon Sep 17 00:00:00 2001
From: Agnibho Mondal <mondal@agnibho.com>
Date: Sun, 16 May 2021 21:54:38 +0530
Subject: [PATCH] Added requisition

---
 '                                  | 276 +++++++++++++++++++++++++++++
 autocomplete/investigation.json    |  13 ++
 forms/admission.schema.json        |   2 +-
 forms/death.schema.json            |   2 +-
 forms/drugs.schema.json            |   2 +-
 forms/history.schema.json          |   2 +-
 forms/nursing.schema.json          |   4 +-
 forms/physician.schema.json        |   4 +-
 forms/report-abg.schema.json       |   2 +-
 forms/report-blood-cs.schema.json  |   2 +-
 forms/report-ch.schema.json        |   2 +-
 forms/report-crp.schema.json       |   2 +-
 forms/report-ddimer.schema.json    |   2 +-
 forms/report-fluid.schema.json     |   2 +-
 forms/report-glycemic.schema.json  |   2 +-
 forms/report-ldh.schema.json       |   2 +-
 forms/report-lft.schema.json       |   2 +-
 forms/report-lipid.schema.json     |   2 +-
 forms/report-other.schema.json     |   4 +-
 forms/report-rft.schema.json       |   2 +-
 forms/report-sputum-cs.schema.json |   2 +-
 forms/report-sputum-me.schema.json |   2 +-
 forms/report-stool-ova.schema.json |   2 +-
 forms/report-stool-re.schema.json  |   2 +-
 forms/report-urine-cs.schema.json  |   2 +-
 forms/report-urine-re.schema.json  |   2 +-
 index.php                          |  38 ++--
 lib/db.php                         |  33 +++-
 report.php                         |   3 +
 requisition.php                    |  90 ++++++++++
 schema.sql                         |   9 +
 treatment.php                      |  12 +-
 view.php                           |   1 +
 33 files changed, 485 insertions(+), 44 deletions(-)
 create mode 100644 '
 create mode 100644 autocomplete/investigation.json
 create mode 100644 requisition.php

diff --git a/' b/'
new file mode 100644
index 0000000..380aab9
--- /dev/null
+++ b/'
@@ -0,0 +1,276 @@
+<?php
+class DB extends SQLite3 {
+  function __construct(){
+    $this->open("data/data.db");
+  }
+  function checkUser($username, $password){
+    $stmt=$this->prepare("SELECT hash FROM users WHERE user=:user");
+    $stmt->bindValue(":user", $username);
+    $result=$stmt->execute();
+    $hash=$result->fetchArray();
+    if($hash){
+      return(password_verify($password, $hash["hash"]));
+    }
+    else{
+      return(false);
+    }
+  }
+  function admit($post){
+    $quer=$this->prepare("SELECT count(rowid) FROM patients WHERE pid=:pid");
+    $quer->bindValue(":pid", $post["pid"]);
+    $exist=$quer->execute();
+    if($exist->fetchArray()[0]==0){
+      $stmt=$this->prepare("INSERT INTO patients (pid,name,age,sex,status,summary,ward,bed,diagnosis,data) VALUES (:pid,:name,:age,:sex,'admitted',:summary,:ward,:bed,:diagnosis,:data);");
+    }
+    else{
+      $stmt=$this->prepare("UPDATE patients SET name=:name,age=:age,sex=:sex,ward=:ward,bed=:bed,diagnosis=:diagnosis,summary=:summary,data=:data WHERE pid=:pid;");
+    }
+    $stmt->bindValue(":pid", $post["pid"]);
+    $stmt->bindValue(":name", $post["name"]);
+    $stmt->bindValue(":age", $post["age"]);
+    $stmt->bindValue(":sex", $post["sex"]);
+    $stmt->bindValue(":status", "admitted");
+    $stmt->bindValue(":ward", $post["ward"]);
+    $stmt->bindValue(":bed", $post["bed"]);
+    $stmt->bindValue(":diagnosis", $post["diagnosis"]);
+    $stmt->bindValue(":summary", $post["summary"]);
+    $stmt->bindValue(":data", json_encode($post));
+    $stmt->execute();
+  }
+  function updateHistory($post, $pid){
+    $stmt=$this->prepare("UPDATE patients SET history=:history WHERE pid=:pid;");
+    $stmt->bindValue(":history", json_encode($post));
+    $stmt->bindValue(":pid", $pid);
+    $stmt->execute();
+  }
+  function addPhysician($post, $pid){
+    $stmt=$this->prepare("INSERT INTO physician (pid, time, data) VALUES (:pid, :time, :data);");
+    $stmt->bindValue(":pid", $pid);
+    $stmt->bindValue(":time", strtotime($post["date"].$post["time"]));
+    $stmt->bindValue(":data", json_encode($post));
+    $stmt->execute();
+  }
+  function editPhysician($post, $pid, $id){
+    $stmt=$this->prepare("UPDATE physician SET time=:time,data=:data WHERE pid=:pid AND rowid=:id;");
+    $stmt->bindValue(":pid", $pid);
+    $stmt->bindValue(":id", $id);
+    $stmt->bindValue(":time", strtotime($post["date"].$post["time"]));
+    $stmt->bindValue(":data", json_encode($post));
+    $stmt->execute();
+  }
+  function addNursing($post, $pid){
+    $stmt=$this->prepare("INSERT INTO nursing (pid, time, data) VALUES (:pid, :time, :data);");
+    $stmt->bindValue(":pid", $pid);
+    $stmt->bindValue(":time", strtotime($post["date"].$post["time"]));
+    $stmt->bindValue(":data", json_encode($post));
+    $stmt->execute();
+  }
+  function editNursing($post, $pid, $id){
+    $stmt=$this->prepare("UPDATE nursing SET time=:time,data=:data WHERE pid=:pid AND rowid=:id;");
+    $stmt->bindValue(":pid", $pid);
+    $stmt->bindValue(":id", $id);
+    $stmt->bindValue(":time", strtotime($post["date"].$post["time"]));
+    $stmt->bindValue(":data", json_encode($post));
+    $stmt->execute();
+  }
+  function addReport($post, $pid, $form){
+    $stmt=$this->prepare("INSERT INTO reports (pid, time, form, data) VALUES (:pid, :time, :form, :data);");
+    $stmt->bindValue(":pid", $pid);
+    $stmt->bindValue(":time", strtotime($post["date"].$post["time"]));
+    $stmt->bindValue(":form", $post["form"]);
+    $stmt->bindValue(":data", json_encode($post));
+    $stmt->execute();
+  }
+  function editReport($post, $pid, $id, $form){
+    $stmt=$this->prepare("UPDATE reports SET time=:time,data=:data WHERE pid=:pid AND rowid=:id;");
+    $stmt->bindValue(":pid", $pid);
+    $stmt->bindValue(":id", $id);
+    $stmt->bindValue(":time", strtotime($post["date"].$post["time"]));
+    $stmt->bindValue(":data", json_encode($post));
+    $stmt->execute();
+  }
+  function addDrug($pid, $drug, $dose, $route, $frequency, $date, $time, $duration, $addl){
+    $stmt=$this->prepare("INSERT INTO treatment (pid, drug, dose, route, frequency, start, duration, omit, addl) VALUES (:pid, :drug, :dose, :route, :frequency, :start, :duration, :omit, :addl);");
+    $stmt->bindValue(":pid", $pid);
+    $stmt->bindValue(":drug", $drug);
+    $stmt->bindValue(":dose", $dose);
+    $stmt->bindValue(":route", $route);
+    $stmt->bindValue(":frequency", $frequency);
+    $stmt->bindValue(":start", strtotime($date." ".$time));
+    $stmt->bindValue(":duration", $duration);
+    $stmt->bindValue(":addl", $addl);
+    $stmt->bindValue(":omit", false);
+    $stmt->execute();
+  }
+  function omitDrug($id){
+    $stmt=$this->prepare("UPDATE treatment SET end=:end,omit=:omit WHERE rowid=:id;");
+    $stmt->bindValue(":end", time());
+    $stmt->bindValue(":omit", true);
+    $stmt->bindValue(":id", $id);
+    $stmt->execute();
+  }
+  function addRequisition($pid, $test, $date, $time, $room){
+    $stmt=$this->prepare("INSERT INTO requisition (pid, test, time, room, sample, status) VALUES (:pid, :test, :time, :room, :sample, :status);");
+    $stmt->bindValue(":pid", $pid);
+    $stmt->bindValue(":test", $test);
+    $stmt->bindValue(":time", strtotime($date." ".$time));
+    $stmt->bindValue(":room", $room);
+    $stmt->bindValue(":status", "sent");
+    $stmt->execute();
+  }
+  function omitRequisition($id){
+    $stmt=$this->prepare("UPDATE requisition SET status=:status WHERE rowid=:id;");
+    $stmt->bindValue(":status", "done");
+    $stmt->bindValue(":id", $id);
+    $stmt->execute();
+  }
+  function addAdvice($pid, $name, $dose, $route, $frequency, $duration, $addl){
+    $stmt=$this->prepare("INSERT INTO discharge (pid, name, dose, route, frequency, duration, addl) VALUES (:pid, :name, :dose, :route, :frequency, :duration, :addl);");
+    $stmt->bindValue(":pid", $pid);
+    $stmt->bindValue(":name", $name);
+    $stmt->bindValue(":dose", $dose);
+    $stmt->bindValue(":route", $route);
+    $stmt->bindValue(":frequency", $frequency);
+    $stmt->bindValue(":duration", $duration);
+    $stmt->bindValue(":addl", $addl);
+    $stmt->execute();
+  }
+  function deleteAdvice($id){
+    $stmt=$this->prepare("DELETE FROM discharge WHERE rowid=:id;");
+    $stmt->bindValue(":id", $id);
+    $stmt->execute();
+  }
+  function setDischarged($pid){
+    $stmt=$this->prepare("UPDATE patients SET status=:discharged WHERE pid=:pid;");
+    $stmt->bindValue(":pid", $pid);
+    $stmt->execute();
+  }
+  function setDead($pid, $post){
+    $stmt=$this->prepare("INSERT INTO death (pid, time, data) VALUES (:pid, :time, :data);");
+    $stmt->bindValue(":pid", $pid);
+    $stmt->bindValue(":time", strtotime($post["date"].$post["time"]));
+    $stmt->bindValue(":data", json_encode($post));
+    $stmt->execute();
+    $stmt=$this->prepare("UPDATE patients SET status='expired' WHERE pid=:pid;");
+    $stmt->bindValue(":pid", $pid);
+    $stmt->execute();
+  }
+  function getDrugs($pid){
+    $stmt=$this->prepare("SELECT rowid,* FROM treatment WHERE pid=:pid;");
+    $stmt->bindValue(":pid", $pid);
+    $result=$stmt->execute();
+    return($result);
+  }
+  function getRequisitions($pid){
+    $stmt=$this->prepare("SELECT rowid,* FROM requisition WHERE pid=:pid;");
+    $stmt->bindValue(":pid", $pid);
+    $result=$stmt->execute();
+    return($result);
+  }
+  function getAdvice($pid){
+    $stmt=$this->prepare("SELECT rowid,* FROM discharge WHERE pid=:pid;");
+    $stmt->bindValue(":pid", $pid);
+    $result=$stmt->execute();
+    return($result);
+  }
+  function getName($pid){
+    $stmt=$this->prepare("SELECT name FROM patients WHERE pid=:pid;");
+    $stmt->bindValue(":pid", $pid);
+    $result=$stmt->execute();
+    return($result);
+  }
+  function getAge($pid){
+    $stmt=$this->prepare("SELECT age FROM patients WHERE pid=:pid;");
+    $stmt->bindValue(":pid", $pid);
+    $result=$stmt->execute();
+    return($result);
+  }
+  function getSex($pid){
+    $stmt=$this->prepare("SELECT sex FROM patients WHERE pid=:pid;");
+    $stmt->bindValue(":pid", $pid);
+    $result=$stmt->execute();
+    return($result);
+  }
+  function getWard($pid){
+    $stmt=$this->prepare("SELECT ward FROM patients WHERE pid=:pid;");
+    $stmt->bindValue(":pid", $pid);
+    $result=$stmt->execute();
+    return($result);
+  }
+  function getBed($pid){
+    $stmt=$this->prepare("SELECT bed FROM patients WHERE pid=:pid;");
+    $stmt->bindValue(":pid", $pid);
+    $result=$stmt->execute();
+    return($result);
+  }
+  function getStatus($pid){
+    $stmt=$this->prepare("SELECT status FROM patients WHERE pid=:pid;");
+    $stmt->bindValue(":pid", $pid);
+    $result=$stmt->execute();
+    return($result);
+  }
+  function getDiagnosis($pid){
+    $stmt=$this->prepare("SELECT diagnosis FROM patients WHERE pid=:pid;");
+    $stmt->bindValue(":pid", $pid);
+    $result=$stmt->execute();
+    return($result);
+  }
+  function getList(){
+    $stmt=$this->prepare("SELECT pid FROM patients;");
+    $result=$stmt->execute();
+    return($result);
+  }
+  function getForm($id){
+      $stmt=$this->prepare("SELECT form FROM reports WHERE rowid=:id;");
+      $stmt->bindValue(":id", $id);
+      $result=$stmt->execute();
+      return($result);
+  }
+  function getAdmission($pid){
+      $stmt=$this->prepare("SELECT data FROM patients WHERE pid=:pid;");
+      $stmt->bindValue(":pid", $pid);
+      $result=$stmt->execute();
+      return($result);
+  }
+  function getHistory($pid){
+      $stmt=$this->prepare("SELECT history FROM patients WHERE pid=:pid;");
+      $stmt->bindValue(":pid", $pid);
+      $result=$stmt->execute();
+      return($result);
+  }
+  function getData($pid, $id, $cat){
+    if($cat=="physician"){
+      $stmt=$this->prepare("SELECT data FROM physician WHERE pid=:pid AND rowid=:id;");
+    } elseif($cat=="nursing"){
+      $stmt=$this->prepare("SELECT data FROM nursing WHERE pid=:pid AND rowid=:id;");
+    } elseif($cat=="reports"){
+      $stmt=$this->prepare("SELECT data FROM reports WHERE pid=:pid AND rowid=:id;");
+    } else{
+      return(false);
+    }
+    $stmt->bindValue(":pid", $pid);
+    $stmt->bindValue(":id", $id);
+    $result=$stmt->execute();
+    return($result);
+  }
+  function getAllData($pid, $cat){
+    if($cat=="physician"){
+      $stmt=$this->prepare("SELECT rowid,data FROM physician WHERE pid=:pid;");
+    } elseif($cat=="nursing"){
+      $stmt=$this->prepare("SELECT rowid,data FROM nursing WHERE pid=:pid;");
+    } elseif($cat=="reports"){
+      $stmt=$this->prepare("SELECT rowid,data FROM reports WHERE pid=:pid;");
+    } elseif($cat=="info"){
+      $stmt=$this->prepare("SELECT rowid,data FROM patients WHERE pid=:pid;");
+    } elseif($cat=="history"){
+      $stmt=$this->prepare("SELECT rowid,history FROM patients WHERE pid=:pid;");
+    } else{
+      return(false);
+    }
+    $stmt->bindValue(":pid", $pid);
+    $result=$stmt->execute();
+    return($result);
+  }
+}
+$db = new DB();
+?>
diff --git a/autocomplete/investigation.json b/autocomplete/investigation.json
new file mode 100644
index 0000000..641450e
--- /dev/null
+++ b/autocomplete/investigation.json
@@ -0,0 +1,13 @@
+{
+    "tests": [
+        "Chest Xray",
+        "Straight Xray Abdomen",
+        "USG W/A"
+    ],
+    "rooms": [
+        "LabMed",
+        "R-4",
+        "R-19A",
+        "Other"
+    ]
+}
diff --git a/forms/admission.schema.json b/forms/admission.schema.json
index 2a58dd7..24a5bc0 100644
--- a/forms/admission.schema.json
+++ b/forms/admission.schema.json
@@ -1,6 +1,6 @@
 {
     "$schema": "http://json-schema.org/draft/2020-12/schema",
-    "title": "Admission Form",
+    "title": "admission",
     "description": "Admission Form",
     "type": "object",
 
diff --git a/forms/death.schema.json b/forms/death.schema.json
index a3dd706..dbdb9bb 100644
--- a/forms/death.schema.json
+++ b/forms/death.schema.json
@@ -1,6 +1,6 @@
 {
     "$schema": "http://json-schema.org/draft/2020-12/schema",
-    "title": "Death Note",
+    "title": "death",
     "description": "Death Note",
     "type": "object",
 
diff --git a/forms/drugs.schema.json b/forms/drugs.schema.json
index 8605693..f3be494 100644
--- a/forms/drugs.schema.json
+++ b/forms/drugs.schema.json
@@ -1,6 +1,6 @@
 {
     "$schema": "http://json-schema.org/draft/2020-12/schema",
-    "title": "Drugs",
+    "title": "drugs",
     "description": "Treatment",
     "type": "object",
 
diff --git a/forms/history.schema.json b/forms/history.schema.json
index 0647afa..1349c66 100644
--- a/forms/history.schema.json
+++ b/forms/history.schema.json
@@ -1,6 +1,6 @@
 {
     "$schema": "http://json-schema.org/draft/2020-12/schema",
-    "title": "History",
+    "title": "history",
     "description": "History",
     "type": "object",
 
diff --git a/forms/nursing.schema.json b/forms/nursing.schema.json
index f2687f4..03ddc37 100644
--- a/forms/nursing.schema.json
+++ b/forms/nursing.schema.json
@@ -1,7 +1,7 @@
 {
     "$schema": "http://json-schema.org/draft/2020-12/schema",
-    "title": "Clinical Notes",
-    "description": "Clinical Notes",
+    "title": "nursing",
+    "description": "Nursing Notes",
     "type": "object",
 
     "properties": {
diff --git a/forms/physician.schema.json b/forms/physician.schema.json
index 6e91d7b..c4c1056 100644
--- a/forms/physician.schema.json
+++ b/forms/physician.schema.json
@@ -1,7 +1,7 @@
 {
     "$schema": "http://json-schema.org/draft/2020-12/schema",
-    "title": "Clinical Notes",
-    "description": "Clinical Notes",
+    "title": "physician",
+    "description": "Physician Notes",
     "type": "object",
 
     "properties": {
diff --git a/forms/report-abg.schema.json b/forms/report-abg.schema.json
index 0ed6f56..1c01577 100644
--- a/forms/report-abg.schema.json
+++ b/forms/report-abg.schema.json
@@ -1,6 +1,6 @@
 {
     "$schema": "http://json-schema.org/draft/2020-12/schema",
-    "title": "ABG",
+    "title": "abg",
     "description": "ABG",
     "type": "object",
 
diff --git a/forms/report-blood-cs.schema.json b/forms/report-blood-cs.schema.json
index 51dfa1d..ed9fe1f 100644
--- a/forms/report-blood-cs.schema.json
+++ b/forms/report-blood-cs.schema.json
@@ -1,6 +1,6 @@
 {
     "$schema": "http://json-schema.org/draft/2020-12/schema",
-    "title": "Blood CS",
+    "title": "blood_cs",
     "description": "Blood CS",
     "type": "object",
 
diff --git a/forms/report-ch.schema.json b/forms/report-ch.schema.json
index 3c33b71..7fcec71 100644
--- a/forms/report-ch.schema.json
+++ b/forms/report-ch.schema.json
@@ -1,6 +1,6 @@
 {
     "$schema": "http://json-schema.org/draft/2020-12/schema",
-    "title": "Complete Hemogram",
+    "title": "ch",
     "description": "Complete Hemogram",
     "type": "object",
 
diff --git a/forms/report-crp.schema.json b/forms/report-crp.schema.json
index 08ce181..c996b50 100644
--- a/forms/report-crp.schema.json
+++ b/forms/report-crp.schema.json
@@ -1,6 +1,6 @@
 {
     "$schema": "http://json-schema.org/draft/2020-12/schema",
-    "title": "CRP",
+    "title": "crp",
     "description": "CRP",
     "type": "object",
 
diff --git a/forms/report-ddimer.schema.json b/forms/report-ddimer.schema.json
index f638073..8e26f79 100644
--- a/forms/report-ddimer.schema.json
+++ b/forms/report-ddimer.schema.json
@@ -1,6 +1,6 @@
 {
     "$schema": "http://json-schema.org/draft/2020-12/schema",
-    "title": "D-Dimer",
+    "title": "d_dimer",
     "description": "D-Dimer",
     "type": "object",
 
diff --git a/forms/report-fluid.schema.json b/forms/report-fluid.schema.json
index 62bd4dc..8b3f02d 100644
--- a/forms/report-fluid.schema.json
+++ b/forms/report-fluid.schema.json
@@ -1,6 +1,6 @@
 {
     "$schema": "http://json-schema.org/draft/2020-12/schema",
-    "title": "Fluid Study",
+    "title": "fluid_study",
     "description": "Fluid Study",
     "type": "object",
 
diff --git a/forms/report-glycemic.schema.json b/forms/report-glycemic.schema.json
index 0875fb0..6109d78 100644
--- a/forms/report-glycemic.schema.json
+++ b/forms/report-glycemic.schema.json
@@ -1,6 +1,6 @@
 {
     "$schema": "http://json-schema.org/draft/2020-12/schema",
-    "title": "Glycemic Status",
+    "title": "glycemic",
     "description": "Glycemic Status",
     "type": "object",
 
diff --git a/forms/report-ldh.schema.json b/forms/report-ldh.schema.json
index cce1e38..e22f810 100644
--- a/forms/report-ldh.schema.json
+++ b/forms/report-ldh.schema.json
@@ -1,6 +1,6 @@
 {
     "$schema": "http://json-schema.org/draft/2020-12/schema",
-    "title": "LDH",
+    "title": "ldh",
     "description": "LDH",
     "type": "object",
 
diff --git a/forms/report-lft.schema.json b/forms/report-lft.schema.json
index 2f89980..6401cad 100644
--- a/forms/report-lft.schema.json
+++ b/forms/report-lft.schema.json
@@ -1,6 +1,6 @@
 {
     "$schema": "http://json-schema.org/draft/2020-12/schema",
-    "title": "LFT",
+    "title": "lft",
     "description": "Liver Function Test",
     "type": "object",
 
diff --git a/forms/report-lipid.schema.json b/forms/report-lipid.schema.json
index a203b15..d9052c4 100644
--- a/forms/report-lipid.schema.json
+++ b/forms/report-lipid.schema.json
@@ -1,6 +1,6 @@
 {
     "$schema": "http://json-schema.org/draft/2020-12/schema",
-    "title": "Lipid Profile",
+    "title": "lipid",
     "description": "Lipid Profile",
     "type": "object",
 
diff --git a/forms/report-other.schema.json b/forms/report-other.schema.json
index ba613ec..57749cb 100644
--- a/forms/report-other.schema.json
+++ b/forms/report-other.schema.json
@@ -1,7 +1,7 @@
 {
     "$schema": "http://json-schema.org/draft/2020-12/schema",
-    "title": "Other Reports",
-    "description": "Other Reports",
+    "title": "other",
+    "description": "Other Report",
     "type": "object",
 
     "properties": {
diff --git a/forms/report-rft.schema.json b/forms/report-rft.schema.json
index 65df1d7..874f8f2 100644
--- a/forms/report-rft.schema.json
+++ b/forms/report-rft.schema.json
@@ -1,6 +1,6 @@
 {
     "$schema": "http://json-schema.org/draft/2020-12/schema",
-    "title": "RFT",
+    "title": "rft",
     "description": "Renal Function Test",
     "type": "object",
 
diff --git a/forms/report-sputum-cs.schema.json b/forms/report-sputum-cs.schema.json
index 8ebf011..65d115f 100644
--- a/forms/report-sputum-cs.schema.json
+++ b/forms/report-sputum-cs.schema.json
@@ -1,6 +1,6 @@
 {
     "$schema": "http://json-schema.org/draft/2020-12/schema",
-    "title": "Sputum CS",
+    "title": "sputum_cs",
     "description": "Sputum CS",
     "type": "object",
 
diff --git a/forms/report-sputum-me.schema.json b/forms/report-sputum-me.schema.json
index 596507f..5883911 100644
--- a/forms/report-sputum-me.schema.json
+++ b/forms/report-sputum-me.schema.json
@@ -1,6 +1,6 @@
 {
     "$schema": "http://json-schema.org/draft/2020-12/schema",
-    "title": "Sputum ME",
+    "title": "sputum_me",
     "description": "Sputum ME",
     "type": "object",
 
diff --git a/forms/report-stool-ova.schema.json b/forms/report-stool-ova.schema.json
index 3551731..8e2cd78 100644
--- a/forms/report-stool-ova.schema.json
+++ b/forms/report-stool-ova.schema.json
@@ -1,6 +1,6 @@
 {
     "$schema": "http://json-schema.org/draft/2020-12/schema",
-    "title": "Stool for Ova",
+    "title": "stool_ova",
     "description": "Stool for Ova",
     "type": "object",
 
diff --git a/forms/report-stool-re.schema.json b/forms/report-stool-re.schema.json
index ab7ac56..9db09db 100644
--- a/forms/report-stool-re.schema.json
+++ b/forms/report-stool-re.schema.json
@@ -1,6 +1,6 @@
 {
     "$schema": "http://json-schema.org/draft/2020-12/schema",
-    "title": "Stool RE",
+    "title": "stool_re",
     "description": "Stool RE",
     "type": "object",
 
diff --git a/forms/report-urine-cs.schema.json b/forms/report-urine-cs.schema.json
index 93d8d5a..16af87c 100644
--- a/forms/report-urine-cs.schema.json
+++ b/forms/report-urine-cs.schema.json
@@ -1,6 +1,6 @@
 {
     "$schema": "http://json-schema.org/draft/2020-12/schema",
-    "title": "Urine CS",
+    "title": "urine_cs",
     "description": "Urine CS",
     "type": "object",
 
diff --git a/forms/report-urine-re.schema.json b/forms/report-urine-re.schema.json
index ac114f2..80a2e0a 100644
--- a/forms/report-urine-re.schema.json
+++ b/forms/report-urine-re.schema.json
@@ -1,6 +1,6 @@
 {
     "$schema": "http://json-schema.org/draft/2020-12/schema",
-    "title": "Urine RE",
+    "title": "urine_re",
     "description": "Urine RE",
     "type": "object",
 
diff --git a/index.php b/index.php
index 72bc484..94632b1 100644
--- a/index.php
+++ b/index.php
@@ -2,19 +2,28 @@
 require("lib/db.php");
 require("lib/functions.php");
 session_start();
+var_dump($_SESSION);
 if(empty($_SESSION["user"])){
   header("Location: login.php");
   exit();
 }
-$list=$db->getList();
-$show="";
-if(!empty($list)){
-  while($arr=$list->fetchArray()){
-    $pid=$arr["pid"];
-    $name=$db->getName($pid)->fetchArray()["name"];
-    $bed=$db->getWard($pid)->fetchArray()["ward"]."-".$db->getBed($pid)->fetchArray()["bed"];
-    $show=$show."<tr><td><a href='view.php?pid=".$pid."'>".$pid."</a></td><td>".$bed."</td><td>".$name."</td></tr>";
+$list=$db->getPatientList();
+$showList="";
+while($arr=$list->fetchArray()){
+  $pid=$arr["pid"];
+  $showList=$showList."<tr><td><a href='view.php?pid=".$pid."'>".$pid."</a></td><td>".$arr["ward"]."-".$arr["bed"]."</td><td>".$arr["name"]."</td><td>".$arr["diagnosis"]."</tr>";
+}
+$reqs=$db->getRequisitionList();
+$showReqs="";
+while($arr=$reqs->fetchArray()){
+  $pid=$arr["pid"];
+  if(!empty($arr["form"])){
+    $test="<a href='report.php?pid=".$pid."&form=".$arr["form"]."&req=".$arr["rowid"]."'>".$arr["test"]."</a>";
+  }
+  else{
+    $test="<a href='report.php?pid=".$pid."&form=report-other&req=".$arr["rowid"]."'>".$arr["test"]."</a>";
   }
+  $showReqs=$showReqs."<tr><td>".$test."</td><td>".$arr["room"]."</td><td>".date("M j, Y", $arr["time"])."</td><td><a href='view.php?pid=".$pid."'>".$pid."</a></td></tr>";
 }
 ?>
 <!DOCTYPE html>
@@ -30,12 +39,21 @@ if(!empty($list)){
         <div class="card-body">
           <h4 class="card-title">Patient List</h4>
           <table class="table">
-            <tr><th>Patient ID</th><th>Bed Number</th><th>Name</th></tr>
-            <?php echo $show;?>
+            <tr><th>Patient ID</th><th>Bed Number</th><th>Name</th><th>Diagnosis</th></tr>
+            <?php echo $showList;?>
           </table>
           <a class="btn btn-primary btn-lg" href="admission.php">Add New Patient</a>
         </div>
       </div>
+      <div class="card">
+        <div class="card-body">
+          <h4 class="card-title">Requisition List</h4>
+          <table class="table">
+            <tr><th>Test Needed</th><th>Place</th><th>Date</th><th>Patient ID</th></tr>
+            <?php echo $showReqs;?>
+          </table>
+        </div>
+      </div>
     </div>
     <?php include("lib/foot.php");?>
   </body>
diff --git a/lib/db.php b/lib/db.php
index 5c438b8..a37bf66 100644
--- a/lib/db.php
+++ b/lib/db.php
@@ -109,6 +109,22 @@ class DB extends SQLite3 {
     $stmt->bindValue(":id", $id);
     $stmt->execute();
   }
+  function addRequisition($pid, $test, $date, $time, $room, $form){
+    $stmt=$this->prepare("INSERT INTO requisition (pid, test, time, room, form, status) VALUES (:pid, :test, :time, :room, :form, :status);");
+    $stmt->bindValue(":pid", $pid);
+    $stmt->bindValue(":test", $test);
+    $stmt->bindValue(":time", strtotime($date." ".$time));
+    $stmt->bindValue(":room", $room);
+    $stmt->bindValue(":form", $form);
+    $stmt->bindValue(":status", "active");
+    $stmt->execute();
+  }
+  function omitRequisition($id){
+    $stmt=$this->prepare("UPDATE requisition SET status=:status WHERE rowid=:id;");
+    $stmt->bindValue(":status", "done");
+    $stmt->bindValue(":id", $id);
+    $stmt->execute();
+  }
   function addAdvice($pid, $name, $dose, $route, $frequency, $duration, $addl){
     $stmt=$this->prepare("INSERT INTO discharge (pid, name, dose, route, frequency, duration, addl) VALUES (:pid, :name, :dose, :route, :frequency, :duration, :addl);");
     $stmt->bindValue(":pid", $pid);
@@ -146,6 +162,13 @@ class DB extends SQLite3 {
     $result=$stmt->execute();
     return($result);
   }
+  function getRequisitions($pid){
+    $stmt=$this->prepare("SELECT rowid,* FROM requisition WHERE pid=:pid AND status=:status;");
+    $stmt->bindValue(":pid", $pid);
+    $stmt->bindValue(":status", "active");
+    $result=$stmt->execute();
+    return($result);
+  }
   function getAdvice($pid){
     $stmt=$this->prepare("SELECT rowid,* FROM discharge WHERE pid=:pid;");
     $stmt->bindValue(":pid", $pid);
@@ -194,8 +217,14 @@ class DB extends SQLite3 {
     $result=$stmt->execute();
     return($result);
   }
-  function getList(){
-    $stmt=$this->prepare("SELECT pid FROM patients;");
+  function getPatientList(){
+    $stmt=$this->prepare("SELECT pid,ward,bed,name,diagnosis FROM patients;");
+    $result=$stmt->execute();
+    return($result);
+  }
+  function getRequisitionList(){
+    $stmt=$this->prepare("SELECT rowid,pid,test,room,time,form FROM requisition WHERE status=:active;");
+    $stmt->bindValue(":active", "active");
     $result=$stmt->execute();
     return($result);
   }
diff --git a/report.php b/report.php
index d21f96c..c791892 100644
--- a/report.php
+++ b/report.php
@@ -15,6 +15,9 @@ if(!empty($_GET["pid"]) && !empty($_GET["form"])){
     else{
       $db->addReport($_POST, $pid, $_POST["form"]);
     }
+    if(!empty($_GET["req"])){
+      $db->omitRequisition($_GET["req"]);
+    }
     //header("Location: view.php?id=".$_GET["id"]);
     //exit();
   }
diff --git a/requisition.php b/requisition.php
new file mode 100644
index 0000000..723059c
--- /dev/null
+++ b/requisition.php
@@ -0,0 +1,90 @@
+<?php
+require("lib/db.php");
+require("lib/functions.php");
+session_start();
+if(empty($_SESSION["user"])){
+  header("Location: login.php");
+  exit();
+}
+if(isSet($_GET["pid"])){
+  $pid=$_GET["pid"];
+  if(!empty($_POST["del"])){
+    $db->omitRequisition($_POST["del"]);
+  }
+  if(!empty($_POST["test"])){
+    if(file_exists($_POST["test"])){
+      $form=str_replace(["forms/",".schema.json"], "", $_POST["test"]);
+      $test=json_decode(file_get_contents("forms/".$form.".schema.json"))->description;
+    }
+    else{
+      $test=$_POST["test"];
+      $form="";
+    }
+    $db->addRequisition($pid, $test, $_POST["date"], $_POST["time"], $_POST["room"], $form);
+  }
+  $inv=json_decode(file_get_contents("autocomplete/investigation.json"));
+  $testList="";
+  foreach(glob("forms/report*.json") as $file){
+    $form=json_decode(file_get_contents($file));
+    $testList=$testList."<option value='".$file."'>".$form->description."</option>";
+  }
+  foreach($inv->tests as $t){
+    $testList=$testList."<option>".$t."</option>";
+  }
+  $roomList="";
+  foreach($inv->rooms as $r){
+    $roomList=$roomList."<option>".$r."</option>";
+  }
+  $roomList=$roomList."<option selected='selected'>Other</option>";
+
+  $reqList=$db->getRequisitions($pid);
+  $list="";
+  while($req=$reqList->fetchArray()){
+    $list=$list."<tr><td>".$req["test"]."</td><td>".$req["room"]."</td><td>".date("M j, Y", $req["time"])."</td><td><button type='submit' class='btn btn-secondary' name='del' value='".$req["rowid"]."' form='delete'>Delete</button></td></tr>";
+  }
+}
+?>
+<!DOCTYPE html>
+<html>
+  <head>
+    <?php include("lib/head.php")?>
+    <title>Laboratory</title>
+  </head>
+  <body>
+    <div class="container">
+      <div class="card">
+        <div class="card-body">
+          <h4 class="card-title">List of Requisitions</h4>
+          <form method='post' id='delete'></form>
+          <table class="table">
+            <tr><th>Test Name</th><th>Destination</th><th>Date</th><th></th></tr>
+            <?php echo $list;?>
+          </table>
+          <form method="post">
+            <div class="row">
+              <div class="col">
+            <select name="test">
+              <?php echo $testList;?>
+            </select>
+              </div>
+              <div class="col">
+            <select name="room">
+              <?php echo $roomList;?>
+            </select>
+              </div>
+              <div class="col">
+                <input type="date" name="date" class="form-control">
+              </div>
+              <div class="col">
+                <input type="time" name="time" class="form-control">
+              </div>
+              <div class="col">
+            <button class="btn btn-primary" type="submit">Submit Requisition</button>
+              </div>
+          </form>
+        </div>
+      </div>
+    </div>
+    <?php include("lib/foot.php");?>
+  </body>
+</html>
diff --git a/schema.sql b/schema.sql
index b745a8c..b570d58 100644
--- a/schema.sql
+++ b/schema.sql
@@ -44,6 +44,15 @@ time int,
 form text,
 data text
 );
+CREATE TABLE requisition(
+pid int,
+test text,
+time int,
+room text,
+sample text,
+form text,
+status text
+);
 CREATE TABLE treatment(
 pid int,
 drug text,
diff --git a/treatment.php b/treatment.php
index ac906fe..2b8c29d 100644
--- a/treatment.php
+++ b/treatment.php
@@ -15,9 +15,7 @@ if(!empty($_GET["pid"])){
     $db->addDrug($pid, $_POST["drug"], $_POST["dose"], $_POST["route"], $_POST["frequency"], $_POST["date"], $_POST["time"], $_POST["duration"], $_POST["extra-note"]);
   }
   $list=$db->getDrugs($pid);
-  $view="<form method='post' id='omitter'></form>";
-  $view=$view."<table class='table'>";
-  $view=$view."<tr><th>Drug</th><th>Dose</th><th>Route</th><th>Frequency</th><th>Start</th><th>Duration</th><th>Note</th></tr>";
+  $view="";
   while($drug=$list->fetchArray()){
     if($drug["omit"]){
       $omit="omit";
@@ -31,7 +29,7 @@ if(!empty($_GET["pid"])){
         }
       } catch(TypeError $e){}
     }
-    $view=$view."<tr class='".$omit."'><td>".$drug["drug"]."</td><td>".$drug["dose"]."</td><td>".$drug["route"]."</td><td>".$drug["frequency"]."</td><td>".date("M j", $drug["start"])."</td><td>".$drug["duration"]."</td><td>".$drug["addl"]."</td><td><button class='btn btn-warning' name='omit' value='".$drug["rowid"]."' form='omitter' ".$omit.">Omit</button></td></tr>";
+    $view=$view."<tr class='".$omit."'><td>".$drug["drug"]."</td><td>".$drug["dose"]."</td><td>".$drug["route"]."</td><td>".$drug["frequency"]."</td><td>".date("M j", $drug["start"])."</td><td>".$drug["duration"]."</td><td>".$drug["addl"]."</td><td><button type='submit' class='btn btn-warning' name='omit' value='".$drug["rowid"]."' form='omitter' ".$omit.">Omit</button></td></tr>";
   }
   $view=$view."</table>";
   $form=schema2form("forms/drugs.schema.json");
@@ -48,7 +46,11 @@ if(!empty($_GET["pid"])){
       <div class="card mb-4">
         <div class="card-body">
           <h4 class="card-title">Medicine List</h4>
-          <?php echo $view;?>
+          <form method='post' id='omitter'></form>
+          <table class="table">
+            <tr><th>Drug</th><th>Dose</th><th>Route</th><th>Frequency</th><th>Start</th><th>Duration</th><th>Note</th><th></th></tr>
+            <?php echo $view;?>
+          </table>
         </div>
       </div>
       <?php echo $form;?>
diff --git a/view.php b/view.php
index a107381..050f92a 100644
--- a/view.php
+++ b/view.php
@@ -45,6 +45,7 @@ if(isSet($_GET["pid"])){
             <a class="mb-3 btn btn-secondary" href="physician.php?pid=<?php echo $pid;?>">Add Physician Note</a>
             <a class="mb-3 btn btn-secondary" href="nursing.php?pid=<?php echo $pid;?>">Add Nursing Note</a>
             <a class="mb-3 btn btn-secondary" href="laboratory.php?pid=<?php echo $pid;?>">Add Laboratory Report</a>
+            <a class="mb-3 btn btn-secondary" href="requisition.php?pid=<?php echo $pid;?>">Add Requisition</a>
         </div>
       </div>
       <div <?php if(empty($pid)) echo "style='display:none'";?>>
-- 
2.39.5