MERMS/MermsEmrWeb
1
0
Fork 0
Code Issues Pull Requests Releases Activity

fix

Browse Source
This commit is contained in:
Olusesan Ameye
2021-02-20 11:36:45 -05:00
parent 924287cb98
commit 1eae616644
9 changed files with 125 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files
providerwww/application/controllers/Patient.php
+4
View File
@@ -45,6 +45,10 @@ class Patient extends Provider_Controller {
$this->renderProviderSecurePage('patient/newpatient', $data); $this->renderProviderSecurePage('patient/newpatient', $data);
} }
public function selectPatient(){
}
public function findpatient(){ public function findpatient(){
$out = array(); $out = array();
$out = $this->getPatientList(); $out = $this->getPatientList();
providerwww/application/controllers/Provider.php
+51 -53
View File
@@ -3,72 +3,70 @@
defined('BASEPATH') OR exit('No direct script access allowed'); defined('BASEPATH') OR exit('No direct script access allowed');
class Provider extends Provider_Controller { class Provider extends Provider_Controller {
//var $patient_model; //var $patient_model;
public function index() { public function index() {
$data = array(); $data = array();
$out = array(); $out = array();
$this->load->model('patient_model'); $this->load->model('patient_model');
$out = $this->patient_model->getPatientList(); $out = $this->patient_model->getPatientList();
$data["patient_list"] = $out["patient_list"]; $data["patient_list"] = $out["patient_list"];
$_SESSION['patient_count']=5; $_SESSION['patient_count'] = 5;
$this->load->model('encounter_model');
$out = $this->encounter_model->getEncounterList();
$data["encounter_list"] = $out["encounter_list"];
$this->load->model('encounter_model'); $this->renderProviderSecurePage('dash', $data);
$out = $this->encounter_model->getEncounterList(); // print_r($_SESSION);
$data["encounter_list"] = $out["encounter_list"];
$this->renderProviderSecurePage('dash', $data);
} }
public function alerts() { public function alerts() {
$data = array(); $data = array();
$out = array(); $out = array();
$this->load->model('patient_model'); $this->load->model('patient_model');
$out = $this->patient_model->getPatientList(); $out = $this->patient_model->getPatientList();
$data["patient_list"] = $out["patient_list"]; $data["patient_list"] = $out["patient_list"];
$this->renderProviderSecurePage('dash', $data); $this->renderProviderSecurePage('dash', $data);
} }
public function todo() { public function todo() {
$data = array(); $data = array();
$out = array(); $out = array();
$this->load->model('patient_model'); $this->load->model('patient_model');
$out = $this->patient_model->getPatientList(); $out = $this->patient_model->getPatientList();
$data["patient_list"] = $out["patient_list"]; $data["patient_list"] = $out["patient_list"];
$this->renderProviderSecurePage('dash', $data); $this->renderProviderSecurePage('dash', $data);
} }
public function tasks() { public function tasks() {
$data = array(); $data = array();
$out = array(); $out = array();
$this->load->model('patient_model'); $this->load->model('patient_model');
$out = $this->patient_model->getPatientList(); $out = $this->patient_model->getPatientList();
$data["patient_list"] = $out["patient_list"]; $data["patient_list"] = $out["patient_list"];
$this->renderProviderSecurePage('dash', $data); $this->renderProviderSecurePage('dash', $data);
} }
public function calendar() { public function calendar() {
$data = array(); $data = array();
$out = array(); $out = array();
$this->load->model('patient_model'); $this->load->model('patient_model');
$out = $this->patient_model->getPatientList(); $out = $this->patient_model->getPatientList();
$data["patient_list"] = $out["patient_list"]; $data["patient_list"] = $out["patient_list"];
$this->renderProviderSecurePage('calendar', $data); $this->renderProviderSecurePage('calendar', $data);
} }
public function encounters() { public function encounters() {
$data = array(); $data = array();
$out = array(); $out = array();
$this->load->model('patient_model'); $this->load->model('patient_model');
$out = $this->patient_model->getPatientList(); $out = $this->patient_model->getPatientList();
$data["patient_list"] = $out["patient_list"]; $data["patient_list"] = $out["patient_list"];
$this->load->model('encounter_model'); $this->load->model('encounter_model');
$out = $this->encounter_model->getEncounterList(); $out = $this->encounter_model->getEncounterList();
$data["encounter_list"] = $out["encounter_list"]; $data["encounter_list"] = $out["encounter_list"];
$this->renderProviderSecurePage('dash', $data); $this->renderProviderSecurePage('dash', $data);
} }
} }
providerwww/application/core/MER_Controller.php
+24 -34
View File
@@ -62,39 +62,35 @@ class MER_Controller extends CI_Controller {
return htmlspecialchars($str); return htmlspecialchars($str);
} }
protected function loginUser($data, $out) { protected function loginUser($data, $out) {
$data['action'] = MERMS_PROVIDERS_LOGIN; $data['action'] = MERMS_PROVIDERS_LOGIN;
// $data['mlog'] = $mlog; // $data['mlog'] = $mlog;
// $data['member_id'] = $_SESSION['member_id']; // $data['member_id'] = $_SESSION['member_id'];
$this->load->model('backend_model'); $this->load->model('backend_model');
$out = array(); $out = array();
$res = $this->backend_model->mermsemr_api($data, $out); $res = $this->backend_model->mermsemr_api($data, $out);
$loginReturn = false; $loginReturn = false;
if ( $res==PHP_LOGIN_OK && isset($out["practice_id"]) && $out["practice_id"] > 0 ){ if ($res == PHP_LOGIN_OK && isset($out["practice_id"]) && $out["practice_id"] > 0) {
$_SESSION['session_id'] = $out['sessionid']; // "";
$_SESSION['username'] = $out['username']; // "";
$_SESSION['session_id'] =$out['sessionid']; // ""; $_SESSION['practice_name'] = $out['practice_name'];
$_SESSION['username'] = $out['username']; // ""; $_SESSION['practice_code'] = "IFE0001A";
$_SESSION['practice_name'] = $out['practice_name']; $_SESSION['user_firstname'] = $out['firstname'];
$_SESSION['practice_code'] = "IFE0001A"; $_SESSION['user_lastname'] = $out['lastname'];
$_SESSION['user_firstname'] = $out['firstname']; $_SESSION['user_email'] = $out['email'];
$_SESSION['user_lastname'] = $out['lastname']; $_SESSION['user_id'] = $out['user_id'];
$_SESSION['user_email'] = $out['email']; $_SESSION['practice_id'] = $out['practice_id'];
$_SESSION['user_id'] = $out['user_id']; $_SESSION['user_provider'] = "1";
$_SESSION['practice_id'] = $out['practice_id']; $_SESSION['user_admin'] = "1";
$_SESSION['user_provider'] = "1";
$_SESSION['user_admin'] = "1";
$loginReturn = true; $loginReturn = true;
} else {
$data['error_message'] = "Invalid Username or Password";
} }
else {
$data['error_message']="Invalid Username or Password";
}
return $loginReturn; return $loginReturn;
} }
@@ -155,7 +151,6 @@ class MER_Controller extends CI_Controller {
return $str; return $str;
} }
protected function sql_escape_func($inp) { protected function sql_escape_func($inp) {
@@ -193,8 +188,6 @@ class MER_Controller extends CI_Controller {
//$this->load->view('users/view_external_footer'); //$this->load->view('users/view_external_footer');
} }
protected function readFixedText($text_key) { protected function readFixedText($text_key) {
$page_key = trim($text_key); $page_key = trim($text_key);
@@ -247,19 +240,16 @@ class MER_Controller extends CI_Controller {
return $query->result(); return $query->result();
} }
protected function renderProviderSecurePage($page_name, $data) { protected function renderProviderSecurePage($page_name, $data) {
// you dont have bussines here if you are not in session // you dont have bussines here if you are not in session
if (!isset($_SESSION['session_id']) or ! isset($_SESSION['username']) or $_SESSION['username'] == '') { if (!isset($_SESSION['session_id']) or ! isset($_SESSION['username']) or $_SESSION['username'] == '') {
redirect(logout); redirect(logout);
} }
$this->load->view('template/provider_header', $data); $this->load->view('template/provider_header', $data);
$this->load->view('provider/' . $page_name, $data); $this->load->view('provider/' . $page_name, $data);
$this->load->view('template/provider_footer', $data); $this->load->view('template/provider_footer', $data);
} }
} }
providerwww/application/models/Encounter_model.php
+2 -2
View File
@@ -8,7 +8,7 @@ class Encounter_model extends CI_Model {
public function getEncounterList() { public function getEncounterList() {
$mysql = "SELECT pe.primary_complain AS reason, pe.appt_date AS appt,m.firstname,m.lastname,'F' AS gender , '35' AS age, pe.id,pe.id AS encounter_id FROM patient_encounters pe LEFT JOIN members m ON m.id=pe.member_id"; $mysql = "SELECT pe.member_id AS patient_id, pe.primary_complain AS reason, to_char(pe.appt_date, 'Day Mon DD HH12:MI') AS appt,m.firstname,m.lastname,'F' AS gender , '35' AS age, pe.id,pe.id AS encounter_id FROM patient_encounters pe LEFT JOIN members m ON m.id=pe.member_id";
$query = $this->db->query($mysql); $query = $this->db->query($mysql);
$num = $query->num_rows(); $num = $query->num_rows();
$data["encounter_list"] = $query->result(); $data["encounter_list"] = $query->result();
@@ -17,7 +17,7 @@ class Encounter_model extends CI_Model {
public function LoadEncounter($practice_id, $patient_id) { public function LoadEncounter($practice_id, $patient_id) {
$mysql = "SELECT pe.primary_complain AS reason, pe.appt_date AS appt,m.firstname,m.lastname,'F' AS gender , '35' AS age, pe.id,pe.id AS encounter_id FROM patient_encounters pe LEFT JOIN members m ON m.id=pe.member_id"; $mysql = "SELECT pe.member_id AS patient_id, pe.primary_complain AS reason, to_char(pe.appt_date, 'Day Mon DD HH12:MI') AS appt,m.firstname,m.lastname,'F' AS gender , '35' AS age, pe.id,pe.id AS encounter_id FROM patient_encounters pe LEFT JOIN members m ON m.id=pe.member_id";
$query = $this->db->query($mysql); $query = $this->db->query($mysql);
$num = $query->num_rows(); $num = $query->num_rows();
$data["patient_return"] = $query->result(); $data["patient_return"] = $query->result();
providerwww/application/models/Patient_model.php
+4 -5
View File
@@ -8,8 +8,8 @@ class Patient_model extends CI_Model {
public function getPatientList() { public function getPatientList() {
$mysql = "SELECT p.practice_id,p.id AS patient_id,p.member_id,p.long_id,m.firstname,m.lastname,m.phone,p.added " $mysql = "SELECT p.practice_id,p.id AS patient_id,p.member_id,p.long_id,m.firstname,m.lastname,m.phone,p.added::date "
. " FROM patients p LEFT JOIN members m ON m.id=p.member_id ORDER BY p.added DESC"; . " FROM patients p LEFT JOIN members m ON m.id=p.member_id WHERE p.practice_id=" . $_SESSION['practice_id'] . " ORDER BY p.added DESC";
$query = $this->db->query($mysql); $query = $this->db->query($mysql);
$num = $query->num_rows(); $num = $query->num_rows();
$data["patient_list"] = $query->result(); $data["patient_list"] = $query->result();
@@ -18,8 +18,8 @@ class Patient_model extends CI_Model {
public function LoadPatient($practice_id, $patient_id) { public function LoadPatient($practice_id, $patient_id) {
$mysql = "SELECT p.practice_id,p.id AS patient_id,p.member_id,p.long_id,m.firstname,m.lastname,m.phone,p.added,m.email " $mysql = "SELECT p.practice_id,p.id AS patient_id,p.member_id,p.long_id,m.firstname,m.lastname,m.phone,p.added::date,m.email "
. " FROM patients p LEFT JOIN members m ON m.id=p.member_id WHERE p.id=" . $patient_id; . " FROM patients p LEFT JOIN members m ON m.id=p.member_id WHERE p.id=" . $patient_id . " AND p.practice_id=" . $_SESSION['practice_id'];
$query = $this->db->query($mysql); $query = $this->db->query($mysql);
$num = $query->num_rows(); $num = $query->num_rows();
$data["patient_return"] = $query->result(); $data["patient_return"] = $query->result();
@@ -27,4 +27,3 @@ class Patient_model extends CI_Model {
} }
} }
providerwww/application/views/provider/components/encounter_listing.php
+3 -3
View File
@@ -14,11 +14,11 @@ $icc = 0;
</div> </div>
</div> </div>
<div class="col-11"> <div class="col-11">
<small class="d-block mb-1"><?= $prow->firstname ?> <?= $prow->lastname ?></small> <small class="d-block mb-1"><?= $prow->reason ?></small>
<h5 class="mb-0"><a href="#"><?= $prow->reason ?></a></h5> <h5 class="mb-0"><a href="/patient/selectPatient/<?=$prow->patient_id?>"><?= $prow->firstname ?> <?= $prow->lastname ?></a></h5>
<ul class="list-unstyled list-inline"> <ul class="list-unstyled list-inline">
<li class="list-inline-item"> <li class="list-inline-item">
<small> Created by Lizzy Halfman</small> <small>Lizzy Halfman</small>
</li> </li>
<li class="list-inline-item">|</li> <li class="list-inline-item">|</li>
<li class="list-inline-item"> <li class="list-inline-item">
providerwww/application/views/provider/components/patient_listing.php
+1 -1
View File
@@ -35,7 +35,7 @@
<tr> <tr>
<td><?= $icc ?></td> <td><?= $icc ?></td>
<td><?= $prow->firstname ?> <?= $prow->lastname ?></td> <td><a href="/patient/selectPatient/<?=$prow->patient_id ?>"><?= $prow->firstname ?> <?= $prow->lastname ?></a></td>
<td><?= $prow->phone ?></td> <td><?= $prow->phone ?></td>
<td><a href="/patient/chart/<?= $prow->patient_id ?>"><button type="button" class="btn btn-info btn-sm">Chart</button></a></td> <td><a href="/patient/chart/<?= $prow->patient_id ?>"><button type="button" class="btn btn-info btn-sm">Chart</button></a></td>
<td><span class="badge badge-success-inverse">Active</span></td> <td><span class="badge badge-success-inverse">Active</span></td>
providerwww/application/views/provider/dash.php
+3 -3
View File
@@ -20,7 +20,7 @@
<div class="row"> <div class="row">
<div class="col-lg-6 col-xxl-4 m-b-30"> <div class="col-lg-6 col-xxl-4 m-b-30">
<div class="card card-statistics h-100 mb-0"> <div class="card card-statistics h-100 mb-0">
<div class="card-header d-flex justify-content-between"> <div class="card-header d-flex justify-content-between">
<div class="card-heading"> <div class="card-heading">
@@ -37,7 +37,7 @@
</div> </div>
</div> </div>
</div> </div>
<div class="col-lg-6 col-xxl-4 m-b-30"> <div class="col-lg-6 col-xxl-2 m-b-30">
<div class="card card-statistics h-100 mb-0"> <div class="card card-statistics h-100 mb-0">
<div class="card-header d-flex justify-content-between"> <div class="card-header d-flex justify-content-between">
<div class="card-heading"> <div class="card-heading">
@@ -112,7 +112,7 @@
</div> </div>
</div> </div>
</div> </div>
<div class="col-xxl-4 m-b-30"> <div class="col-xxl-6 m-b-30">
<? include 'components/patient_listing.php'; ?> <? include 'components/patient_listing.php'; ?>
</div> </div>
providerwww/application/views/provider/patient/newpatient.php
+33 -11
View File
@@ -43,6 +43,28 @@
</div> </div>
</div> </div>
<div class="form-row">
<div class="form-group col-md-6">
<label for="inputEmail4">DOB</label>
<input type="text" class="form-control date-picker-default" value="" name="dob">
</div>
<div class="form-group col-md-6">
<label for="inputPassword4">Gendar</label>
<select class="form-control" aria-label="Default select example">
<option selected>Open this select menu</option>
<option value="1">One</option>
<option value="2">Two</option>
<option value="3">Three</option>
</select>
</div>
</div>
<div class="form-row"> <div class="form-row">
<div class="form-group col-md-6"> <div class="form-group col-md-6">
<label for="inputEmail4">Email</label> <label for="inputEmail4">Email</label>
@@ -102,7 +124,7 @@
</div> </div>
</div> </div>
<div class="col-xxl-4 m-b-30"> <div class="col-xxl-3 m-b-30">
<div class="card card-statistics h-40 mb-0"> <div class="card card-statistics h-40 mb-0">
<div class="card-header d-flex justify-content-between"> <div class="card-header d-flex justify-content-between">
<div class="card-heading"> <div class="card-heading">
@@ -122,11 +144,11 @@
</div> </div>
</div> </div>
<div class="form-row"> <div class="form-row">
<div class="form-group col-md-9"> <div class="form-group col-md-6">
<div id="link_result">[]</div> <div id="link_result">[]</div>
</div> </div>
<div class="form-group col-md-3"> <div class="form-group col-md-6">
<button type="submit" id="link_submit" class="btn btn-primary" onclick="return connectLinkID()">Link Patient</button> <button type="submit" id="link_submit" class="btn btn-primary btn-block" onclick="return connectLinkID()">Link Patient</button>
</div> </div>
</div> </div>
</form> </form>
@@ -136,7 +158,7 @@
</div> </div>
<div class="col-xxl-4 m-b-30"> <div class="col-xxl-5 m-b-30">
<? include 'application/views/provider/components/patient_listing.php'; ?> <? include 'application/views/provider/components/patient_listing.php'; ?>
</div> </div>
@@ -156,13 +178,13 @@
<!-- begin footer --> <!-- begin footer -->
<script type="text/javascript"> <script type="text/javascript">
<!-- <!--
function connectLinkID() { function connectLinkID() {
var patient_link_id = document.linkform.patient_link_id.value; var patient_link_id = document.linkform.patient_link_id.value;
// alert(patient_link_id); // alert(patient_link_id);
if (patient_link_id === '' ) { if (patient_link_id === '') {
alert('You must enter valid linkID to continue!'); alert('You must enter valid linkID to continue!');
return false; return false;
} }
@@ -179,6 +201,6 @@
}); });
return false; return false;
} }
// --> // -->
</script> </script>