diff --git a/application/config/database.php b/application/config/database.php
index 0127f52..5627973 100644
--- a/application/config/database.php
+++ b/application/config/database.php
@@ -74,13 +74,35 @@ defined('BASEPATH') OR exit('No direct script access allowed');
 $active_group = 'default';
 $query_builder = TRUE;
 
+// $db['default'] = array(
+// 	'dsn'	   => '',
+// 	'hostname' => 'localhost',
+// 	'username' => 'root',
+// 	'password' => '',
+// 	'database' => 'db_saturssa',
+// 	'dbdriver' => 'mysqli',
+// 	'dbprefix' => '',
+// 	'pconnect' => FALSE,
+// 	'db_debug' => (ENVIRONMENT !== 'production'),
+// 	'cache_on' => FALSE,
+// 	'cachedir' => '',
+// 	'char_set' => 'utf8',
+// 	'dbcollat' => 'utf8_general_ci',
+// 	'swap_pre' => '',
+// 	'encrypt'  => FALSE,
+// 	'compress' => FALSE,
+// 	'stricton' => FALSE,
+// 	'failover' => array(),
+// 	'save_queries' => TRUE
+// );
+
 $db['default'] = array(
 	'dsn'	   => '',
-	'hostname' => 'localhost',
-	'username' => 'root',
-	'password' => '',
+	'hostname' => '10.10.150.135',
+	'username' => 'postgres',
+	'password' => 'itikom123',
 	'database' => 'db_saturssa',
-	'dbdriver' => 'mysqli',
+	'dbdriver' => 'postgre',
 	'dbprefix' => '',
 	'pconnect' => FALSE,
 	'db_debug' => (ENVIRONMENT !== 'production'),
@@ -93,7 +115,9 @@ $db['default'] = array(
 	'compress' => FALSE,
 	'stricton' => FALSE,
 	'failover' => array(),
-	'save_queries' => TRUE
+	'save_queries' => TRUE,
+	'port' => 5432,
+	'init_command' => "SET TIME ZONE 'Asia/Jakarta'"
 );
 
 $db['saturssa'] = array(
@@ -142,6 +166,50 @@ $db['datasim'] = array(
     'save_queries' => TRUE
 );
 
+$db['datagomed'] = array(
+    'dsn'    => '',
+    'hostname' => '10.10.123.163',
+    'username' => 'stim',
+    'password' => 'stim*RS54',
+    'database' => 'gomed_db',
+    'dbdriver' => 'postgre',
+    'dbprefix' => '',
+    'pconnect' => FALSE,
+    'db_debug' => (ENVIRONMENT !== 'production'),
+    'cache_on' => FALSE,
+    'cachedir' => '',
+    'char_set' => 'utf8',
+    'dbcollat' => 'utf8_general_ci',
+    'swap_pre' => '',
+    'encrypt' => FALSE,
+    'compress' => FALSE,
+    'stricton' => FALSE,
+    'failover' => array(),
+    'save_queries' => TRUE
+);
+
+$db['dataradiologi'] = array(
+	'dsn'	   => '',
+	'hostname' => '10.10.123.141',
+	'username' => 'simrs',
+	'password' => 'RISadmin@2022',
+	'database' => 'fk_radiology',
+	'dbdriver' => 'mysqli',
+	'dbprefix' => '',
+	'pconnect' => FALSE,
+	'db_debug' => (ENVIRONMENT !== 'production'),
+	'cache_on' => FALSE,
+	'cachedir' => '',
+	'char_set' => 'utf8',
+	'dbcollat' => 'utf8_general_ci',
+	'swap_pre' => '',
+	'encrypt'  => FALSE,
+	'compress' => FALSE,
+	'stricton' => FALSE,
+	'failover' => array(),
+	'save_queries' => TRUE
+);
+
 // $db['default']['hostname'] = 'localhost';
 // $db['default']['username'] = 'root';
 // $db['default']['password'] = '';
diff --git a/application/controllers/lp_gomed_report.php b/application/controllers/lp_gomed_report.php
new file mode 100644
index 0000000..eb42825
--- /dev/null
+++ b/application/controllers/lp_gomed_report.php
@@ -0,0 +1,127 @@
+<?php
+
+class Lp_gomed_report extends CI_Controller {
+    
+//-----------start variables for check action access----------//
+    public $vartambah   = null;
+    public $varedit     = null;
+    public $vardelete   = null;
+    public $varview     = null;
+
+    public $parent      = 'GOMED';
+    public $title       = 'REPORT';
+    public $link        = 'Lp_gomed_report';
+    public $index       = 'index.php/Lp_gomed_report';
+    public $maincontent = 'gomed/report/';
+    public $idmenu      = '50';
+
+//-----------start variables for check action access----------//
+    
+    function __construct(){
+		parent::__construct();
+		$this->check_isvalidated();
+        $this->load->helper(array('form', 'date'));        
+	}
+    private function check_isvalidated(){
+	   if(! $this->session->userdata('validated')){
+	       redirect('index.php/ps_login');
+        }
+//--------------start check access this form page-------------//
+        $this->db->where('am_fk_rolegroup_id', $this->session->userdata('s_IDRoleGroup'));
+        $this->db->where('am_fk_menu_id', $this->idmenu);
+        $this->db->where('am_access', 1);
+        $cekMenu = $this->db->get('access_menu');
+        $rowcount = $cekMenu->num_rows();
+        if($rowcount==0){
+            redirect('index.php');
+        }else{
+            foreach ($cekMenu->result() as $cm)
+                {
+                    $this->vartambah= $cm->am_create;
+                    $this->varedit  = $cm->am_edit;
+                    $this->vardelete= $cm->am_delete;
+                    $this->varview  = $cm->am_view;
+                }
+        }
+//--------------end check access this form page-------------//
+    }
+
+//----------------------------------------------------------------PLEBITIS
+    public function antreanmjknonsite(){
+        $data['title']          = "GOMED - REPORT M-JKN / ONSITE";
+        $data['parent']         = $this->parent;
+        $data['link']           = $this->link;
+        $data['main_content']   = $this->maincontent."/mjkn/v_mjkn";
+        if(isset($_POST['tanggal'])) {
+            $dateall    = $this->input->post('tanggal');
+            $pisah      = explode ("-", $dateall);
+            $awal       = date("Y-m-d", strtotime($pisah[0]));
+            $akhir      = date("Y-m-d", strtotime($pisah[1]));
+        }else{
+            $awal       = date("Y-m-d");
+            $akhir      = date("Y-m-d");
+        }
+        $data['awal']       = $awal;
+        $data['akhir']      = $akhir;
+        
+        $this->load->model('m_gomed_report_lp');
+        $mjknall = $this->m_gomed_report_lp->mjkn();
+        $this->load->vars('mjknall', $mjknall);
+
+        $this->load->model('m_gomed_report_lp');
+        $onsiteall = $this->m_gomed_report_lp->onsite();
+        $this->load->vars('onsiteall', $onsiteall);
+
+        $this->load->view('includes/template', $data);
+    }
+
+    public function antreanmjkndetail(){
+        $data['title']          = "GOMED - REPORT M-JKN DETAIL";
+        $data['parent']         = $this->parent;
+        $data['link']           = $this->link;
+        $data['main_content']   = $this->maincontent."/detail/v_mjkn_detail";
+        if(isset($_POST['tanggal'])) {
+            $dateall    = $this->input->post('tanggal');
+            $pisah      = explode ("-", $dateall);
+            $awal       = date("Y-m-d", strtotime($pisah[0]));
+            $akhir      = date("Y-m-d", strtotime($pisah[1]));
+        }else{
+            $awal       = date("Y-m-d");
+            $akhir      = date("Y-m-d");
+        }
+        $data['awal']       = $awal;
+        $data['akhir']      = $akhir;
+        
+        $this->load->model('m_gomed_report_lp');
+        $mjkndetail = $this->m_gomed_report_lp->mjkn_detail();
+        $this->load->vars('mjkndetail', $mjkndetail);
+
+        $this->load->view('includes/template', $data);
+    }
+
+    public function antreanmonsitedetail(){
+        $data['title']          = "GOMED - REPORT ONSITE DETAIL";
+        $data['parent']         = $this->parent;
+        $data['link']           = $this->link;
+        $data['main_content']   = $this->maincontent."/detail/v_onsite_detail";
+        if(isset($_POST['tanggal'])) {
+            $dateall    = $this->input->post('tanggal');
+            $pisah      = explode ("-", $dateall);
+            $awal       = date("Y-m-d", strtotime($pisah[0]));
+            $akhir      = date("Y-m-d", strtotime($pisah[1]));
+        }else{
+            $awal       = date("Y-m-d");
+            $akhir      = date("Y-m-d");
+        }
+        $data['awal']       = $awal;
+        $data['akhir']      = $akhir;
+        
+        $this->load->model('m_gomed_report_lp');
+        $onsitedetail = $this->m_gomed_report_lp->onsite_detail();
+        $this->load->vars('onsitedetail', $onsitedetail);
+
+        $this->load->view('includes/template', $data);
+    }
+}
+
+?>
\ No newline at end of file
diff --git a/application/controllers/lp_simrs_report.php b/application/controllers/lp_simrs_report.php
index a7fcef5..fded96d 100644
--- a/application/controllers/lp_simrs_report.php
+++ b/application/controllers/lp_simrs_report.php
@@ -13,7 +13,7 @@ class Lp_simrs_report extends CI_Controller {
     public $link        = 'Lp_simrs_report';
     public $index       = 'index.php/Lp_simrs_report';
     public $maincontent = 'simrs/report/';
-    public $idmenu      = '27';
+    public $idmenu      = '1';
 
 //-----------start variables for check action access----------//
     
@@ -100,6 +100,7 @@ class Lp_simrs_report extends CI_Controller {
         $data['parent']         = $this->parent;
         $data['link']           = $this->link;
         $data['main_content']   = $this->maincontent."/rm/v_icd9";
+        //$data['main_content']   = $this->maincontent."/pasiendetailicd9/v_pasiendetailicd9";
         if(isset($_POST['tanggal'])) {
             $dateall    = $this->input->post('tanggal');
             $pisah      = explode ("-", $dateall);
@@ -112,6 +113,9 @@ class Lp_simrs_report extends CI_Controller {
         $data['awal']       = $awal;
         $data['akhir']      = $akhir;
         
+        // $this->load->model('m_simrs_report_lp');
+        // $pasiendetail = $this->m_simrs_report_lp->pasiendetailicd9();
+        // $this->load->vars('pasiendetail', $pasiendetail);
         $this->load->model('m_simrs_report_lp');
         $icd9 = $this->m_simrs_report_lp->icd9();
         $this->load->vars('icd9', $icd9);
@@ -422,6 +426,236 @@ class Lp_simrs_report extends CI_Controller {
 
         $this->load->view('includes/template', $data);
     }
+
+    public function rajalrekap(){
+        $data['title']          = "SIMRS - REPORT REKAP RAJAL";
+        $data['parent']         = $this->parent;
+        $data['link']           = $this->link;
+        $data['main_content']   = $this->maincontent."/rekap/v_rekaprajal";
+        if(isset($_POST['tanggal'])) {
+            $dateall    = $this->input->post('tanggal');
+            $pisah      = explode ("-", $dateall);
+            $awal       = date("Y-m-d", strtotime($pisah[0]));
+            $akhir      = date("Y-m-d", strtotime($pisah[1]));
+        }else{
+            $awal       = date("Y-m-d");
+            $akhir      = date("Y-m-d");
+        }
+        $data['awal']       = $awal;
+        $data['akhir']      = $akhir;
+        
+        $this->load->model('m_simrs_report_lp');
+        $datarajal = $this->m_simrs_report_lp->rajalrekap();
+        $this->load->vars('datarajal', $datarajal);
+
+        $this->load->view('includes/template', $data);
+    }
+
+    public function ranaprekap(){
+        $data['title']          = "SIMRS - REPORT REKAP RANAP";
+        $data['parent']         = $this->parent;
+        $data['link']           = $this->link;
+        $data['main_content']   = $this->maincontent."/rekap/v_rekapranap";
+        if(isset($_POST['tanggal'])) {
+            $dateall    = $this->input->post('tanggal');
+            $pisah      = explode ("-", $dateall);
+            $awal       = date("Y-m-d", strtotime($pisah[0]));
+            $akhir      = date("Y-m-d", strtotime($pisah[1]));
+        }else{
+            $awal       = date("Y-m-d");
+            $akhir      = date("Y-m-d");
+        }
+        $data['awal']       = $awal;
+        $data['akhir']      = $akhir;
+        
+        $this->load->model('m_simrs_report_lp');
+        $ranaprekap = $this->m_simrs_report_lp->ranaprekap();
+        $this->load->vars('dataranap', $ranaprekap);
+
+        $this->load->view('includes/template', $data);
+    }
+
+    public function orderpenunjangrajal(){
+        $data['title']          = "SIMRS - REPORT ORDER PENUNJANG LAB PK RAWAT JALAN";
+        $data['parent']         = $this->parent;
+        $data['link']           = $this->link;
+        $data['main_content']   = $this->maincontent."/penunjangrajal/v_penunjangrajal";
+        if(isset($_POST['tanggal'])) {
+            $dateall    = $this->input->post('tanggal');
+            $pisah      = explode ("-", $dateall);
+            $awal       = date("Y-m-d", strtotime($pisah[0]));
+            $akhir      = date("Y-m-d", strtotime($pisah[1]));
+        }else{
+            $awal       = date("Y-m-d");
+            $akhir      = date("Y-m-d");
+        }
+        $data['awal']       = $awal;
+        $data['akhir']      = $akhir;
+        
+        $this->load->model('m_simrs_report_lp');
+        $databill = $this->m_simrs_report_lp->orderlabpk();
+        $this->load->vars('databill', $databill);
+
+        $this->load->view('includes/template', $data);
+    }
+
+    public function orderpenunjangranap(){
+        $data['title']          = "SIMRS - REPORT ORDER PENUNJANG LAB PK RAWAT INAP";
+        $data['parent']         = $this->parent;
+        $data['link']           = $this->link;
+        $data['main_content']   = $this->maincontent."/penunjangranap/v_penunjangranap";
+        if(isset($_POST['tanggal'])) {
+            $dateall    = $this->input->post('tanggal');
+            $pisah      = explode ("-", $dateall);
+            $awal       = date("Y-m-d", strtotime($pisah[0]));
+            $akhir      = date("Y-m-d", strtotime($pisah[1]));
+        }else{
+            $awal       = date("Y-m-d");
+            $akhir      = date("Y-m-d");
+        }
+        $data['awal']       = $awal;
+        $data['akhir']      = $akhir;
+        
+        $this->load->model('m_simrs_report_lp');
+        $databill = $this->m_simrs_report_lp->orderlabpkranap();
+        $this->load->vars('databill', $databill);
+
+        $this->load->view('includes/template', $data);
+    }
+
+    public function orderfarmasirajal(){
+        $data['title']          = "SIMRS - REPORT ORDER FARMASI RAWAT JALAN";
+        $data['parent']         = $this->parent;
+        $data['link']           = $this->link;
+        $data['main_content']   = $this->maincontent."/farmasirajal/v_farmasirajal";
+        if(isset($_POST['tanggal'])) {
+            $dateall    = $this->input->post('tanggal');
+            $pisah      = explode ("-", $dateall);
+            $awal       = date("Y-m-d", strtotime($pisah[0]));
+            $akhir      = date("Y-m-d", strtotime($pisah[1]));
+        }else{
+            $awal       = date("Y-m-d");
+            $akhir      = date("Y-m-d");
+        }
+        $data['awal']       = $awal;
+        $data['akhir']      = $akhir;
+        
+        $this->load->model('m_simrs_report_lp');
+        $databill = $this->m_simrs_report_lp->orderfarmasirajal();
+        $this->load->vars('databill', $databill);
+
+        $this->load->model('m_simrs_report_lp');
+        $dataobat = $this->m_simrs_report_lp->dataobat();
+        $this->load->vars('dataobat', $dataobat);
+
+        $this->load->view('includes/template', $data);
+    }
+
+    public function orderfarmasiranap(){
+        $data['title']          = "SIMRS - REPORT ORDER FARMASI RAWAT INAP";
+        $data['parent']         = $this->parent;
+        $data['link']           = $this->link;
+        $data['main_content']   = $this->maincontent."/farmasiranap/v_farmasiranap";
+        if(isset($_POST['tanggal'])) {
+            $dateall    = $this->input->post('tanggal');
+            $pisah      = explode ("-", $dateall);
+            $awal       = date("Y-m-d", strtotime($pisah[0]));
+            $akhir      = date("Y-m-d", strtotime($pisah[1]));
+        }else{
+            $awal       = date("Y-m-d");
+            $akhir      = date("Y-m-d");
+        }
+        $data['awal']       = $awal;
+        $data['akhir']      = $akhir;
+        
+        $this->load->model('m_simrs_report_lp');
+        $databill = $this->m_simrs_report_lp->orderfarmasiranap();
+        $this->load->vars('databill', $databill);
+
+        $this->load->model('m_simrs_report_lp');
+        $dataobat = $this->m_simrs_report_lp->dataobat();
+        $this->load->vars('dataobat', $dataobat);
+
+        $this->load->view('includes/template', $data);
+    }
+
+    public function pasienpenunjang(){
+        $data['title']          = "SIMRS - DATA HASIL PENUNJANG PASIEN";
+        $data['parent']         = $this->parent;
+        $data['link']           = $this->link;
+        $data['main_content']   = $this->maincontent."/pasienpenunjang/v_pasienpenunjang";
+        if(isset($_POST['tanggal'])) {
+            $dateall    = $this->input->post('tanggal');
+            $pisah      = explode ("-", $dateall);
+            $awal       = date("Y-m-d", strtotime($pisah[0]));
+            $akhir      = date("Y-m-d", strtotime($pisah[1]));
+        }else{
+            $awal       = date("Y-m-d");
+            $akhir      = date("Y-m-d");
+        }
+        $data['awal']       = $awal;
+        $data['akhir']      = $akhir;
+        
+        $this->load->model('m_simrs_report_lp');
+        $datapen = $this->m_simrs_report_lp->pasienpenunjang();
+        $this->load->vars('datapen', $datapen);
+
+        // $this->load->model('m_simrs_report_lp');
+        // $dataro = $this->m_simrs_report_lp->dataradiologi();
+        // $this->load->vars('dataro', $dataro);
+
+        $this->load->view('includes/template', $data);
+    }
+
+    public function viewpasienpenunjang($idxdaftar,$nomr){
+        $data['title']          = "SIMRS - VIEW DATA HASIL PENUNJANG PASIEN";
+        $data['parent']         = $this->parent;
+        $data['link']           = $this->link;
+        $data['main_content']   = $this->maincontent."/pasienpenunjang/form_pasienpenunjang";
+
+        $this->load->model('m_simrs_report_lp');
+        $datapas = $this->m_simrs_report_lp->viewpasien($idxdaftar);
+        $this->load->vars('datapas', $datapas);
+
+        $this->load->model('m_simrs_report_lp');
+        $dataro = $this->m_simrs_report_lp->dataradiologi($nomr);
+        $this->load->vars('dataro', $dataro);
+
+        $this->load->view('includes/template', $data);
+    }
+
+    public function pencarianpasien(){
+        $data['title']          = "SIMRS - PENCARIAN HASIL PENUNJANG PASIEN";
+        $data['parent']         = $this->parent;
+        $data['link']           = $this->link;
+        $data['main_content']   = $this->maincontent."/pasienpenunjang/v_pencarianpasien";
+
+        if(isset($_POST['norekamedik'])){
+            $norekamedik       = $this->input->post('norekamedik');
+        }else{ $norekamedik       = ""; }
+
+        if(isset($_POST['namapasien'])){
+            $namapasien = $this->input->post('namapasien');
+        }else{ $namapasien = ""; }
+
+        if(isset($_POST['dokterdpjp'])){
+            $dokterdpjp = $this->input->post('dokterdpjp');
+        }else{ $dokterdpjp = ""; }
+
+        $data['norekamedik']= $norekamedik;
+        $data['namapasien'] = $namapasien;
+        $data['dokter'] = $dokterdpjp;
+        
+        $this->load->model('m_simrs_report_lp');
+        $datapen = $this->m_simrs_report_lp->pencarianpasienpenunjang();
+        $this->load->vars('datapen', $datapen);
+
+        $this->load->model('m_simrs_report_lp');
+        $dokterdpjp = $this->m_simrs_report_lp->dokterdpjp();
+        $this->load->vars('dokterdpjp', $dokterdpjp);
+
+        $this->load->view('includes/template', $data);
+    }
 }
 
 ?>
\ No newline at end of file
diff --git a/application/controllers/ps_login.php b/application/controllers/ps_login.php
index 121d1e3..39f3634 100644
--- a/application/controllers/ps_login.php
+++ b/application/controllers/ps_login.php
@@ -23,7 +23,7 @@ class Ps_login extends CI_Controller{
 	}
     public function logout(){
         $this->session->sess_destroy();
-        redirect('ps_login');
+        redirect('index.php/ps_login');
     }
 }
 ?>
\ No newline at end of file
diff --git a/application/models/m_gomed_report_lp.php b/application/models/m_gomed_report_lp.php
new file mode 100644
index 0000000..72c6e58
--- /dev/null
+++ b/application/models/m_gomed_report_lp.php
@@ -0,0 +1,94 @@
+<?php
+
+if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+
+class M_gomed_report_lp extends CI_Model {
+    function mjkn(){
+        if(isset($_POST['tanggal'])) {
+            $dateall    = $this->input->post('tanggal');
+            $pisah      = explode ("-", $dateall);
+            $awal       = date("Y-m-d", strtotime($pisah[0]));
+            $akhir      = date("Y-m-d", strtotime($pisah[1]));
+        }else{
+            $awal       = date("Y-m-d");
+            $akhir      = date("Y-m-d");
+        }
+
+        $query = $this->load->database('datagomed', TRUE);
+        $query->select('tbr.tanggal_periksa as tglperiksa, 
+            count(*) as jumlah,
+            count(*) FILTER (WHERE tbr.checkin = 1 ) AS checkin');
+        $query->where('tbr.tanggal_periksa >=', $awal);
+        $query->where('tbr.tanggal_periksa <=', $akhir);
+        $query->group_by('tbr.tanggal_periksa');
+        $query->order_by('tbr.tanggal_periksa', 'ASC');
+        return $query->get('tb_booking_registrasi as tbr')->result();    
+    }
+
+    function onsite(){
+        if(isset($_POST['tanggal'])) {
+            $dateall    = $this->input->post('tanggal');
+            $pisah      = explode ("-", $dateall);
+            $awal       = date("Y-m-d", strtotime($pisah[0]));
+            $akhir      = date("Y-m-d", strtotime($pisah[1]));
+        }else{
+            $awal       = date("Y-m-d");
+            $akhir      = date("Y-m-d");
+        }
+
+        $akhir_plus1 = date("Y-m-d", strtotime($akhir . ' +1 day'));
+
+
+        $query = $this->load->database('datagomed', TRUE);
+        $query->select("
+            to_char(tr.created_at, 'YYYY-MM-DD') AS tgl_kunjungan,
+	        count(*) as jumlah,
+            count(*) FILTER (WHERE tr.checkin = 1 ) AS checkin",false);
+        $query->from('tb_registrasi as tr');
+        $query->where('tr.created_at >=', $awal);
+        $query->where('tr.created_at <', $akhir_plus1);
+        $query->group_by("to_char(tr.created_at, 'YYYY-MM-DD')");
+        $query->order_by("tgl_kunjungan", "ASC");
+        return $query->get()->result();    
+    }
+
+    function mjkn_detail(){
+        if(isset($_POST['tanggal'])) {
+            $dateall    = $this->input->post('tanggal');
+            $pisah      = explode ("-", $dateall);
+            $awal       = date("Y-m-d", strtotime($pisah[0]));
+            $akhir      = date("Y-m-d", strtotime($pisah[1]));
+        }else{
+            $awal       = date("Y-m-d");
+            $akhir      = date("Y-m-d");
+        }
+
+        $query = $this->load->database('datagomed', TRUE);
+        $query->join('tb_task_proses',      'tb_task_proses.sid     = tb_booking_registrasi.sid', 'left');
+        $query->where('tanggal_periksa >=', $awal);
+        $query->where('tanggal_periksa <=', $akhir);
+        $query->order_by('tanggal_periksa', 'ASC');
+        return $query->get('tb_booking_registrasi')->result();    
+    }
+
+      function onsite_detail(){
+        if(isset($_POST['tanggal'])) {
+            $dateall    = $this->input->post('tanggal');
+            $pisah      = explode ("-", $dateall);
+            $awal       = date("Y-m-d", strtotime($pisah[0]));
+            $akhir      = date("Y-m-d", strtotime($pisah[1]));
+        }else{
+            $awal       = date("Y-m-d");
+            $akhir      = date("Y-m-d");
+        }
+
+        $akhir_plus1 = date("Y-m-d", strtotime($akhir . ' +1 day'));
+
+        $query = $this->load->database('datagomed', TRUE);
+        $query->where('created_at >=', $awal);
+        $query->where('created_at <', $akhir_plus1);
+        $query->order_by("created_at", "ASC");
+        return $query->get('tb_registrasi')->result(); 
+    }
+}
+?>
\ No newline at end of file
diff --git a/application/models/m_saturssa_report_lp.php b/application/models/m_saturssa_report_lp.php
index 2bcf87d..bc757ba 100644
--- a/application/models/m_saturssa_report_lp.php
+++ b/application/models/m_saturssa_report_lp.php
@@ -17,10 +17,11 @@ class M_saturssa_report_lp extends CI_Model {
 
         $query = $this->load->database('saturssa', TRUE);
         $query->select('dpo.No_rekam_medis as norm, dpo.No_KTP as nik, dpo.Nama_pasien as namapasien, dpo.Jenis_kelamin as jk, dpo.Tanggal_lahir as tgllahir, dpo.Umur as umur, dpo.Tanggal_daftar as tgldaftar, dpo.Tanggal_selesai_operasi as tglselesai, dpo.Kategori_operasi as kodekategorioperasi,
-                            dko.Kategori as kategorioperasi
+                            dko.Kategori as kategorioperasi, ds.Kode as kodespe, ds.Spesialis as spesialis, dss.Subspesialis as subSpesialis
                             ');
         $query->join('daftar_kategori_operasi AS dko',      'dko.id     = dpo.Kategori_operasi', 'left');
-
+        $query->join('daftar_spesialis AS ds',              'ds.id      = dpo.Spesialis', 'left');
+        $query->join('daftar_subspesialis AS dss',          'dss.id     = dpo.Sub_spesialis', 'left');
         $query->where('dpo.Tanggal_selesai_operasi >=', $awal);
         $query->where('dpo.Tanggal_selesai_operasi <=', $akhir);
         $query->where('dpo.Status_operasi',"2");
diff --git a/application/models/m_simrs_report_lp.php b/application/models/m_simrs_report_lp.php
index 682063c..d46504f 100644
--- a/application/models/m_simrs_report_lp.php
+++ b/application/models/m_simrs_report_lp.php
@@ -121,18 +121,22 @@ class M_simrs_report_lp extends CI_Model {
                         micdver.keterangan as keticdver,
                         tp.tglreg, 
                         mr.nama as klinik,
-                        mp.nama as namapasien');
+                        mp.nama as namapasien,
+                        tbl.nobill as nobill
+                        ');
         $query->join('icd_cm AS micdnon',           'micdnon.kode   = icm.icd', 'left');
         $query->join('icd_cm AS micdver',           'micdver.kode   = icm.icd_verified', 'left');
         $query->join('t_pendaftaran as tp',         'tp.idxdaftar   = icm.idxdaftar', 'left');
         $query->join('m_ruang as mr',               'mr.no          = tp.kdpoly', 'left');
         $query->join('m_pasien as mp',              'mp.nomr        = tp.nomr', 'left');
+        $query->join('t_billrajal AS tbl',          'tbl.idxdaftar  = tp.idxdaftar', 'left');
         $query->where('icm.status_rajal', '1');
         $query->where('date(tp.tglreg) >=', $awal);
         $query->where('date(tp.tglreg) <=', $akhir);
         $query->order_by('tp.tglreg', 'ASC');
         $query->order_by('icm.idxdaftar', 'ASC');
         $query->order_by('icm.icd_verified_order', 'ASC');
+        $query->group_by('icm.nomr, icm.idxdaftar, icm.icd, icm.icd_verified, icm.icd_verified_order, micdnon.keterangan, micdver.keterangan, tp.tglreg, mr.nama, mp.nama, tbl.nobill');
         return $query->get('t_icd_cm AS icm ')->result();      
     }
 
@@ -161,6 +165,46 @@ class M_simrs_report_lp extends CI_Model {
         return $query->get('t_pendaftaran as tp ')->result();    
     }
 
+    // function pasiendetailicd9(){
+    //     if(isset($_POST['tanggal'])) {
+    //         $dateall    = $this->input->post('tanggal');
+    //         $pisah      = explode ("-", $dateall);
+    //         $awal       = date("Y-m-d", strtotime($pisah[0]));
+    //         $akhir      = date("Y-m-d", strtotime($pisah[1]));
+    //     }else{
+    //         $awal       = date("Y-m-d");
+    //         $akhir      = date("Y-m-d");
+    //     }
+
+    //     $query = $this->load->database('datasim', TRUE);
+    //     $query->select('tp.tglreg as tglregistrasi, tp.pasienbaru as statuspasien, tp.nosep as nosep, tp.nomr as nomr, tp.idxdaftar as idxdaftar,
+    //                     mr.nama as klinik, 
+    //                     mp.nama as namapasien, mp.jeniskelamin as jkelamin,
+    //                     tbl.nobill as nobill, 
+    //                     msk.keterangan as statuskeluar,
+    //                     mdk.kode_dpjp as kddokter, mdk.namadokter as dpjp,
+    //                     mcr.nama as penjamin,
+    //                     array(select ticm.icd
+    //                         from t_icd_cm as ticm
+    //                         join icd_cm cdm on cdm.kode = ticm.icd
+    //                         where ticm.idxdaftar = tp.idxdaftar
+    //                     ) AS icd_9,
+    //                     ');
+    //     $query->join('m_pasien as mp',              'mp.nomr        = tp.nomr', 'left');
+    //     $query->join('m_ruang as mr',               'mr.no          = tp.kdpoly', 'left');
+    //     $query->join('t_billrajal AS tbl',          'tbl.idxdaftar  = tp.idxdaftar', 'left');
+    //     $query->join('m_statuskeluar AS msk',       'msk.status     = tp.status', 'left');
+    //     $query->join('t_resumemedis AS trm',        'trm.idxrajal   = tp.idxdaftar', 'left');
+    //     $query->join('m_dokter AS mdk',             'mdk.kddokter   = trm.dpjp', 'left');
+    //     $query->join('m_carabayar AS mcr',          'mcr.kode       = tp.kdcarabayar', 'left');
+    //     $query->where('tp.tglreg >=', $awal);
+    //     $query->where('tp.tglreg <=', $akhir);
+    //     $query->group_by('tp.tglreg, mr.nama, tp.pasienbaru, tp.nosep, mp.nama, mp.jeniskelamin, tp.nomr, tbl.nobill, msk.keterangan, tp.idxdaftar, mdk.kode_dpjp, mdk.namadokter, mcr.nama');
+    //     $query->order_by('tp.tglreg', 'ASC');
+    //     $query->order_by('mr.nama', 'ASC');
+    //     return $query->get('t_pendaftaran as tp ')->result();    
+    // }
+
     function pasiendetail(){
         if(isset($_POST['tanggal'])) {
             $dateall    = $this->input->post('tanggal');
@@ -180,6 +224,7 @@ class M_simrs_report_lp extends CI_Model {
                         msk.keterangan as statuskeluar,
                         mdk.kode_dpjp as kddokter, mdk.namadokter as dpjp,
                         mcr.nama as penjamin,
+                        trm.tindakan_utama as tindakanutama, trm.dasar_tindakan_utama as dasartindakanutama, trm.tindakan_lain as tindakanlain, 
                         array(select ticd.icd
                             from t_icd as ticd
                             where ticd.idxdaftar = tp.idxdaftar
@@ -204,7 +249,7 @@ class M_simrs_report_lp extends CI_Model {
         $query->join('m_carabayar AS mcr',          'mcr.kode       = tp.kdcarabayar', 'left');
         $query->where('tp.tglreg >=', $awal);
         $query->where('tp.tglreg <=', $akhir);
-        $query->group_by('tp.tglreg, mr.nama, tp.pasienbaru, tp.nosep, mp.nama, mp.jeniskelamin, tp.nomr, tbl.nobill, msk.keterangan, tp.idxdaftar, mdk.kode_dpjp, mdk.namadokter, mcr.nama');
+        $query->group_by('tp.tglreg, mr.nama, tp.pasienbaru, tp.nosep, mp.nama, mp.jeniskelamin, tp.nomr, tbl.nobill, msk.keterangan, tp.idxdaftar, mdk.kode_dpjp, mdk.namadokter, mcr.nama,trm.tindakan_utama, trm.dasar_tindakan_utama, trm.tindakan_lain');
         $query->order_by('tp.tglreg', 'ASC');
         $query->order_by('mr.nama', 'ASC');
         return $query->get('t_pendaftaran as tp ')->result();    
@@ -225,10 +270,11 @@ class M_simrs_report_lp extends CI_Model {
         $query->select("
                         tp.masukpoly as masukklinik, tp.keluarpoly as keluarklinik, tp.st_asal_masuk as asalmasuk,
 		                mrj.nama as namapoly,
-                        ta.masukrs as masukrs, ta.keluarrs as keluarrs, 
+                        ta.masukrs as masukrs, ta.keluarrs as keluarrs, ta.dt_meninggal as tglmeninggal,
                         mp.nomr as nomr, mp.nama as namapasien, mp.jeniskelamin as jeniskelamin,
                         mr.nama as namaruang, ms.keterangan as statuspulang,
                         rm.keadaan_pulang as keadaanpulang, mcr.nama as penjamin, mdk.namadokter as dpjp,
+                        ta.id_admission as idx,
                         array(select ticd.icd
                             from t_icd as ticd
                             where ticd.idxdaftar = ta.id_admission
@@ -260,11 +306,13 @@ class M_simrs_report_lp extends CI_Model {
                         (select tb.nobill 
                             from t_billrajal tb
                             where tb.idxdaftar = ta.id_admission
+                            and tb.status_verifikasi = 1
                             limit 1
 		                ) as nobilrajal,
                         (select tn.nobill 
                             from t_billranap tn
                             where tn.idxdaftar = ta.id_admission
+                            and tn.status_verifikasi = 1
                             limit 1
                         ) as nobilranap, 
                         (select SUM(tp.jumlah_bayar)
@@ -380,7 +428,7 @@ class M_simrs_report_lp extends CI_Model {
         }
 
         $query = $this->load->database('datasim', TRUE);
-        $query->select('tp.tglreg as tglregistrasi, tp.pasienbaru as statuspasien, tp.nosep as nosep, tp.nomr as nomr, tp.idxdaftar as idxdaftar, tp.st_asal_masuk as subsistem,
+        $query->select('tp.tglreg as tglregistrasi, tp.pasienbaru as statuspasien, tp.nosep as nosep, tp.nomr as nomr, tp.idxdaftar as idxdaftar, tp.st_asal_masuk as subsistem, tp.keluarpoly as pasienkrs,
                         mp.nama as namapasien, mcr.nama as penjamin, mcb.nama_cara_bayar as carabayar,
 
                         tbl.nobill as nobillrajal, tbl.kodetarif as kodetarifrajal, tbl.tarifrs as tarifrsrajal, tbl.tanggal as tglbillrajal, tbl.tgl_verifikasi as tglverif, tbl.user_verifikasi as userverif,
@@ -424,7 +472,7 @@ class M_simrs_report_lp extends CI_Model {
         }
 
         $query = $this->load->database('datasim', TRUE);
-        $query->select('tp.tglreg as tglregistrasi, tp.pasienbaru as statuspasien, tp.nosep as nosep, tp.nomr as nomr, tp.idxdaftar as idxdaftar, tad.st_asal_masuk as subsistem, tad.masukrs as masukrs, 
+        $query->select('tp.tglreg as tglregistrasi, tp.pasienbaru as statuspasien, tp.nosep as nosep, tp.nomr as nomr, tp.idxdaftar as idxdaftar, tad.st_asal_masuk as subsistem, tad.masukrs as masukrs, tad.keluarrs as pasienkrs,
                         mp.nama as namapasien, mcr.nama as penjamin, mcb.nama_cara_bayar as carabayar,
                         tbp.nobill as nobillranap, tbp.kodetarif as kodetarifranap, tbp.tarifrs as tarifrsranap, tbp.tanggal as tglbillranap, tbp.tgl_verifikasi as tglverif, tbp.user_verifikasi as userverif,
                         mrrp.nama as ruangranap, 
@@ -468,17 +516,21 @@ class M_simrs_report_lp extends CI_Model {
         }
 
         $query = $this->load->database('datasim', TRUE);
-        $query->select('
+        $query->select("
             tp.tglreg as tglregistrasi, tp.pasienbaru as statuspasien, tp.nosep as nosep, tp.nomr as nomr, tp.idxdaftar as idxdaftar,
             mp.nama as namapasien, 
             tbp.nobill as nobillranap,
             mcr.nama as penjamin,
-            tiu.hak_kelas as hakkelas, tiu.naik_kelas as naikkelas, tiu.nominal_naik_kelas as nominalnaik, tiu.selisih_biaya as selisih, tiu.st_verif as verif, tiu.tgl_verifikasi as tglverif, tiu.user_verifikasi as userverif, tiu.kode_tarif as kodetarif, tiu.jumlah_bayar as jumlahbayar,
+            tiu.tgl_iurbea as tgliurbea, tiu.hak_kelas as hakkelas, tiu.naik_kelas as naikkelas, tiu.nominal_naik_kelas as nominalnaik, tiu.selisih_biaya as selisih, tiu.st_verif as verif, tiu.tgl_verifikasi as tglverif, tiu.user_verifikasi as userverif, tiu.kode_tarif as kodetarif, tiu.jumlah_bayar as jumlahbayar,
             tiu.st_bayar as statusbayar, tiu.user_bayar as petugasbayar, tiu.tgl_bayar as tglbayar,
             mdkp.namadokter as dpjp, mdkp.kdsmf as smf,
             mr.nama as namaruang,
-            ta.st_asal_masuk as subsistem, 
-            ');
+            ta.st_asal_masuk as subsistem, ta.keluarrs as pasienkrs,
+            (SELECT SUM(tb.tarifrs) FROM t_billranap tb 
+                where tb.status != 'BATAL' 
+                and tb.nobill = tbp.nobill
+            ) as totaltarifrs
+            ");
         $query->join('m_pasien as mp',              'mp.nomr            = tp.nomr', 'left');
         $query->join('t_billranap AS tbp',          'tbp.idxdaftar      = tp.idxdaftar', 'left');
         $query->join('m_carabayar AS mcr',          'mcr.kode           = tp.kdcarabayar', 'left');
@@ -500,7 +552,7 @@ class M_simrs_report_lp extends CI_Model {
                             tiu.hak_kelas, tiu.naik_kelas, tiu.nominal_naik_kelas, tiu.selisih_biaya, tiu.st_verif, tiu.tgl_verifikasi, tiu.user_verifikasi, tiu.kode_tarif, tiu.jumlah_bayar, 
                             mdkp.namadokter, mdkp.kdsmf,
                             mr.nama, ta.st_asal_masuk, 
-                            tiu.st_bayar, tiu.user_bayar, tiu.tgl_bayar
+                            tiu.st_bayar, tiu.user_bayar, tiu.tgl_bayar, tiu.tgl_iurbea, ta.keluarrs
                         ');
         return $query->get('t_pendaftaran as tp')->result();   
     }
@@ -858,5 +910,342 @@ class M_simrs_report_lp extends CI_Model {
          $query->group_by('mo.mo_kode, mo.mo_nama');
         return $query->get('master_obat as mo')->result();
     }
+
+    function rajalrekap(){
+        if(isset($_POST['tanggal'])) {
+            $dateall    = $this->input->post('tanggal');
+            $pisah      = explode ("-", $dateall);
+            $awal       = date("Y-m-d", strtotime($pisah[0]));
+            $akhir      = date("Y-m-d", strtotime($pisah[1]));
+        }else{
+            $awal       = date("Y-m-d");
+            $akhir      = date("Y-m-d");
+        }
+
+        $query = $this->load->database('datasim', TRUE);
+        $query->select("mr.nama as klinik, mr.kelompok as kelompok, mr.subsistem as subsistem, 
+                            ARRAY(
+                                SELECT ROW(mc.nama, COUNT(*)) 
+                                FROM t_pendaftaran ta
+                                join m_carabayar mc on mc.kode = ta.kdcarabayar 
+                                WHERE ta.kdpoly = mr.no
+                                AND ta.tglreg BETWEEN '$awal' AND '$akhir'
+                                GROUP BY mc.nama
+                                ORDER BY mc.nama
+                            ) AS totpasienpenjamin,
+                            ARRAY(
+                                SELECT row(ms.keterangan, count(*))
+                                from t_pendaftaran ta 
+                                join m_statuskeluar ms on ms.status = ta.status 
+                                where ta.kdpoly = mr.no
+                                and ta.tglreg BETWEEN '$awal' AND '$akhir'
+                                GROUP BY ms.keterangan
+                                ORDER BY ms.keterangan
+                            ) AS totpasienkeluar
+                        ");
+        $query->where('mr.st_aktif', '1');
+        $query->order_by('mr.nama', 'ASC');
+        return $query->get('m_ruang as mr ')->result();    
+    }
+
+     function ranaprekap(){
+        if(isset($_POST['tanggal'])) {
+            $dateall    = $this->input->post('tanggal');
+            $pisah      = explode ("-", $dateall);
+            $awal       = date("Y-m-d H:i:s", strtotime($pisah[0]." 00:00:00"));
+            $akhir      = date("Y-m-d H:i:s", strtotime($pisah[1]." 23:59:00"));
+        }else{
+            $awal       = date("Y-m-d H:i:s");
+            $akhir      = date("Y-m-d H:i:s");
+        }
+
+        $query = $this->load->database('datasim', TRUE);
+        $query->select("mr.nama as klinik, mr.kelompok as kelompok, mr.subsistem as subsistem, 
+                            ARRAY(
+                                SELECT ROW(mc.nama, COUNT(*)) 
+                                FROM t_admission ta
+                                join t_pendaftaran tp on tp.idxdaftar = ta.id_admission 
+                                join m_carabayar mc on mc.kode = tp.kdcarabayar 
+                                WHERE ta.noruang = mr.no
+                                AND ta.masukrs BETWEEN '$awal' AND '$akhir'
+                                GROUP BY mc.nama
+                                ORDER BY mc.nama
+                            ) AS totpasienpenjamin
+                        ");
+        $query->where('mr.st_aktif', '1');
+        $query->order_by('mr.nama', 'ASC');
+        return $query->get('m_ruang as mr ')->result();    
+    }
+
+    function penunjangrajalbill(){
+        if(isset($_POST['tanggal'])) {
+            $dateall    = $this->input->post('tanggal');
+            $pisah      = explode ("-", $dateall);
+            $awal       = date("Y-m-d", strtotime($pisah[0]));
+            $akhir      = date("Y-m-d", strtotime($pisah[1]));
+        }else{
+            $awal       = date("Y-m-d");
+            $akhir      = date("Y-m-d");
+        }
+
+        $query = $this->load->database('datasim', TRUE);
+        $query->join('m_pasien as mp',    'tp.nomr = mp.nomr ', 'left');
+        $query->where('date(tp.tglreg) >=', $awal);
+        $query->where('date(tp.tglreg) <=', $akhir);
+        return $query->get('t_pendaftaran AS tp')->result();    
+    }
+
+    function orderlabpk(){
+        if(isset($_POST['tanggal'])) {
+            $dateall    = $this->input->post('tanggal');
+            $pisah      = explode ("-", $dateall);
+            $awal       = date("Y-m-d H:i:s", strtotime($pisah[0]." 00:00:00"));
+            $akhir      = date("Y-m-d H:i:s", strtotime($pisah[1]." 23:59:00"));
+        }else{
+            $awal       = date("Y-m-d H:i:s");
+            $akhir      = date("Y-m-d H:i:s");
+        }
+
+        $query = $this->load->database('datasim', TRUE);
+        $query->select("tb.nobill as nobill, tb.nomr as nomr, tb.nonota as nonota, tb.status as statusbilling, tb.status_verifikasi as status_verifikasi, tb.jasa_sarana as jasa_sarana, tb.jasa_pelayanan as jasa_pelayanan, tb.tarifrs as tarifrs, tb.tgl_verifikasi as tgl_verifikasi, tb.tgl_transaksi as tgl_transaksi,
+                        mtr.uraian_tarif as uraian_tarif, mtr.kelas_tarif as kelas_tarif, mtr.kode_tarif as kode_tarif,
+                        mcr.nama as namabayar,
+                        tbr.jmbayar as jmbayar, tbr.tottarifrs as tottarifrs, tbr.totjasa_sarana as totjasa_sarana, tbr.totjasa_pelayanan as totjasa_pelayanan, tbr.status as statusbayar,
+                        mps.nama as namapasien, mdk.namadokter as namadokter,
+                        array(
+                            select jsonb_build_object(
+                            'nolab', dat.nolab,
+                            'field', mfl.nama_field,
+                            'tgl_order', tom.tglorder
+                            ) from t_orderlabpk dat
+                            left join m_form_lab mfl on mfl.form_id = dat.idxform 
+                            left join t_orderlabpk_main tom on tom.nolab = dat.nolab 
+                            where dat.idxdaftar = tb.idxdaftar
+                        ) as lappkmain
+                        ");
+        $query->join('m_tarif_rs as mtr',       'tb.kodetarif   = mtr.kode_tarif', 'inner');
+        $query->join('m_carabayar as mcr',      'mcr.kode       = tb.carabayar', 'inner');
+        $query->join('t_bayarrajal as tbr',     'tbr.idxbill    = tb.idxbill', 'inner');
+        $query->join('m_pasien as mps',         'mps.nomr       = tb.nomr', 'inner');
+        $query->join('t_pendaftaran as tpd',    'tpd.idxdaftar  = tb.idxdaftar', 'inner');
+        $query->join('m_dokter as mdk',         'mdk.kddokter   = tpd.kddokter', 'inner');
+        $query->where('date(tb.tgl_transaksi) >=', $awal);
+        $query->where('date(tb.tgl_transaksi) <=', $akhir);
+        $query->where('tb.status !=', 'BATAL');
+        $query->where('mtr.kelompok_tarif', 'PATOLOGI KLINIK');
+        return $query->get('t_billrajal AS tb')->result();    
+    }
+
+    function orderlabpkranap(){
+        if(isset($_POST['tanggal'])) {
+            $dateall    = $this->input->post('tanggal');
+            $pisah      = explode ("-", $dateall);
+            $awal       = date("Y-m-d H:i:s", strtotime($pisah[0]." 00:00:00"));
+            $akhir      = date("Y-m-d H:i:s", strtotime($pisah[1]." 23:59:00"));
+        }else{
+            $awal       = date("Y-m-d H:i:s");
+            $akhir      = date("Y-m-d H:i:s");
+        }
+
+        $query = $this->load->database('datasim', TRUE);
+        $query->select("tb.nobill as nobill, tb.nomr as nomr, tb.nonota as nonota, tb.status as statusbilling, tb.status_verifikasi as status_verifikasi, tb.jasa_sarana as jasa_sarana, tb.jasa_pelayanan as jasa_pelayanan, tb.tarifrs as tarifrs, tb.tgl_verifikasi as tgl_verifikasi, tb.tgl_transaksi as tgl_transaksi,
+                        mtr.uraian_tarif as uraian_tarif, mtr.kelas_tarif as kelas_tarif, mtr.kode_tarif as kode_tarif,
+                        mcr.nama as namabayar,
+                        tbr.jmbayar as jmbayar, tbr.tottarifrs as tottarifrs, tbr.totjasa_sarana as totjasa_sarana, tbr.totjasa_pelayanan as totjasa_pelayanan, tbr.status as statusbayar,
+                        mps.nama as namapasien, mdk.namadokter as namadokter,
+                        array(
+                            select jsonb_build_object(
+                            'nolab', dat.nolab,
+                            'field', mfl.nama_field,
+                            'tgl_order', tom.tglorder
+                            ) from t_orderlabpk dat
+                            left join m_form_lab mfl on mfl.form_id = dat.idxform 
+                            left join t_orderlabpk_main tom on tom.nolab = dat.nolab 
+                            where dat.idxdaftar = tb.idxdaftar
+                        ) as lappkmain
+                        ");
+        $query->join('m_tarif_rs as mtr',       'tb.kodetarif   = mtr.kode_tarif', 'inner');
+        $query->join('m_carabayar as mcr',      'mcr.kode       = tb.carabayar', 'inner');
+        $query->join('t_bayarranap as tbr',     'tbr.idxbill    = tb.idxbill', 'inner');
+        $query->join('m_pasien as mps',         'mps.nomr       = tb.nomr', 'inner');
+        $query->join('t_admission as tpd',      'tpd.id_admission  = tb.idxdaftar', 'inner');
+        $query->join('m_dokter as mdk',         'mdk.kddokter   = tpd.dokter_penanggungjawab', 'inner');
+        $query->where('date(tb.tgl_transaksi) >=', $awal);
+        $query->where('date(tb.tgl_transaksi) <=', $akhir);
+        $query->where('tb.status !=', 'BATAL');
+        $query->where('mtr.kelompok_tarif', 'PATOLOGI KLINIK');
+        return $query->get('t_billranap AS tb')->result();    
+    }
+
+    function orderfarmasirajal(){
+        if(isset($_POST['tanggal'])) {
+            $dateall    = $this->input->post('tanggal');
+            $pisah      = explode ("-", $dateall);
+            $awal       = date("Y-m-d H:i:s", strtotime($pisah[0]." 00:00:00"));
+            $akhir      = date("Y-m-d H:i:s", strtotime($pisah[1]." 23:59:00"));
+        }else{
+            $awal       = date("Y-m-d H:i:s");
+            $akhir      = date("Y-m-d H:i:s");
+        }
+
+        $query = $this->load->database('datasim', TRUE);
+        $query->select("tb.nobill as nobill, tb.nomr as nomr, tb.nonota as nonota, tb.status as statusbilling, tb.status_verifikasi as status_verifikasi, tb.jasa_sarana as jasa_sarana, tb.jasa_pelayanan as jasa_pelayanan, tb.tarifrs as tarifrs, tb.tgl_verifikasi as tgl_verifikasi,
+                        mtr.uraian_tarif as uraian_tarif, mtr.kelas_tarif as kelas_tarif,
+                        mcr.nama as namabayar,
+                        tbr.jmbayar as jmbayar, tbr.tottarifrs as tottarifrs, tbr.totjasa_sarana as totjasa_sarana, tbr.totjasa_pelayanan as totjasa_pelayanan, tbr.status as statusbayar,
+                        mps.nama as namapasien, 
+                        tbj.kode_obat as kodeobat, tbj.noresep as noresep, tbj.harga as hargaobat, tbj.qty as jumlahobat, tbj.satuan as satuanobat, tbj.harga_obat_bulat as hargaobatbulat
+                        ");
+        $query->join('m_tarif_rs as mtr',       'tb.kodetarif   = mtr.kode_tarif', 'inner');
+        $query->join('m_carabayar as mcr',      'mcr.kode       = tb.carabayar', 'inner');
+        $query->join('t_bayarrajal as tbr',     'tbr.idxbill    = tb.idxbill', 'inner');
+        $query->join('m_pasien as mps',         'mps.nomr       = tb.nomr', 'inner');
+        $query->join('t_billobat_rajal as tbj', 'tbj.idxbill    = tb.idxbill', 'inner');
+        $query->where('date(tb.tgl_transaksi) >=', $awal);
+        $query->where('date(tb.tgl_transaksi) <=', $akhir);
+        $query->where('mtr.kelompok_tarif', 'FARMASI');
+        return $query->get('t_billrajal AS tb')->result();
+    }
+
+    function orderfarmasiranap(){
+        if(isset($_POST['tanggal'])) {
+            $dateall    = $this->input->post('tanggal');
+            $pisah      = explode ("-", $dateall);
+            $awal       = date("Y-m-d H:i:s", strtotime($pisah[0]." 00:00:00"));
+            $akhir      = date("Y-m-d H:i:s", strtotime($pisah[1]." 23:59:00"));
+        }else{
+            $awal       = date("Y-m-d H:i:s");
+            $akhir      = date("Y-m-d H:i:s");
+        }
+
+        $query = $this->load->database('datasim', TRUE);
+        $query->select("tb.nobill as nobill, tb.nomr as nomr, tb.nonota as nonota, tb.status as statusbilling, tb.status_verifikasi as status_verifikasi, tb.jasa_sarana as jasa_sarana, tb.jasa_pelayanan as jasa_pelayanan, tb.tarifrs as tarifrs, tb.tgl_verifikasi as tgl_verifikasi,
+                        mtr.uraian_tarif as uraian_tarif, mtr.kelas_tarif as kelas_tarif,
+                        mcr.nama as namabayar,
+                        tbr.jmbayar as jmbayar, tbr.tottarifrs as tottarifrs, tbr.totjasa_sarana as totjasa_sarana, tbr.totjasa_pelayanan as totjasa_pelayanan, tbr.status as statusbayar,
+                        mps.nama as namapasien,
+                        tbj.kode_obat as kodeobat, tbj.noresep as noresep, tbj.harga as hargaobat, tbj.qty as jumlahobat, tbj.satuan as satuanobat, tbj.harga_obat_bulat as hargaobatbulat
+                        ");
+        $query->join('m_tarif_rs as mtr',       'tb.kodetarif   = mtr.kode_tarif', 'inner');
+        $query->join('m_carabayar as mcr',      'mcr.kode       = tb.carabayar', 'inner');
+        $query->join('t_bayarranap as tbr',     'tbr.idxbill    = tb.idxbill', 'inner');
+        $query->join('m_pasien as mps',         'mps.nomr       = tb.nomr', 'inner');
+        $query->join('t_billobat_ranap as tbj', 'tbj.idxbill    = tb.idxbill', 'inner');
+        $query->where('date(tb.tgl_transaksi) >=', $awal);
+        $query->where('date(tb.tgl_transaksi) <=', $akhir);
+        $query->where('mtr.kelompok_tarif', 'FARMASI');
+        return $query->get('t_billranap AS tb')->result();    
+    }
+
+    function pasienpenunjang(){
+        if(isset($_POST['tanggal'])) {
+            $dateall    = $this->input->post('tanggal');
+            $pisah      = explode ("-", $dateall);
+            $awal       = date("Y-m-d", strtotime($pisah[0]));
+            $akhir      = date("Y-m-d", strtotime($pisah[1]));
+        }else{
+            $awal       = date("Y-m-d");
+            $akhir      = date("Y-m-d");
+        }
+        $query = $this->load->database('datasim', TRUE);
+        $query->select("tp.nomr as nomr, tp.tglreg as tglreg, tp.idxdaftar as idxdaftar, tp.st_asal_masuk as asalmasuk,
+                        mp.title as title, mp.nama as namapasien, mp.jeniskelamin as jeniskelamin, mp.alamat as alamat,
+                        md.namadokter as namadokter, md.kdsmf as kdsmf,
+                        mr.nama as klinik,
+                        mc.nama as penjamin,
+                        array(
+                            select jsonb_build_object(
+                                'tgl order', tom.tglorder,
+                                'no_film', tom.nofilm,
+                                'pemeriksaan', tom.ket_pemeriksaan
+                            ) from t_orderradiologi_main tom 
+                            where tom.nomr  = tp.nomr
+                            order by tom.tglorder DESC
+                        ) as radiologi
+                        ");
+        $query->join('m_pasien as mp',       'mp.nomr       = tp.nomr',     'inner');
+        $query->join('m_dokter as md',       'md.kddokter   = tp.kddokter', 'inner');
+        $query->join('m_ruang as mr',        'mr.no         = tp.kdpoly',   'inner');
+        $query->join('m_carabayar as mc',    'mc.kode       = tp.kdcarabayar', 'inner');
+        $query->where('date(tp.tglreg) >=', $awal);
+        $query->where('date(tp.tglreg) <=', $akhir);
+        return $query->get('t_pendaftaran AS tp')->result();   
+    }
+
+    function viewpasien($idxdaftar) {
+        $query = $this->load->database('datasim', TRUE);
+        $query->select('tp.nomr as nomr, tp.tglreg as tglreg, tp.idxdaftar as idxdaftar, tp.jamreg as jamreg,
+                        mp.title as title, mp.nama as namapasien, mp.jeniskelamin as jeniskelamin, mp.alamat as alamat,
+                        md.namadokter as namadokter, md.kdsmf as kdsmf,
+                        mr.nama as klinik,
+                        mc.nama as penjamin');
+        $query->join('m_pasien as mp',       'mp.nomr       = tp.nomr',     'inner');
+        $query->join('m_dokter as md',       'md.kddokter   = tp.kddokter', 'inner');
+        $query->join('m_ruang as mr',        'mr.no         = tp.kdpoly',   'inner');
+        $query->join('m_carabayar as mc',    'mc.kode       = tp.kdcarabayar', 'inner');
+        $query->where('tp.idxdaftar', $idxdaftar);
+        return $query->get('t_pendaftaran  AS tp');
+    }
+
+    function dataradiologi($nomr) {
+        $query = $this->load->database('dataradiologi', TRUE);
+        $query->where('noregister', $nomr);
+        $query->order_by('daftar', 'DESC');
+        return $query->get('periksa')->result();  
+    }
+
+    function pencarianpasienpenunjang(){
+        $query = $this->load->database('datasim', TRUE);
+        $query->select("tp.nomr as nomr, tp.tglreg as tglreg, tp.idxdaftar as idxdaftar, tp.st_asal_masuk as asalmasuk,
+                        mp.title as title, mp.nama as namapasien, mp.jeniskelamin as jeniskelamin, mp.alamat as alamat,
+                        md.namadokter as namadokter, md.kdsmf as kdsmf,
+                        mr.nama as klinik,
+                        mc.nama as penjamin,
+                        array(
+                            select jsonb_build_object(
+                                'tgl order', tom.tglorder,
+                                'no_film', tom.nofilm,
+                                'pemeriksaan', tom.ket_pemeriksaan
+                            ) from t_orderradiologi_main tom 
+                            where tom.nomr  = tp.nomr
+                            order by tom.tglorder DESC
+                        ) as radiologi
+                        ");
+        $query->join('m_pasien as mp',       'mp.nomr       = tp.nomr',     'inner');
+        $query->join('m_dokter as md',       'md.kddokter   = tp.kddokter', 'inner');
+        $query->join('m_ruang as mr',        'mr.no         = tp.kdpoly',   'inner');
+        $query->join('m_carabayar as mc',    'mc.kode       = tp.kdcarabayar', 'inner');
+
+        $nomr = trim($this->input->post('norekamedik'));
+        $nama = strtoupper(trim($this->input->post('namapasien')));
+        $dpjp = $this->input->post('dokterdpjp');
+
+         if (!empty($nomr) || !empty($nama) || !empty($dpjp)) {
+
+        $query->group_start();
+        if (!empty($nomr)) {
+            $query->where('tp.nomr', $nomr);
+        }
+        if (!empty($nama)) {
+            $query->like('mp.nama', $nama);
+        }
+        if (!empty($dpjp)) {
+            $query->where('tp.kddokter', (int)$dpjp);
+        }
+        $query->group_end();
+
+    } else {
+        $query->where('DATE(tp.tglreg)', date('Y-m-d'));
+    }
+        $query->order_by('tp.tglreg', 'DESC');
+        $query->limit(100);
+        return $query->get('t_pendaftaran  AS tp')->result();
+    }
+
+    function dokterdpjp(){
+        $query = $this->load->database('datasim', TRUE);
+        $query->where('aktif =', 1);
+        return $query->get('m_dokter')->result(); 
+    }
 }
 ?>
\ No newline at end of file
diff --git a/application/views/gomed/report/detail/v_mjkn_detail.php b/application/views/gomed/report/detail/v_mjkn_detail.php
new file mode 100644
index 0000000..419c06e
--- /dev/null
+++ b/application/views/gomed/report/detail/v_mjkn_detail.php
@@ -0,0 +1,125 @@
+<section class="content-header">
+    <div class="container-fluid">
+        <div class="row mb-2">
+            <div class="col-sm-6">
+                <h1>
+                </h1>
+            </div>
+            <div class="col-sm-6">
+                <ol class="breadcrumb float-sm-right">
+                    <li class="breadcrumb-item"><a href="<?php echo base_url();?>">Dashboard</a></li>
+                    <li class="breadcrumb-item"><?php echo $parent;?></li>
+                    <li class="breadcrumb-item active"><?php echo $title;?></li>
+                </ol>
+            </div>
+        </div>
+    </div>
+</section>
+<!-- Main content -->
+<section class="content">
+    <div class="container-fluid">
+        <div class="row">
+            <div class="col-md-12">
+                <div class="card card-default">
+                    <div class="card-header">
+                        <h3 class="card-title"><?php 
+                        echo $title;
+                        $tglawal = $awal;
+                        $tglakhir= $akhir;
+                        $tglgabung = date("m/d/Y", strtotime($awal))." - ".date("m/d/Y", strtotime($akhir));
+                        ?></h3>
+                    </div>
+                    <form action="<?php echo(base_url()); ?>index.php/lp_gomed_report/antreanmjkndetail" method="post" autocomplete="off">
+                        <div class="card-body">
+                            <div class="form-group row">
+                                <label class="col-sm-1 col-form-label">Tanggal :</label>
+                                <div class="col-sm-4">
+                                    <div class="input-group">
+                                        <div class="input-group-prepend">
+                                            <span class="input-group-text">
+                                                <i class="far fa-calendar-alt"></i>
+                                            </span>
+                                        </div>
+                                        <input type="text" name="tanggal" class="form-control float-right" id="reservation" value="<?php echo $tglgabung;?>">
+                                    </div>
+                                </div>
+                                <div class="col-sm-2">
+                                    <button type="submit" class="btn btn-outline-info">Search </button>
+                                </div>
+                            </div>
+                        </div>
+                    </form>
+                    <div class="card-body">
+                        <?php if($this->session->flashdata('message')){?>
+                        <div id="alert" class="alert alert-success alert-dismissable">
+                            <button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
+                            <i class="icon fa fa-check"></i> Alert!
+                            <?php echo $this->session->flashdata('message');?>
+                        </div>
+                        <?php }?>
+                        <script> 
+                            setTimeout(function() {
+                                $('#alert').hide('fast');
+                            }, 3000);
+                        </script>
+                        <?php
+                            $tglgabung = date("m/d/Y", strtotime($awal)) . " - " . date("m/d/Y", strtotime($akhir));
+                            
+                            $start = new DateTime($awal);
+                            $end   = new DateTime($akhir);
+                            $end   = $end->modify('+1 day'); 
+
+                            $interval = new DateInterval('P1D'); 
+                            $period   = new DatePeriod($start, $interval, $end);
+                        ?>
+                        <table id="example1" class="table table-bordered table-striped">
+                            <thead>
+                                <tr>
+                                    <th>No</th>
+                                    <th>Tgl Periksa</th>
+                                    <th>Tgl Booking</th>
+                                    <th>No Antrian</th>
+                                    <th>Booking Code</th>
+                                    <th>Nama Pasien</th>
+                                    <th>No BPJS</th>
+                                    <th>NIK</th>
+                                    <th>NO MR</th>
+                                    <th>No Referensi</th>
+                                    <th>Code Poli</th>
+                                    <th>Code Dokter</th>
+                                    <th>Checkin</th>
+                                    <th>Task ID</th>
+                                </tr>
+                            </thead>
+                            <tbody>
+                                <?php 
+                                    $no = 0;
+                                    foreach($mjkndetail as $dat){
+                                        $no++;
+                                        echo 
+                                        "<tr>
+                                            <td>$no</td>
+                                            <td>$dat->tanggal_periksa</td>
+                                            <td>$dat->tanggal_booking</td>
+                                            <td>$dat->queue_clinic</td>
+                                            <td>$dat->booking_code</td>
+                                            <td>$dat->pasien</td>
+                                            <td>$dat->nomor_bpjs</td>
+                                            <td>$dat->nik</td>
+                                            <td>$dat->norm</td>
+                                            <td>$dat->nomor_referensi</td>
+                                            <td>$dat->code_poli</td>
+                                            <td>$dat->code_doctor</td>
+                                            <td>$dat->checkin - $dat->checkin_time</td>
+                                            <td>TID1 $dat->task_id1 ($dat->task_id1_time) | TID2 $dat->task_id2 ($dat->task_id2_time) </br> TID3 $dat->task_id3 ($dat->task_id3_time) | TID4 $dat->task_id4 ($dat->task_id4_time) </br> TID5 $dat->task_id5 ($dat->task_id5_time) | TID6 $dat->task_id6 ($dat->task_id6_time) | TID7 $dat->task_id7 ($dat->task_id7_time) </td>
+                                        </tr>";
+                                    }
+                                ?>
+                            </tbody>
+                        </table>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</section>
\ No newline at end of file
diff --git a/application/views/gomed/report/detail/v_onsite_detail.php b/application/views/gomed/report/detail/v_onsite_detail.php
new file mode 100644
index 0000000..a9b4943
--- /dev/null
+++ b/application/views/gomed/report/detail/v_onsite_detail.php
@@ -0,0 +1,125 @@
+<section class="content-header">
+    <div class="container-fluid">
+        <div class="row mb-2">
+            <div class="col-sm-6">
+                <h1>
+                </h1>
+            </div>
+            <div class="col-sm-6">
+                <ol class="breadcrumb float-sm-right">
+                    <li class="breadcrumb-item"><a href="<?php echo base_url();?>">Dashboard</a></li>
+                    <li class="breadcrumb-item"><?php echo $parent;?></li>
+                    <li class="breadcrumb-item active"><?php echo $title;?></li>
+                </ol>
+            </div>
+        </div>
+    </div>
+</section>
+<!-- Main content -->
+<section class="content">
+    <div class="container-fluid">
+        <div class="row">
+            <div class="col-md-12">
+                <div class="card card-default">
+                    <div class="card-header">
+                        <h3 class="card-title"><?php 
+                        echo $title;
+                        $tglawal = $awal;
+                        $tglakhir= $akhir;
+                        $tglgabung = date("m/d/Y", strtotime($awal))." - ".date("m/d/Y", strtotime($akhir));
+                        ?></h3>
+                    </div>
+                    <form action="<?php echo(base_url()); ?>index.php/lp_gomed_report/antreanmonsitedetail" method="post" autocomplete="off">
+                        <div class="card-body">
+                            <div class="form-group row">
+                                <label class="col-sm-1 col-form-label">Tanggal :</label>
+                                <div class="col-sm-4">
+                                    <div class="input-group">
+                                        <div class="input-group-prepend">
+                                            <span class="input-group-text">
+                                                <i class="far fa-calendar-alt"></i>
+                                            </span>
+                                        </div>
+                                        <input type="text" name="tanggal" class="form-control float-right" id="reservation" value="<?php echo $tglgabung;?>">
+                                    </div>
+                                </div>
+                                <div class="col-sm-2">
+                                    <button type="submit" class="btn btn-outline-info">Search </button>
+                                </div>
+                            </div>
+                        </div>
+                    </form>
+                    <div class="card-body">
+                        <?php if($this->session->flashdata('message')){?>
+                        <div id="alert" class="alert alert-success alert-dismissable">
+                            <button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
+                            <i class="icon fa fa-check"></i> Alert!
+                            <?php echo $this->session->flashdata('message');?>
+                        </div>
+                        <?php }?>
+                        <script> 
+                            setTimeout(function() {
+                                $('#alert').hide('fast');
+                            }, 3000);
+                        </script>
+                        <?php
+                            $tglgabung = date("m/d/Y", strtotime($awal)) . " - " . date("m/d/Y", strtotime($akhir));
+                            
+                            $start = new DateTime($awal);
+                            $end   = new DateTime($akhir);
+                            $end   = $end->modify('+1 day'); 
+
+                            $interval = new DateInterval('P1D'); 
+                            $period   = new DatePeriod($start, $interval, $end);
+                        ?>
+                        <table id="example1" class="table table-bordered table-striped">
+                            <thead>
+                                <tr>
+                                    <th>No</th>
+                                    <th>Tgl Periksa</th>
+                                    <th>Nama</th>
+                                    <th>No Antrian</th>
+                                    <th>Booking Code</th>
+                                    <th>No BPJS</th>
+                                    <th>NIK</th>
+                                    <th>NO MR</th>
+                                    <th>No Registrasi</th>
+                                    <th>No Referensi</th>
+                                    <th>Code Specialis</th>
+                                    <th>Code Sub Specialis</th>
+                                    <th>Code Doctor</th>
+                                    <th>Endpoint</th>
+                                </tr>
+                            </thead>
+                            <tbody>
+                                <?php 
+                                    $no = 0;
+                                    foreach($onsitedetail as $dat){
+                                        $no++;
+                                        echo 
+                                        "<tr>
+                                            <td>$no</td>
+                                            <td>$dat->created_at</td>
+                                            <td>$dat->name</td>
+                                            <td>$dat->queue_admisi</td>
+                                            <td>$dat->booking_code</td>
+                                            <td>$dat->nomor_bpjs</td>
+                                            <td>$dat->nik</td>
+                                            <td>$dat->norm</td>
+                                            <td>$dat->nomor_registrasi</td>
+                                            <td>$dat->nomor_referensi</td>
+                                            <td>$dat->code_specialis</td>
+                                            <td>$dat->code_subspecialis</td>
+                                            <td>$dat->code_doctor</td>
+                                            <td>$dat->endpoint</td>
+                                        </tr>";
+                                    }
+                                ?>
+                            </tbody>
+                        </table>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</section>
\ No newline at end of file
diff --git a/application/views/gomed/report/mjkn/v_mjkn.php b/application/views/gomed/report/mjkn/v_mjkn.php
new file mode 100644
index 0000000..be4b4cd
--- /dev/null
+++ b/application/views/gomed/report/mjkn/v_mjkn.php
@@ -0,0 +1,124 @@
+<section class="content-header">
+    <div class="container-fluid">
+        <div class="row mb-2">
+            <div class="col-sm-6">
+                <h1>
+                </h1>
+            </div>
+            <div class="col-sm-6">
+                <ol class="breadcrumb float-sm-right">
+                    <li class="breadcrumb-item"><a href="<?php echo base_url();?>">Dashboard</a></li>
+                    <li class="breadcrumb-item"><?php echo $parent;?></li>
+                    <li class="breadcrumb-item active"><?php echo $title;?></li>
+                </ol>
+            </div>
+        </div>
+    </div>
+</section>
+<!-- Main content -->
+<section class="content">
+    <div class="container-fluid">
+        <div class="row">
+            <div class="col-md-12">
+                <div class="card card-default">
+                    <div class="card-header">
+                        <h3 class="card-title"><?php 
+                        echo $title;
+                        $tglawal = $awal;
+                        $tglakhir= $akhir;
+                        $tglgabung = date("m/d/Y", strtotime($awal))." - ".date("m/d/Y", strtotime($akhir));
+                        ?></h3>
+                    </div>
+                    <form action="<?php echo(base_url()); ?>index.php/lp_gomed_report/antreanmjknonsite" method="post" autocomplete="off">
+                        <div class="card-body">
+                            <div class="form-group row">
+                                <label class="col-sm-1 col-form-label">Tanggal :</label>
+                                <div class="col-sm-4">
+                                    <div class="input-group">
+                                        <div class="input-group-prepend">
+                                            <span class="input-group-text">
+                                                <i class="far fa-calendar-alt"></i>
+                                            </span>
+                                        </div>
+                                        <input type="text" name="tanggal" class="form-control float-right" id="reservation" value="<?php echo $tglgabung;?>">
+                                    </div>
+                                </div>
+                                <div class="col-sm-2">
+                                    <button type="submit" class="btn btn-outline-info">Search </button>
+                                </div>
+                            </div>
+                        </div>
+                    </form>
+                    <div class="card-body">
+                        <?php if($this->session->flashdata('message')){?>
+                        <div id="alert" class="alert alert-success alert-dismissable">
+                            <button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
+                            <i class="icon fa fa-check"></i> Alert!
+                            <?php echo $this->session->flashdata('message');?>
+                        </div>
+                        <?php }?>
+                        <script> 
+                            setTimeout(function() {
+                                $('#alert').hide('fast');
+                            }, 3000);
+                        </script>
+                        <?php
+                            $tglgabung = date("m/d/Y", strtotime($awal)) . " - " . date("m/d/Y", strtotime($akhir));
+                            
+                            $start = new DateTime($awal);
+                            $end   = new DateTime($akhir);
+                            $end   = $end->modify('+1 day'); 
+
+                            $interval = new DateInterval('P1D'); 
+                            $period   = new DatePeriod($start, $interval, $end);
+                        ?>
+                        <table id="example1" class="table table-bordered table-striped">
+                            <thead>
+                                <tr>
+                                    <th>No</th>
+                                    <th>Tanggal</th>
+                                    <th>Jumlah Pasien M-JKN</th>
+                                    <th>Check-In M-JKN</th>
+                                    <th>Jumlah Pasien Onsite</th>
+                                    <th>Onsite</th>
+                                </tr>
+                            </thead>
+                            <tbody>
+                                <?php 
+                                $no=0;
+                                foreach($period as $row){
+                                    $no++; $jumlahmjkn = 0; $checkinmjkn = 0; 
+                                    foreach($mjknall as $datmjkn){
+                                        if($row->format('Y-m-d') === $datmjkn->tglperiksa){
+                                            $jumlahmjkn = $datmjkn->jumlah;
+                                            $checkinmjkn = $datmjkn->checkin;
+                                        }
+                                    }
+
+                                    $jumlahonsite = 0; $checkinonsite = 0;
+                                    foreach($onsiteall as $datonsite){
+                                        if($row->format('Y-m-d') === $datonsite->tgl_kunjungan){
+                                            $jumlahonsite = $datonsite->jumlah;
+                                            $checkinonsite = $datonsite->checkin;
+                                        }
+                                    }
+                                ?>
+                                <tr>
+                                    <td><?php echo $no;?></td>
+                                    <td><?php echo $row->format('Y-m-d');?></td>
+                                    <td><?php echo $jumlahmjkn;?></td>
+                                    <td><?php echo $checkinmjkn;?></td>
+                                    <td><?php echo $jumlahonsite;?></td>
+                                    <td><?php echo $checkinonsite;?></td>
+                                </tr>
+                                <?php 
+                                }
+                                ?>
+                            </tbody>
+                        </table>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</section>
\ No newline at end of file
diff --git a/application/views/includes/sidebar.php b/application/views/includes/sidebar.php
index 815d245..0d32b68 100644
--- a/application/views/includes/sidebar.php
+++ b/application/views/includes/sidebar.php
@@ -45,6 +45,7 @@
                     $this->db->join('master_menu', 'mm_id = am_fk_menu_id', 'LEFT');
             		$this->db->where('mm_status', 1);
                     $this->db->where('am_fk_rolegroup_id', $this->session->userdata('s_IDRoleGroup'));
+                    $this->db->order_by('mm_sort', 'ASC');
             		$query = $this->db->get('access_menu');
                     
                     foreach ($query->result() as $parent){
@@ -85,6 +86,12 @@
                         }
                     }
                 ?>
+                <li class="nav-item">
+                    <a href="<?php echo base_url()."index.php/ps_login/logout"?>" class="nav-link">
+                        <i class="fas fa-lock "></i>
+                        <p>&nbsp;&nbsp;Log Out</p>
+                    </a>
+                </li>
             </ul>
         </nav>
     </div>
diff --git a/application/views/saturssa/antrianoperasi/ketepatanantrianoperasi/v_ketepatanantrianoperasi.php b/application/views/saturssa/antrianoperasi/ketepatanantrianoperasi/v_ketepatanantrianoperasi.php
index 33f26f1..abed3f1 100644
--- a/application/views/saturssa/antrianoperasi/ketepatanantrianoperasi/v_ketepatanantrianoperasi.php
+++ b/application/views/saturssa/antrianoperasi/ketepatanantrianoperasi/v_ketepatanantrianoperasi.php
@@ -71,6 +71,8 @@
                                     <th>Nama Pasien</th>
                                     <th>Tanggal Lahir</th>
                                     <th>No RM</th>
+                                    <th>Spesialis</th>
+                                    <th>Sub Spesialis</th>
                                     <th>Kategori Operasi</th>
                                     <th>Waktu Tunggu Operasi</th>
                                 </tr>
@@ -107,6 +109,8 @@
                                                 <td>".$dat->nik." | ".$dat->jk." - ".$dat->namapasien."</td>
                                                 <td>".$dat->tgllahir." | Umur ".$dat->umur."</td>
                                                 <td>".$dat->norm."</td>
+                                                <td>".$dat->kodespe."-".$dat->spesialis."</td>
+                                                <td>".$dat->subSpesialis."</td>
                                                 <td>".$kategorioperasi."</td>
                                                 <td>".$hasil."</td>
                                             </tr>
diff --git a/application/views/simrs/report/farmasirajal/v_farmasirajal.php b/application/views/simrs/report/farmasirajal/v_farmasirajal.php
new file mode 100644
index 0000000..b747ed9
--- /dev/null
+++ b/application/views/simrs/report/farmasirajal/v_farmasirajal.php
@@ -0,0 +1,151 @@
+<section class="content-header">
+    <div class="container-fluid">
+        <div class="row mb-2">
+            <div class="col-sm-6">
+                <h1>
+                </h1>
+            </div>
+            <div class="col-sm-6">
+                <ol class="breadcrumb float-sm-right">
+                    <li class="breadcrumb-item"><a href="<?php echo base_url();?>">Dashboard</a></li>
+                    <li class="breadcrumb-item"><?php echo $parent;?></li>
+                    <li class="breadcrumb-item active"><?php echo $title;?></li>
+                </ol>
+            </div>
+        </div>
+    </div>
+</section>
+<!-- Main content -->
+<section class="content">
+    <div class="container-fluid">
+        <div class="row">
+            <div class="col-md-12">
+                <div class="card card-default">
+                    <div class="card-header">
+                        <h3 class="card-title"><?php 
+                        echo $title;
+                        $tglawal = $awal;
+                        $tglakhir= $akhir;
+                        $tglgabung = date("m/d/Y", strtotime($awal))." - ".date("m/d/Y", strtotime($akhir));
+                        ?></h3>
+                    </div>
+                    <form action="<?php echo(base_url()); ?>index.php/lp_simrs_report/orderfarmasirajal" method="post" autocomplete="off">
+                        <div class="card-body">
+                            <div class="form-group row">
+                                <label class="col-sm-1 col-form-label">Tanggal Transaksi :</label>
+                                <div class="col-sm-4">
+                                    <div class="input-group">
+                                        <div class="input-group-prepend">
+                                            <span class="input-group-text">
+                                                <i class="far fa-calendar-alt"></i>
+                                            </span>
+                                        </div>
+                                        <input type="text" name="tanggal" class="form-control float-right" id="reservation" value="<?php echo $tglgabung;?>">
+                                    </div>
+                                </div>
+                                <div class="col-sm-2">
+                                    <button type="submit" class="btn btn-outline-info">Search </button>
+                                </div>
+                            </div>
+                        </div>
+                    </form>
+                    <div class="card-body">
+                        <?php if($this->session->flashdata('message')){?>
+                        <div id="alert" class="alert alert-success alert-dismissable">
+                            <button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
+                            <i class="icon fa fa-check"></i> Alert!
+                            <?php echo $this->session->flashdata('message');?>
+                        </div>
+                        <?php }?>
+                        <script> 
+                            setTimeout(function() {
+                                $('#alert').hide('fast');
+                            }, 3000);
+                        </script>
+                        <table id="example1" class="table table-bordered table-striped">
+                            <thead>
+                                <tr>
+                                    <th>No</th>
+                                    <th>No Bill</th>
+                                    <th>No RM</th>
+                                    <th>No Nota</th>
+                                    <th>Pasien</th>
+                                    <th>Status Bill</th>
+                                    <th>Cara Bayar</th>
+                                    <th>Jasa Sarana</th>
+                                    <th>Jasa Pelayanan</th>
+                                    <th>Tarif RS</th>
+                                    <th>Status Verifikasi</th>
+                                    <th>Tgl Verifikasi</th>
+                                    <th>Uraian Tarif</th>
+                                    <th>Kelas Tarif</th>
+                                    <th>Jml Bayar</th>
+                                    <th>Tot Tarif RS</th>
+                                    <th>Tot Jasa Sarana</th>
+                                    <th>Tot Jasa Pelayanan</th>
+                                    <th>Status Bayar</th>
+                                    <th>Kode Obat</th>
+                                    <th>Nama Obat</th>
+                                    <th>No Resep</th>
+                                    <th>Jumlah</th>
+                                    <th>Satuan</th>
+                                    <th>Harga Obat</th>
+                                    <th>Harga Bulat</th>
+                                </tr>
+                            </thead>
+                            <tbody>
+                                <?php
+                                    $no = 0;
+                                    foreach ($databill as $dat){
+                                        $no++;$statusverif="";
+                                        if($dat->status_verifikasi==1){
+                                            $statusverif="Verif";
+                                        }
+
+                                        $namaobat = "";
+                                        foreach($dataobat as $datobt){
+                                            if($dat->kodeobat==$datobt->mo_kode){
+                                                $namaobat=$datobt->mo_nama;
+                                            }
+                                        }
+
+                                        echo("
+                                            <tr>
+                                                <td>".$no."</td>
+                                                <td>".$dat->nobill."</td>
+                                                <td>".$dat->nomr."</td>
+                                                <td>".$dat->nonota."</td>
+                                                <td>".$dat->namapasien  ."</td>
+                                                <td>".$dat->statusbilling."</td>
+                                                <td>".$dat->namabayar."</td>
+                                                <td>".$dat->jasa_sarana."</td>
+                                                <td>".$dat->jasa_pelayanan."</td>
+                                                <td>".$dat->tarifrs."</td>
+                                                <td>".$statusverif."</td>
+                                                <td>".$dat->tgl_verifikasi."</td>
+                                                <td>".$dat->uraian_tarif."</td>
+                                                <td>".$dat->kelas_tarif."</td>
+                                                <td>".$dat->jmbayar."</td>
+                                                <td>".$dat->tottarifrs."</td>
+                                                <td>".$dat->totjasa_sarana."</td>
+                                                <td>".$dat->totjasa_pelayanan."</td>
+                                                <td>".$dat->statusbayar."</td>
+                                                <td>".$dat->kodeobat."</td>
+                                                <td>".$namaobat."</td>
+                                                <td>".$dat->noresep."</td>
+                                                <td>".$dat->jumlahobat."</td>
+                                                <td>".$dat->satuanobat."</td>
+                                                <td>".$dat->hargaobat."</td>
+                                                <td>".$dat->hargaobatbulat."</td>
+                                            </tr>
+                                        ");
+                                    }
+                                ?>
+                            </tbody>
+                        </table>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</section>
\ No newline at end of file
diff --git a/application/views/simrs/report/farmasiranap/v_farmasiranap.php b/application/views/simrs/report/farmasiranap/v_farmasiranap.php
new file mode 100644
index 0000000..d4a28ed
--- /dev/null
+++ b/application/views/simrs/report/farmasiranap/v_farmasiranap.php
@@ -0,0 +1,152 @@
+<section class="content-header">
+    <div class="container-fluid">
+        <div class="row mb-2">
+            <div class="col-sm-6">
+                <h1>
+                </h1>
+            </div>
+            <div class="col-sm-6">
+                <ol class="breadcrumb float-sm-right">
+                    <li class="breadcrumb-item"><a href="<?php echo base_url();?>">Dashboard</a></li>
+                    <li class="breadcrumb-item"><?php echo $parent;?></li>
+                    <li class="breadcrumb-item active"><?php echo $title;?></li>
+                </ol>
+            </div>
+        </div>
+    </div>
+</section>
+<!-- Main content -->
+<section class="content">
+    <div class="container-fluid">
+        <div class="row">
+            <div class="col-md-12">
+                <div class="card card-default">
+                    <div class="card-header">
+                        <h3 class="card-title"><?php 
+                        echo $title;
+                        $tglawal = $awal;
+                        $tglakhir= $akhir;
+                        $tglgabung = date("m/d/Y", strtotime($awal))." - ".date("m/d/Y", strtotime($akhir));
+                        ?></h3>
+                    </div>
+                    <form action="<?php echo(base_url()); ?>index.php/lp_simrs_report/orderfarmasiranap" method="post" autocomplete="off">
+                        <div class="card-body">
+                            <div class="form-group row">
+                                <label class="col-sm-1 col-form-label">Tanggal Transaksi :</label>
+                                <div class="col-sm-4">
+                                    <div class="input-group">
+                                        <div class="input-group-prepend">
+                                            <span class="input-group-text">
+                                                <i class="far fa-calendar-alt"></i>
+                                            </span>
+                                        </div>
+                                        <input type="text" name="tanggal" class="form-control float-right" id="reservation" value="<?php echo $tglgabung;?>">
+                                    </div>
+                                </div>
+                                <div class="col-sm-2">
+                                    <button type="submit" class="btn btn-outline-info">Search </button>
+                                </div>
+                            </div>
+                        </div>
+                    </form>
+                    <div class="card-body">
+                        <?php if($this->session->flashdata('message')){?>
+                        <div id="alert" class="alert alert-success alert-dismissable">
+                            <button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
+                            <i class="icon fa fa-check"></i> Alert!
+                            <?php echo $this->session->flashdata('message');?>
+                        </div>
+                        <?php }?>
+                        <script> 
+                            setTimeout(function() {
+                                $('#alert').hide('fast');
+                            }, 3000);
+                        </script>
+                        <table id="example1" class="table table-bordered table-striped">
+                            <thead>
+                                <tr>
+                                    <th>No</th>
+                                    <th>No Bill</th>
+                                    <th>No RM</th>
+                                    <th>No Nota</th>
+                                    <th>Pasien</th>
+                                    <th>Status Bill</th>
+                                    <th>Cara Bayar</th>
+                                    <th>Jasa Sarana</th>
+                                    <th>Jasa Pelayanan</th>
+                                    <th>Tarif RS</th>
+                                    <th>Status Verifikasi</th>
+                                    <th>Tgl Verifikasi</th>
+                                    <th>Uraian Tarif</th>
+                                    <th>Kelas Tarif</th>
+                                    <th>Jml Bayar</th>
+                                    <th>Tot Tarif RS</th>
+                                    <th>Tot Jasa Sarana</th>
+                                    <th>Tot Jasa Pelayanan</th>
+                                    <th>Status Bayar</th>
+                                    <th>Kode Obat</th>
+                                    <th>Nama Obat</th>
+                                    <th>No Resep</th>
+                                    <th>Jumlah</th>
+                                    <th>Satuan</th>
+                                    <th>Harga Obat</th>
+                                    <th>Harga Bulat</th>
+                                    
+                                </tr>
+                            </thead>
+                            <tbody>
+                                <?php
+                                    $no = 0;
+                                    foreach ($databill as $dat){
+                                        $no++;$statusverif="";
+                                        if($dat->status_verifikasi==1){
+                                            $statusverif="Verif";
+                                        }
+
+                                        $namaobat = "";
+                                        foreach($dataobat as $datobt){
+                                            if($dat->kodeobat==$datobt->mo_kode){
+                                                $namaobat=$datobt->mo_nama;
+                                            }
+                                        }
+
+                                        echo("
+                                            <tr>
+                                                <td>".$no."</td>
+                                                <td>".$dat->nobill."</td>
+                                                <td>".$dat->nomr."</td>
+                                                <td>".$dat->nonota."</td>
+                                                <td>".$dat->namapasien  ."</td>
+                                                <td>".$dat->statusbilling."</td>
+                                                <td>".$dat->namabayar."</td>
+                                                <td>".$dat->jasa_sarana."</td>
+                                                <td>".$dat->jasa_pelayanan."</td>
+                                                <td>".$dat->tarifrs."</td>
+                                                <td>".$statusverif."</td>
+                                                <td>".$dat->tgl_verifikasi."</td>
+                                                <td>".$dat->uraian_tarif."</td>
+                                                <td>".$dat->kelas_tarif."</td>
+                                                <td>".$dat->jmbayar."</td>
+                                                <td>".$dat->tottarifrs."</td>
+                                                <td>".$dat->totjasa_sarana."</td>
+                                                <td>".$dat->totjasa_pelayanan."</td>
+                                                <td>".$dat->statusbayar."</td>
+                                                <td>".$dat->kodeobat."</td>
+                                                <td>".$namaobat."</td>
+                                                <td>".$dat->noresep."</td>
+                                                <td>".$dat->jumlahobat."</td>
+                                                <td>".$dat->satuanobat."</td>
+                                                <td>".$dat->hargaobat."</td>
+                                                <td>".$dat->hargaobatbulat."</td>
+                                            </tr>
+                                        ");
+                                    }
+                                ?>
+                            </tbody>
+                        </table>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</section>
\ No newline at end of file
diff --git a/application/views/simrs/report/pasiendetail/v_pasiendetail.php b/application/views/simrs/report/pasiendetail/v_pasiendetail.php
index 16646ca..6bbfd52 100644
--- a/application/views/simrs/report/pasiendetail/v_pasiendetail.php
+++ b/application/views/simrs/report/pasiendetail/v_pasiendetail.php
@@ -82,6 +82,9 @@
                                     <th>ICD Resume</th>
                                     <th>ICD</th>
                                     <th>ICD Verif</th>
+                                    <th>Tind. Utama</th>
+                                    <th>Dasar Tind. Utama</th>
+                                    <th>Tind. Lain</th>
                                 </tr>
                             </thead>
                             <tbody>
@@ -145,6 +148,12 @@
                                             $icdresume="ICD Tidak Terisi";
                                         }
 
+                                        if($dat->tindakanlain=='{""}'){
+                                            $tindakanlain = "";
+                                        }else{
+                                            $tindakanlain = $dat->tindakanlain;
+                                        }
+                                        
                                         
 
                                         echo("
@@ -166,6 +175,9 @@
                                                 <td>ICD Utama : ".$icdresume."</td>
                                                 <td>ICD Utama : ".$icdutama." </br> ICD Secunder : ".$icdprimer." </td>
                                                 <td>ICD Utama : ".$icdutama2." </br> ICD Secunder : ".$icdprimer2." </td>
+                                                <td>".$dat->tindakanutama."</td>
+                                                <td>".$dat->dasartindakanutama."</td>
+                                                <td>".$tindakanlain."</td>
                                             </tr>
                                         ");
                                     }
diff --git a/application/views/simrs/report/pasiendetailicd9/v_pasiendetail.php b/application/views/simrs/report/pasiendetailicd9/v_pasiendetail.php
new file mode 100644
index 0000000..a52193c
--- /dev/null
+++ b/application/views/simrs/report/pasiendetailicd9/v_pasiendetail.php
@@ -0,0 +1,133 @@
+<section class="content-header">
+    <div class="container-fluid">
+        <div class="row mb-2">
+            <div class="col-sm-6">
+                <h1>
+                </h1>
+            </div>
+            <div class="col-sm-6">
+                <ol class="breadcrumb float-sm-right">
+                    <li class="breadcrumb-item"><a href="<?php echo base_url();?>">Dashboard</a></li>
+                    <li class="breadcrumb-item"><?php echo $parent;?></li>
+                    <li class="breadcrumb-item active"><?php echo $title;?></li>
+                </ol>
+            </div>
+        </div>
+    </div>
+</section>
+<!-- Main content -->
+<section class="content">
+    <div class="container-fluid">
+        <div class="row">
+            <div class="col-md-12">
+                <div class="card card-default">
+                    <div class="card-header">
+                        <h3 class="card-title"><?php 
+                        echo $title;
+                        $tglawal = $awal;
+                        $tglakhir= $akhir;
+                        $tglgabung = date("m/d/Y", strtotime($awal))." - ".date("m/d/Y", strtotime($akhir));
+                        ?></h3>
+                    </div>
+                    <form action="<?php echo(base_url()); ?>index.php/lp_simrs_report/pasiendetail" method="post" autocomplete="off">
+                        <div class="card-body">
+                            <div class="form-group row">
+                                <label class="col-sm-1 col-form-label">Tanggal :</label>
+                                <div class="col-sm-4">
+                                    <div class="input-group">
+                                        <div class="input-group-prepend">
+                                            <span class="input-group-text">
+                                                <i class="far fa-calendar-alt"></i>
+                                            </span>
+                                        </div>
+                                        <input type="text" name="tanggal" class="form-control float-right" id="reservation" value="<?php echo $tglgabung;?>">
+                                    </div>
+                                </div>
+                                <div class="col-sm-2">
+                                    <button type="submit" class="btn btn-outline-info">Search </button>
+                                </div>
+                            </div>
+                        </div>
+                    </form>
+                    <div class="card-body">
+                        <?php if($this->session->flashdata('message')){?>
+                        <div id="alert" class="alert alert-success alert-dismissable">
+                            <button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
+                            <i class="icon fa fa-check"></i> Alert!
+                            <?php echo $this->session->flashdata('message');?>
+                        </div>
+                        <?php }?>
+                        <script> 
+                            setTimeout(function() {
+                                $('#alert').hide('fast');
+                            }, 3000);
+                        </script>
+                        <table id="example1" class="table table-bordered table-striped">
+                            <thead>
+                                <tr>
+                                    <th>No</th>
+                                    <th>Tanggal</th>
+                                    <th>IDX</th>
+                                    <th>No RM</th>
+                                    <th>No Bill</th>
+                                    <th>Nama</th>
+                                    <th>JK</th>
+                                    <th>No SEP</th>
+                                    <th>Penjamin</th>
+                                    <th>Klinik</th>
+                                    <th>KD Dokter</th>
+                                    <th>DPJP</th>
+                                    <th>Status Pasien</th>
+                                    <th>Status Keluar</th>
+                                    <th>ICD 9</th>
+                                </tr>
+                            </thead>
+                            <tbody>
+                                <?php
+                                    $no = 0;
+                                    foreach ($pasiendetail as $dat){
+                                        $no++;
+                                        $statuspasien = "";
+                                        if($dat->statuspasien=="0"){
+                                            $statuspasien = "Pasien Lama";
+                                        }else{
+                                            $statuspasien = "Pasien Baru";
+                                        }
+                                        $statuskeluar="";
+                                        if($dat->statuskeluar==""){
+                                            $statuskeluar="Belum Pulang";
+                                        }else{
+                                            $statuskeluar=$dat->statuskeluar;
+                                        }
+
+                                        
+
+                                        echo("
+                                            <tr>
+                                                <td>".$no."</td>
+                                                <td>".$dat->tglregistrasi."</td>
+                                                <td>".$dat->idxdaftar."</td>
+                                                <td>".$dat->nomr."</td>
+                                                <td>".$dat->nobill."</td>
+                                                <td>".$dat->namapasien."</td>
+                                                <td>".$dat->jkelamin."</td>
+                                                <td>".$dat->nosep."</td>
+                                                <td>".$dat->penjamin."</td>
+                                                <td>".$dat->klinik."</td>
+                                                <td>".$dat->kddokter."</td>
+                                                <td>".$dat->dpjp."</td>
+                                                <td>".$statuspasien."</td>
+                                                <td>".$statuskeluar."</td>
+                                                <td>".$icd_9."</td>
+                                            </tr>
+                                        ");
+                                    }
+                                ?>
+                            </tbody>
+                        </table>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</section>
\ No newline at end of file
diff --git a/application/views/simrs/report/pasiendetailranap/v_pasiendetailranap.php b/application/views/simrs/report/pasiendetailranap/v_pasiendetailranap.php
index 91732f2..952ceec 100644
--- a/application/views/simrs/report/pasiendetailranap/v_pasiendetailranap.php
+++ b/application/views/simrs/report/pasiendetailranap/v_pasiendetailranap.php
@@ -67,6 +67,7 @@
                                 <tr>
                                     <th>No</th>
                                     <th>No RM</th>
+                                    <th>IDX</th>
                                     <th>Nama</th>
                                     <th>JK</th>
                                     <th>Bill Rajal</th>
@@ -76,13 +77,13 @@
                                     <th>Bill Ranap</th>
                                     <th>Tgl Masuk Ranap</th>
                                     <th>Tgl Keluar Ranap</th>
+                                    <th>Tgl Meninggal</th>
                                     <th>Ruang</th>
                                     <th>Cara Bayar</th>
                                     <th>Cara Pulang</th>
                                     <th>Keadaan Pulang</th>
                                     <th>DPJP</th>
                                     <th>Total Biaya</th>
-                                    <th>Tgl Pulang</th>
                                     <th>Icd Dokter</th>
                                     <th>Icd Mati Dokter</th>
                                     <th>ICD Verif</th>
@@ -98,6 +99,7 @@
                                             <tr>
                                                 <td>".$no."</td>
                                                 <td>".$dat->nomr."</td>
+                                                <td>".$dat->idx."</td>
                                                 <td>".$dat->namapasien."</td>
                                                 <td>".$dat->jeniskelamin."</td>
                                                 <td>".$dat->nobilrajal."</td>
@@ -107,13 +109,13 @@
                                                 <td>".$dat->nobilranap."</td>
                                                 <td>".$dat->masukrs."</td>
                                                 <td>".$dat->keluarrs."</td>
+                                                <td>".$dat->tglmeninggal."</td>
                                                 <td>".$dat->namaruang."</td>
                                                 <td>".$dat->penjamin."</td>
                                                 <td>".$dat->statuspulang."</td>
                                                 <td>".$dat->keadaanpulang."</td>
                                                 <td>".$dat->dpjp."</td>
                                                 <td>".$dat->total_biaya."</td>
-                                                <td></td>
                                                 <td>".$dat->icd."</td>
                                                 <td>".$dat->icdmati."</td>
                                                 <td>".$dat->icdverif."</td>
diff --git a/application/views/simrs/report/pasieniurbearanap/v_pasieniurbearanap.php b/application/views/simrs/report/pasieniurbearanap/v_pasieniurbearanap.php
index ea74bd7..ca655a8 100644
--- a/application/views/simrs/report/pasieniurbearanap/v_pasieniurbearanap.php
+++ b/application/views/simrs/report/pasieniurbearanap/v_pasieniurbearanap.php
@@ -70,13 +70,15 @@
                                     <th>No RM</th>
                                     <th>NoBill Ranap</th>
                                     <th>Tgl Reg </th>
+                                    <th>Tgl KRS </th>
+                                    <th>Tgl IURBEA</th>
                                     <th>Nama</th>
                                     <th>DPJP</th>
                                     <th>SMF</th>
-                                    <th>Tgl Tarif</th>
-                                    <th>Status</th>
+                                    <!--th>Tgl Tarif</th-->
+                                    <!--th>Status</th-->
                                     <th>Tempat Layanan</th>
-                                    <th>Kelompok Tarif</th>
+                                    <!--th>Kelompok Tarif</th-->
                                     <th>Sub Sistem</th>
                                     <th>Penjamin</th>
                                     <th>Hak Kelas</th>
@@ -84,6 +86,7 @@
                                     <th>Nominal Naik</th>
                                     <th>Selisih biaya</th>
                                     <th>Jumlah bayar</th>
+                                    <th>Jumlah Tarif RS</th>
                                     <th>Tgl bayar</th>
                                     <th>Status Pembayaran</th>
                                     <th>Petugas Bayar</th>
@@ -107,13 +110,12 @@
                                                 <td>".$dat->nomr."</td>
                                                 <td>".$dat->nobillranap."</td>
                                                 <td>".$dat->tglregistrasi."</td>
+                                                <td>".$dat->pasienkrs."</td>
+                                                <td>".$dat->tgliurbea."</td>
                                                 <td>".$dat->namapasien."</td>
                                                 <td>".$dat->dpjp."</td>
                                                 <td>".$dat->smf."</td>
-                                                <td></td>
-                                                <td></td>
                                                 <td>".$dat->namaruang."</td>
-                                                <td></td>
                                                 <td>".$dat->subsistem."</td>
                                                 <td>".$dat->penjamin."</td>
                                                 <td>".$dat->hakkelas."</td>
@@ -121,6 +123,7 @@
                                                 <td>".$dat->nominalnaik."</td>
                                                 <td>".$dat->selisih."</td>
                                                 <td>".$dat->jumlahbayar."</td>
+                                                <td>".$dat->totaltarifrs."</td>
                                                 <td>".$dat->tglbayar."</td>
                                                 <td>".$dat->statusbayar."</td>
                                                 <td>".$dat->petugasbayar."</td>
diff --git a/application/views/simrs/report/pasienkeuanganrajal/v_pasienkeuanganrajal.php b/application/views/simrs/report/pasienkeuanganrajal/v_pasienkeuanganrajal.php
index 2c2b066..3984723 100644
--- a/application/views/simrs/report/pasienkeuanganrajal/v_pasienkeuanganrajal.php
+++ b/application/views/simrs/report/pasienkeuanganrajal/v_pasienkeuanganrajal.php
@@ -70,6 +70,7 @@
                                     <th>No RM</th>
                                     <th>NoBill Rajal</th>
                                     <th>Tgl Reg </th>
+                                    <th>Tgl KRS </th>
                                     <th>Nama</th>
                                     <th>DPJP</th>
                                     <th>SMF</th>
@@ -116,6 +117,7 @@
                                                 <td>".$dat->nomr."</td>
                                                 <td>".$dat->nobillrajal."</td>
                                                 <td>".$dat->tglregistrasi."</td>
+                                                <td>".$dat->pasienkrs."</td>
                                                 <td>".$dat->namapasien."</td>
                                                 <td>".$dat->dokterrajal."</td>
                                                 <td>".$dat->smfrajal."</td>
diff --git a/application/views/simrs/report/pasienkeuanganranap/v_pasienkeuanganranap.php b/application/views/simrs/report/pasienkeuanganranap/v_pasienkeuanganranap.php
index c860016..241bea3 100644
--- a/application/views/simrs/report/pasienkeuanganranap/v_pasienkeuanganranap.php
+++ b/application/views/simrs/report/pasienkeuanganranap/v_pasienkeuanganranap.php
@@ -69,7 +69,8 @@
                                     <th>IDX</th>
                                     <th>No RM</th>
                                     <th>NoBill Ranap</th>
-                                    <th>Tgl Ranap </th>
+                                    <th>Tgl Ranap</th>
+                                    <th>Tgl KRS</th>
                                     <th>Nama</th>
                                     <th>DPJP</th>
                                     <th>SMF</th>
@@ -115,6 +116,7 @@
                                                 <td>".$dat->nomr."</td>
                                                 <td>".$dat->nobillranap."</td>
                                                 <td>".$dat->masukrs."</td>
+                                                <td>".$dat->pasienkrs."</td>
                                                 <td>".$dat->namapasien."</td>
                                                 <td>".$dat->dokterranap."</td>
                                                 <td>".$dat->smfranap."</td>
diff --git a/application/views/simrs/report/pasienpenunjang/form_pasienpenunjang.php b/application/views/simrs/report/pasienpenunjang/form_pasienpenunjang.php
new file mode 100644
index 0000000..e183369
--- /dev/null
+++ b/application/views/simrs/report/pasienpenunjang/form_pasienpenunjang.php
@@ -0,0 +1,145 @@
+<section class="content-header">
+    <div class="container-fluid">
+        <div class="row mb-2">
+            <div class="col-sm-6">
+                <h1>
+                    
+                </h1>
+            </div>
+            <div class="col-sm-6">
+                <ol class="breadcrumb float-sm-right">
+                    <li class="breadcrumb-item"><a href="<?php echo base_url();?>">Dashboard</a></li>
+                    <li class="breadcrumb-item"><?php echo $parent;?></li>
+                    <li class="breadcrumb-item"><a href="<?php echo base_url()."index.php/lp_simrs_report/pasienpenunjang";?>">DATA PASIEN</a></li>
+                    <li class="breadcrumb-item active"><?php echo $title;?></li>
+                </ol>
+            </div>
+        </div>
+    </div>
+</section>
+<!-- Main content -->
+<section class="content">
+    <div class="container-fluid">
+        <div class="row">
+            <div class="col-md-12">
+                <div class="card card-default">
+                    <?php 
+                        $setglreg   = $datapas->row('tglreg');
+                        $sejamreg   = $datapas->row('jamreg');
+                        $setnomr    = $datapas->row('nomr');
+                        $setnama    = $datapas->row('title')." / ".$datapas->row('namapasien');
+                        $setjk      = $datapas->row('jeniskelamin');
+                        $setalamat  = $datapas->row('alamat');
+                        $setklinik  = $datapas->row('klinik');
+                        $setdokter  = $datapas->row('namadokter');
+                        $setsmf     = $datapas->row('kdsmf');
+                        $setpenjamin= $datapas->row('penjamin');
+                    ?>
+                    <form >
+                        <div class="card-header">
+                            <h3 class="card-title"><?php echo $title;?></h3>
+                        </div>
+                        <div class="card-body">
+                            <div class="form-group row">
+                                <label for="regpas" class="col-sm-2 col-form-label">Register Pasien</label>
+                                <div class="col-sm-3">
+                                    <input id="regpas" name="regpas" type="text" class="form-control" disabled value="<?php echo $setglreg;?>" />
+                                </div>
+                                <div class="col-sm-3">
+                                    <input type="text" class="form-control" disabled value="<?php echo $sejamreg;?>" />
+                                </div>
+                                <div class="col-sm-2">
+                                    <input type="text" class="form-control" disabled value="<?php echo $setnomr;?>" />
+                                </div>
+                            </div>
+                            <div class="form-group row">
+                                <label for="nama" class="col-sm-2 col-form-label">Nama Pasien</label>
+                                <div class="col-sm-3">
+                                    <input id="nama" name="nama" type="text" class="form-control" disabled value="<?php echo $setnama;?>" />
+                                </div>
+                                <div class="col-sm-1">
+                                    <input type="text" class="form-control" disabled value="<?php echo $setjk;?>" />
+                                </div>
+                                <div class="col-sm-4">
+                                    <input type="text" class="form-control" disabled value="<?php echo $setalamat;?>" />
+                                </div>
+                            </div>
+                            <div class="form-group row">
+                                <label for="kunjungan" class="col-sm-2 col-form-label">Data Kunjungan</label>
+                                <div class="col-sm-1">
+                                    <input id="kunjungan" name="kunjungan" type="text" class="form-control" disabled value="<?php echo $setklinik;?>" />
+                                </div>
+                                <div class="col-sm-3">
+                                    <input type="text" class="form-control" disabled value="<?php echo $setdokter;?>" />
+                                </div>
+                                <div class="col-sm-2">
+                                    <input type="text" class="form-control" disabled value="SMF : <?php echo $setsmf;?>" />
+                                </div>
+                                <div class="col-sm-2">
+                                    <input type="text" class="form-control" disabled value="<?php echo $setpenjamin;?>" />
+                                </div>
+                            </div>
+                        </div>
+                        <div class="card-body">
+                            <div class="form-group row">
+                                <div class="col-sm-2">
+                                    <label class="col-form-label">RADIOLOGI</label>
+                                </div>
+                                <div class="col-sm-8">
+                                    <table id="example1" class="table table-bordered table-striped">
+                                        <thead>
+                                            <tr>
+                                                <th width="5%">No</th>
+                                                <th>Tanggal Foto</th>
+                                                <th>No Foto</th>
+                                                <th>Request</th>
+                                                <th>Bacaan</th>
+                                                <th>Hasil</th>
+                                            </tr>
+                                        </thead>
+                                        <tbody>
+                                            <?php 
+                                            $no=0;
+                                                foreach($dataro as $dat){
+                                                    $no++;
+                                                    ?>
+                                            <tr>
+                                                <td><?php echo $no;?></td>
+                                                <td><?php echo $dat->daftar;?></td>
+                                                <td><?php echo $dat->nofoto;?></td>
+                                                <td><?php echo $dat->reques;?></td>
+                                                <td><?php echo "<a class='btn btn-xs btn-info' href='https://ris.rssa.id/hasil/$dat->nofoto' target='_blank'>View</a></br></br>";;?></td>
+                                                <td><?php 
+                                                         $data = array(
+                                                                    'force_all_browsers' => 'true',
+                                                                    'patient_id' => $dat->noregister,
+                                                                    'accession_number' => $dat->nofoto,
+                                                                    'tz' => password_hash(date('Y-m-d H:i:s'), PASSWORD_DEFAULT),
+                                                                    'password_encrypted' => 'true',
+                                                                    'user_name' => 'hisris',
+                                                                    'password' => 'HIIFALMMAHFLAOCN',
+                                                                );
+                                                                $url = 'https://pacs.rssa.my.id/portal/';
+                                                                //echo json_encode(['url' => $url . '?' . http_build_query($data)]);
+                                                                $url = 'https://pacs.rssa.my.id/portal/';
+                                                                $finalUrl = $url . '?' . http_build_query($data); 
+                                                ?>
+                                                <a href="<?= $finalUrl ?>" target="_blank" class="btn btn-xs btn-primary">Buka PACS</a></td>
+                                            </tr>
+                                                    <?php
+                                                }
+                                            ?>
+                                        </tbody>
+                                    </table>
+                                </div>
+                            </div>
+                        </div>
+                        <div class="card-footer">
+                            <a href="<?php echo base_url()."index.php/lp_simrs_report/pencarianpasien";?>" class="btn btn-default float-right">Cancel</a>
+                        </div>
+                    </form>
+                </div>
+            </div>
+        </div>
+    </div>
+</section>
diff --git a/application/views/simrs/report/pasienpenunjang/v_pasienpenunjang.php b/application/views/simrs/report/pasienpenunjang/v_pasienpenunjang.php
new file mode 100644
index 0000000..b5cd13a
--- /dev/null
+++ b/application/views/simrs/report/pasienpenunjang/v_pasienpenunjang.php
@@ -0,0 +1,145 @@
+<section class="content-header">
+    <div class="container-fluid">
+        <div class="row mb-2">
+            <div class="col-sm-6">
+                <h1>
+                </h1>
+            </div>
+            <div class="col-sm-6">
+                <ol class="breadcrumb float-sm-right">
+                    <li class="breadcrumb-item"><a href="<?php echo base_url();?>">Dashboard</a></li>
+                    <li class="breadcrumb-item"><?php echo $parent;?></li>
+                    <li class="breadcrumb-item active"><?php echo $title;?></li>
+                </ol>
+            </div>
+        </div>
+    </div>
+</section>
+<!-- Main content -->
+<section class="content">
+    <div class="container-fluid">
+        <div class="row">
+            <div class="col-md-12">
+                <div class="card card-default">
+                    <div class="card-header">
+                        <h3 class="card-title"><?php 
+                        echo $title;
+                        $tglawal = $awal;
+                        $tglakhir= $akhir;
+                        $tglgabung = date("m/d/Y", strtotime($awal))." - ".date("m/d/Y", strtotime($akhir));
+                        ?></h3>
+                    </div>
+                    <form action="<?php echo(base_url()); ?>index.php/lp_simrs_report/pasienpenunjang" method="post" autocomplete="off">
+                        <div class="card-body">
+                            <div class="form-group row">
+                                <label class="col-sm-1 col-form-label">Tanggal Registrasi :</label>
+                                <div class="col-sm-4">
+                                    <div class="input-group">
+                                        <div class="input-group-prepend">
+                                            <span class="input-group-text">
+                                                <i class="far fa-calendar-alt"></i>
+                                            </span>
+                                        </div>
+                                        <input type="text" name="tanggal" class="form-control float-right" id="reservation" value="<?php echo $tglgabung;?>">
+                                    </div>
+                                </div>
+                                <div class="col-sm-2">
+                                    <button type="submit" class="btn btn-outline-info">Search </button>
+                                </div>
+                            </div>
+                        </div>
+                    </form>
+                    <div class="card-body">
+                        <?php if($this->session->flashdata('message')){?>
+                        <div id="alert" class="alert alert-success alert-dismissable">
+                            <button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
+                            <i class="icon fa fa-check"></i> Alert!
+                            <?php echo $this->session->flashdata('message');?>
+                        </div>
+                        <?php }?>
+                        <script> 
+                            setTimeout(function() {
+                                $('#alert').hide('fast');
+                            }, 3000);
+                        </script>
+                        <table id="example1" class="table table-bordered table-striped">
+                            <thead>
+                                <tr>
+                                    <th>No</th>
+                                    <th>Registrasi</th>
+                                    <th>Substansi</th>
+                                    <th>Penjamin</th>
+                                    <th>RM</th>
+                                    <th>Nama</th>
+                                    <th>JK</th>
+                                    <th>Alamat</th>
+                                    <th>Klinik</th>
+                                    <th>Dokter</th>
+                                    <th>SMF</th>
+                                    <th>Penunjang</th>
+                                </tr>
+                            </thead>
+                            <tbody>
+                                <?php
+
+                                    $no = 0;
+                                    foreach ($datapen as $dat){
+                                        // $dbRad = $this->load->database('dataradiologi', TRUE);
+                                        // $q = $dbRad
+                                        //     ->where('prk.noregister', $dat->nomr)
+                                        //     ->order_by('prk.mulai', 'DESC')
+                                        //     ->get('periksa AS prk');
+                                        
+                                        $no++;
+                                        ?>
+                                            <tr>
+                                                <td><?php echo $no;?></td>
+                                                <td><?php echo $dat->tglreg;?></td>
+                                                <td><?php echo $dat->asalmasuk;?></td>
+                                                <td><?php echo $dat->penjamin;?></td>
+                                                <td><?php echo $dat->nomr;?></td>
+                                                <td><?php echo $dat->title." ".$dat->namapasien;?></td>
+                                                <td><?php echo $dat->jeniskelamin;?></td>
+                                                <td><?php echo $dat->alamat;?></td>
+                                                <td><?php echo $dat->klinik;?></td>
+                                                <td><?php echo $dat->namadokter;?></td>
+                                                <td><?php echo $dat->kdsmf;?></td>
+                                                <td><?php 
+                                                    if($dat->radiologi!="{}"){
+                                                        echo "<a href='".base_url()."index.php/lp_simrs_report/viewpasienpenunjang/".$dat->idxdaftar."/".$dat->nomr."' class='btn btn-info btn-xs'><i class='fa fa-eye'></i></a>";
+                                                        //echo $dat->radiologi;
+                                                    }
+                                                    
+                                                    ?>
+                                                    
+                                                    <?php  
+                                                        // foreach ($q->result() as $datro){
+                                                        //     echo "<a class='btn btn-info' href='https://ris.rssa.id/hasil/$datro->nofoto' target='_blank'>$datro->mulai / $datro->nofoto / Jabawan</a></br></br>";
+                                                        //     $data = array(
+                                                        //             'force_all_browsers' => 'true',
+                                                        //             'patient_id' => $datro->noregister,
+                                                        //             'accession_number' => $datro->nofoto,
+                                                        //             'tz' => password_hash(date('Y-m-d H:i:s'), PASSWORD_DEFAULT),
+                                                        //             'password_encrypted' => 'true',
+                                                        //             'user_name' => 'hisris',
+                                                        //             'password' => 'HIIFALMMAHFLAOCN',
+                                                        //         );
+                                                        //         $url = 'https://pacs.rssa.my.id/portal/';
+                                                        //     echo json_encode(['url' => $url . '?' . http_build_query($data)]);
+                                                        // }
+                                                    ?>
+                                                </td>
+                                            </tr>
+                                        <?php
+                                    }
+
+                                    
+                                ?>
+                            </tbody>
+                        </table>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</section>
\ No newline at end of file
diff --git a/application/views/simrs/report/pasienpenunjang/v_pencarianpasien.php b/application/views/simrs/report/pasienpenunjang/v_pencarianpasien.php
new file mode 100644
index 0000000..07ee3df
--- /dev/null
+++ b/application/views/simrs/report/pasienpenunjang/v_pencarianpasien.php
@@ -0,0 +1,151 @@
+<section class="content-header">
+    <div class="container-fluid">
+        <div class="row mb-2">
+            <div class="col-sm-6">
+                <h1>
+                </h1>
+            </div>
+            <div class="col-sm-6">
+                <ol class="breadcrumb float-sm-right">
+                    <li class="breadcrumb-item"><a href="<?php echo base_url();?>">Dashboard</a></li>
+                    <li class="breadcrumb-item"><?php echo $parent;?></li>
+                    <li class="breadcrumb-item active"><?php echo $title;?></li>
+                </ol>
+            </div>
+        </div>
+    </div>
+</section>
+<!-- Main content -->
+<section class="content">
+    <div class="container-fluid">
+        <div class="row">
+            <div class="col-md-12">
+                <div class="card card-default">
+                    <div class="card-header">
+                        <h3 class="card-title"><?php 
+                        echo $title;
+                        // $tglawal = $awal;
+                        // $tglakhir= $akhir;
+                        // $tglgabung = date("m/d/Y", strtotime($awal))." - ".date("m/d/Y", strtotime($akhir));
+                        ?></h3>
+                    </div>
+                    <form action="<?php echo(base_url()); ?>index.php/lp_simrs_report/pencarianpasien" method="post" autocomplete="off">
+                        <div class="card-body">
+                            <div class="form-group row">
+                                <label class="col-sm-1 col-form-label"> Pencarian Pasien</label>
+                                <div class="col-sm-2">
+                                    <input id="norekamedik" name="norekamedik" type="text" class="form-control"  value="<?php echo $norekamedik;?>" placeholder="Pencarian Berdasarkan No Rekamedik" />
+                                </div>
+                                <div class="col-sm-2">
+                                    <input id="namapasien" name="namapasien" type="text" class="form-control"  value="<?php echo $namapasien;?>" placeholder="Pencarian Berdasarkan Nama Pasien" />
+                                </div>
+                                <div class="col-sm-3">
+                                    <select name="dokterdpjp" class="select2" data-placeholder="Dokter DPJP" style="width: 100%;">
+                                        <option>Pilih Dokter DPJP</option>
+                                        <?php 
+                                            foreach($dokterdpjp as $datdpjp){
+                                        ?>
+                                                <option <?php if($datdpjp->kddokter==$dokter){echo "selected";}?> value="<?php echo $datdpjp->kddokter;?>"><?php echo $datdpjp->kdsmf." - ".$datdpjp->namadokter;?></option>
+                                        <?php } ?>
+                                    </select>
+                                </div>
+                                <div class="col-sm-2">
+                                    <button type="submit" class="btn btn-outline-info">Search </button>
+                                </div>
+                            </div>
+                        </div>
+                    </form>
+                    <div class="card-body">
+                        <?php if($this->session->flashdata('message')){?>
+                        <div id="alert" class="alert alert-success alert-dismissable">
+                            <button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
+                            <i class="icon fa fa-check"></i> Alert!
+                            <?php echo $this->session->flashdata('message');?>
+                        </div>
+                        <?php }?>
+                        <script> 
+                            setTimeout(function() {
+                                $('#alert').hide('fast');
+                            }, 3000);
+                        </script>
+                        <table id="example1" class="table table-bordered table-striped">
+                            <thead>
+                                <tr>
+                                    <th>No</th>
+                                    <th>Registrasi</th>
+                                    <th>Substansi</th>
+                                    <th>Penjamin</th>
+                                    <th>RM</th>
+                                    <th>Nama</th>
+                                    <th>JK</th>
+                                    <th>Alamat</th>
+                                    <th>Klinik</th>
+                                    <th>Dokter</th>
+                                    <th>SMF</th>
+                                    <th>Penunjang</th>
+                                </tr>
+                            </thead>
+                            <tbody>
+                                <?php
+
+                                    $no = 0;
+                                    foreach ($datapen as $dat){
+                                        // $dbRad = $this->load->database('dataradiologi', TRUE);
+                                        // $q = $dbRad
+                                        //     ->where('prk.noregister', $dat->nomr)
+                                        //     ->order_by('prk.mulai', 'DESC')
+                                        //     ->get('periksa AS prk');
+                                        
+                                        $no++;
+                                        ?>
+                                            <tr>
+                                                <td><?php echo $no;?></td>
+                                                <td><?php echo $dat->tglreg;?></td>
+                                                <td><?php echo $dat->asalmasuk;?></td>
+                                                <td><?php echo $dat->penjamin;?></td>
+                                                <td><?php echo $dat->nomr;?></td>
+                                                <td><?php echo $dat->title." ".$dat->namapasien;?></td>
+                                                <td><?php echo $dat->jeniskelamin;?></td>
+                                                <td><?php echo $dat->alamat;?></td>
+                                                <td><?php echo $dat->klinik;?></td>
+                                                <td><?php echo $dat->namadokter;?></td>
+                                                <td><?php echo $dat->kdsmf;?></td>
+                                                <td><?php 
+                                                    if($dat->radiologi!="{}"){
+                                                        echo "<a href='".base_url()."index.php/lp_simrs_report/viewpasienpenunjang/".$dat->idxdaftar."/".$dat->nomr."' class='btn btn-info btn-xs'><i class='fa fa-eye'></i></a>";
+                                                        //echo $dat->radiologi;
+                                                    }
+                                                    
+                                                    ?>
+                                                    
+                                                    <?php  
+                                                        // foreach ($q->result() as $datro){
+                                                        //     echo "<a class='btn btn-info' href='https://ris.rssa.id/hasil/$datro->nofoto' target='_blank'>$datro->mulai / $datro->nofoto / Jabawan</a></br></br>";
+                                                        //     $data = array(
+                                                        //             'force_all_browsers' => 'true',
+                                                        //             'patient_id' => $datro->noregister,
+                                                        //             'accession_number' => $datro->nofoto,
+                                                        //             'tz' => password_hash(date('Y-m-d H:i:s'), PASSWORD_DEFAULT),
+                                                        //             'password_encrypted' => 'true',
+                                                        //             'user_name' => 'hisris',
+                                                        //             'password' => 'HIIFALMMAHFLAOCN',
+                                                        //         );
+                                                        //         $url = 'https://pacs.rssa.my.id/portal/';
+                                                        //     echo json_encode(['url' => $url . '?' . http_build_query($data)]);
+                                                        // }
+                                                    ?>
+                                                </td>
+                                            </tr>
+                                        <?php
+                                    }
+
+                                    
+                                ?>
+                            </tbody>
+                        </table>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</section>
\ No newline at end of file
diff --git a/application/views/simrs/report/penunjangrajal/v_penunjangrajal.php b/application/views/simrs/report/penunjangrajal/v_penunjangrajal.php
new file mode 100644
index 0000000..dd2fd19
--- /dev/null
+++ b/application/views/simrs/report/penunjangrajal/v_penunjangrajal.php
@@ -0,0 +1,157 @@
+<section class="content-header">
+    <div class="container-fluid">
+        <div class="row mb-2">
+            <div class="col-sm-6">
+                <h1>
+                </h1>
+            </div>
+            <div class="col-sm-6">
+                <ol class="breadcrumb float-sm-right">
+                    <li class="breadcrumb-item"><a href="<?php echo base_url();?>">Dashboard</a></li>
+                    <li class="breadcrumb-item"><?php echo $parent;?></li>
+                    <li class="breadcrumb-item active"><?php echo $title;?></li>
+                </ol>
+            </div>
+        </div>
+    </div>
+</section>
+<!-- Main content -->
+<section class="content">
+    <div class="container-fluid">
+        <div class="row">
+            <div class="col-md-12">
+                <div class="card card-default">
+                    <div class="card-header">
+                        <h3 class="card-title"><?php 
+                        echo $title;
+                        $tglawal = $awal;
+                        $tglakhir= $akhir;
+                        $tglgabung = date("m/d/Y", strtotime($awal))." - ".date("m/d/Y", strtotime($akhir));
+                        ?></h3>
+                    </div>
+                    <form action="<?php echo(base_url()); ?>index.php/lp_simrs_report/orderpenunjangrajal" method="post" autocomplete="off">
+                        <div class="card-body">
+                            <div class="form-group row">
+                                <label class="col-sm-1 col-form-label">Tanggal Transaksi :</label>
+                                <div class="col-sm-4">
+                                    <div class="input-group">
+                                        <div class="input-group-prepend">
+                                            <span class="input-group-text">
+                                                <i class="far fa-calendar-alt"></i>
+                                            </span>
+                                        </div>
+                                        <input type="text" name="tanggal" class="form-control float-right" id="reservation" value="<?php echo $tglgabung;?>">
+                                    </div>
+                                </div>
+                                <div class="col-sm-2">
+                                    <button type="submit" class="btn btn-outline-info">Search </button>
+                                </div>
+                            </div>
+                        </div>
+                    </form>
+                    <div class="card-body">
+                        <?php if($this->session->flashdata('message')){?>
+                        <div id="alert" class="alert alert-success alert-dismissable">
+                            <button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
+                            <i class="icon fa fa-check"></i> Alert!
+                            <?php echo $this->session->flashdata('message');?>
+                        </div>
+                        <?php }?>
+                        <script> 
+                            setTimeout(function() {
+                                $('#alert').hide('fast');
+                            }, 3000);
+                        </script>
+                        <table id="example1" class="table table-bordered table-striped">
+                            <thead>
+                                <tr>
+                                    <th>No</th>
+                                    <th>No Bill</th>
+                                    <th>No RM</th>
+                                    <th>Tgl Transaksi</th>
+                                    <th>No Nota</th>
+                                    <th>Pasien</th>
+                                    <th>Dokter</th>
+                                    <th>Status Bill</th>
+                                    <th>Cara Bayar</th>
+                                    <th>Jasa Sarana</th>
+                                    <th>Jasa Pelayanan</th>
+                                    <th>Tarif RS</th>
+                                    <th>Status Verifikasi</th>
+                                    <th>Tgl Verifikasi</th>
+                                    <th>Kode Tarif</th>
+                                    <th>Uraian Tarif</th>
+                                    <th>Kelas Tarif</th>
+                                    <th>Jml Bayar</th>
+                                    <th>Tot Tarif RS</th>
+                                    <th>Tot Jasa Sarana</th>
+                                    <th>Tot Jasa Pelayanan</th>
+                                    <th>Status Bayar</th>
+                                    <th style="width: 60%;" >Detail Order</th>
+                                </tr>
+                            </thead>
+                            <tbody>
+                                <?php
+                                function formatLappkmain($str) {
+                                    if (!$str) return "";
+                                    $str = stripslashes($str);
+                                    preg_match_all('/\{[^}]+\}/', $str, $matches);
+                                    $output = [];
+                                    foreach ($matches[0] as $json) {
+                                        $data = json_decode($json, true);
+                                        if (is_array($data) && isset($data['nolab'])) {
+                                            $output[] = "nolab : {$data['nolab']} - tgl_order : {$data['tgl_order']} - field : {$data['field']}";
+                                        }
+                                    }
+                                    if (empty($output)) {
+                                        return htmlspecialchars($str);
+                                    }
+                                    return implode("<br>", $output);
+                                }
+
+                                    $no = 0;
+                                    foreach ($databill as $dat){
+                                        $no++;$statusverif="";
+                                        if($dat->status_verifikasi==1){
+                                            $statusverif="Verif";
+                                        }
+
+                                        echo("
+                                            <tr>
+                                                <td>".$no."</td>
+                                                <td>".$dat->nobill."</td>
+                                                <td>".$dat->nomr."</td>
+                                                <td>".$dat->tgl_transaksi."</td>
+                                                <td>".$dat->nonota."</td>
+                                                <td>".$dat->namapasien."</td>
+                                                <td>".$dat->namadokter."</td>
+                                                <td>".$dat->statusbilling."</td>
+                                                <td>".$dat->namabayar."</td>
+                                                <td>".$dat->jasa_sarana."</td>
+                                                <td>".$dat->jasa_pelayanan."</td>
+                                                <td>".$dat->tarifrs."</td>
+                                                <td>".$statusverif."</td>
+                                                <td>".$dat->tgl_verifikasi."</td>
+                                                <td>".$dat->kode_tarif."</td>
+                                                <td>".$dat->uraian_tarif."</td>
+                                                <td>".$dat->kelas_tarif."</td>
+                                                <td>".$dat->jmbayar."</td>
+                                                <td>".$dat->tottarifrs."</td>
+                                                <td>".$dat->totjasa_sarana."</td>
+                                                <td>".$dat->totjasa_pelayanan."</td>
+                                                <td>".$dat->statusbayar."</td>
+                                                <td>".formatLappkmain($dat->lappkmain)."</td>
+                                            </tr>
+                                        ");
+                                    }
+
+                                    
+                                ?>
+                            </tbody>
+                        </table>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</section>
\ No newline at end of file
diff --git a/application/views/simrs/report/penunjangranap/v_penunjangranap.php b/application/views/simrs/report/penunjangranap/v_penunjangranap.php
new file mode 100644
index 0000000..7545c82
--- /dev/null
+++ b/application/views/simrs/report/penunjangranap/v_penunjangranap.php
@@ -0,0 +1,155 @@
+<section class="content-header">
+    <div class="container-fluid">
+        <div class="row mb-2">
+            <div class="col-sm-6">
+                <h1>
+                </h1>
+            </div>
+            <div class="col-sm-6">
+                <ol class="breadcrumb float-sm-right">
+                    <li class="breadcrumb-item"><a href="<?php echo base_url();?>">Dashboard</a></li>
+                    <li class="breadcrumb-item"><?php echo $parent;?></li>
+                    <li class="breadcrumb-item active"><?php echo $title;?></li>
+                </ol>
+            </div>
+        </div>
+    </div>
+</section>
+<!-- Main content -->
+<section class="content">
+    <div class="container-fluid">
+        <div class="row">
+            <div class="col-md-12">
+                <div class="card card-default">
+                    <div class="card-header">
+                        <h3 class="card-title"><?php 
+                        echo $title;
+                        $tglawal = $awal;
+                        $tglakhir= $akhir;
+                        $tglgabung = date("m/d/Y", strtotime($awal))." - ".date("m/d/Y", strtotime($akhir));
+                        ?></h3>
+                    </div>
+                    <form action="<?php echo(base_url()); ?>index.php/lp_simrs_report/orderpenunjangranap" method="post" autocomplete="off">
+                        <div class="card-body">
+                            <div class="form-group row">
+                                <label class="col-sm-1 col-form-label">Tanggal Transaksi :</label>
+                                <div class="col-sm-4">
+                                    <div class="input-group">
+                                        <div class="input-group-prepend">
+                                            <span class="input-group-text">
+                                                <i class="far fa-calendar-alt"></i>
+                                            </span>
+                                        </div>
+                                        <input type="text" name="tanggal" class="form-control float-right" id="reservation" value="<?php echo $tglgabung;?>">
+                                    </div>
+                                </div>
+                                <div class="col-sm-2">
+                                    <button type="submit" class="btn btn-outline-info">Search </button>
+                                </div>
+                            </div>
+                        </div>
+                    </form>
+                    <div class="card-body">
+                        <?php if($this->session->flashdata('message')){?>
+                        <div id="alert" class="alert alert-success alert-dismissable">
+                            <button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
+                            <i class="icon fa fa-check"></i> Alert!
+                            <?php echo $this->session->flashdata('message');?>
+                        </div>
+                        <?php }?>
+                        <script> 
+                            setTimeout(function() {
+                                $('#alert').hide('fast');
+                            }, 3000);
+                        </script>
+                        <table id="example1" class="table table-bordered table-striped">
+                            <thead>
+                                <tr>
+                                    <th>No</th>
+                                    <th>No Bill</th>
+                                    <th>No RM</th>
+                                    <th>Tgl Transaksi</th>
+                                    <th>No Nota</th>
+                                    <th>Pasien</th>
+                                    <th>Dokter</th>
+                                    <th>Status Bill</th>
+                                    <th>Cara Bayar</th>
+                                    <th>Jasa Sarana</th>
+                                    <th>Jasa Pelayanan</th>
+                                    <th>Tarif RS</th>
+                                    <th>Status Verifikasi</th>
+                                    <th>Tgl Verifikasi</th>
+                                    <th>Kode Tarif</th>
+                                    <th>Uraian Tarif</th>
+                                    <th>Kelas Tarif</th>
+                                    <th>Jml Bayar</th>
+                                    <th>Tot Tarif RS</th>
+                                    <th>Tot Jasa Sarana</th>
+                                    <th>Tot Jasa Pelayanan</th>
+                                    <th>Status Bayar</th>
+                                    <th style="width: 60%;" >Detail Order</th>
+                                </tr>
+                            </thead>
+                            <tbody>
+                                <?php
+                                    function formatLappkmain($str) {
+                                        if (!$str) return "";
+                                        $str = stripslashes($str);
+                                        preg_match_all('/\{[^}]+\}/', $str, $matches);
+                                        $output = [];
+                                        foreach ($matches[0] as $json) {
+                                            $data = json_decode($json, true);
+                                            if (is_array($data) && isset($data['nolab'])) {
+                                                $output[] = "nolab : {$data['nolab']} - tgl_order : {$data['tgl_order']} - field : {$data['field']}";
+                                            }
+                                        }
+                                        if (empty($output)) {
+                                            return htmlspecialchars($str);
+                                        }
+                                        return implode("<br>", $output);
+                                    }
+
+                                    $no = 0;
+                                    foreach ($databill as $dat){
+                                        $no++;$statusverif="";
+                                        if($dat->status_verifikasi==1){
+                                            $statusverif="Verif";
+                                        }
+
+                                        echo("
+                                            <tr>
+                                                <td>".$no."</td>
+                                                <td>".$dat->nobill."</td>
+                                                <td>".$dat->nomr."</td>
+                                                <td>".$dat->tgl_transaksi."</td>
+                                                <td>".$dat->nonota."</td>
+                                                <td>".$dat->namapasien  ."</td>
+                                                <td>".$dat->namadokter."</td>
+                                                <td>".$dat->statusbilling."</td>
+                                                <td>".$dat->namabayar."</td>
+                                                <td>".$dat->jasa_sarana."</td>
+                                                <td>".$dat->jasa_pelayanan."</td>
+                                                <td>".$dat->tarifrs."</td>
+                                                <td>".$statusverif."</td>
+                                                <td>".$dat->tgl_verifikasi."</td>
+                                                <td>".$dat->kode_tarif."</td>
+                                                <td>".$dat->uraian_tarif."</td>
+                                                <td>".$dat->kelas_tarif."</td>
+                                                <td>".$dat->jmbayar."</td>
+                                                <td>".$dat->tottarifrs."</td>
+                                                <td>".$dat->totjasa_sarana."</td>
+                                                <td>".$dat->totjasa_pelayanan."</td>
+                                                <td>".$dat->statusbayar."</td>
+                                                <td>".formatLappkmain($dat->lappkmain)."</td>
+                                            </tr>
+                                        ");
+                                    }
+                                ?>
+                            </tbody>
+                        </table>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</section>
\ No newline at end of file
diff --git a/application/views/simrs/report/rekap/v_rekaprajal.php b/application/views/simrs/report/rekap/v_rekaprajal.php
new file mode 100644
index 0000000..bf14dac
--- /dev/null
+++ b/application/views/simrs/report/rekap/v_rekaprajal.php
@@ -0,0 +1,183 @@
+<section class="content-header">
+    <div class="container-fluid">
+        <div class="row mb-2">
+            <div class="col-sm-6">
+                <h1>
+                </h1>
+            </div>
+            <div class="col-sm-6">
+                <ol class="breadcrumb float-sm-right">
+                    <li class="breadcrumb-item"><a href="<?php echo base_url();?>">Dashboard</a></li>
+                    <li class="breadcrumb-item"><?php echo $parent;?></li>
+                    <li class="breadcrumb-item active"><?php echo $title;?></li>
+                </ol>
+            </div>
+        </div>
+    </div>
+</section>
+<!-- Main content -->
+<section class="content">
+    <div class="container-fluid">
+        <div class="row">
+            <div class="col-md-12">
+                <div class="card card-default">
+                    <div class="card-header">
+                        <h3 class="card-title"><?php 
+                        echo $title;
+                        $tglawal = $awal;
+                        $tglakhir= $akhir;
+                        $tglgabung = date("m/d/Y", strtotime($awal))." - ".date("m/d/Y", strtotime($akhir));
+                        ?></h3>
+                    </div>
+                    <form action="<?php echo(base_url()); ?>index.php/lp_simrs_report/rajalrekap" method="post" autocomplete="off">
+                        <div class="card-body">
+                            <div class="form-group row">
+                                <label class="col-sm-1 col-form-label">Tanggal :</label>
+                                <div class="col-sm-4">
+                                    <div class="input-group">
+                                        <div class="input-group-prepend">
+                                            <span class="input-group-text">
+                                                <i class="far fa-calendar-alt"></i>
+                                            </span>
+                                        </div>
+                                        <input type="text" name="tanggal" class="form-control float-right" id="reservation" value="<?php echo $tglgabung;?>">
+                                    </div>
+                                </div>
+                                <div class="col-sm-2">
+                                    <button type="submit" class="btn btn-outline-info">Search </button>
+                                </div>
+                            </div>
+                        </div>
+                    </form>
+                    <div class="card-body">
+                        <?php if($this->session->flashdata('message')){?>
+                        <div id="alert" class="alert alert-success alert-dismissable">
+                            <button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
+                            <i class="icon fa fa-check"></i> Alert!
+                            <?php echo $this->session->flashdata('message');?>
+                        </div>
+                        <?php }?>
+                        <script> 
+                            setTimeout(function() {
+                                $('#alert').hide('fast');
+                            }, 3000);
+                        </script>
+                        <table id="example1" class="table table-bordered table-striped">
+                            <thead>
+                                <tr>
+                                    <th>No</th>
+                                    <th>Ruang</th>
+                                    <th>Kelompok</th>
+                                    <th>Sub Sistem</th>
+                                    <th>PKS</th>
+                                    <th>JKN</th>
+                                    <th>JKMM</th>
+                                    <th>SPM</th>
+                                    <th>UMUM</th>
+                                    <th>Batal</th>
+                                    <th>Pulang</th>
+                                    <th>Ranap</th>
+                                    <th>Meninggal</th>
+                                    <th>APS</th>
+                                    <th>Konsul</th>
+                                    <th>Rujuk IGD</th>
+                                    <th>Rujuk RS Lain</th>
+                                    <th>Kosong</th>
+                                    <th>Total</th>
+                                </tr>
+                            </thead>
+                            <tbody>
+                                <?php
+                                    $no = 0;
+                                    foreach ($datarajal as $dat){
+                                        $no++;
+                                        $batal          = 0;
+                                        $pulang         = 0;
+                                        $rujukrawatinap = 0;
+                                        $meninggal      = 0;
+                                        $aps            = 0;
+                                        $konsul         = 0;
+                                        $rujukigd       = 0;
+                                        $rujukkeluar    = 0;
+                                        $kosong         = 0;
+                                        $total          = 0;
+                                        $PKS            = 0;
+                                        $JKN            = 0;
+                                        $JKMM           = 0;
+                                        $SPM            = 0;
+                                        $UMUM           = 0;
+                                        
+                                        $totpasienpenjamin = str_replace(['{', '}', '"', '\\'], '', $dat->totpasienpenjamin);
+                                        $totpasienkeluar = str_replace(['{', '}', '"', '\\'], '', $dat->totpasienkeluar);
+
+                                        $items = explode('),', $totpasienkeluar);
+
+                                        $items2 = explode('),', $totpasienpenjamin);
+
+                                        foreach ($items as $item) {
+                                            $clean = str_replace(['(', ')'], '', trim($item));
+                                            $parts = explode(',', $clean, 2);
+                                            $label = isset($parts[0]) ? trim($parts[0]) : 'kosong';
+                                            $value = isset($parts[1]) ? (int) trim($parts[1]) : 0;
+                                            if ($label === '') {$label = 'kosong';}
+
+                                            if($label === 'BATAL') {$batal = $batal+$value;}
+                                            if($label === 'Pulang') {$pulang = $pulang+$value;}
+                                            if($label === 'Rujuk Rawat Inap') {$rujukrawatinap = $rujukrawatinap+$value;}
+                                            if($label === 'DOA' || $label === 'Meninggal') {$meninggal = $meninggal+$value;}
+                                            if($label === 'Atas Permintaan Sendiri') {$aps = $aps+$value;}
+                                            if($label === 'Konsul Ke Klinik Lain' || $label === 'Konsul Balik' || $label === 'Konsul Di Hari Lain' || $label === 'Konsul Antar Dokter - Poli Eksekutif') {$konsul = $konsul+$value;}
+                                            if($label === 'Diarahkan Ke IGD Reguler' || $label === 'Diarahkan Ke IGD Covid') {$rujukigd = $rujukigd+$value;}
+                                            if($label === 'Rujuk Ke Faskes Lain') {$rujukkeluar = $rujukkeluar+$value;}
+                                            if($label === 'kosong') {$kosong = $kosong+$value;}
+
+                                            $total = $total+$value;
+                                        }
+
+                                        foreach ($items2 as $item) {
+                                            $clean = str_replace(['(', ')'], '', trim($item));
+                                            $parts = explode(',', $clean, 2);
+                                            $label = isset($parts[0]) ? trim($parts[0]) : 'kosong';
+                                            $value = isset($parts[1]) ? (int) trim($parts[1]) : 0;
+                                            if ($label === '') {$label = 'kosong';}
+
+                                            if($label === 'PKS') {$PKS = $PKS+$value;}
+                                            if($label === 'JKN') {$JKN = $JKN+$value;}
+                                            if($label === 'JKMM') {$JKMM = $JKMM+$value;}
+                                            if($label === 'SPM') {$SPM = $SPM+$value;}
+                                            if($label === 'UMUM') {$UMUM = $UMUM+$value;}
+                                        }
+
+                                        echo("
+                                            <tr>
+                                                <td>".$no."</td>
+                                                <td>".$dat->klinik."</td>
+                                                <td>".$dat->kelompok."</td>
+                                                <td>".$dat->subsistem."</td>
+                                                <td>".$PKS."</td>
+                                                <td>".$JKN."</td>
+                                                <td>".$JKMM."</td>
+                                                <td>".$SPM."</td>
+                                                <td>".$UMUM."</td>
+                                                <td>".$batal."</td>
+                                                <td>".$pulang."</td>
+                                                <td>".$rujukrawatinap."</td>
+                                                <td>".$meninggal."</td>
+                                                <td>".$aps."</td>
+                                                <td>".$konsul."</td>
+                                                <td>".$rujukigd."</td>
+                                                <td>".$rujukkeluar."</td>
+                                                <td>".$kosong."</td>
+                                                <td>".$total."</td>
+                                            </tr>
+                                        ");
+                                    }
+                                ?>
+                            </tbody>
+                        </table>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</section>
\ No newline at end of file
diff --git a/application/views/simrs/report/rekap/v_rekapranap.php b/application/views/simrs/report/rekap/v_rekapranap.php
new file mode 100644
index 0000000..9d64b1f
--- /dev/null
+++ b/application/views/simrs/report/rekap/v_rekapranap.php
@@ -0,0 +1,130 @@
+<section class="content-header">
+    <div class="container-fluid">
+        <div class="row mb-2">
+            <div class="col-sm-6">
+                <h1>
+                </h1>
+            </div>
+            <div class="col-sm-6">
+                <ol class="breadcrumb float-sm-right">
+                    <li class="breadcrumb-item"><a href="<?php echo base_url();?>">Dashboard</a></li>
+                    <li class="breadcrumb-item"><?php echo $parent;?></li>
+                    <li class="breadcrumb-item active"><?php echo $title;?></li>
+                </ol>
+            </div>
+        </div>
+    </div>
+</section>
+<!-- Main content -->
+<section class="content">
+    <div class="container-fluid">
+        <div class="row">
+            <div class="col-md-12">
+                <div class="card card-default">
+                    <div class="card-header">
+                        <h3 class="card-title"><?php 
+                        echo $title;
+                        $tglawal = $awal;
+                        $tglakhir= $akhir;
+                        $tglgabung = date("m/d/Y", strtotime($awal))." - ".date("m/d/Y", strtotime($akhir));
+                        ?></h3>
+                    </div>
+                    <form action="<?php echo(base_url()); ?>index.php/lp_simrs_report/ranaprekap" method="post" autocomplete="off">
+                        <div class="card-body">
+                            <div class="form-group row">
+                                <label class="col-sm-1 col-form-label">Tanggal :</label>
+                                <div class="col-sm-4">
+                                    <div class="input-group">
+                                        <div class="input-group-prepend">
+                                            <span class="input-group-text">
+                                                <i class="far fa-calendar-alt"></i>
+                                            </span>
+                                        </div>
+                                        <input type="text" name="tanggal" class="form-control float-right" id="reservation" value="<?php echo $tglgabung;?>">
+                                    </div>
+                                </div>
+                                <div class="col-sm-2">
+                                    <button type="submit" class="btn btn-outline-info">Search </button>
+                                </div>
+                            </div>
+                        </div>
+                    </form>
+                    <div class="card-body">
+                        <?php if($this->session->flashdata('message')){?>
+                        <div id="alert" class="alert alert-success alert-dismissable">
+                            <button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
+                            <i class="icon fa fa-check"></i> Alert!
+                            <?php echo $this->session->flashdata('message');?>
+                        </div>
+                        <?php }?>
+                        <script> 
+                            setTimeout(function() {
+                                $('#alert').hide('fast');
+                            }, 3000);
+                        </script>
+                        <table id="example1" class="table table-bordered table-striped">
+                            <thead>
+                                <tr>
+                                    <th>No</th>
+                                    <th>Ruang</th>
+                                    <th>Kelompok</th>
+                                    <th>Sub Sistem</th>
+                                    <th>PKS</th>
+                                    <th>JKN</th>
+                                    <th>JKMM</th>
+                                    <th>SPM</th>
+                                    <th>UMUM</th>
+                                    <th>Total</th>
+                                </tr>
+                            </thead>
+                            <tbody>
+                                <?php
+                                    $no = 0;
+                                    foreach ($dataranap as $dat){
+                                        $no++;
+                                        $PKS            = 0;
+                                        $JKN            = 0;
+                                        $JKMM           = 0;
+                                        $SPM            = 0;
+                                        $UMUM           = 0;
+                                        $total          = 0;
+                                        $totpasienpenjamin = str_replace(['{', '}', '"', '\\'], '', $dat->totpasienpenjamin);
+                                        $items2 = explode('),', $totpasienpenjamin);
+                                        foreach ($items2 as $item) {
+                                            $clean = str_replace(['(', ')'], '', trim($item));
+                                            $parts = explode(',', $clean, 2);
+                                            $label = isset($parts[0]) ? trim($parts[0]) : 'kosong';
+                                            $value = isset($parts[1]) ? (int) trim($parts[1]) : 0;
+                                            if ($label === '') {$label = 'kosong';}
+
+                                            if($label === 'PKS') {$PKS = $PKS+$value;}
+                                            if($label === 'JKN') {$JKN = $JKN+$value;}
+                                            if($label === 'JKMM') {$JKMM = $JKMM+$value;}
+                                            if($label === 'SPM') {$SPM = $SPM+$value;}
+                                            if($label === 'UMUM') {$UMUM = $UMUM+$value;}
+                                            $total = $total+$value;
+                                        }
+                                        echo("
+                                            <tr>
+                                                <td>".$no."</td>
+                                                <td>".$dat->klinik."</td>
+                                                <td>".$dat->kelompok."</td>
+                                                <td>".$dat->subsistem."</td>
+                                                <td>".$PKS."</td>
+                                                <td>".$JKN."</td>
+                                                <td>".$JKMM."</td>
+                                                <td>".$SPM."</td>
+                                                <td>".$UMUM."</td>
+                                                <td>".$total."</td>
+                                            </tr>
+                                        ");
+                                    }
+                                ?>
+                            </tbody>
+                        </table>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</section>
\ No newline at end of file
diff --git a/application/views/simrs/report/rm/v_icd9.php b/application/views/simrs/report/rm/v_icd9.php
index 4ea2b32..f746e97 100644
--- a/application/views/simrs/report/rm/v_icd9.php
+++ b/application/views/simrs/report/rm/v_icd9.php
@@ -67,6 +67,8 @@
                                 <tr>
                                     <th>No</th>
                                     <th>No MR</th>
+                                    <th>Idxdaftar</th>
+                                    <th>No Bill</th>
                                     <th>Nama</th>
                                     <th>Tanggal Datang</th>
                                     <th>Ruang</th>
@@ -104,7 +106,9 @@
                                             echo("
                                                 <tr>
                                                     <td>".$no."</td>
-                                                    <td>".$nomr."</td>
+                                                    <td>".$dat->nomr."</td>
+                                                    <td>".$dat->idxdaftar."</td>
+                                                    <td>".$dat->nobill."</td>
                                                     <td>".$dat->namapasien."</td>
                                                     <td>".$dat->tglreg."</td>
                                                     <td>".$dat->klinik."</td>