time int,
room text,
form text,
-status text
+status text,
+addl text
);
CREATE TABLE treatment(
pid int,
$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);
$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]));
}
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);
"protozoology",
"mycology",
"parasitology",
- "pathology"
+ "pathology",
+ "ictc",
+ "ccu_lab",
+ "other_govt_hospital",
+ "outside_lab"
],
"sample": {
"blood": "blood",
else{
$test="<a href='report.php?pid=".$pid."&form=report-other&req=".$arr["rowid"]."&src=index'>".$arr["test"]."</a>";
}
- $showReqs=$showReqs."<tr><td>".$test."</td><td>".$arr["sample"]."</td><td>".$arr["room"]."</td><td>".date("M j, Y", $arr["time"])."</td><td><a href='view.php?pid=".$pid."' target='_blank'>".$pid."</a></td></tr>";
+ $showReqs=$showReqs."<tr><td>".$test."</td><td>".$arr["sample"]."</td><td>".$arr["room"]."</td><td>".date("M j", $arr["time"])."</td><td><a href='view.php?pid=".$pid."' target='_blank'>".$pid."</a></td></tr><tr><td></td><td colspan='4'>".$arr["addl"]."</td></tr>";
}
?>
<!DOCTYPE html>
<div class="card">
<div class="card-body">
<h4 class="card-title">Requisition List</h4>
- <table class="table">
+ <table class="table table-striped">
<tr><th>Test Needed</th><th>Sample</th><th>Place</th><th>Date</th><th>Patient ID</th></tr>
<?php echo $showReqs;?>
</table>
$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="";
$testList=$testList."<option>".$t."</option>";
}
$roomList="";
+ $roomList=$roomList."<option hidden disabled selected value=''>--- Select Room ---</option>";
foreach($inv->rooms as $r){
$roomList=$roomList."<option>".$r."</option>";
}
- $roomList=$roomList."<option selected='selected'>other</option>";
-
+ $roomList=$roomList."<option>other</option>";
$reqList=$db->getRequisitions($pid);
$list="";
while($req=$reqList->fetchArray()){
- $list=$list."<tr><td>".$req["test"]."</td><td>".$req["sample"]."</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' ".checkAccess("requisition","form").">Delete</button></td></tr>";
+ $list=$list."<tr><td>".$req["test"]."</td><td>".$req["sample"]."</td><td>".$req["room"]."</td><td>".date("M j", $req["time"])."</td><td>".$req["addl"]."</td><td><button type='submit' class='btn btn-secondary confirm' name='del' value='".$req["rowid"]."' form='delete' ".checkAccess("requisition","form").">Delete</button></td></tr>";
}
}
?>
<html>
<head>
<?php include(CONFIG_LIB."head.php");?>
- <title>Laboratory</title>
+ <title>Requisitions</title>
</head>
<body>
<div class="container">
<h4 class="card-title">List of Requisitions</h4>
<form method='post' id='delete'></form>
<table class="table">
- <tr><th>Test Name</th><th>Sample</th><th>Destination</th><th>Date</th><th></th></tr>
+ <tr><th>Test Name</th><th>Sample</th><th>Destination</th><th>Date</th><th>Extra note</th><th></th></tr>
<?php echo $list;?>
</table>
<hr>
<form method="post" <?php echo checkAccess("requisition", "form");?>>
<div class="row">
<div class="col">
- <select name="test">
+ <select name="test" required>
<?php echo $testList;?>
</select>
</div>
<input type="text" class="form-control" name="sample" placeholder="Sample">
</div>
<div class="col">
- <select name="room">
+ <select name="room" required>
<?php echo $roomList;?>
</select>
</div>
<input type="date" name="date" class="form-control">
<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>
+ <textarea type="text" class="form-control" name="addl" placeholder="Extra note"></textarea>
+ <button class="btn btn-primary" type="submit">Submit Requisition</button>
+ </form>
</div>
</div>
- <?php include(CONFIG_LIB."foot.php");?>
+ </div>
+ <?php include(CONFIG_LIB."foot.php");?>
</body>
</html>
<html>
<head>
<?php include(CONFIG_LIB."head.php");?>
- <title>Clinical Notes</title>
+ <title>Treatment</title>
</head>
<body>
<div class="container">