diff --git a/build/built-jar.properties b/build/built-jar.properties
index 9c9beddc430..a36d25c6a57 100644
--- a/build/built-jar.properties
+++ b/build/built-jar.properties
@@ -1,4 +1,4 @@
-#Tue, 15 Feb 2022 00:16:31 +0700
+#Tue, 15 Feb 2022 00:32:54 +0700
 
 
 /Users/windiartonugroho/Documents/Pekerjaan/SIMRSKhanza=
diff --git a/build/classes/inventory/DlgCopyResep.class b/build/classes/inventory/DlgCopyResep.class
index 13b644c3c39..ef1df05a51d 100644
Binary files a/build/classes/inventory/DlgCopyResep.class and b/build/classes/inventory/DlgCopyResep.class differ
diff --git a/build/classes/inventory/DlgDaftarPermintaanResep.class b/build/classes/inventory/DlgDaftarPermintaanResep.class
index c0d85c80ac1..da2300d6c5a 100644
Binary files a/build/classes/inventory/DlgDaftarPermintaanResep.class and b/build/classes/inventory/DlgDaftarPermintaanResep.class differ
diff --git a/build/classes/keuangan/DlgBilingRalan.class b/build/classes/keuangan/DlgBilingRalan.class
index 6ffbeb5af9a..81a7114e5b5 100644
Binary files a/build/classes/keuangan/DlgBilingRalan.class and b/build/classes/keuangan/DlgBilingRalan.class differ
diff --git a/build/classes/keuangan/DlgBilingRanap.class b/build/classes/keuangan/DlgBilingRanap.class
index 7dcef501743..23731cdfd50 100644
Binary files a/build/classes/keuangan/DlgBilingRanap.class and b/build/classes/keuangan/DlgBilingRanap.class differ
diff --git a/nbproject/private/private.xml b/nbproject/private/private.xml
index b2d43e3e586..875f649990a 100755
--- a/nbproject/private/private.xml
+++ b/nbproject/private/private.xml
@@ -20,10 +20,10 @@
     </editor-bookmarks>
     <open-files xmlns="http://www.netbeans.org/ns/projectui-open-files/2">
         <group>
-            <file>file:/Users/windiartonugroho/Documents/Pekerjaan/SIMRSKhanza/src/inventory/DlgCariObat3.java</file>
-            <file>file:/Users/windiartonugroho/Documents/Pekerjaan/SIMRSKhanza/src/simrskhanza/frmUtama.java</file>
-            <file>file:/Users/windiartonugroho/Documents/Pekerjaan/SIMRSKhanza/src/inventory/DlgResepPulang.java</file>
-            <file>file:/Users/windiartonugroho/Documents/Pekerjaan/SIMRSKhanza/src/inventory/InventoryTelaahResep.java</file>
+            <file>file:/Users/windiartonugroho/Documents/Pekerjaan/SIMRSKhanza/src/keuangan/DlgBilingRalan.java</file>
+            <file>file:/Users/windiartonugroho/Documents/Pekerjaan/SIMRSKhanza/src/keuangan/DlgBilingRanap.java</file>
+            <file>file:/Users/windiartonugroho/Documents/Pekerjaan/SIMRSKhanza/src/inventory/DlgCopyResep.java</file>
+            <file>file:/Users/windiartonugroho/Documents/Pekerjaan/SIMRSKhanza/src/inventory/DlgDaftarPermintaanResep.java</file>
         </group>
     </open-files>
 </project-private>
diff --git a/src/inventory/DlgCopyResep.java b/src/inventory/DlgCopyResep.java
index 66997ad8aa6..74dfc21ea28 100755
--- a/src/inventory/DlgCopyResep.java
+++ b/src/inventory/DlgCopyResep.java
@@ -458,14 +458,14 @@ public void tampil() {
             if(ChkTanggal.isSelected()==true){
                 ps=koneksi.prepareStatement("select resep_obat.no_resep,resep_obat.tgl_peresepan,resep_obat.jam_peresepan,"+
                     " resep_obat.no_rawat,pasien.no_rkm_medis,pasien.nm_pasien,resep_obat.kd_dokter,dokter.nm_dokter, "+
-                    " if(resep_obat.tgl_peresepan='0000-00-00','Belum Terlayani','Sudah Terlayani') as status,resep_obat.status as status_asal "+
+                    " if(resep_obat.tgl_perawatan='0000-00-00','Belum Terlayani','Sudah Terlayani') as status,resep_obat.status as status_asal "+
                     " from resep_obat inner join reg_periksa inner join pasien inner join dokter on resep_obat.no_rawat=reg_periksa.no_rawat  "+
                     " and reg_periksa.no_rkm_medis=pasien.no_rkm_medis and resep_obat.kd_dokter=dokter.kd_dokter where "+
                     " resep_obat.tgl_peresepan<>'0000-00-00' and resep_obat.tgl_peresepan between ? and ? and pasien.no_rkm_medis=? and resep_obat.kd_dokter=? order by resep_obat.tgl_perawatan,resep_obat.jam desc");
             }else{
                 ps=koneksi.prepareStatement("select resep_obat.no_resep,resep_obat.tgl_peresepan,resep_obat.jam_peresepan,"+
                     " resep_obat.no_rawat,pasien.no_rkm_medis,pasien.nm_pasien,resep_obat.kd_dokter,dokter.nm_dokter, "+
-                    " if(resep_obat.tgl_peresepan='0000-00-00','Belum Terlayani','Sudah Terlayani') as status,resep_obat.status as status_asal "+
+                    " if(resep_obat.tgl_perawatan='0000-00-00','Belum Terlayani','Sudah Terlayani') as status,resep_obat.status as status_asal "+
                     " from resep_obat inner join reg_periksa inner join pasien inner join dokter on resep_obat.no_rawat=reg_periksa.no_rawat  "+
                     " and reg_periksa.no_rkm_medis=pasien.no_rkm_medis and resep_obat.kd_dokter=dokter.kd_dokter where "+
                     " resep_obat.tgl_peresepan<>'0000-00-00' and pasien.no_rkm_medis=? and resep_obat.kd_dokter=? order by resep_obat.tgl_perawatan,resep_obat.jam desc");
diff --git a/src/inventory/DlgDaftarPermintaanResep.java b/src/inventory/DlgDaftarPermintaanResep.java
index 44a6308ba6e..803210e241c 100755
--- a/src/inventory/DlgDaftarPermintaanResep.java
+++ b/src/inventory/DlgDaftarPermintaanResep.java
@@ -1855,7 +1855,7 @@ public void tampil() {
             semua=CrDokter.getText().trim().equals("")&&CrPoli.getText().trim().equals("")&&TCari.getText().trim().equals("");
             ps=koneksi.prepareStatement("select resep_obat.no_resep,resep_obat.tgl_peresepan,resep_obat.jam_peresepan,"+
                     " resep_obat.no_rawat,pasien.no_rkm_medis,pasien.nm_pasien,resep_obat.kd_dokter,dokter.nm_dokter,"+
-                    " if(resep_obat.tgl_peresepan='0000-00-00','Belum Terlayani','Sudah Terlayani') as status,poliklinik.nm_poli, "+
+                    " if(resep_obat.tgl_perawatan='0000-00-00','Belum Terlayani','Sudah Terlayani') as status,poliklinik.nm_poli, "+
                     " reg_periksa.kd_poli,penjab.png_jawab,if(resep_obat.tgl_perawatan='0000-00-00','',resep_obat.tgl_perawatan) as tgl_perawatan,"+
                     " if(resep_obat.jam='00:00:00','',resep_obat.jam) as jam,"+
                     " if(resep_obat.tgl_penyerahan='0000-00-00','',resep_obat.tgl_penyerahan) as tgl_penyerahan,"+
@@ -1994,7 +1994,7 @@ private void tampil2() {
         try{  
             semua=CrDokter.getText().trim().equals("")&&CrPoli.getText().trim().equals("")&&TCari.getText().trim().equals("");
             ps=koneksi.prepareStatement("select resep_obat.no_resep,resep_obat.tgl_perawatan,resep_obat.jam,resep_obat.no_rawat,pasien.no_rkm_medis,"+
-                    " pasien.nm_pasien,resep_obat.kd_dokter,dokter.nm_dokter,if(resep_obat.tgl_peresepan='0000-00-00','Belum Terlayani','Sudah Terlayani') as status,"+
+                    " pasien.nm_pasien,resep_obat.kd_dokter,dokter.nm_dokter,if(resep_obat.tgl_perawatan='0000-00-00','Belum Terlayani','Sudah Terlayani') as status,"+
                     " poliklinik.nm_poli,resep_obat.status as status_asal,penjab.png_jawab from resep_obat "+
                     " inner join reg_periksa on resep_obat.no_rawat=reg_periksa.no_rawat "+
                     " inner join pasien on reg_periksa.no_rkm_medis=pasien.no_rkm_medis "+
@@ -2299,7 +2299,7 @@ public void tampil3() {
             semua=CrDokter2.getText().trim().equals("")&&Kamar.getText().trim().equals("")&&TCari.getText().trim().equals("");
             ps=koneksi.prepareStatement("select resep_obat.no_resep,resep_obat.tgl_peresepan,resep_obat.jam_peresepan,"+
                     " resep_obat.no_rawat,pasien.no_rkm_medis,pasien.nm_pasien,resep_obat.kd_dokter,dokter.nm_dokter, "+
-                    " if(resep_obat.tgl_peresepan='0000-00-00','Belum Terlayani','Sudah Terlayani') as status,"+
+                    " if(resep_obat.tgl_perawatan='0000-00-00','Belum Terlayani','Sudah Terlayani') as status,"+
                     " bangsal.nm_bangsal,kamar.kd_bangsal,penjab.png_jawab,"+
                     " if(resep_obat.tgl_perawatan='0000-00-00','',resep_obat.tgl_perawatan) as tgl_perawatan,"+
                     " if(resep_obat.jam='00:00:00','',resep_obat.jam) as jam from resep_obat  "+
@@ -2366,7 +2366,7 @@ public void tampil3() {
             
             ps=koneksi.prepareStatement("select resep_obat.no_resep,resep_obat.tgl_peresepan,resep_obat.jam_peresepan,"+
                     " resep_obat.no_rawat,pasien.no_rkm_medis,pasien.nm_pasien,resep_obat.kd_dokter,dokter.nm_dokter, "+
-                    " if(resep_obat.tgl_peresepan='0000-00-00','Belum Terlayani','Sudah Terlayani') as status,"+
+                    " if(resep_obat.tgl_perawatan='0000-00-00','Belum Terlayani','Sudah Terlayani') as status,"+
                     " bangsal.nm_bangsal,kamar.kd_bangsal,penjab.png_jawab,"+
                     " if(resep_obat.tgl_perawatan='0000-00-00','',resep_obat.tgl_perawatan) as tgl_perawatan,"+
                     " if(resep_obat.jam='00:00:00','',resep_obat.jam) as jam from resep_obat  "+
@@ -2441,7 +2441,7 @@ public void tampil4() {
         try{  
             semua=CrDokter2.getText().trim().equals("")&&Kamar.getText().trim().equals("")&&TCari.getText().trim().equals("");
             ps=koneksi.prepareStatement("select resep_obat.no_resep,resep_obat.tgl_perawatan,resep_obat.jam,resep_obat.no_rawat,pasien.no_rkm_medis,"+
-                    " pasien.nm_pasien,resep_obat.kd_dokter,dokter.nm_dokter,if(resep_obat.tgl_peresepan='0000-00-00','Belum Terlayani','Sudah Terlayani') as status,"+
+                    " pasien.nm_pasien,resep_obat.kd_dokter,dokter.nm_dokter,if(resep_obat.tgl_perawatan='0000-00-00','Belum Terlayani','Sudah Terlayani') as status,"+
                     " bangsal.nm_bangsal,resep_obat.status as status_asal,penjab.png_jawab from resep_obat "+
                     " inner join reg_periksa on resep_obat.no_rawat=reg_periksa.no_rawat "+
                     " inner join pasien on reg_periksa.no_rkm_medis=pasien.no_rkm_medis "+
@@ -2645,7 +2645,7 @@ public void tampil4() {
             } 
             
             ps=koneksi.prepareStatement("select resep_obat.no_resep,resep_obat.tgl_perawatan,resep_obat.jam,resep_obat.no_rawat,pasien.no_rkm_medis,"+
-                    " pasien.nm_pasien,resep_obat.kd_dokter,dokter.nm_dokter,if(resep_obat.tgl_peresepan='0000-00-00','Belum Terlayani','Sudah Terlayani') as status,"+
+                    " pasien.nm_pasien,resep_obat.kd_dokter,dokter.nm_dokter,if(resep_obat.tgl_perawatan='0000-00-00','Belum Terlayani','Sudah Terlayani') as status,"+
                     " bangsal.nm_bangsal,resep_obat.status as status_asal,penjab.png_jawab from resep_obat "+
                     " inner join ranap_gabung on ranap_gabung.no_rawat2=resep_obat.no_rawat "+
                     " inner join reg_periksa on resep_obat.no_rawat=reg_periksa.no_rawat "+
diff --git a/src/keuangan/DlgBilingRalan.java b/src/keuangan/DlgBilingRalan.java
index 07d7821ea18..bdae33ff6f7 100755
--- a/src/keuangan/DlgBilingRalan.java
+++ b/src/keuangan/DlgBilingRalan.java
@@ -3608,7 +3608,7 @@ private void TabRawatMouseClicked(java.awt.event.MouseEvent evt) {//GEN-FIRST:ev
                 
                 Valid.tabelKosong(tabModeApotek);
                 psobatlangsung=koneksi.prepareStatement("select resep_obat.no_resep,resep_obat.tgl_peresepan,resep_obat.jam_peresepan,"+
-                    " dokter.nm_dokter,if(resep_obat.tgl_peresepan='0000-00-00','Belum Terlayani','Sudah Terlayani') as status "+
+                    " dokter.nm_dokter,if(resep_obat.tgl_perawatan='0000-00-00','Belum Terlayani','Sudah Terlayani') as status "+
                     " from resep_obat inner join dokter on resep_obat.kd_dokter=dokter.kd_dokter "+
                     " where resep_obat.tgl_peresepan<>'0000-00-00' and resep_obat.status='ralan' and resep_obat.no_rawat=? order by resep_obat.tgl_perawatan desc,resep_obat.jam desc");
                 try {
diff --git a/src/keuangan/DlgBilingRanap.java b/src/keuangan/DlgBilingRanap.java
index 7329d2e49ca..6a71418f910 100755
--- a/src/keuangan/DlgBilingRanap.java
+++ b/src/keuangan/DlgBilingRanap.java
@@ -4233,7 +4233,7 @@ private void TabRawatMouseClicked(java.awt.event.MouseEvent evt) {//GEN-FIRST:ev
                 
                 Valid.tabelKosong(tabModeApotek);
                 psobatlangsung=koneksi.prepareStatement("select resep_obat.no_resep,resep_obat.tgl_peresepan,resep_obat.jam_peresepan,"+
-                    " dokter.nm_dokter,if(resep_obat.tgl_peresepan='0000-00-00','Belum Terlayani','Sudah Terlayani') as status "+
+                    " dokter.nm_dokter,if(resep_obat.tgl_perawatan='0000-00-00','Belum Terlayani','Sudah Terlayani') as status "+
                     " from resep_obat inner join dokter on resep_obat.kd_dokter=dokter.kd_dokter "+
                     " where resep_obat.tgl_peresepan<>'0000-00-00' and resep_obat.no_rawat=? order by resep_obat.tgl_perawatan desc,resep_obat.jam desc");
                 try {