From b8a4f35effec6beb36fa1840b7885f88ef691aa8 Mon Sep 17 00:00:00 2001
From: mahdahar <89adham@gmail.com>
Date: Wed, 18 Dec 2024 09:18:38 +0700
Subject: [PATCH] fix patnumber empty, change merge sample if datetime is the
same coll/recv
---
app/Controllers/PrintResult.php | 54 +++++++++++++++++++++++++--------
app/Views/orders_edit.php | 2 +-
app/Views/patients_index.php | 2 +-
3 files changed, 43 insertions(+), 15 deletions(-)
diff --git a/app/Controllers/PrintResult.php b/app/Controllers/PrintResult.php
index 652530f..ae321d2 100644
--- a/app/Controllers/PrintResult.php
+++ b/app/Controllers/PrintResult.php
@@ -20,17 +20,17 @@ class PrintResult extends BaseController {
$last_name = $data[0]['NAME'];
$birth_date = $data[0]['BIRTHDATE'];
- $dateTime = \DateTime::createFromFormat('Y-m-d H:i:s.u', $birth_date);
- if ($dateTime) {
- $birth_date = $dateTime->format('d-m-Y');
- }
+ $birth_date = \DateTime::createFromFormat('Y-m-d H:i:s.u', $birth_date);
+ 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:s');
+ $collection_date = $dateTime->format('d-m-Y H:i');
}
+
+ $resultdate = date('d-m-Y H:i', time());
} else {
$sex ='';
$accessnumber = "";
@@ -87,7 +87,7 @@ class PrintResult extends BaseController {
| $birth_date / $sex |
Result Date/Time |
: |
- |
+ $resultdate |
@@ -116,16 +116,44 @@ class PrintResult extends BaseController {
// Untuk Collection
if ($data[1] != null) {
- $cm_output = [];
- $sp_output = [];
foreach ($data[1] as $item) {
- $cm_output[] = "{$item['SHORTTEXT']} " . date('Y-m-d H:i:s', strtotime($item['CM_collection_datetime']));
- $sp_output[] = "{$item['SHORTTEXT']} " . date('Y-m-d H:i:s', strtotime($item['SP_reception_datetime']));
+ $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 = implode(' | ', $cm_output) . "\n";
- $receptionText = implode(' | ', $sp_output) . "\n";
+
+ $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++;
+ }
+
+ $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 = "
diff --git a/app/Views/orders_edit.php b/app/Views/orders_edit.php
index fc7091e..2edabd3 100644
--- a/app/Views/orders_edit.php
+++ b/app/Views/orders_edit.php
@@ -127,7 +127,7 @@ $visitdate = $now;