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

Perbaikan Order Time dan Result Time

Browse Source
This commit is contained in:
mikael-zakaria 2025-01-21 11:05:09 +07:00
parent a0fe7505ec
commit 059cda06cd
6 changed files with 52 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
app/Controllers/PrintResult.php
View File

@ -40,7 +40,7 @@ class PrintResult extends BaseController {
$accessnumber = $data[0]['SP_ACCESSNUMBER'];
$sex = $data[0]['sex'] == 1 ? "Male" : "Female";
$sex = $data[0]['SEX'] == 1 ? "Male" : "Female";
$rm_number = $data[0]['PATNUMBER'];
$rm_number = substr($rm_number, -10);
@ -53,13 +53,19 @@ class PrintResult extends BaseController {
if ($birth_date) { $birth_date = $birth_date->format('d-m-Y'); }
$hostordernumber = $data[0]['HOSTORDERNUMBER'];
$collection_date = $data[0]['COLLECTIONDATE'];
$dateTime = \DateTime::createFromFormat('Y-m-d H:i:s.u', $collection_date);
if ($dateTime) {
$collection_date = $dateTime->format('d-m-Y H:i');
}
$resultdate = date('d-m-Y H:i', time());
$result_date = $data[0]['RESULTDATE'];
$dateTime = \DateTime::createFromFormat('Y-m-d H:i:s.u', $result_date);
if ($dateTime) {
$result_date = $dateTime->format('d-m-Y H:i');
}
} else {
$sex ='';
$accessnumber = "";
@ -69,6 +75,7 @@ class PrintResult extends BaseController {
$birth_date = "";
$hostordernumber = "";
$collection_date = "";
$result_date = "";
}
$fullPage="";
@ -116,7 +123,7 @@ class PrintResult extends BaseController {
<td>$birth_date / $sex</td>
<th align='left'>Result Date/Time</th>
<td>:</td>
<td>$resultdate</td>
<td>$result_date</td>
</tr>
</table>
@ -379,10 +386,36 @@ class PrintResult extends BaseController {
$db = \Config\Database::connect();
// 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'";
$sql = "SELECT
p.PATNUMBER,
p.FIRSTNAME,
p.NAME,
p.BIRTHDATE,
sr.HOSTORDERNUMBER,
sr.COLLECTIONDATE,
sr.SP_ACCESSNUMBER,
p.SEX,
r.MAX_RESDATE AS RESULTDATE
FROM
PATIENTS p
LEFT JOIN
SP_REQUESTS sr
ON p.PATID = sr.PATID
LEFT JOIN
(
SELECT
MAX(RESDATE) AS MAX_RESDATE,
ACCESSNUMBER
FROM
[cmod].[dbo].[CM_RESULTS]
WHERE
ACCESSNUMBER = '$access'
GROUP BY
ACCESSNUMBER
) r
ON sr.SP_ACCESSNUMBER = r.ACCESSNUMBER
WHERE
sr.SP_ACCESSNUMBER = '$access'";
$query = $db->query($sql);
$results = $query->getResultArray();
$header = $results[0];

2
app/Views/admin/dashboard.php
View File

@ -107,7 +107,7 @@ function index() {
$("#table-body").html("");
var data = response['data'];
for (var i = 0; i < data.length; i++) {
colldate = data[i].COLLECTIONDATE.substr(0,10);
colldate = data[i].COLLECTIONDATE.substr(0,16);
if (data[i].PATNUMBER != null) {
patnumber = data[i].PATNUMBER.substr(-16,16);

2
app/Views/fo/dashboard.php
View File

@ -107,7 +107,7 @@ function index() {
$("#table-body").html("");
var data = response['data'];
for (var i = 0; i < data.length; i++) {
colldate = data[i].COLLECTIONDATE.substr(0,10);
colldate = data[i].COLLECTIONDATE.substr(0,16);
if (data[i].PATNUMBER != null) {
patnumber = data[i].PATNUMBER.substr(-16,16);

8
app/Views/orders_edit.php
View File

@ -2,8 +2,16 @@
<?= $this->section('content') ?>
<?php
$usercityid = session()->get('usercityid');
if ($usercityid == 1) {
date_default_timezone_set('Asia/Makassar');
} else if ($usercityid == 2) {
date_default_timezone_set('Asia/Jakarta');
}
$now = date('Y-m-d H:i');
$visitdate = $now;
$usercityid = session()->get('usercityid');
if ($usercityid == 1) {
$placeholdervisitnumber = "placeholder='BV........'";

2
app/Views/sampling/dashboard.php
View File

@ -107,7 +107,7 @@ function index() {
$("#table-body").html("");
var data = response['data'];
for (var i = 0; i < data.length; i++) {
colldate = data[i].COLLECTIONDATE.substr(0,10);
colldate = data[i].COLLECTIONDATE.substr(0,16);
if (data[i].PATNUMBER != null) {
patnumber = data[i].PATNUMBER.substr(-16,16);

2
app/Views/user/dashboard.php
View File

@ -107,7 +107,7 @@ function index() {
$("#table-body").html("");
var data = response['data'];
for (var i = 0; i < data.length; i++) {
colldate = data[i].COLLECTIONDATE.substr(0,10);
colldate = data[i].COLLECTIONDATE.substr(0,16);
if (data[i].PATNUMBER != null) {
patnumber = data[i].PATNUMBER.substr(-16,16);