From: Agnibho Mondal Date: Mon, 24 May 2021 12:33:46 +0000 (+0530) Subject: Additional column to requisition X-Git-Url: https://code.agnibho.com/repo?a=commitdiff_plain;h=d33906f1b3416f97c831efef62fba51630038daf;p=simpleipd.git Additional column to requisition --- diff --git a/data.schema.sql b/data.schema.sql index 9875979..1be4572 100644 --- a/data.schema.sql +++ b/data.schema.sql @@ -52,7 +52,8 @@ sample text, time int, room text, form text, -status text +status text, +addl text ); CREATE TABLE treatment( pid int, diff --git a/lib/db.php b/lib/db.php index f0f0489..66131e8 100644 --- a/lib/db.php +++ b/lib/db.php @@ -182,10 +182,10 @@ class DB extends SQLite3 { $stmt->execute(); $log->log(null, "drug_given", $id); } - function addRequisition($pid, $test, $sample, $date, $time, $room, $form){ + function addRequisition($pid, $test, $sample, $date, $time, $room, $form, $addl){ global $log; if(!checkAccess("requisition", "dbSet")) return false; - $stmt=$this->prepare("INSERT INTO requisition (pid, test, sample, time, room, form, status) VALUES (:pid, :test, :sample, :time, :room, :form, :status);"); + $stmt=$this->prepare("INSERT INTO requisition (pid, test, sample, time, room, form, status, addl) VALUES (:pid, :test, :sample, :time, :room, :form, :status, :addl);"); $stmt->bindValue(":pid", $pid); $stmt->bindValue(":test", $test); $stmt->bindValue(":sample", $sample); @@ -193,6 +193,7 @@ class DB extends SQLite3 { $stmt->bindValue(":room", $room); $stmt->bindValue(":form", $form); $stmt->bindValue(":status", "active"); + $stmt->bindValue(":addl", $addl); $stmt->execute(); $log->log($pid, "requisition_added", json_encode([$test,$room,$form])); } @@ -361,7 +362,7 @@ class DB extends SQLite3 { function getRequisitionList(){ global $log; if(!checkAccess("requisition", "dbGet")) return false; - $stmt=$this->prepare("SELECT rowid,pid,test,sample,room,time,form FROM requisition WHERE status=:active ORDER BY room,test;"); + $stmt=$this->prepare("SELECT rowid,* FROM requisition WHERE status=:active ORDER BY room,test;"); $stmt->bindValue(":active", "active"); $result=$stmt->execute(); return($result); diff --git a/www/autocomplete/investigation.json b/www/autocomplete/investigation.json index 2e4928c..f26bf5a 100644 --- a/www/autocomplete/investigation.json +++ b/www/autocomplete/investigation.json @@ -11,7 +11,11 @@ "protozoology", "mycology", "parasitology", - "pathology" + "pathology", + "ictc", + "ccu_lab", + "other_govt_hospital", + "outside_lab" ], "sample": { "blood": "blood", diff --git a/www/index.php b/www/index.php index 9900dbb..2813278 100644 --- a/www/index.php +++ b/www/index.php @@ -21,7 +21,7 @@ while($arr=$reqs->fetchArray()){ else{ $test="".$arr["test"].""; } - $showReqs=$showReqs."".$test."".$arr["sample"]."".$arr["room"]."".date("M j, Y", $arr["time"])."".$pid.""; + $showReqs=$showReqs."".$test."".$arr["sample"]."".$arr["room"]."".date("M j", $arr["time"])."".$pid."".$arr["addl"].""; } ?> @@ -47,7 +47,7 @@ while($arr=$reqs->fetchArray()){

Requisition List

- +
Test NeededSamplePlaceDatePatient ID
diff --git a/www/requisition.php b/www/requisition.php index dd56343..f4f3e1e 100644 --- a/www/requisition.php +++ b/www/requisition.php @@ -14,7 +14,7 @@ if(isSet($_GET["pid"])){ $test=$_POST["test"]; $form=""; } - $db->addRequisition($pid, $test, $_POST["sample"], $_POST["date"], $_POST["time"], $_POST["room"], $form); + $db->addRequisition($pid, $test, $_POST["sample"], $_POST["date"], $_POST["time"], $_POST["room"], $form, $_POST["addl"]); } $inv=json_decode(file_get_contents("autocomplete/investigation.json")); $testList=""; @@ -26,15 +26,15 @@ if(isSet($_GET["pid"])){ $testList=$testList.""; } $roomList=""; + $roomList=$roomList.""; foreach($inv->rooms as $r){ $roomList=$roomList.""; } - $roomList=$roomList.""; - + $roomList=$roomList.""; $reqList=$db->getRequisitions($pid); $list=""; while($req=$reqList->fetchArray()){ - $list=$list."".$req["test"]."".$req["sample"]."".$req["room"]."".date("M j, Y", $req["time"]).""; + $list=$list."".$req["test"]."".$req["sample"]."".$req["room"]."".date("M j", $req["time"])."".$req["addl"].""; } } ?> @@ -42,7 +42,7 @@ if(isSet($_GET["pid"])){ - Laboratory + Requisitions
@@ -52,14 +52,14 @@ if(isSet($_GET["pid"])){

List of Requisitions

- +
Test NameSampleDestinationDate
Test NameSampleDestinationDateExtra note
>
-
@@ -67,7 +67,7 @@ if(isSet($_GET["pid"])){
-
@@ -75,13 +75,13 @@ if(isSet($_GET["pid"])){
-
- -
-
+ + +
- + + diff --git a/www/treatment.php b/www/treatment.php index 96e879c..7239de8 100644 --- a/www/treatment.php +++ b/www/treatment.php @@ -57,7 +57,7 @@ if(!empty($_GET["pid"])){ - Clinical Notes + Treatment