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

result fix coll receive, fix unittext

Browse Source
This commit is contained in:
mahdahar 2024-12-19 08:13:27 +07:00
parent 605b02505a
commit 97e1190f52
4 changed files with 54 additions and 59 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 ) as T
for xml path('')),1,1,'') for xml path('')),1,1,'')
from cmod.dbo.CM_HIS_ORDERS o 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); $query = $db->query($sql);
$results = $query->getResultArray(); $results = $query->getResultArray();
$data['data'] = $results; $data['data'] = $results;

82
app/Controllers/PrintResult.php
View File

@ -115,45 +115,34 @@ class PrintResult extends BaseController {
$note = $notes['RESULT'] == "" ? "-" : $notes['RESULT']; $note = $notes['RESULT'] == "" ? "-" : $notes['RESULT'];
// Untuk Collection // Untuk Collection
if ($data[1] != null) { if ($data[1] != null) {
$colltext = '';
$recvtext = '';
$qcolldate = '';
$qcolltime = '';
$qrecvdate = '';
$qrecvtime = '';
foreach ($data[1] as $item) { foreach ($data[1] as $item) {
$samp = $item['SHORTTEXT']; $samp = $item['SHORTTEXT'];
$colldate = date('Y-m-d H:i', strtotime($item['CM_collection_datetime'])); $colldate = $item['colldate'];
$recvdate = date('Y-m-d H:i', strtotime($item['SP_reception_datetime'])); $recvdate = $item['recvdate'];
$colldates[$samp] = $colldate; $colltime = $item['colltime'];
$recvdates[$samp] = $recvdate; $recvtime = $item['recvtime'];
} if($colldate !='') {
if($colldate != $qcolldate) { $colltext .= "$colldate $colltime $samp"; $qcolldate = $colldate; $qcolltime = $colltime; }
$collectionText = ''; else {
$date1 = ''; if($colltime != $qcolltime) { $colltext .= ", $colltime $samp"; $qcolltime = $colltime; }
$i = 1 ; else { $colltext .= ", $samp"; }
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 {
$receptionText = ''; if($recvtime != $qrecvtime) { $recvtext .= ", $recvtime $samp"; $qrecvtime = $recvtime; }
$date1 = ''; else { $recvtext .= ", $samp"; }
$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 = " $resultNoteandSpecimen = "
@ -174,10 +163,10 @@ class PrintResult extends BaseController {
<table class='t_center table_collection' > <table class='t_center table_collection' >
<tr> <tr>
<td>Collection datetime : $collectionText </td> <td>Collection datetime : $colltext </td>
</tr> </tr>
<tr> <tr>
<td>Reception datetime &nbsp;: $receptionText </td> <td>Reception datetime : $recvtext </td>
</tr> </tr>
</table> </table>
"; ";
@ -257,6 +246,9 @@ class PrintResult extends BaseController {
$reff = $item["REFRANGE"]; $reff = $item["REFRANGE"];
$refftext = $item["REFFTEXT"]; $refftext = $item["REFFTEXT"];
if($refftext !='') {$reff = $refftext;} if($refftext !='') {$reff = $refftext;}
$unit = $item['UNIT'];
$unittext = $item['UNITTEXT'];
if($unittext !='') {$unit = $unittext;}
$resultTest .= " $resultTest .= "
<tr> <tr>
<td colspan='1' class=''> <td colspan='1' class=''>
@ -265,7 +257,7 @@ class PrintResult extends BaseController {
</td> </td>
<td class=''>" . $resflag . "</td> <td class=''>" . $resflag . "</td>
<td class=''>" . $resvalue . "</td> <td class=''>" . $resvalue . "</td>
<td class=''>" . $item["UNIT"] . "</td> <td class=''>" . $unit . "</td>
<td class=''>" . $reff . "</td> <td class=''>" . $reff . "</td>
<td class=''>" . $item["serum_type"] . "</td> <td class=''>" . $item["serum_type"] . "</td>
</tr> </tr>
@ -297,20 +289,21 @@ class PrintResult extends BaseController {
// Untuk Header // Untuk Header
$sql = "select p.PATNUMBER, p.FIRSTNAME, p.NAME, p.BIRTHDATE, sr.HOSTORDERNUMBER, sr.COLLECTIONDATE, sr.SP_ACCESSNUMBER, p.sex $sql = "select p.PATNUMBER, p.FIRSTNAME, p.NAME, p.BIRTHDATE, sr.HOSTORDERNUMBER, sr.COLLECTIONDATE, sr.SP_ACCESSNUMBER, p.sex
from PATIENTS p from PATIENTS p
left join SP_REQUESTS sr on p.PATID=sr.PATID left join SP_REQUESTS sr on p.PATID=sr.PATID
where sr.SP_ACCESSNUMBER='$access'"; where sr.SP_ACCESSNUMBER='$access'";
$query = $db->query($sql); $query = $db->query($sql);
$results = $query->getResultArray(); $results = $query->getResultArray();
$header = $results[0]; $header = $results[0];
// Untuk Collection // 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 from SP_TUBES tu
left join DICT_SAMPLES_TYPES ds on ds.SAMPCODE= tu.SAMPLETYPE 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 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); $query = $db->query($sql);
$results = $query->getResultArray(); $results = $query->getResultArray();
$collection = $results; $collection = $results;
@ -347,7 +340,8 @@ class PrintResult extends BaseController {
dc.FULLTEXT as chap_ind, dc.FULLTEXT as chap_ind,
st.FULLTEXT as serum_type, st.FULLTEXT as serum_type,
cdt.TEXT1 as test_eng, cdt.TEXT1 as test_eng,
cdt.TEXT2 as test_ind, cdt.TEXT2 as test_ind,
cdt.UNIT as UNITTEXT,
t.DEPTH, t.DEPTH,
t.TESTORDER, t.TESTORDER,
dt.SHORTTEXT, dt.SHORTTEXT,

13
app/Views/orders_edit.php
View File

@ -75,11 +75,6 @@ $visitdate = $now;
<p>Tests</p> <p>Tests</p>
<div class='table-responsive testtable border'> <div class='table-responsive testtable border'>
<table class='table table-sm '> <table class='table table-sm '>
<colgroup>
<col style='width:5%'>
<col style='width:95%'>
<col style='width:5%'>
</colgroup>
<tbody> <tbody>
<?php <?php
for($i=0;$i<50;$i++) { for($i=0;$i<50;$i++) {
@ -98,7 +93,7 @@ $visitdate = $now;
?> ?>
</select> </select>
</td> </td>
<td></td> <td> <button class='btn btn-sm btn-warning' onclick="testdel(<?=$i+1;?>)">X</button> </td>
</tr> </tr>
<?php <?php
} }
@ -172,6 +167,12 @@ $visitdate = $now;
<?= $this->section('script') ?> <?= $this->section('script') ?>
<script> <script>
function testdel(testid) {
if(confirm('are you sure') == true) {
$('.test'+testid).val('').change();
}
}
function orderDetail(orderid) { function orderDetail(orderid) {
console.log(orderid); console.log(orderid);
let url = '<?=base_url('');?>api/orders/detail/'+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 border-0">
<div class="card-body"> <div class="card-body">
<div class='card-title'>Order List</div> <div class='card-title'>Order List</div>
<div class="row g-3 justify-content-between align-items-end"> <p>
<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">
<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> <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> </p>
</div> <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"> <div class="table-responsive">
<table id="myTable" class="table"> <table id="myTable" class="table">
<thead> <thead>
@ -57,6 +55,7 @@ function index() {
method: 'POST', method: 'POST',
data : {date1:date1, date2:date2}, data : {date1:date1, date2:date2},
success: function(response) { success: function(response) {
$("#myTable").DataTable().destroy();
$("#table-body").html(""); $("#table-body").html("");
var data = response['data']; var data = response['data'];
for (var i = 0; i < data.length; i++) { for (var i = 0; i < data.length; i++) {
@ -76,7 +75,7 @@ function index() {
'</tr>'; '</tr>';
$("#table-body").append(datarow); $("#table-body").append(datarow);
} }
//$('#myTable').DataTable(); $('#myTable').DataTable();
}, },
error: function(response) { console.log(response.responseJSON); } error: function(response) { console.log(response.responseJSON); }
}); });