mahdahar/pbmc-cmod
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' into zakaria

Browse Source 
merge
This commit is contained in:
mikael-zakaria 2024-12-19 09:24:24 +08:00
commit 76b0f69a56
5 changed files with 56 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/Controllers/API_HISOrders.php
View File

@ -17,7 +17,8 @@ class API_HISOrders extends ResourceController {
) as T
for xml path('')),1,1,'')
from cmod.dbo.CM_HIS_ORDERS o
left join cmod.dbo.CM_HIS_PATIENTS p on p.PATID=o.PATID";
left join cmod.dbo.CM_HIS_PATIENTS p on p.PATID=o.PATID
where o.VISITDATE between '$date1 00:00' and '$date2 23:59'";
$query = $db->query($sql);
$results = $query->getResultArray();
$data['data'] = $results;

4
app/Controllers/API_Tubes.php
View File

@ -27,7 +27,7 @@ class API_Tubes extends BaseController {
public function unreceive($access, $sample) {
$db = \Config\Database::connect();
$sql = "UPDATE SP_TUBES set TUBESTATUS=null where SP_ACCESSNUMBER='$access' and SAMPLETYPE='$sample'";
$sql = "UPDATE SP_TUBES set TUBESTATUS=0 where SP_ACCESSNUMBER='$access' and SAMPLETYPE='$sample'";
$query = $db->query($sql);
}
@ -58,7 +58,7 @@ class API_Tubes extends BaseController {
public function unreceiveAll($access) {
$db = \Config\Database::connect();
$sql = "UPDATE SP_TUBES set TUBESTATUS=null where SP_ACCESSNUMBER='$access'";
$sql = "UPDATE SP_TUBES set TUBESTATUS=0 where SP_ACCESSNUMBER='$access'";
$query = $db->query($sql);
}

68
app/Controllers/PrintResult.php
View File

@ -116,44 +116,33 @@ class PrintResult extends BaseController {
// Untuk Collection
if ($data[1] != null) {
$colltext = '';
$recvtext = '';
$qcolldate = '';
$qcolltime = '';
$qrecvdate = '';
$qrecvtime = '';
foreach ($data[1] as $item) {
$samp = $item['SHORTTEXT'];
$colldate = date('Y-m-d H:i', strtotime($item['CM_collection_datetime']));
$recvdate = date('Y-m-d H:i', strtotime($item['SP_reception_datetime']));
$colldates[$samp] = $colldate;
$recvdates[$samp] = $recvdate;
$colldate = $item['colldate'];
$recvdate = $item['recvdate'];
$colltime = $item['colltime'];
$recvtime = $item['recvtime'];
if($colldate !='') {
if($colldate != $qcolldate) { $colltext .= "$colldate $colltime $samp"; $qcolldate = $colldate; $qcolltime = $colltime; }
else {
if($colltime != $qcolltime) { $colltext .= ", $colltime $samp"; $qcolltime = $colltime; }
else { $colltext .= ", $samp"; }
}
$collectionText = '';
$date1 = '';
$i = 1 ;
foreach( $colldates as $qsamp => $qdate ) {
if($date1 != $qdate) {
$date1 = $qdate;
if($i != 1) { $collectionText .= ", "; }
$collectionText .= "$qdate $qsamp";
} else {
$collectionText .= ", $qsamp";
}
$i++;
if($recvdate !='') {
if($recvdate != $qrecvdate) { $recvtext .= "$recvdate $recvtime $samp"; $qrecvdate = $recvdate; $qrecvtime = $recvtime; }
else {
if($recvtime != $qrecvtime) { $recvtext .= ", $recvtime $samp"; $qrecvtime = $recvtime; }
else { $recvtext .= ", $samp"; }
}
$receptionText = '';
$date1 = '';
$i = 1 ;
foreach( $recvdates as $qsamp => $qdate ) {
if($date1 != $qdate) {
$date1 = $qdate;
if($i != 1) { $receptionText .= ", "; }
$receptionText .= "$qdate $qsamp";
} else {
$receptionText .= ", $qsamp";
}
$i++;
}
//$receptionText = implode(' | ', $sp_output) . "\n";
}
$resultNoteandSpecimen = "
@ -174,10 +163,10 @@ class PrintResult extends BaseController {
<table class='t_center table_collection' >
<tr>
<td>Collection datetime : $collectionText </td>
<td>Collection datetime : $colltext </td>
</tr>
<tr>
<td>Reception datetime &nbsp;: $receptionText </td>
<td>Reception datetime : $recvtext </td>
</tr>
</table>
";
@ -257,6 +246,9 @@ class PrintResult extends BaseController {
$reff = $item["REFRANGE"];
$refftext = $item["REFFTEXT"];
if($refftext !='') {$reff = $refftext;}
$unit = $item['UNIT'];
$unittext = $item['UNITTEXT'];
if($unittext !='') {$unit = $unittext;}
$resultTest .= "
<tr>
<td colspan='1' class=''>
@ -265,7 +257,7 @@ class PrintResult extends BaseController {
</td>
<td class=''>" . $resflag . "</td>
<td class=''>" . $resvalue . "</td>
<td class=''>" . $item["UNIT"] . "</td>
<td class=''>" . $unit . "</td>
<td class=''>" . $reff . "</td>
<td class=''>" . $item["serum_type"] . "</td>
</tr>
@ -305,12 +297,13 @@ class PrintResult extends BaseController {
$header = $results[0];
// Untuk Collection
$sql = "select tu.SAMPLETYPE, ds.SHORTTEXT, tu.COLLECTIONDATE as CM_collection_datetime, ct.COLLECTIONDATE as SP_reception_datetime
$sql = "select ds.SHORTTEXT,
format(tu.COLLECTIONDATE, 'dd-MM-yyyy') as recvdate, format(tu.COLLECTIONDATE, 'hh:mm') as recvtime,
format(ct.COLLECTIONDATE, 'dd-MM-yyyy') as colldate, format(ct.COLLECTIONDATE, 'hh:mm') as colltime
from SP_TUBES tu
left join DICT_SAMPLES_TYPES ds on ds.SAMPCODE= tu.SAMPLETYPE
left join cmod.dbo.CM_TUBES ct on ct.SAMPLETYPE=tu.SAMPLETYPE and ct.ACCESSNUMBER=tu.SP_ACCESSNUMBER
where tu.SP_ACCESSNUMBER='$access'
";
where tu.SP_ACCESSNUMBER='$access'";
$query = $db->query($sql);
$results = $query->getResultArray();
$collection = $results;
@ -348,6 +341,7 @@ class PrintResult extends BaseController {
st.FULLTEXT as serum_type,
cdt.TEXT1 as test_eng,
cdt.TEXT2 as test_ind,
cdt.UNIT as UNITTEXT,
t.DEPTH,
t.TESTORDER,
dt.SHORTTEXT,

13
app/Views/orders_edit.php
View File

@ -75,11 +75,6 @@ $visitdate = $now;
<p>Tests</p>
<div class='table-responsive testtable border'>
<table class='table table-sm '>
<colgroup>
<col style='width:5%'>
<col style='width:95%'>
<col style='width:5%'>
</colgroup>
<tbody>
<?php
for($i=0;$i<50;$i++) {
@ -98,7 +93,7 @@ $visitdate = $now;
?>
</select>
</td>
<td></td>
<td> <button class='btn btn-sm btn-warning' onclick="testdel(<?=$i+1;?>)">X</button> </td>
</tr>
<?php
}
@ -172,6 +167,12 @@ $visitdate = $now;
<?= $this->section('script') ?>
<script>
function testdel(testid) {
if(confirm('are you sure') == true) {
$('.test'+testid).val('').change();
}
}
function orderDetail(orderid) {
console.log(orderid);
let url = '<?=base_url('');?>api/orders/detail/'+orderid;

15
app/Views/orders_index.php
View File

@ -7,14 +7,12 @@
<div class="card border-0">
<div class="card-body">
<div class='card-title'>Order List</div>
<div class="row g-3 justify-content-between align-items-end">
<div class='col col-auto'>
<button class='btn btn-sm btn-success' onclick='create()'><i class="bi bi-plus-circle"></i>&nbsp;New Order</button>
</div>
<div class="col col-auto">
<p>
<b>Date</b> &nbsp; <input class='date1' type='date' value=''> - <input class='date2' type='date'> <button class='btn btn-sm btn-primary' onclick='index()'><i class="bi bi-calendar2-event"></i>&nbsp;Filter</button>
</div>
</div>
</p>
<p> <button class='btn btn-sm btn-success' onclick='create()'><i class="bi bi-plus-circle"></i>&nbsp;New Order</button> </p>
<div class="table-responsive">
<table id="myTable" class="table">
<thead>
@ -57,6 +55,7 @@ function index() {
method: 'POST',
data : {date1:date1, date2:date2},
success: function(response) {
$("#myTable").DataTable().destroy();
$("#table-body").html("");
var data = response['data'];
for (var i = 0; i < data.length; i++) {
@ -76,7 +75,7 @@ function index() {
'</tr>';
$("#table-body").append(datarow);
}
//$('#myTable').DataTable();
$('#myTable').DataTable();
},
error: function(response) { console.log(response.responseJSON); }
});