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

Update Dashboard Access(Memunculkan Informasi Pasien dan Pemerikasaan) dan Perbaikan Patnumber null pada tampilan Dashboard

Browse Source
This commit is contained in:
mikael-zakaria 2024-12-26 10:44:41 +07:00
parent d87278c017
commit f5514db2d5
12 changed files with 111 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
app/Controllers/AdminController.php
View File

@ -10,30 +10,33 @@ class AdminController extends BaseController {
public function viewAccess($accessnumber): string { public function viewAccess($accessnumber): string {
$db = \Config\Database::connect(); $db = \Config\Database::connect();
$sql = "select p.PATNUMBER, p.NAME, sr.HOSTORDERNUMBER, tu.SAMPLETYPE, ds.SHORTTEXT, tu.TUBESTATUS, ct.COLLSTATUS, ct.TUBECOMMENT from SP_TUBES tu $sql = "select sr.HOSTORDERNUMBER, tu.SAMPLETYPE, ds.SHORTTEXT, tu.TUBESTATUS, ct.COLLSTATUS, ct.TUBECOMMENT from SP_TUBES tu
left join SP_REQUESTS sr on tu.SP_ACCESSNUMBER=sr.SP_ACCESSNUMBER left join SP_REQUESTS sr on tu.SP_ACCESSNUMBER=sr.SP_ACCESSNUMBER
left join PATIENTS p on p.PATID=sr.PATID
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='$accessnumber'"; where tu.SP_ACCESSNUMBER='$accessnumber'";
$query = $db->query($sql); $query = $db->query($sql);
$results = $query->getResultArray(); $results = $query->getResultArray();
$hostordernumber = $results[0]['HOSTORDERNUMBER']; $visit_number = $results[0]['HOSTORDERNUMBER'];
$data['data'] = $results; $data['data'] = $results;
$sql = "select concat([Patient First Name],' ',[Patient Last Name]) as [Patient Full Name], [Visit Description], $sql = "select hp.PATNUMBER, hp.PATNAME, ho.PAYERNAME, ho.TREATDOC
[Treating Doctor], [Payer Name] from cmod.dbo.CM_HIS_ORDER where [Visit Number] = '$hostordernumber'"; from cmod.dbo.CM_HIS_ORDERS ho
left join cmod.dbo.CM_HIS_PATIENTS hp on hp.PATID=ho.PATID
WHERE ho.VISITNUMBER='$visit_number'";
$query = $db->query($sql); $query = $db->query($sql);
$results = $query->getResultArray(); $results = $query->getResultArray();
if($results != null) { if($results != null) {
$data['patient_fullname'] = $results[0]['Patient Full Name']; $data['patnumber'] = $results[0]['PATNUMBER'];
$data['visit_description'] = $results[0]['Visit Description']; $data['patient_fullname'] = $results[0]['PATNAME'];
$data['treating_doctor'] = $results[0]['Treating Doctor']; // $data['visit_description'] = $results[0]['Visit Description'];
$data['payer_name'] = $results[0]['Payer Name']; $data['treating_doctor'] = $results[0]['TREATDOC'];
$data['payer_name'] = $results[0]['PAYERNAME'];
} else { } else {
$data['patnumber'] = "";
$data['patient_fullname'] = ""; $data['patient_fullname'] = "";
$data['visit_description'] = ""; // $data['visit_description'] = "";
$data['treating_doctor'] = ""; $data['treating_doctor'] = "";
$data['payer_name'] = ""; $data['payer_name'] = "";
} }

25
app/Controllers/FoController.php
View File

@ -10,37 +10,40 @@ class FoController extends BaseController {
public function viewAccess($accessnumber): string { public function viewAccess($accessnumber): string {
$db = \Config\Database::connect(); $db = \Config\Database::connect();
$sql = "select p.PATNUMBER, p.NAME, sr.HOSTORDERNUMBER, tu.SAMPLETYPE, ds.SHORTTEXT, tu.TUBESTATUS, ct.COLLSTATUS, ct.TUBECOMMENT from SP_TUBES tu $sql = "select sr.HOSTORDERNUMBER, tu.SAMPLETYPE, ds.SHORTTEXT, tu.TUBESTATUS, ct.COLLSTATUS, ct.TUBECOMMENT from SP_TUBES tu
left join SP_REQUESTS sr on tu.SP_ACCESSNUMBER=sr.SP_ACCESSNUMBER left join SP_REQUESTS sr on tu.SP_ACCESSNUMBER=sr.SP_ACCESSNUMBER
left join PATIENTS p on p.PATID=sr.PATID
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='$accessnumber'"; where tu.SP_ACCESSNUMBER='$accessnumber'";
$query = $db->query($sql); $query = $db->query($sql);
$results = $query->getResultArray(); $results = $query->getResultArray();
$hostordernumber = $results[0]['HOSTORDERNUMBER']; $visit_number = $results[0]['HOSTORDERNUMBER'];
$data['data'] = $results; $data['data'] = $results;
$sql = "select concat([Patient First Name],' ',[Patient Last Name]) as [Patient Full Name], [Visit Description], $sql = "select hp.PATNUMBER, hp.PATNAME, ho.PAYERNAME, ho.TREATDOC
[Treating Doctor], [Payer Name] from cmod.dbo.CM_HIS_ORDER where [Visit Number] = '$hostordernumber'"; from cmod.dbo.CM_HIS_ORDERS ho
left join cmod.dbo.CM_HIS_PATIENTS hp on hp.PATID=ho.PATID
WHERE ho.VISITNUMBER='$visit_number'";
$query = $db->query($sql); $query = $db->query($sql);
$results = $query->getResultArray(); $results = $query->getResultArray();
if($results != null) { if($results != null) {
$data['patient_fullname'] = $results[0]['Patient Full Name']; $data['patnumber'] = $results[0]['PATNUMBER'];
$data['visit_description'] = $results[0]['Visit Description']; $data['patient_fullname'] = $results[0]['PATNAME'];
$data['treating_doctor'] = $results[0]['Treating Doctor']; // $data['visit_description'] = $results[0]['Visit Description'];
$data['payer_name'] = $results[0]['Payer Name']; $data['treating_doctor'] = $results[0]['TREATDOC'];
$data['payer_name'] = $results[0]['PAYERNAME'];
} else { } else {
$data['patnumber'] = "";
$data['patient_fullname'] = ""; $data['patient_fullname'] = "";
$data['visit_description'] = ""; // $data['visit_description'] = "";
$data['treating_doctor'] = ""; $data['treating_doctor'] = "";
$data['payer_name'] = ""; $data['payer_name'] = "";
} }
$data['accessnumber'] = $accessnumber; $data['accessnumber'] = $accessnumber;
return view('fo/dashboard_viewAccess', $data); return view('admin/dashboard_viewAccess', $data);
} }
public function changePass() { public function changePass() {

25
app/Controllers/SamplingController.php
View File

@ -10,37 +10,40 @@ class SamplingController extends BaseController {
public function viewAccess($accessnumber): string { public function viewAccess($accessnumber): string {
$db = \Config\Database::connect(); $db = \Config\Database::connect();
$sql = "select p.PATNUMBER, p.NAME, sr.HOSTORDERNUMBER, tu.SAMPLETYPE, ds.SHORTTEXT, tu.TUBESTATUS, ct.COLLSTATUS, ct.TUBECOMMENT from SP_TUBES tu $sql = "select sr.HOSTORDERNUMBER, tu.SAMPLETYPE, ds.SHORTTEXT, tu.TUBESTATUS, ct.COLLSTATUS, ct.TUBECOMMENT from SP_TUBES tu
left join SP_REQUESTS sr on tu.SP_ACCESSNUMBER=sr.SP_ACCESSNUMBER left join SP_REQUESTS sr on tu.SP_ACCESSNUMBER=sr.SP_ACCESSNUMBER
left join PATIENTS p on p.PATID=sr.PATID
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='$accessnumber'"; where tu.SP_ACCESSNUMBER='$accessnumber'";
$query = $db->query($sql); $query = $db->query($sql);
$results = $query->getResultArray(); $results = $query->getResultArray();
$hostordernumber = $results[0]['HOSTORDERNUMBER']; $visit_number = $results[0]['HOSTORDERNUMBER'];
$data['data'] = $results; $data['data'] = $results;
$sql = "select concat([Patient First Name],' ',[Patient Last Name]) as [Patient Full Name], [Visit Description], $sql = "select hp.PATNUMBER, hp.PATNAME, ho.PAYERNAME, ho.TREATDOC
[Treating Doctor], [Payer Name] from cmod.dbo.CM_HIS_ORDER where [Visit Number] = '$hostordernumber'"; from cmod.dbo.CM_HIS_ORDERS ho
left join cmod.dbo.CM_HIS_PATIENTS hp on hp.PATID=ho.PATID
WHERE ho.VISITNUMBER='$visit_number'";
$query = $db->query($sql); $query = $db->query($sql);
$results = $query->getResultArray(); $results = $query->getResultArray();
if($results != null) { if($results != null) {
$data['patient_fullname'] = $results[0]['Patient Full Name']; $data['patnumber'] = $results[0]['PATNUMBER'];
$data['visit_description'] = $results[0]['Visit Description']; $data['patient_fullname'] = $results[0]['PATNAME'];
$data['treating_doctor'] = $results[0]['Treating Doctor']; // $data['visit_description'] = $results[0]['Visit Description'];
$data['payer_name'] = $results[0]['Payer Name']; $data['treating_doctor'] = $results[0]['TREATDOC'];
$data['payer_name'] = $results[0]['PAYERNAME'];
} else { } else {
$data['patnumber'] = "";
$data['patient_fullname'] = ""; $data['patient_fullname'] = "";
$data['visit_description'] = ""; // $data['visit_description'] = "";
$data['treating_doctor'] = ""; $data['treating_doctor'] = "";
$data['payer_name'] = ""; $data['payer_name'] = "";
} }
$data['accessnumber'] = $accessnumber; $data['accessnumber'] = $accessnumber;
return view('sampling/dashboard_viewAccess', $data); return view('admin/dashboard_viewAccess', $data);
} }
public function changePass() { public function changePass() {

25
app/Controllers/UserController.php
View File

@ -10,37 +10,40 @@ class UserController extends BaseController {
public function viewAccess($accessnumber): string { public function viewAccess($accessnumber): string {
$db = \Config\Database::connect(); $db = \Config\Database::connect();
$sql = "select p.PATNUMBER, p.NAME, sr.HOSTORDERNUMBER, tu.SAMPLETYPE, ds.SHORTTEXT, tu.TUBESTATUS, ct.COLLSTATUS, ct.TUBECOMMENT from SP_TUBES tu $sql = "select sr.HOSTORDERNUMBER, tu.SAMPLETYPE, ds.SHORTTEXT, tu.TUBESTATUS, ct.COLLSTATUS, ct.TUBECOMMENT from SP_TUBES tu
left join SP_REQUESTS sr on tu.SP_ACCESSNUMBER=sr.SP_ACCESSNUMBER left join SP_REQUESTS sr on tu.SP_ACCESSNUMBER=sr.SP_ACCESSNUMBER
left join PATIENTS p on p.PATID=sr.PATID
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='$accessnumber'"; where tu.SP_ACCESSNUMBER='$accessnumber'";
$query = $db->query($sql); $query = $db->query($sql);
$results = $query->getResultArray(); $results = $query->getResultArray();
$hostordernumber = $results[0]['HOSTORDERNUMBER']; $visit_number = $results[0]['HOSTORDERNUMBER'];
$data['data'] = $results; $data['data'] = $results;
$sql = "select concat([Patient First Name],' ',[Patient Last Name]) as [Patient Full Name], [Visit Description], $sql = "select hp.PATNUMBER, hp.PATNAME, ho.PAYERNAME, ho.TREATDOC
[Treating Doctor], [Payer Name] from cmod.dbo.CM_HIS_ORDER where [Visit Number] = '$hostordernumber'"; from cmod.dbo.CM_HIS_ORDERS ho
left join cmod.dbo.CM_HIS_PATIENTS hp on hp.PATID=ho.PATID
WHERE ho.VISITNUMBER='$visit_number'";
$query = $db->query($sql); $query = $db->query($sql);
$results = $query->getResultArray(); $results = $query->getResultArray();
if($results != null) { if($results != null) {
$data['patient_fullname'] = $results[0]['Patient Full Name']; $data['patnumber'] = $results[0]['PATNUMBER'];
$data['visit_description'] = $results[0]['Visit Description']; $data['patient_fullname'] = $results[0]['PATNAME'];
$data['treating_doctor'] = $results[0]['Treating Doctor']; // $data['visit_description'] = $results[0]['Visit Description'];
$data['payer_name'] = $results[0]['Payer Name']; $data['treating_doctor'] = $results[0]['TREATDOC'];
$data['payer_name'] = $results[0]['PAYERNAME'];
} else { } else {
$data['patnumber'] = "";
$data['patient_fullname'] = ""; $data['patient_fullname'] = "";
$data['visit_description'] = ""; // $data['visit_description'] = "";
$data['treating_doctor'] = ""; $data['treating_doctor'] = "";
$data['payer_name'] = ""; $data['payer_name'] = "";
} }
$data['accessnumber'] = $accessnumber; $data['accessnumber'] = $accessnumber;
return view('user/dashboard_viewAccess', $data); return view('admin/dashboard_viewAccess', $data);
} }
public function changePass() { public function changePass() {

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

@ -108,8 +108,14 @@ function index() {
var data = response['data']; var data = response['data'];
for (var i = 0; i < data.length; i++) { for (var i = 0; i < data.length; i++) {
colldate = data[i].COLLECTIONDATE.substr(0,10); colldate = data[i].COLLECTIONDATE.substr(0,10);
patnumber = data[i].PATNUMBER.substr(-16,16);
patnumber = patnumber.substring(patnumber.length - 10); if (data[i].PATNUMBER != null) {
patnumber = data[i].PATNUMBER.substr(-16,16);
patnumber = patnumber.substring(patnumber.length - 10);
} else {
patnumber = ' NULL ';
}
accessnumber = data[i].SP_ACCESSNUMBER; accessnumber = data[i].SP_ACCESSNUMBER;
patname = data[i].NAME; patname = data[i].NAME;
hon = data[i].HOSTORDERNUMBER; hon = data[i].HOSTORDERNUMBER;

12
app/Views/admin/dashboard_viewAccess.php
View File

@ -1,10 +1,10 @@
<?php <?php
if(isset($data[0])) { if(isset($data[0])) {
$row = $data[0]; $row = $data[0];
$patnumber = $row['PATNUMBER'];
$patnumber = substr($patnumber, -10); if (strlen($patnumber) < 10) {
$host = $row['HOSTORDERNUMBER']; $patnumber = str_pad($patnumber, 10, "0", STR_PAD_LEFT);
$name = $row['NAME']; }
?> ?>
<div class="modal-header bg-soft-green text-white"> <div class="modal-header bg-soft-green text-white">
<h1 class="modal-title fs-5" id="exampleModalToggleLabel">Detail Request </h1> <h1 class="modal-title fs-5" id="exampleModalToggleLabel">Detail Request </h1>
@ -21,7 +21,7 @@ $name = $row['NAME'];
<th>Visit Description</th> <th>Visit Description</th>
<th>:</th> <th>:</th>
<td><?=$visit_description;?></td> <td></td>
</tr> </tr>
<tr> <tr>

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

@ -108,8 +108,14 @@ function index() {
var data = response['data']; var data = response['data'];
for (var i = 0; i < data.length; i++) { for (var i = 0; i < data.length; i++) {
colldate = data[i].COLLECTIONDATE.substr(0,10); colldate = data[i].COLLECTIONDATE.substr(0,10);
patnumber = data[i].PATNUMBER.substr(-16,16);
patnumber = patnumber.substring(patnumber.length - 10); if (data[i].PATNUMBER != null) {
patnumber = data[i].PATNUMBER.substr(-16,16);
patnumber = patnumber.substring(patnumber.length - 10);
} else {
patnumber = ' NULL ';
}
accessnumber = data[i].SP_ACCESSNUMBER; accessnumber = data[i].SP_ACCESSNUMBER;
patname = data[i].NAME; patname = data[i].NAME;
hon = data[i].HOSTORDERNUMBER; hon = data[i].HOSTORDERNUMBER;

12
app/Views/fo/dashboard_viewAccess.php
View File

@ -1,10 +1,10 @@
<?php <?php
if(isset($data[0])) { if(isset($data[0])) {
$row = $data[0]; $row = $data[0];
$patnumber = $row['PATNUMBER'];
$patnumber = substr($patnumber, -10); if (strlen($patnumber) < 10) {
$host = $row['HOSTORDERNUMBER']; $patnumber = str_pad($patnumber, 10, "0", STR_PAD_LEFT);
$name = $row['NAME']; }
?> ?>
<div class="modal-header bg-soft-green text-white"> <div class="modal-header bg-soft-green text-white">
<h1 class="modal-title fs-5" id="exampleModalToggleLabel">Detail Request </h1> <h1 class="modal-title fs-5" id="exampleModalToggleLabel">Detail Request </h1>
@ -21,7 +21,7 @@ $name = $row['NAME'];
<th>Visit Description</th> <th>Visit Description</th>
<th>:</th> <th>:</th>
<td><?=$visit_description;?></td> <td></td>
</tr> </tr>
<tr> <tr>

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

@ -108,8 +108,14 @@ function index() {
var data = response['data']; var data = response['data'];
for (var i = 0; i < data.length; i++) { for (var i = 0; i < data.length; i++) {
colldate = data[i].COLLECTIONDATE.substr(0,10); colldate = data[i].COLLECTIONDATE.substr(0,10);
patnumber = data[i].PATNUMBER.substr(-16,16);
patnumber = patnumber.substring(patnumber.length - 10); if (data[i].PATNUMBER != null) {
patnumber = data[i].PATNUMBER.substr(-16,16);
patnumber = patnumber.substring(patnumber.length - 10);
} else {
patnumber = ' NULL ';
}
accessnumber = data[i].SP_ACCESSNUMBER; accessnumber = data[i].SP_ACCESSNUMBER;
patname = data[i].NAME; patname = data[i].NAME;
hon = data[i].HOSTORDERNUMBER; hon = data[i].HOSTORDERNUMBER;

12
app/Views/sampling/dashboard_viewAccess.php
View File

@ -1,10 +1,10 @@
<?php <?php
if(isset($data[0])) { if(isset($data[0])) {
$row = $data[0]; $row = $data[0];
$patnumber = $row['PATNUMBER'];
$patnumber = substr($patnumber, -10); if (strlen($patnumber) < 10) {
$host = $row['HOSTORDERNUMBER']; $patnumber = str_pad($patnumber, 10, "0", STR_PAD_LEFT);
$name = $row['NAME']; }
?> ?>
<div class="modal-header bg-soft-green text-white"> <div class="modal-header bg-soft-green text-white">
<h1 class="modal-title fs-5" id="exampleModalToggleLabel">Detail Request </h1> <h1 class="modal-title fs-5" id="exampleModalToggleLabel">Detail Request </h1>
@ -21,7 +21,7 @@ $name = $row['NAME'];
<th>Visit Description</th> <th>Visit Description</th>
<th>:</th> <th>:</th>
<td><?=$visit_description;?></td> <td></td>
</tr> </tr>
<tr> <tr>

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

@ -108,8 +108,14 @@ function index() {
var data = response['data']; var data = response['data'];
for (var i = 0; i < data.length; i++) { for (var i = 0; i < data.length; i++) {
colldate = data[i].COLLECTIONDATE.substr(0,10); colldate = data[i].COLLECTIONDATE.substr(0,10);
patnumber = data[i].PATNUMBER.substr(-16,16);
patnumber = patnumber.substring(patnumber.length - 10); if (data[i].PATNUMBER != null) {
patnumber = data[i].PATNUMBER.substr(-16,16);
patnumber = patnumber.substring(patnumber.length - 10);
} else {
patnumber = ' NULL ';
}
accessnumber = data[i].SP_ACCESSNUMBER; accessnumber = data[i].SP_ACCESSNUMBER;
patname = data[i].NAME; patname = data[i].NAME;
hon = data[i].HOSTORDERNUMBER; hon = data[i].HOSTORDERNUMBER;

12
app/Views/user/dashboard_viewAccess.php
View File

@ -1,10 +1,10 @@
<?php <?php
if(isset($data[0])) { if(isset($data[0])) {
$row = $data[0]; $row = $data[0];
$patnumber = $row['PATNUMBER'];
$patnumber = substr($patnumber, -10); if (strlen($patnumber) < 10) {
$host = $row['HOSTORDERNUMBER']; $patnumber = str_pad($patnumber, 10, "0", STR_PAD_LEFT);
$name = $row['NAME']; }
?> ?>
<div class="modal-header bg-soft-green text-white"> <div class="modal-header bg-soft-green text-white">
<h1 class="modal-title fs-5" id="exampleModalToggleLabel">Detail Request </h1> <h1 class="modal-title fs-5" id="exampleModalToggleLabel">Detail Request </h1>
@ -21,7 +21,7 @@ $name = $row['NAME'];
<th>Visit Description</th> <th>Visit Description</th>
<th>:</th> <th>:</th>
<td><?=$visit_description;?></td> <td></td>
</tr> </tr>
<tr> <tr>