From 97e1190f525c29b87887a98899d51aa1670e8e65 Mon Sep 17 00:00:00 2001 From: mahdahar <89adham@gmail.com> Date: Thu, 19 Dec 2024 08:13:27 +0700 Subject: [PATCH] result fix coll receive, fix unittext --- app/Controllers/API_HISOrders.php | 3 +- app/Controllers/PrintResult.php | 82 ++++++++++++++----------------- app/Views/orders_edit.php | 13 ++--- app/Views/orders_index.php | 15 +++--- 4 files changed, 54 insertions(+), 59 deletions(-) diff --git a/app/Controllers/API_HISOrders.php b/app/Controllers/API_HISOrders.php index 0ce2b5f..11b65da 100644 --- a/app/Controllers/API_HISOrders.php +++ b/app/Controllers/API_HISOrders.php @@ -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; diff --git a/app/Controllers/PrintResult.php b/app/Controllers/PrintResult.php index ae321d2..c09d298 100644 --- a/app/Controllers/PrintResult.php +++ b/app/Controllers/PrintResult.php @@ -115,45 +115,34 @@ class PrintResult extends BaseController { $note = $notes['RESULT'] == "" ? "-" : $notes['RESULT']; // Untuk Collection - if ($data[1] != null) { - + 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; - } - - $collectionText = ''; - $date1 = ''; - $i = 1 ; - foreach( $colldates as $qsamp => $qdate ) { - if($date1 != $qdate) { - $date1 = $qdate; - if($i != 1) { $collectionText .= ", "; } - $collectionText .= "$qdate $qsamp"; - } else { - $collectionText .= ", $qsamp"; + $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"; } + } } - $i++; - } - - $receptionText = ''; - $date1 = ''; - $i = 1 ; - foreach( $recvdates as $qsamp => $qdate ) { - if($date1 != $qdate) { - $date1 = $qdate; - if($i != 1) { $receptionText .= ", "; } - $receptionText .= "$qdate $qsamp"; - } else { - $receptionText .= ", $qsamp"; + 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"; } + } } - $i++; } - //$receptionText = implode(' | ', $sp_output) . "\n"; - } $resultNoteandSpecimen = " @@ -174,10 +163,10 @@ class PrintResult extends BaseController { - + - +
Collection datetime : $collectionText Collection datetime : $colltext
Reception datetime  : $receptionText Reception datetime : $recvtext
"; @@ -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 .= " @@ -265,7 +257,7 @@ class PrintResult extends BaseController { " . $resflag . " " . $resvalue . " - " . $item["UNIT"] . " + " . $unit . " " . $reff . " " . $item["serum_type"] . " @@ -297,20 +289,21 @@ class PrintResult extends BaseController { // Untuk Header $sql = "select p.PATNUMBER, p.FIRSTNAME, p.NAME, p.BIRTHDATE, sr.HOSTORDERNUMBER, sr.COLLECTIONDATE, sr.SP_ACCESSNUMBER, p.sex - from PATIENTS p - left join SP_REQUESTS sr on p.PATID=sr.PATID - where sr.SP_ACCESSNUMBER='$access'"; + from PATIENTS p + left join SP_REQUESTS sr on p.PATID=sr.PATID + where sr.SP_ACCESSNUMBER='$access'"; $query = $db->query($sql); $results = $query->getResultArray(); $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; @@ -347,7 +340,8 @@ class PrintResult extends BaseController { dc.FULLTEXT as chap_ind, st.FULLTEXT as serum_type, cdt.TEXT1 as test_eng, - cdt.TEXT2 as test_ind, + cdt.TEXT2 as test_ind, + cdt.UNIT as UNITTEXT, t.DEPTH, t.TESTORDER, dt.SHORTTEXT, diff --git a/app/Views/orders_edit.php b/app/Views/orders_edit.php index 2edabd3..7c05b81 100644 --- a/app/Views/orders_edit.php +++ b/app/Views/orders_edit.php @@ -75,11 +75,6 @@ $visitdate = $now;

Tests

- - - - - - + section('script') ?>