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

Update pembeda tampilan dashboard dan his orders untuk user bali dan sby. Update label untuk sample surabaya

Browse Source
This commit is contained in:
mikael-zakaria 2025-01-13 13:31:54 +07:00
parent d7f10d279f
commit 401b737a57
3 changed files with 27 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
app/Controllers/API_Dashboard.php
View File

@ -7,6 +7,17 @@ class API_Dashboard extends ResourceController {
protected $format = 'json'; protected $format = 'json';
public function index() { public function index() {
// Mengetahui Apakah User Login adalah Bali atau Surabaya
$cityid = session()->get('usercityid');
if ($cityid == 1) {
$filter_query = " AND sr.HOSTORDERNUMBER LIKE 'BV%' ";
} elseif ($cityid == 2) {
$filter_query = " AND sr.HOSTORDERNUMBER LIKE 'SV%' ";
} else {
$filter_query = " ";
}
$db = \Config\Database::connect(); $db = \Config\Database::connect();
$date1 = $this->request->getPost('date1'); $date1 = $this->request->getPost('date1');
$date2 = $this->request->getPost('date2'); $date2 = $this->request->getPost('date2');
@ -51,8 +62,9 @@ end STATS
from SP_REQUESTS sr from SP_REQUESTS sr
left join PATIENTS p on p.PATID=sr.PATID left join PATIENTS p on p.PATID=sr.PATID
left join REQUESTS r on r.ACCESSNUMBER=sr.SP_ACCESSNUMBER left join REQUESTS r on r.ACCESSNUMBER=sr.SP_ACCESSNUMBER
where sr.COLLECTIONDATE between '$date1 00:00' and '$date2 23:59' where sr.COLLECTIONDATE between '$date1 00:00' and '$date2 23:59'"
order by sr.COLLECTIONDATE desc"; .$filter_query.
"order by sr.COLLECTIONDATE desc";
$query = $db->query($sql); $query = $db->query($sql);
$results = $query->getResultArray(); $results = $query->getResultArray();
$data['data'] = $results; $data['data'] = $results;

13
app/Controllers/API_HISOrders.php
View File

@ -7,6 +7,17 @@ class API_HISOrders extends ResourceController {
protected $format = 'json'; protected $format = 'json';
public function index() { public function index() {
// Mengetahui Apakah User Login adalah Bali atau Surabaya
$cityid = session()->get('usercityid');
if ($cityid == 1) {
$filter_query = " AND o.VISITNUMBER LIKE 'BV%' ";
} elseif ($cityid == 2) {
$filter_query = " AND o.VISITNUMBER LIKE 'SV%' ";
} else {
$filter_query = " ";
}
$db = \Config\Database::connect(); $db = \Config\Database::connect();
$date1 = $this->request->getPost('date1'); $date1 = $this->request->getPost('date1');
$date2 = $this->request->getPost('date2'); $date2 = $this->request->getPost('date2');
@ -18,7 +29,7 @@ class API_HISOrders extends ResourceController {
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'"; where o.VISITDATE between '$date1 00:00' and '$date2 23:59' " . $filter_query;
$query = $db->query($sql); $query = $db->query($sql);
$results = $query->getResultArray(); $results = $query->getResultArray();
$data['data'] = $results; $data['data'] = $results;

2
app/Controllers/PrintLabelSby.php
View File

@ -141,7 +141,7 @@ class PrintLabelSby extends BaseController {
^FO325,42^ADN,18,10^FD$sex {$age}Y^FS ^FO325,42^ADN,18,10^FD$sex {$age}Y^FS
^FO4,54^ADN,18,10^FD$sample^FS ^FO4,54^ADN,18,10^FD$sample^FS
^FO265,64^ADN,18,10^FDChapter^FS ^FO265,64^ADN,18,10^FDChapter^FS
^FO13,85^BY3,3,70^BCN,70,N,N^FD$barcode^FS ^FO54,85^BY2,3,70^BCN,70,N,N^FD$barcode^FS
^FO115,160^ADN,18,10^FDSAM# $barcode^FS ^FO115,160^ADN,18,10^FDSAM# $barcode^FS
^FO4,182^ADN,18,10^FDRM:$uhid^FS ^FO4,182^ADN,18,10^FDRM:$uhid^FS
^FO195,182^ADN,18,10^FD$collection_date^FS ^FO195,182^ADN,18,10^FD$collection_date^FS