Skip to content

I
IPok_Web
Commit fe4778cd by Jemsheer K D
Options

Merge branch 'master' into client

parents e2c6455d 438165b3
Showing with 13 additions and 12 deletions
admin/application/controllers/Webservice.php
...@@ -5275,7 +5275,7 @@ class Webservice extends CI_Controller { ...@@ -5275,7 +5275,7 @@ class Webservice extends CI_Controller {
if(isset($headers['Auth']) && strlen($headers['Auth'])) { if(isset($headers['Auth']) && strlen($headers['Auth'])) {
$check_authToken = $this->Webservice_model->check_auth_token_doctor($headers['Auth']); $check_authToken = $this->Webservice_model->check_auth_token_doctor($headers['Auth']);
if($check_authToken){ if($check_authToken){
if(isset($_GET['notification_id']) && strlen(trim($_GET['notification_id']," ")) > 0 && isset($_GET['status']) && strlen(trim($_GET['status']," ")) > 0 ) { if(isset($_GET['notification_id']) && strlen(trim($_GET['notification_id']," ")) > 0 && isset($_GET['status']) ) {
$result = $this->Webservice_model->set_doctor_notification_status($data); $result = $this->Webservice_model->set_doctor_notification_status($data);
if($result == true){ if($result == true){
$res = array( $res = array(
......
admin/application/models/Webservice_model.php
...@@ -1915,21 +1915,20 @@ CASE when tbl_doctors.gender='0' then 'MALE' when tbl_doctors.gender='1' then 'F ...@@ -1915,21 +1915,20 @@ CASE when tbl_doctors.gender='0' then 'MALE' when tbl_doctors.gender='1' then 'F
$med_data = $this->db->get_where('tbl_medical_records',array('id'=>$data['medical_record_id']))->row(); $med_data = $this->db->get_where('tbl_medical_records',array('id'=>$data['medical_record_id']))->row();
if($med_data->patient_review != ''){ if($med_data->patient_review != ''){
$this->db->update('tbl_medical_records',array('patient_review'=>encrypt_data($data['review'])),array('id'=>$data['medical_record_id'])); $this->db->update('tbl_medical_records',array('patient_review'=>encrypt_data($data['review'])),array('id'=>$data['medical_record_id']));
$revw_data = $this->db->get_where('tbl_review',array('booking_id'=>$med_data['booking_id']))->row(); $revw_data = $this->db->get_where('tbl_review',array('booking_id'=>$med_data->booking_id))->row();
$this->db->update('tbl_review',array('review'=>$data['review']),array('booking_id'=>$med_data['booking_id'])); $this->db->update('tbl_review',array('review'=>$data['review']),array('booking_id'=>$med_data->booking_id));
$insertid = $revw_data->id; $insertid = $revw_data->review_id;
}else{ }else{
$this->db->update('tbl_medical_records',array('patient_review'=>encrypt_data($data['review'])),array('id'=>$data['medical_record_id'])); $this->db->update('tbl_medical_records',array('patient_review'=>encrypt_data($data['review'])),array('id'=>$data['medical_record_id']));
unset($data['medical_record_id']); unset($data['medical_record_id']);
$this->db->insert('tbl_review',$data); $this->db->insert('tbl_review',array('doctor_id'=>$data['doctor_id'],'reviewer_id'=>$rslt->userid,'review'=>$data['review'],'date'=>$data['date'],'booking_id'=>$med_data->booking_id));
$insertid = $this->db->insert_id(); $insertid = $this->db->insert_id();
} }
} }
}
$this->db->insert('tbl_doctor_notifications',array('doctor_id'=>$data['doctor_id'],'type'=>'1','message'=>$msg,'time'=>$data['date'],'read_status'=>'0')); if($this->db->insert('tbl_doctor_notifications',array('doctor_id'=>$data['doctor_id'],'type'=>'1','message'=>$msg,'time'=>$data['date'],'read_status'=>'0'))){
$doctor_insert_id = $this->db->insert_id(); $doctor_insert_id = $this->db->insert_id();
$fcm_doctor = $this->db->get_where('tbl_authtoken_doctors',array('doctor_id'=>$data['doctor_id']))->row(); $fcm_doctor = $this->db->get_where('tbl_authtoken_doctors',array('doctor_id'=>$data['doctor_id']))->row();
...@@ -1940,13 +1939,15 @@ CASE when tbl_doctors.gender='0' then 'MALE' when tbl_doctors.gender='1' then 'F ...@@ -1940,13 +1939,15 @@ CASE when tbl_doctors.gender='0' then 'MALE' when tbl_doctors.gender='1' then 'F
$news['to'] = $fcm_doctor->fcm_token; $news['to'] = $fcm_doctor->fcm_token;
$doctor_type = '2'; $doctor_type = '2';
$doctor_push = $this->push_sent($news,$doctor_type); $doctor_push = $this->push_sent($news,$doctor_type);
if($doctor_push){
$res = array("status"=>"success","msg" =>"Insertion Success",'data'=>array('id'=>$insertid,'review'=>$data['review'])); $res = array("status"=>"success","msg" =>"Insertion Success",'data'=>array('id'=>$insertid,'review'=>$data['review']));
} }
else{ else{
$res = array("status"=>"failed","msg" =>"Insertion failed"); $res = array("status"=>"failed","msg" =>"Insertion failed");
} }
}else{ }else{
$res = array("status"=>"failed","msg" =>"Medical Record Id Doesnot Exist");
}
}else{
$res = array("status"=>"failed","msg" =>"Invalid Auth token"); $res = array("status"=>"failed","msg" =>"Invalid Auth token");
} }
return $res; return $res;
...@@ -2300,7 +2301,7 @@ CASE when tbl_doctors.gender='0' then 'MALE' when tbl_doctors.gender='1' then 'F ...@@ -2300,7 +2301,7 @@ CASE when tbl_doctors.gender='0' then 'MALE' when tbl_doctors.gender='1' then 'F
$res = $this->db->get()->result(); $res = $this->db->get()->result();
foreach ($res as $key => $values) { foreach ($res as $key => $values) {
$new_fee = $values->fee - ($values->fee * $query->amount/100); $new_fee = $values->fee - ($values->fee * $query->amount/100);
$values->fee = $new_fee; $values->fee = (string)$new_fee;
$new_array[] = $values; $new_array[] = $values;
} }
$result = array("status"=>"success","data"=>$new_array); $result = array("status"=>"success","data"=>$new_array);
......
application/controllers/Patient.php
...@@ -710,7 +710,7 @@ public function record() ...@@ -710,7 +710,7 @@ public function record()
$doctor_data = $this->Doctor_model->get_single_doctor($booking_details['doc_id']); $doctor_data = $this->Doctor_model->get_single_doctor($booking_details['doc_id']);
$patient_data = $this->Patient_model->get_single_patient($booking_details['pat_id']); $patient_data = $this->Patient_model->get_single_patient($booking_details['pat_id']);
//echo "<pre>";print_r($record_data);echo "<br>";
$record_data['diseases'] = json_decode(decrypt_data($record_data['diseases'])); $record_data['diseases'] = json_decode(decrypt_data($record_data['diseases']));
$record_data['prescribtions'] = json_decode(decrypt_data($record_data['prescribtions'])); $record_data['prescribtions'] = json_decode(decrypt_data($record_data['prescribtions']));
$record_data['exams'] = json_decode(decrypt_data($record_data['exams'])); $record_data['exams'] = json_decode(decrypt_data($record_data['exams']));
...@@ -718,7 +718,7 @@ public function record() ...@@ -718,7 +718,7 @@ public function record()
$record_data['letters'] = json_decode(decrypt_data($record_data['letters'])); $record_data['letters'] = json_decode(decrypt_data($record_data['letters']));
//print_r($record_data);die(); //echo "<pre>";print_r($record_data);die();
$template['page'] = "patient_dash_service_summary"; $template['page'] = "patient_dash_service_summary";
$template['page_title'] = "Record"; $template['page_title'] = "Record";
$template['record_data'] = $record_data; $template['record_data'] = $record_data;
......
application/views/patient_dash_service_summary.php
...@@ -56,7 +56,7 @@ ...@@ -56,7 +56,7 @@
<div class="tab-content"> <div class="tab-content">
<div class="ip_profile_tab_top p0"> <div class="ip_profile_tab_top p0">
<div class="ip_profile_tab_name"> <div class="ip_profile_tab_name">
<h3><?php if(!empty($record_data['main_complaint'])) echo $record_data['main_complaint'];?></h3> <h3><?php if(!empty($record_data['main_complaint'])) echo decrypt_data($record_data['main_complaint']);?></h3>
</div> </div>
<div class="clear"></div> <div class="clear"></div>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment