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

Merge branch 'main' into zakaria

Browse Source
This commit is contained in:
mikael-zakaria 2024-12-15 08:28:40 +08:00
commit f4fa370a64
4 changed files with 123 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/Config/Routes.php
View File

@ -66,7 +66,8 @@ $routes->get('api/dictChapters/detail/(:any)', 'API_DictChapters::detail/$1');
$routes->POST('api/orders/index', 'API_HISOrders::index');
$routes->POST('api/orders/save', 'API_HISOrders::save');
$routes->get('api/orders/detail/(:any)', 'API_HISOrders::detail/$1');
$routes->get('api/patients/search/(:any)', 'API_HISPatients::search/$1');
$routes->get('api/patients/patnumberSearch/(:any)', 'API_HISPatients::patnumberSearch/$1');
$routes->POST('api/patients/search/', 'API_HISPatients::search');
$routes->get('api/patients/detail/(:any)', 'API_HISPatients::detail/$1');
$routes->POST('api/patients/save', 'API_HISPatients::save');

29
app/Controllers/API_HISPatients.php
View File

@ -24,7 +24,7 @@ class API_HISPatients extends ResourceController {
return $this->respond($data,200);
}
public function search($patnumber) {
public function patnumberSearch($patnumber) {
$db = \Config\Database::connect();
$sql = "select * from cmod.dbo.CM_HIS_PATIENTS where PATNUMBER like '%$patnumber%'";
$query = $db->query($sql);
@ -33,9 +33,32 @@ class API_HISPatients extends ResourceController {
return $this->respond($data,200);
}
public function detail($patnumber) {
public function search() {
$db = \Config\Database::connect();
$sql = "select * from cmod.dbo.CM_HIS_PATIENTS where PATNUMBER='$patnumber'";
$patnumber = $this->request->getPost('patnumber');
$patname = strtolower( $this->request->getPost('patname') );
$sql = "select * from cmod.dbo.CM_HIS_PATIENTS";
// Initialize a WHERE clause
$where= '';
if (!empty($patnumber) || !empty($patname)) {
$where= ' WHERE ';
if (!empty($patnumber)) { $where .= "PATNUMBER like '%$patnumber%'"; }
if (!empty($shorttext)) {
if (!empty($testcode)) { $where .= ' OR '; }
$where .= "LOWER(PATNAME) LIKE '%$patname%'";
}
}
$sql .= $where;
$query = $db->query($sql);
$results = $query->getResultArray();
$data['patients'] = $results;
return $this->respond($data, 200);
}
public function detail($patid) {
$db = \Config\Database::connect();
$sql = "select * from cmod.dbo.CM_HIS_PATIENTS where PATID='$patid'";
$query = $db->query($sql);
$results = $query->getResultArray();
$data['patient'] = $results[0];

67
app/Views/orders_update.php
View File

@ -235,11 +235,11 @@ function patClear() {
$('#phone').html('');
}
function patSelect(patnumber) {
function patSelect() {
$('#modal_patList').modal('hide');
$('#modal_patEditor').modal('hide');
$('#patid').val('');
let url = '<?=base_url('');?>api/patients/detail/'+patnumber;
let url = '<?=base_url('');?>api/patients/detail/'+patid;
$.ajax({
url: url,
method: "GET",
@ -251,7 +251,7 @@ function patSelect(patnumber) {
$('#address').html(data.ADDRESS);
$('#phone').html(data.PHONE);
$("#patid").val(data.PATID);
$("#patnumber").val(patnumber);
$("#patnumber").val(data.PATNUMBER);
},
error: function(response) {
alert(response.responseJSON.messages.errors);
@ -259,7 +259,7 @@ function patSelect(patnumber) {
});
}
function patCreate(patnumber) {
function patCreate() {
$('#modal_patList').modal('hide');
$("#qpatid").val('0');
$("#qpatnumber").val(patnumber);
@ -270,17 +270,16 @@ function patCreate(patnumber) {
$('#modal_patEditor').modal('show');
}
function patEdit(patnumber) {
function patEdit(patid) {
$('#modal_patList').modal('hide');
let url = '<?=base_url('');?>api/patients/detail/'+patnumber;
let url = '<?=base_url('');?>api/patients/detail/'+patid;
$.ajax({
url: url,
method: "GET",
success: function(response) {
let data = response['patient'];
console.log(data);
$("#qpatnumber").val(patnumber);
$("#qpatid").val(data.PATID);
$("#qpatnumber").val(data.PATNUMBER);
$("#qpatid").val(patid);
$("#qpatname").val(data.PATNAME);
$("#qsex").val(data.SEX);
$("#qbirthdate").val(data.BIRTHDATE);
@ -296,10 +295,11 @@ function patEdit(patnumber) {
function patSearch() {
patnumber = $("#patnumber").val();
let url = '<?=base_url('');?>api/patients/search/'+patnumber;
let url = '<?=base_url('');?>api/patients/search';
$.ajax({
url: url,
method: "GET",
method: "POST",
data: {patnumber:patnumber},
success: function(response) {
$("#patList_tbody").html("");
var data = response['patients'];
@ -312,8 +312,8 @@ function patSearch() {
patname = data[i].PATNAME;
sex = data[i].SEX;
birthdate = data[i].BIRTHDATE;
editBtn = '<button class="btn btn-sm btn-warning" ' + ' onclick="patEdit(\'' + qpatnumber + '\')">Edit' + '</button> ';
selectBtn = '<button class="btn btn-sm btn-success" ' + ' onclick="patSelect(\'' + qpatnumber + '\')">Select' + '</button> ';
editBtn = '<button class="btn btn-sm btn-warning" ' + ' onclick="patEdit(\'' + patid + '\')">Edit' + '</button> ';
selectBtn = '<button class="btn btn-sm btn-success" ' + ' onclick="patSelect(\'' + patid + '\')">Select' + '</button> ';
if(data[i].LISCODE == null) { liscode = '-'; }
let datarow = '<tr class="align-middle">' +
'<td>' + qpatnumber + '</td>' + '<td>' + patname+ '</td> <td>' + sex + '</td>' + '<td>' + birthdate+ '</td>' + '<td>' + selectBtn + editBtn + '</td>' +
@ -336,25 +336,21 @@ function patSave() {
birthdate = $('#qbirthdate').val();
sex = $('#qsex').val();
address = $('#qaddress').val();
phone = $('#qphone').val();
if(patid == '') {
} else {
let data = { patid: patid, patnumber: patnumber, patname:patname, birthdate:birthdate, sex:sex, address:address, phone:phone };
let url = '<?=base_url('');?>api/patients/save';
$.ajax({
url: url,
method: "POST",
data:data,
success: function(response) {
console.log(response);
patSelect(patnumber);
},
error: function(response) {
alert(response.responseJSON.messages.errors);
}
});
}
phone = $('#qphone').val();
let data = { patid: patid, patnumber: patnumber, patname:patname, birthdate:birthdate, sex:sex, address:address, phone:phone };
let url = '<?=base_url('');?>api/patients/save';
$.ajax({
url: url,
method: "POST",
data:data,
success: function(response) {
console.log(response);
patSelect(patnumber);
},
error: function(response) {
alert(response.responseJSON.messages.errors);
}
});
}
$(document).ready(function() {
@ -363,7 +359,14 @@ $(document).ready(function() {
echo "$('.test$i').select2();";
}
?>
flatpickr("#visitdate", { allowInput: true, enableTime: true, dateFormat: "Y-m-d H:i", time_24hr: true });
$("#patnumber").keydown(function(event) {
if (event.keyCode === 13) {
patSearch();
}
});
});
</script>
<?= $this->endSection() ?>

112
app/Views/patients_index.php
View File

@ -2,9 +2,7 @@
<?= $this->section('content') ?>
<div class="card border-0 m-1">
<div class="card-header bg-success text-white">
<div class='card-title m-0'><b>Patients List</b></div>
</div>
<div class="card-header bg-success text-white">Patients List</div>
<div class="card-body">
<div class='row mb-2'>
<div class='col-2'>MR#</div>
@ -20,6 +18,7 @@
<div class="card border-0 m-1">
<div class="card-body">
<button class='btn btn-sm btn-primary' onclick='create()'><i class='bi bi-plus-circle'></i> Create</button>
<div class="table-responsive">
<table id="myTable" class="table">
<thead>
@ -38,7 +37,7 @@
</div>
</div>
<div class="modal fade" id="modal_crud" aria-hidden="true" tabindex="-1">
<div class="modal fade" id="modal_patEditor" aria-hidden="true" tabindex="-1">
<div class="modal-dialog modal-lg modal-dialog-centered modal-dialog-scrollable">
<div class="modal-content">
<div class="modal-header">
@ -46,21 +45,28 @@
<button type="button" class="btn-close" data-bs-dismiss="modal" ></button>
</div>
<div class="modal-body" style='background-color:#F4F6FF'>
<div class="row">
<div class="col-12">
<table class="table table-sm table-borderless">
<input type='hidden' id='patid' value='' />
<tr class="align-middle"> <th>MR#</th> <th>:</th> <td><input type='text' class='form-control' id='patnumber' /></td> </tr>
<tr class="align-middle"> <th>Name</th> <th>:</th> <td><input type='text' class='form-control' id='patname' /></td> </tr>
<tr class="align-middle"> <th>Sex</th> <th>:</th> <td></td> </tr>
<tr class="align-middle"> <th>Birthdate</th> <th>:</th> <td><textarea class='form-control' id='unit'/></textarea></td> </tr>
<tr class="align-middle"> <th>Address</th> <th>:</th> <td><textarea class='form-control' id='refftext'/></textarea></td> </tr>
<tr class="align-middle"> <th>Phone</th> <th>:</th> <td><textarea class='form-control' id='refftext'/></textarea></td> </tr>
</table>
<button class='btn btn-sm btn-primary' onclick='save()'>Save</button>
<button class='btn btn-sm btn-secondary' data-bs-dismiss="modal">Cancel</button>
</div>
</div>
<table class="table table-sm table-borderless">
<input type='hidden' id='qpatid' value='' />
<tr class="align-middle"> <th>MR#</th> <th>:</th>
<td><input class='form-control' type='text' id='qpatnumber' /></td>
</tr>
<tr class="align-middle"> <th>Patient Name</th> <th>:</th> <td><input class='form-control' type='text' id='qpatname'/></td> </tr>
<tr class="align-middle"> <th>BirthDate</th> <th>:</th> <td><input class='form-control' type='date' id='qbirthdate'/></td> </tr>
<tr class="align-middle">
<th>Sex</th> <th>:</th>
<td>
<select class='form-control' id='qsex'>
<option value=''></option>
<option value='F'>Female</option>
<option value='M'>Male</option>
</select>
</td>
</tr>
<tr class="align-middle"> <th>Address</th> <th>:</th> <td><textarea class='form-control' id='qaddress'></textarea></td> </tr>
<tr class="align-middle"> <th>Phone</th> <th>:</th> <td><input class='form-control' type='text' id='qphone'/></td> </tr>
</table>
<button class='btn btn-sm btn-success' onclick='save()'>Save</button>
<button class='btn btn-sm btn-secondary' data-bs-dismiss="modal">Cancel</button>
</div>
</div>
</div>
@ -100,60 +106,62 @@ function search() {
});
}
function edit(testcode) {
let url = '<?=base_url('');?>api/dictTests/detail/'+testcode;
function create() {
$("#qpatid").val('0');
$("#qpatnumber").val();
$("#qpatname").val("");
$("#qsex").val("");
$("#qbirthdate").val("");
$("#qaddress").val('');
$('#modal_patEditor').modal('show');
}
function edit(patid) {
let url = '<?=base_url('');?>api/patients/detail/'+patid;
$.ajax({
url: url,
method: "GET",
success: function(response) {
let data = response;
$("#alert-div").html("");
$("#error-div").html("");
$("#testcode").val(testcode);
$("#testcodetext").html(testcode);
$("#update").val('1');
$("#text1").val(data.TEXT1);
$("#text2").val(data.TEXT2);
$("#unit").val(data.UNIT);
$("#refftext").val(data.REFFTEXT);
$("#modal_crud").modal('show');
let data = response['patient'];
$("#qpatid").val(patid);
$("#qpatnumber").val(data.PATNUMBER);
$("#qpatname").val(data.PATNAME);
$("#qsex").val(data.SEX);
$("#qbirthdate").val(data.BIRTHDATE);
$("#qaddress").val(data.ADDRESS);
$("#qphone").val(data.PHONE);
$("#modal_patEditor").modal('show');
},
error: function(response) {
console.log(response.responseJSON)
alert(response.responseJSON.messages.errors);
}
});
}
function save() {
let url = '<?=base_url('');?>api/dictTests/save';
var testcode = $("#testcode").val();
var text1 = $("#text1").val();
var text2 = $("#text2").val();
var unit = $("#unit").val();
var refftext = $("#refftext").val();
let data = { testcode: testcode, text1:text1, text2:text2, unit:unit, refftext:refftext };
patid = $("#qpatid").val();
patnumber = $("#qpatnumber").val();
patname = $("#qpatname").val();
birthdate = $('#qbirthdate').val();
sex = $('#qsex').val();
address = $('#qaddress').val();
phone = $('#qphone').val();
let data = { patid: patid, patnumber: patnumber, patname:patname, birthdate:birthdate, sex:sex, address:address, phone:phone };
let url = '<?=base_url('');?>api/patients/save';
$.ajax({
url: url,
method: "POST",
data: data,
data:data,
success: function(response) {
$("#alert-div").html("");
$("#error-div").html("");
$("#testcode").val('');
$("#text1").val('');
$("#text2").val('');
$("#refftext").val('');
$("#unit").val('');
$("#modal_crud").modal('hide');
$("#modal_patEditor").modal('hide');
$('#search_patnumber').val(patnumber);
search();
},
error: function(response) {
console.log(response.responseJSON)
alert(response.responseJSON.messages.errors);
}
});
}
</script>
<?= $this->endSection() ?>