diff --git a/build/classes/simrskhanza/frmUtama$308.class b/build/classes/simrskhanza/frmUtama$308.class
diff --git a/build/classes/simrskhanza/frmUtama$309.class b/build/classes/simrskhanza/frmUtama$309.class
diff --git a/build/classes/simrskhanza/frmUtama$31.class b/build/classes/simrskhanza/frmUtama$31.class
diff --git a/build/classes/simrskhanza/frmUtama$310.class b/build/classes/simrskhanza/frmUtama$310.class
diff --git a/build/classes/simrskhanza/frmUtama$311.class b/build/classes/simrskhanza/frmUtama$311.class
diff --git a/build/classes/simrskhanza/frmUtama$312.class b/build/classes/simrskhanza/frmUtama$312.class
diff --git a/build/classes/simrskhanza/frmUtama$313.class b/build/classes/simrskhanza/frmUtama$313.class
diff --git a/build/classes/simrskhanza/frmUtama$314.class b/build/classes/simrskhanza/frmUtama$314.class
diff --git a/build/classes/simrskhanza/frmUtama$315.class b/build/classes/simrskhanza/frmUtama$315.class
diff --git a/build/classes/simrskhanza/frmUtama$316.class b/build/classes/simrskhanza/frmUtama$316.class
diff --git a/build/classes/simrskhanza/frmUtama$317.class b/build/classes/simrskhanza/frmUtama$317.class
diff --git a/build/classes/simrskhanza/frmUtama$318.class b/build/classes/simrskhanza/frmUtama$318.class
diff --git a/build/classes/simrskhanza/frmUtama$319.class b/build/classes/simrskhanza/frmUtama$319.class
diff --git a/build/classes/simrskhanza/frmUtama$32.class b/build/classes/simrskhanza/frmUtama$32.class
diff --git a/build/classes/simrskhanza/frmUtama$320.class b/build/classes/simrskhanza/frmUtama$320.class
diff --git a/build/classes/simrskhanza/frmUtama$321.class b/build/classes/simrskhanza/frmUtama$321.class
diff --git a/build/classes/simrskhanza/frmUtama$322.class b/build/classes/simrskhanza/frmUtama$322.class
diff --git a/build/classes/simrskhanza/frmUtama$323.class b/build/classes/simrskhanza/frmUtama$323.class
diff --git a/build/classes/simrskhanza/frmUtama$324.class b/build/classes/simrskhanza/frmUtama$324.class
diff --git a/build/classes/simrskhanza/frmUtama$325.class b/build/classes/simrskhanza/frmUtama$325.class
diff --git a/build/classes/simrskhanza/frmUtama$326.class b/build/classes/simrskhanza/frmUtama$326.class
diff --git a/build/classes/simrskhanza/frmUtama$327.class b/build/classes/simrskhanza/frmUtama$327.class
diff --git a/build/classes/simrskhanza/frmUtama$328.class b/build/classes/simrskhanza/frmUtama$328.class
diff --git a/build/classes/simrskhanza/frmUtama$329.class b/build/classes/simrskhanza/frmUtama$329.class
diff --git a/build/classes/simrskhanza/frmUtama$33.class b/build/classes/simrskhanza/frmUtama$33.class
diff --git a/build/classes/simrskhanza/frmUtama$34.class b/build/classes/simrskhanza/frmUtama$34.class
diff --git a/build/classes/simrskhanza/frmUtama$35.class b/build/classes/simrskhanza/frmUtama$35.class
diff --git a/build/classes/simrskhanza/frmUtama$36.class b/build/classes/simrskhanza/frmUtama$36.class
diff --git a/build/classes/simrskhanza/frmUtama$37.class b/build/classes/simrskhanza/frmUtama$37.class
diff --git a/build/classes/simrskhanza/frmUtama$38.class b/build/classes/simrskhanza/frmUtama$38.class
diff --git a/build/classes/simrskhanza/frmUtama$39.class b/build/classes/simrskhanza/frmUtama$39.class
diff --git a/build/classes/simrskhanza/frmUtama$4.class b/build/classes/simrskhanza/frmUtama$4.class
diff --git a/build/classes/simrskhanza/frmUtama$40.class b/build/classes/simrskhanza/frmUtama$40.class
diff --git a/build/classes/simrskhanza/frmUtama$41.class b/build/classes/simrskhanza/frmUtama$41.class
diff --git a/build/classes/simrskhanza/frmUtama$42.class b/build/classes/simrskhanza/frmUtama$42.class
diff --git a/build/classes/simrskhanza/frmUtama$43.class b/build/classes/simrskhanza/frmUtama$43.class
diff --git a/build/classes/simrskhanza/frmUtama$44.class b/build/classes/simrskhanza/frmUtama$44.class
diff --git a/build/classes/simrskhanza/frmUtama$45.class b/build/classes/simrskhanza/frmUtama$45.class
diff --git a/build/classes/simrskhanza/frmUtama$46.class b/build/classes/simrskhanza/frmUtama$46.class
diff --git a/build/classes/simrskhanza/frmUtama$47.class b/build/classes/simrskhanza/frmUtama$47.class
diff --git a/build/classes/simrskhanza/frmUtama$48.class b/build/classes/simrskhanza/frmUtama$48.class
diff --git a/build/classes/simrskhanza/frmUtama$49.class b/build/classes/simrskhanza/frmUtama$49.class
diff --git a/build/classes/simrskhanza/frmUtama$5.class b/build/classes/simrskhanza/frmUtama$5.class
diff --git a/build/classes/simrskhanza/frmUtama$50.class b/build/classes/simrskhanza/frmUtama$50.class
diff --git a/build/classes/simrskhanza/frmUtama$51.class b/build/classes/simrskhanza/frmUtama$51.class
diff --git a/build/classes/simrskhanza/frmUtama$52.class b/build/classes/simrskhanza/frmUtama$52.class
diff --git a/build/classes/simrskhanza/frmUtama$53.class b/build/classes/simrskhanza/frmUtama$53.class
diff --git a/build/classes/simrskhanza/frmUtama$54.class b/build/classes/simrskhanza/frmUtama$54.class
diff --git a/build/classes/simrskhanza/frmUtama$55.class b/build/classes/simrskhanza/frmUtama$55.class
diff --git a/build/classes/simrskhanza/frmUtama$56.class b/build/classes/simrskhanza/frmUtama$56.class
diff --git a/build/classes/simrskhanza/frmUtama$57.class b/build/classes/simrskhanza/frmUtama$57.class
diff --git a/build/classes/simrskhanza/frmUtama$58.class b/build/classes/simrskhanza/frmUtama$58.class
diff --git a/build/classes/simrskhanza/frmUtama$59.class b/build/classes/simrskhanza/frmUtama$59.class
diff --git a/build/classes/simrskhanza/frmUtama$6.class b/build/classes/simrskhanza/frmUtama$6.class
diff --git a/build/classes/simrskhanza/frmUtama$60.class b/build/classes/simrskhanza/frmUtama$60.class
diff --git a/build/classes/simrskhanza/frmUtama$61.class b/build/classes/simrskhanza/frmUtama$61.class
diff --git a/build/classes/simrskhanza/frmUtama$62.class b/build/classes/simrskhanza/frmUtama$62.class
diff --git a/build/classes/simrskhanza/frmUtama$63.class b/build/classes/simrskhanza/frmUtama$63.class
diff --git a/build/classes/simrskhanza/frmUtama$64.class b/build/classes/simrskhanza/frmUtama$64.class
diff --git a/build/classes/simrskhanza/frmUtama$65.class b/build/classes/simrskhanza/frmUtama$65.class
diff --git a/build/classes/simrskhanza/frmUtama$66.class b/build/classes/simrskhanza/frmUtama$66.class
diff --git a/build/classes/simrskhanza/frmUtama$67.class b/build/classes/simrskhanza/frmUtama$67.class
diff --git a/build/classes/simrskhanza/frmUtama$68.class b/build/classes/simrskhanza/frmUtama$68.class
diff --git a/build/classes/simrskhanza/frmUtama$69.class b/build/classes/simrskhanza/frmUtama$69.class
diff --git a/build/classes/simrskhanza/frmUtama$7.class b/build/classes/simrskhanza/frmUtama$7.class
diff --git a/build/classes/simrskhanza/frmUtama$70.class b/build/classes/simrskhanza/frmUtama$70.class
diff --git a/build/classes/simrskhanza/frmUtama$71.class b/build/classes/simrskhanza/frmUtama$71.class
diff --git a/build/classes/simrskhanza/frmUtama$72.class b/build/classes/simrskhanza/frmUtama$72.class
diff --git a/build/classes/simrskhanza/frmUtama$73.class b/build/classes/simrskhanza/frmUtama$73.class
diff --git a/build/classes/simrskhanza/frmUtama$74.class b/build/classes/simrskhanza/frmUtama$74.class
diff --git a/build/classes/simrskhanza/frmUtama$75.class b/build/classes/simrskhanza/frmUtama$75.class
diff --git a/build/classes/simrskhanza/frmUtama$76.class b/build/classes/simrskhanza/frmUtama$76.class
diff --git a/build/classes/simrskhanza/frmUtama$77.class b/build/classes/simrskhanza/frmUtama$77.class
diff --git a/build/classes/simrskhanza/frmUtama$78.class b/build/classes/simrskhanza/frmUtama$78.class
diff --git a/build/classes/simrskhanza/frmUtama$79.class b/build/classes/simrskhanza/frmUtama$79.class
diff --git a/build/classes/simrskhanza/frmUtama$8.class b/build/classes/simrskhanza/frmUtama$8.class
diff --git a/build/classes/simrskhanza/frmUtama$80.class b/build/classes/simrskhanza/frmUtama$80.class
diff --git a/build/classes/simrskhanza/frmUtama$81.class b/build/classes/simrskhanza/frmUtama$81.class
diff --git a/build/classes/simrskhanza/frmUtama$82.class b/build/classes/simrskhanza/frmUtama$82.class
diff --git a/build/classes/simrskhanza/frmUtama$83.class b/build/classes/simrskhanza/frmUtama$83.class
diff --git a/build/classes/simrskhanza/frmUtama$84.class b/build/classes/simrskhanza/frmUtama$84.class
diff --git a/build/classes/simrskhanza/frmUtama$85.class b/build/classes/simrskhanza/frmUtama$85.class
diff --git a/build/classes/simrskhanza/frmUtama$86.class b/build/classes/simrskhanza/frmUtama$86.class
diff --git a/build/classes/simrskhanza/frmUtama$87.class b/build/classes/simrskhanza/frmUtama$87.class
diff --git a/build/classes/simrskhanza/frmUtama$88.class b/build/classes/simrskhanza/frmUtama$88.class
diff --git a/build/classes/simrskhanza/frmUtama$89.class b/build/classes/simrskhanza/frmUtama$89.class
diff --git a/build/classes/simrskhanza/frmUtama$9.class b/build/classes/simrskhanza/frmUtama$9.class
diff --git a/build/classes/simrskhanza/frmUtama$90.class b/build/classes/simrskhanza/frmUtama$90.class
diff --git a/build/classes/simrskhanza/frmUtama$91.class b/build/classes/simrskhanza/frmUtama$91.class
diff --git a/build/classes/simrskhanza/frmUtama$92.class b/build/classes/simrskhanza/frmUtama$92.class
diff --git a/build/classes/simrskhanza/frmUtama$93.class b/build/classes/simrskhanza/frmUtama$93.class
diff --git a/build/classes/simrskhanza/frmUtama$94.class b/build/classes/simrskhanza/frmUtama$94.class
diff --git a/build/classes/simrskhanza/frmUtama$95.class b/build/classes/simrskhanza/frmUtama$95.class
diff --git a/build/classes/simrskhanza/frmUtama$96.class b/build/classes/simrskhanza/frmUtama$96.class
diff --git a/build/classes/simrskhanza/frmUtama$97.class b/build/classes/simrskhanza/frmUtama$97.class
diff --git a/build/classes/simrskhanza/frmUtama$98.class b/build/classes/simrskhanza/frmUtama$98.class
diff --git a/build/classes/simrskhanza/frmUtama$99.class b/build/classes/simrskhanza/frmUtama$99.class
diff --git a/build/classes/simrskhanza/frmUtama.class b/build/classes/simrskhanza/frmUtama.class
diff --git a/dist/SIMRSKhanza.jar b/dist/SIMRSKhanza.jar
diff --git a/nbproject/private/private.xml b/nbproject/private/private.xml
@@ -2,12 +2,6 @@
 <project-private xmlns="http://www.netbeans.org/ns/project-private/1">
     <editor-bookmarks xmlns="http://www.netbeans.org/ns/editor-bookmarks/2" lastBookmarkId="1"/>
     <open-files xmlns="http://www.netbeans.org/ns/projectui-open-files/2">
-        <group>
-            <file>file:/media/khanzamedia/Data/Source%20Java/SIMRSKhanza/setting/database.xml</file>
-            <file>file:/media/khanzamedia/Data/Source%20Java/SIMRSKhanza/src/keuangan/DlgPembayaranPerPoli.java</file>
-            <file>file:/media/khanzamedia/Data/Source%20Java/SIMRSKhanza/src/simrskhanza/frmUtama.java</file>
-            <file>file:/media/khanzamedia/Data/Source%20Java/SIMRSKhanza/src/simrskhanza/DlgIGD.java</file>
-            <file>file:/media/khanzamedia/Data/Source%20Java/SIMRSKhanza/src/simrskhanza/DlgReg.java</file>
-        </group>
+        <group/>
     </open-files>
 </project-private>
diff --git a/sik.sql b/sik.sql
diff --git a/src/bridging/PCareCekReferensiDokter.form → src/bridging/PCareCekReferensiKesadaran.form b/src/bridging/PCareCekReferensiDokter.form → src/bridging/PCareCekReferensiKesadaran.form
@@ -35,7 +35,7 @@
       <Properties>
         <Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor">
           <Border info="org.netbeans.modules.form.compat2.border.TitledBorderInfo">
-            <TitledBorder title="::[ Pencarian Data Referensi Dokter PCare ]::">
+            <TitledBorder title="::[ Pencarian Data Referensi Kesadaran PCare ]::">
               <Border PropertyName="innerBorder" info="org.netbeans.modules.form.compat2.border.LineBorderInfo">
                 <LineBorder>
                   <Color PropertyName="color" blue="eb" green="f5" red="f0" type="rgb"/>
@@ -101,10 +101,10 @@
           <SubComponents>
             <Component class="widget.Label" name="jLabel16">
               <Properties>
-                <Property name="text" type="java.lang.String" value="Kode/Nama Diagnosa :"/>
+                <Property name="text" type="java.lang.String" value="Kesadaran :"/>
                 <Property name="name" type="java.lang.String" value="jLabel16" noResource="true"/>
                 <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
-                  <Dimension value="[120, 23]"/>
+                  <Dimension value="[70, 23]"/>
                 </Property>
               </Properties>
             </Component>

diff --git a/src/bridging/PCareCekReferensiDokter.java → src/bridging/PCareCekReferensiKesadaran.java b/src/bridging/PCareCekReferensiDokter.java → src/bridging/PCareCekReferensiKesadaran.java
@@ -43,7 +43,7 @@
  *
  * @author dosen
  */
-public final class PCareCekReferensiDokter extends javax.swing.JDialog {
+public final class PCareCekReferensiKesadaran extends javax.swing.JDialog {
     private final DefaultTableModel tabMode;
     private final Properties prop = new Properties();
     private validasi Valid=new validasi();
@@ -53,13 +53,13 @@ public final class PCareCekReferensiDokter extends javax.swing.JDialog {
     /** Creates new form DlgKamar
      * @param parent
      * @param modal */
-    public PCareCekReferensiDokter(java.awt.Frame parent, boolean modal) {
+    public PCareCekReferensiKesadaran(java.awt.Frame parent, boolean modal) {
         super(parent, modal);
         initComponents();
 
         this.setLocation(10,2);
         setSize(628,674);
-        tabMode=new DefaultTableModel(null,new String[]{"No.","Kode Dokter","Nama Dokter"}){
+        tabMode=new DefaultTableModel(null,new String[]{"No.","Kode Kesadaran","Nama Kesadaran"}){
               @Override public boolean isCellEditable(int rowIndex, int colIndex){return false;}
         };
         tbKamar.setModel(tabMode);
@@ -75,7 +75,7 @@ public PCareCekReferensiDokter(java.awt.Frame parent, boolean modal) {
             }else if(i==1){
                 column.setPreferredWidth(140);
             }else if(i==2){
-                column.setPreferredWidth(470);
+                column.setPreferredWidth(370);
             }
         }
         tbKamar.setDefaultRenderer(Object.class, new WarnaTable());
@@ -122,7 +122,7 @@ private void initComponents() {
         setUndecorated(true);
         setResizable(false);
 
-        internalFrame1.setBorder(javax.swing.BorderFactory.createTitledBorder(javax.swing.BorderFactory.createLineBorder(new java.awt.Color(240, 245, 235)), "::[ Pencarian Data Referensi Dokter PCare ]::", javax.swing.border.TitledBorder.DEFAULT_JUSTIFICATION, javax.swing.border.TitledBorder.DEFAULT_POSITION, new java.awt.Font("Tahoma", 0, 11), new java.awt.Color(90, 120, 80))); // NOI18N
+        internalFrame1.setBorder(javax.swing.BorderFactory.createTitledBorder(javax.swing.BorderFactory.createLineBorder(new java.awt.Color(240, 245, 235)), "::[ Pencarian Data Referensi Kesadaran PCare ]::", javax.swing.border.TitledBorder.DEFAULT_JUSTIFICATION, javax.swing.border.TitledBorder.DEFAULT_POSITION, new java.awt.Font("Tahoma", 0, 11), new java.awt.Color(90, 120, 80))); // NOI18N
         internalFrame1.setName("internalFrame1"); // NOI18N
         internalFrame1.setLayout(new java.awt.BorderLayout(1, 1));
 
@@ -140,9 +140,9 @@ private void initComponents() {
         panelGlass6.setPreferredSize(new java.awt.Dimension(44, 54));
         panelGlass6.setLayout(new java.awt.FlowLayout(java.awt.FlowLayout.LEFT, 5, 9));
 
-        jLabel16.setText("Kode/Nama Diagnosa :");
+        jLabel16.setText("Kesadaran :");
         jLabel16.setName("jLabel16"); // NOI18N
-        jLabel16.setPreferredSize(new java.awt.Dimension(120, 23));
+        jLabel16.setPreferredSize(new java.awt.Dimension(70, 23));
         panelGlass6.add(jLabel16);
 
         diagnosa.setName("diagnosa"); // NOI18N
@@ -248,7 +248,7 @@ private void BtnPrintActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRS
             param.put("kontakrs",var.getkontakrs());
             param.put("emailrs",var.getemailrs());   
             param.put("logo",Sequel.cariGambar("select logo from setting")); 
-            Valid.MyReport("rptCariPCAREReferensiDiagnosa.jrxml","report","[ Pencarian Referensi Diagnosa ]",
+            Valid.MyReport("rptCariPCAREReferensiKesadaran.jrxml","report","[ Pencarian Referensi Diagnosa ]",
                 "select no, temp1, temp2, temp3, temp4, temp5, temp6, temp7, temp8, temp9, temp10, temp11, temp12, temp13, temp14 from temporary order by no asc",param);
             this.setCursor(Cursor.getDefaultCursor());
         }        
@@ -286,7 +286,7 @@ private void BtnCariKeyPressed(java.awt.event.KeyEvent evt) {//GEN-FIRST:event_B
     */
     public static void main(String args[]) {
         java.awt.EventQueue.invokeLater(() -> {
-            PCareCekReferensiDokter dialog = new PCareCekReferensiDokter(new javax.swing.JFrame(), true);
+            PCareCekReferensiKesadaran dialog = new PCareCekReferensiKesadaran(new javax.swing.JFrame(), true);
             dialog.addWindowListener(new java.awt.event.WindowAdapter() {
                 @Override
                 public void windowClosing(java.awt.event.WindowEvent e) {
@@ -314,7 +314,7 @@ public void tampil(String diagnosa) {
         PcareApi api=new PcareApi();
         try {
             prop.loadFromXML(new FileInputStream("setting/database.xml"));
-            String URL = prop.getProperty("URLAPIPCARE")+"/v1/dokter/0/10000";	
+            String URL = prop.getProperty("URLAPIPCARE")+"/v1/kesadaran";	
 
             HttpHeaders headers = new HttpHeaders();
             headers.add("X-cons-id",prop.getProperty("CONSIDAPIPCARE"));
@@ -337,10 +337,10 @@ public void tampil(String diagnosa) {
                 if(response.path("list").isArray()){
                     i=1;
                     for(JsonNode list:response.path("list")){
-                        if(list.path("kdDokter").asText().toLowerCase().contains(diagnosa.toLowerCase())||
-                                list.path("nmDokter").asText().toLowerCase().contains(diagnosa.toLowerCase())){
+                        if(list.path("kdSadar").asText().toLowerCase().contains(diagnosa.toLowerCase())||
+                                list.path("nmSadar").asText().toLowerCase().contains(diagnosa.toLowerCase())){
                             tabMode.addRow(new Object[]{
-                                i+".",list.path("kdDokter").asText(),list.path("nmDokter").asText()
+                                i+".",list.path("kdSadar").asText(),list.path("nmSadar").asText()
                             });
                             i++;
                         }

diff --git a/src/fungsi/var.java b/src/fungsi/var.java
@@ -63,7 +63,8 @@ public final class var {
             grafik_kunjungan_statusdaftartahun=false,grafik_kunjungan_statusdaftartahun2=false,grafik_kunjungan_statusdaftarbulan=false,grafik_kunjungan_statusdaftarbulan2=false,
             grafik_kunjungan_statusdaftartanggal=false,grafik_kunjungan_statusdaftartanggal2=false,grafik_kunjungan_statusbataltahun=false,grafik_kunjungan_statusbatalbulan=false,
             pcare_cek_penyakit=false,grafik_kunjungan_statusbataltanggal=false,kategori_barang=false,golongan_barang=false,pemberian_obat_pertanggal=false,
-            penjualan_obat_pertanggal=false,pcare_cek_dokter=false,pembatalan_periksa_dokter=false,pembayaran_per_unit=false,rekap_pembayaran_per_unit=false;
+            penjualan_obat_pertanggal=false,pcare_cek_kesadaran=false,pembatalan_periksa_dokter=false,pembayaran_per_unit=false,rekap_pembayaran_per_unit=false,
+            grafik_kunjungan_percarabayar=false;
 
     public static void setData(String user, String pass) {
        try {                
@@ -356,10 +357,11 @@ public static void setData(String user, String pass) {
                         var.golongan_barang=true;
                         var.pemberian_obat_pertanggal=true;
                         var.penjualan_obat_pertanggal=true;
-                        var.pcare_cek_dokter=true;
+                        var.pcare_cek_kesadaran=true;
                         var.pembatalan_periksa_dokter=true;
                         var.pembayaran_per_unit=true;
                         var.rekap_pembayaran_per_unit=true;
+                        var.grafik_kunjungan_percarabayar=true;
                     }else */
                     if(rs.getRow()>=1){
                         var.kode="Admin Utama";
@@ -634,10 +636,11 @@ public static void setData(String user, String pass) {
                         var.golongan_barang=true;
                         var.pemberian_obat_pertanggal=true;                        
                         var.penjualan_obat_pertanggal=true;
-                        var.pcare_cek_dokter=true;
+                        var.pcare_cek_kesadaran=true;
                         var.pembatalan_periksa_dokter=true;
                         var.pembayaran_per_unit=true;
                         var.rekap_pembayaran_per_unit=true;
+                        var.grafik_kunjungan_percarabayar=true;
                     }else if(rs2.getRow()>=1){   
                         rs2.beforeFirst();
                         rs2.next();
@@ -913,10 +916,11 @@ public static void setData(String user, String pass) {
                         var.golongan_barang=rs2.getBoolean("golongan_barang");
                         var.pemberian_obat_pertanggal=rs2.getBoolean("pemberian_obat_pertanggal");
                         var.penjualan_obat_pertanggal=rs2.getBoolean("penjualan_obat_pertanggal");
-                        var.pcare_cek_dokter=rs2.getBoolean("pcare_cek_dokter");                        
+                        var.pcare_cek_kesadaran=rs2.getBoolean("pcare_cek_kesadaran");                        
                         var.pembatalan_periksa_dokter=rs2.getBoolean("pembatalan_periksa_dokter");
                         var.pembayaran_per_unit=rs2.getBoolean("pembayaran_per_unit");
-                        var.rekap_pembayaran_per_unit=rs2.getBoolean("rekap_pembayaran_per_unit");
+                        var.rekap_pembayaran_per_unit=rs2.getBoolean("rekap_pembayaran_per_unit");                        
+                        var.grafik_kunjungan_percarabayar=rs2.getBoolean("grafik_kunjungan_percarabayar");
                     }else if((rs.getRow()==0)&&(rs2.getRow()==0)){
                         var.kode="";                  
                         var.penyakit= false;
@@ -1190,10 +1194,11 @@ public static void setData(String user, String pass) {
                         var.golongan_barang=false;
                         var.pemberian_obat_pertanggal=false;
                         var.penjualan_obat_pertanggal=false;
-                        var.pcare_cek_dokter=false;
+                        var.pcare_cek_kesadaran=false;
                         var.pembatalan_periksa_dokter=false;
                         var.pembayaran_per_unit=false;
                         var.rekap_pembayaran_per_unit=false;
+                        var.grafik_kunjungan_percarabayar=false;
                     }
                 } catch (Exception e) {
                     System.out.println("Notifikasi : "+e);
@@ -1514,8 +1519,9 @@ public static void setData(String user, String pass) {
     public static boolean getgolongan_barang(){return var.golongan_barang;}
     public static boolean getpemberian_obat_pertanggal(){return var.pemberian_obat_pertanggal;}
     public static boolean getpenjualan_obat_pertanggal(){return var.penjualan_obat_pertanggal;}
-    public static boolean getpcare_cek_dokter(){return var.pcare_cek_dokter;}
+    public static boolean getpcare_cek_kesadaran(){return var.pcare_cek_kesadaran;}
     public static boolean getpembatalan_periksa_dokter(){return var.pembatalan_periksa_dokter;}
     public static boolean getpembayaran_per_unit(){return var.pembayaran_per_unit;}
     public static boolean getrekap_pembayaran_per_unit(){return var.rekap_pembayaran_per_unit;}
+    public static boolean getgrafik_kunjungan_percarabayar(){return var.grafik_kunjungan_percarabayar;}
 }
diff --git a/src/grafikanalisa/GrafikKunjunganPerCaraBayar.form b/src/grafikanalisa/GrafikKunjunganPerCaraBayar.form
@@ -0,0 +1,235 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<Form version="1.5" maxVersion="1.7" type="org.netbeans.modules.form.forminfo.JDialogFormInfo">
+  <Properties>
+    <Property name="defaultCloseOperation" type="int" value="2"/>
+    <Property name="undecorated" type="boolean" value="true"/>
+    <Property name="resizable" type="boolean" value="false"/>
+  </Properties>
+  <SyntheticProperties>
+    <SyntheticProperty name="formSizePolicy" type="int" value="1"/>
+    <SyntheticProperty name="generateCenter" type="boolean" value="false"/>
+  </SyntheticProperties>
+  <Events>
+    <EventHandler event="windowActivated" listener="java.awt.event.WindowListener" parameters="java.awt.event.WindowEvent" handler="formWindowActivated"/>
+    <EventHandler event="windowOpened" listener="java.awt.event.WindowListener" parameters="java.awt.event.WindowEvent" handler="formWindowOpened"/>
+  </Events>
+  <AuxValues>
+    <AuxValue name="FormSettings_autoResourcing" type="java.lang.Integer" value="0"/>
+    <AuxValue name="FormSettings_autoSetComponentName" type="java.lang.Boolean" value="true"/>
+    <AuxValue name="FormSettings_generateFQN" type="java.lang.Boolean" value="true"/>
+    <AuxValue name="FormSettings_generateMnemonicsCode" type="java.lang.Boolean" value="false"/>
+    <AuxValue name="FormSettings_i18nAutoMode" type="java.lang.Boolean" value="false"/>
+    <AuxValue name="FormSettings_layoutCodeTarget" type="java.lang.Integer" value="1"/>
+    <AuxValue name="FormSettings_listenerGenerationStyle" type="java.lang.Integer" value="0"/>
+    <AuxValue name="FormSettings_variablesLocal" type="java.lang.Boolean" value="false"/>
+    <AuxValue name="FormSettings_variablesModifier" type="java.lang.Integer" value="2"/>
+    <AuxValue name="designerSize" type="java.awt.Dimension" value="-84,-19,0,5,115,114,0,18,106,97,118,97,46,97,119,116,46,68,105,109,101,110,115,105,111,110,65,-114,-39,-41,-84,95,68,20,2,0,2,73,0,6,104,101,105,103,104,116,73,0,5,119,105,100,116,104,120,112,0,0,1,48,0,0,3,-65"/>
+  </AuxValues>
+
+  <Layout class="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout"/>
+  <SubComponents>
+    <Container class="widget.InternalFrame" name="internalFrame1">
+      <Properties>
+        <Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor">
+          <Border info="org.netbeans.modules.form.compat2.border.TitledBorderInfo">
+            <TitledBorder title="::[ Grafik Kunjungan Registrasi Per Cara Bayar ]::">
+              <Border PropertyName="innerBorder" info="org.netbeans.modules.form.compat2.border.LineBorderInfo">
+                <LineBorder>
+                  <Color PropertyName="color" blue="eb" green="f5" red="f0" type="rgb"/>
+                </LineBorder>
+              </Border>
+              <Font PropertyName="font" name="Tahoma" size="11" style="0"/>
+              <Color PropertyName="color" blue="50" green="78" red="5a" type="rgb"/>
+            </TitledBorder>
+          </Border>
+        </Property>
+        <Property name="name" type="java.lang.String" value="internalFrame1" noResource="true"/>
+      </Properties>
+      <Constraints>
+        <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout" value="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout$BorderConstraintsDescription">
+          <BorderConstraints direction="Center"/>
+        </Constraint>
+      </Constraints>
+
+      <Layout class="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout">
+        <Property name="horizontalGap" type="int" value="1"/>
+        <Property name="verticalGap" type="int" value="1"/>
+      </Layout>
+      <SubComponents>
+        <Container class="widget.PanelBiasa" name="panelBiasa3">
+          <Properties>
+            <Property name="name" type="java.lang.String" value="panelBiasa3" noResource="true"/>
+          </Properties>
+          <Constraints>
+            <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout" value="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout$BorderConstraintsDescription">
+              <BorderConstraints direction="Center"/>
+            </Constraint>
+          </Constraints>
+
+          <Layout class="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout">
+            <Property name="useNullLayout" type="boolean" value="true"/>
+          </Layout>
+        </Container>
+        <Container class="widget.panelisi" name="panelGlass5">
+          <Properties>
+            <Property name="name" type="java.lang.String" value="panelGlass5" noResource="true"/>
+            <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+              <Dimension value="[55, 55]"/>
+            </Property>
+          </Properties>
+          <Constraints>
+            <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout" value="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout$BorderConstraintsDescription">
+              <BorderConstraints direction="Last"/>
+            </Constraint>
+          </Constraints>
+
+          <Layout class="org.netbeans.modules.form.compat2.layouts.DesignFlowLayout">
+            <Property name="alignment" type="int" value="0"/>
+            <Property name="verticalGap" type="int" value="9"/>
+          </Layout>
+          <SubComponents>
+            <Component class="widget.Label" name="jLabel33">
+              <Properties>
+                <Property name="text" type="java.lang.String" value="Periode Kunjungan :"/>
+                <Property name="name" type="java.lang.String" value="jLabel33" noResource="true"/>
+                <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+                  <Dimension value="[105, 23]"/>
+                </Property>
+              </Properties>
+            </Component>
+            <Component class="widget.Tanggal" name="Tanggal1">
+              <Properties>
+                <Property name="editable" type="boolean" value="false"/>
+                <Property name="foreground" type="java.awt.Color" editor="org.netbeans.beaninfo.editors.ColorEditor">
+                  <Color blue="32" green="46" red="32" type="rgb"/>
+                </Property>
+                <Property name="model" type="javax.swing.ComboBoxModel" editor="org.netbeans.modules.form.editors2.ComboBoxModelEditor">
+                  <StringArray count="1">
+                    <StringItem index="0" value="06-01-2018"/>
+                  </StringArray>
+                </Property>
+                <Property name="displayFormat" type="java.lang.String" value="dd-MM-yyyy"/>
+                <Property name="name" type="java.lang.String" value="Tanggal1" noResource="true"/>
+                <Property name="opaque" type="boolean" value="false"/>
+                <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+                  <Dimension value="[100, 23]"/>
+                </Property>
+              </Properties>
+            </Component>
+            <Component class="widget.Label" name="jLabel32">
+              <Properties>
+                <Property name="horizontalAlignment" type="int" value="0"/>
+                <Property name="text" type="java.lang.String" value="s/d"/>
+                <Property name="name" type="java.lang.String" value="jLabel32" noResource="true"/>
+                <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+                  <Dimension value="[25, 23]"/>
+                </Property>
+              </Properties>
+            </Component>
+            <Component class="widget.Tanggal" name="Tanggal2">
+              <Properties>
+                <Property name="editable" type="boolean" value="false"/>
+                <Property name="foreground" type="java.awt.Color" editor="org.netbeans.beaninfo.editors.ColorEditor">
+                  <Color blue="32" green="46" red="32" type="rgb"/>
+                </Property>
+                <Property name="model" type="javax.swing.ComboBoxModel" editor="org.netbeans.modules.form.editors2.ComboBoxModelEditor">
+                  <StringArray count="1">
+                    <StringItem index="0" value="06-01-2018"/>
+                  </StringArray>
+                </Property>
+                <Property name="displayFormat" type="java.lang.String" value="dd-MM-yyyy"/>
+                <Property name="name" type="java.lang.String" value="Tanggal2" noResource="true"/>
+                <Property name="opaque" type="boolean" value="false"/>
+                <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+                  <Dimension value="[100, 23]"/>
+                </Property>
+              </Properties>
+            </Component>
+            <Component class="widget.Label" name="jLabel34">
+              <Properties>
+                <Property name="horizontalAlignment" type="int" value="0"/>
+                <Property name="name" type="java.lang.String" value="jLabel34" noResource="true"/>
+                <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+                  <Dimension value="[25, 23]"/>
+                </Property>
+              </Properties>
+            </Component>
+            <Component class="widget.Button" name="BtnPrint4">
+              <Properties>
+                <Property name="icon" type="javax.swing.Icon" noResource="true" editor="org.netbeans.modules.form.editors2.IconEditor">
+                  <Image iconType="3" name="/picture/Bar Chart (copy).png"/>
+                </Property>
+                <Property name="mnemonic" type="int" value="71"/>
+                <Property name="text" type="java.lang.String" value="Plot"/>
+                <Property name="toolTipText" type="java.lang.String" value="Alt+G"/>
+                <Property name="name" type="java.lang.String" value="BtnPrint4" noResource="true"/>
+                <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+                  <Dimension value="[100, 30]"/>
+                </Property>
+              </Properties>
+              <Events>
+                <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="BtnPrint4ActionPerformed"/>
+                <EventHandler event="keyPressed" listener="java.awt.event.KeyListener" parameters="java.awt.event.KeyEvent" handler="BtnPrint4KeyPressed"/>
+              </Events>
+            </Component>
+            <Component class="widget.Button" name="BtnPrint3">
+              <Properties>
+                <Property name="icon" type="javax.swing.Icon" noResource="true" editor="org.netbeans.modules.form.editors2.IconEditor">
+                  <Image iconType="3" name="/picture/Bar Chart (copy).png"/>
+                </Property>
+                <Property name="mnemonic" type="int" value="71"/>
+                <Property name="text" type="java.lang.String" value="Batang"/>
+                <Property name="toolTipText" type="java.lang.String" value="Alt+G"/>
+                <Property name="name" type="java.lang.String" value="BtnPrint3" noResource="true"/>
+                <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+                  <Dimension value="[100, 30]"/>
+                </Property>
+              </Properties>
+              <Events>
+                <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="BtnPrint3ActionPerformed"/>
+                <EventHandler event="keyPressed" listener="java.awt.event.KeyListener" parameters="java.awt.event.KeyEvent" handler="BtnPrint3KeyPressed"/>
+              </Events>
+            </Component>
+            <Component class="widget.Button" name="BtnPrint5">
+              <Properties>
+                <Property name="icon" type="javax.swing.Icon" noResource="true" editor="org.netbeans.modules.form.editors2.IconEditor">
+                  <Image iconType="3" name="/picture/Bar Chart (copy).png"/>
+                </Property>
+                <Property name="mnemonic" type="int" value="71"/>
+                <Property name="text" type="java.lang.String" value="Pie"/>
+                <Property name="toolTipText" type="java.lang.String" value="Alt+G"/>
+                <Property name="name" type="java.lang.String" value="BtnPrint5" noResource="true"/>
+                <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+                  <Dimension value="[100, 30]"/>
+                </Property>
+              </Properties>
+              <Events>
+                <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="BtnPrint5ActionPerformed"/>
+                <EventHandler event="keyPressed" listener="java.awt.event.KeyListener" parameters="java.awt.event.KeyEvent" handler="BtnPrint5KeyPressed"/>
+              </Events>
+            </Component>
+            <Component class="widget.Button" name="BtnKeluar3">
+              <Properties>
+                <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
+                  <Image iconType="3" name="/picture/exit.png"/>
+                </Property>
+                <Property name="mnemonic" type="int" value="75"/>
+                <Property name="text" type="java.lang.String" value="Keluar"/>
+                <Property name="toolTipText" type="java.lang.String" value="Alt+K"/>
+                <Property name="name" type="java.lang.String" value="BtnKeluar3" noResource="true"/>
+                <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+                  <Dimension value="[100, 30]"/>
+                </Property>
+              </Properties>
+              <Events>
+                <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="BtnKeluar3ActionPerformed"/>
+                <EventHandler event="keyPressed" listener="java.awt.event.KeyListener" parameters="java.awt.event.KeyEvent" handler="BtnKeluar3KeyPressed"/>
+              </Events>
+            </Component>
+          </SubComponents>
+        </Container>
+      </SubComponents>
+    </Container>
+  </SubComponents>
+</Form>
diff --git a/src/grafikanalisa/GrafikKunjunganPerCaraBayar.java b/src/grafikanalisa/GrafikKunjunganPerCaraBayar.java
@@ -0,0 +1,323 @@
+    /*
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+
+/*
+ * DlgSpesialis.java
+ *
+ * Created on May 23, 2010, 1:25:13 AM
+ */
+
+package grafikanalisa;
+
+import fungsi.koneksiDB;
+import fungsi.sekuel;
+import fungsi.validasi;
+import java.sql.Connection;
+import java.sql.ResultSet;
+import javax.swing.ImageIcon;
+import org.jfree.chart.ChartFactory;
+import org.jfree.chart.ChartFrame;
+import org.jfree.chart.JFreeChart;
+import org.jfree.chart.plot.PlotOrientation;
+import org.jfree.data.category.DefaultCategoryDataset;
+import org.jfree.data.general.DefaultPieDataset;
+
+/**
+ *
+ * @author dosen
+ */
+public class GrafikKunjunganPerCaraBayar extends javax.swing.JDialog {
+    private final Connection koneksi=koneksiDB.condb();
+    private final validasi Valid=new validasi();
+    private ResultSet rs;
+
+    /** Creates new form DlgSpesialis
+     * @param parent
+     * @param modal */
+    public GrafikKunjunganPerCaraBayar(java.awt.Frame parent, boolean modal) {
+        super(parent, modal);
+        initComponents();
+
+
+    }
+
+    /** This method is called from within the constructor to
+     * initialize the form.
+     * WARNING: Do NOT modify this code. The content of this method is
+     * always regenerated by the Form Editor.
+     */
+    @SuppressWarnings("unchecked")
+    // <editor-fold defaultstate="collapsed" desc="Generated Code">//GEN-BEGIN:initComponents
+    private void initComponents() {
+
+        internalFrame1 = new widget.InternalFrame();
+        panelBiasa3 = new widget.PanelBiasa();
+        panelGlass5 = new widget.panelisi();
+        jLabel33 = new widget.Label();
+        Tanggal1 = new widget.Tanggal();
+        jLabel32 = new widget.Label();
+        Tanggal2 = new widget.Tanggal();
+        jLabel34 = new widget.Label();
+        BtnPrint4 = new widget.Button();
+        BtnPrint3 = new widget.Button();
+        BtnPrint5 = new widget.Button();
+        BtnKeluar3 = new widget.Button();
+
+        setDefaultCloseOperation(javax.swing.WindowConstants.DISPOSE_ON_CLOSE);
+        setUndecorated(true);
+        setResizable(false);
+        addWindowListener(new java.awt.event.WindowAdapter() {
+            public void windowActivated(java.awt.event.WindowEvent evt) {
+                formWindowActivated(evt);
+            }
+            public void windowOpened(java.awt.event.WindowEvent evt) {
+                formWindowOpened(evt);
+            }
+        });
+
+        internalFrame1.setBorder(javax.swing.BorderFactory.createTitledBorder(javax.swing.BorderFactory.createLineBorder(new java.awt.Color(240, 245, 235)), "::[ Grafik Kunjungan Registrasi Per Cara Bayar ]::", javax.swing.border.TitledBorder.DEFAULT_JUSTIFICATION, javax.swing.border.TitledBorder.DEFAULT_POSITION, new java.awt.Font("Tahoma", 0, 11), new java.awt.Color(90, 120, 80))); // NOI18N
+        internalFrame1.setName("internalFrame1"); // NOI18N
+        internalFrame1.setLayout(new java.awt.BorderLayout(1, 1));
+
+        panelBiasa3.setName("panelBiasa3"); // NOI18N
+        panelBiasa3.setLayout(null);
+        internalFrame1.add(panelBiasa3, java.awt.BorderLayout.CENTER);
+
+        panelGlass5.setName("panelGlass5"); // NOI18N
+        panelGlass5.setPreferredSize(new java.awt.Dimension(55, 55));
+        panelGlass5.setLayout(new java.awt.FlowLayout(java.awt.FlowLayout.LEFT, 5, 9));
+
+        jLabel33.setText("Periode Kunjungan :");
+        jLabel33.setName("jLabel33"); // NOI18N
+        jLabel33.setPreferredSize(new java.awt.Dimension(105, 23));
+        panelGlass5.add(jLabel33);
+
+        Tanggal1.setEditable(false);
+        Tanggal1.setForeground(new java.awt.Color(50, 70, 50));
+        Tanggal1.setModel(new javax.swing.DefaultComboBoxModel(new String[] { "06-01-2018" }));
+        Tanggal1.setDisplayFormat("dd-MM-yyyy");
+        Tanggal1.setName("Tanggal1"); // NOI18N
+        Tanggal1.setOpaque(false);
+        Tanggal1.setPreferredSize(new java.awt.Dimension(100, 23));
+        panelGlass5.add(Tanggal1);
+
+        jLabel32.setHorizontalAlignment(javax.swing.SwingConstants.CENTER);
+        jLabel32.setText("s/d");
+        jLabel32.setName("jLabel32"); // NOI18N
+        jLabel32.setPreferredSize(new java.awt.Dimension(25, 23));
+        panelGlass5.add(jLabel32);
+
+        Tanggal2.setEditable(false);
+        Tanggal2.setForeground(new java.awt.Color(50, 70, 50));
+        Tanggal2.setModel(new javax.swing.DefaultComboBoxModel(new String[] { "06-01-2018" }));
+        Tanggal2.setDisplayFormat("dd-MM-yyyy");
+        Tanggal2.setName("Tanggal2"); // NOI18N
+        Tanggal2.setOpaque(false);
+        Tanggal2.setPreferredSize(new java.awt.Dimension(100, 23));
+        panelGlass5.add(Tanggal2);
+
+        jLabel34.setHorizontalAlignment(javax.swing.SwingConstants.CENTER);
+        jLabel34.setName("jLabel34"); // NOI18N
+        jLabel34.setPreferredSize(new java.awt.Dimension(25, 23));
+        panelGlass5.add(jLabel34);
+
+        BtnPrint4.setIcon(new javax.swing.ImageIcon(getClass().getResource("/picture/Bar Chart (copy).png"))); // NOI18N
+        BtnPrint4.setMnemonic('G');
+        BtnPrint4.setText("Plot");
+        BtnPrint4.setToolTipText("Alt+G");
+        BtnPrint4.setName("BtnPrint4"); // NOI18N
+        BtnPrint4.setPreferredSize(new java.awt.Dimension(100, 30));
+        BtnPrint4.addActionListener(new java.awt.event.ActionListener() {
+            public void actionPerformed(java.awt.event.ActionEvent evt) {
+                BtnPrint4ActionPerformed(evt);
+            }
+        });
+        BtnPrint4.addKeyListener(new java.awt.event.KeyAdapter() {
+            public void keyPressed(java.awt.event.KeyEvent evt) {
+                BtnPrint4KeyPressed(evt);
+            }
+        });
+        panelGlass5.add(BtnPrint4);
+
+        BtnPrint3.setIcon(new javax.swing.ImageIcon(getClass().getResource("/picture/Bar Chart (copy).png"))); // NOI18N
+        BtnPrint3.setMnemonic('G');
+        BtnPrint3.setText("Batang");
+        BtnPrint3.setToolTipText("Alt+G");
+        BtnPrint3.setName("BtnPrint3"); // NOI18N
+        BtnPrint3.setPreferredSize(new java.awt.Dimension(100, 30));
+        BtnPrint3.addActionListener(new java.awt.event.ActionListener() {
+            public void actionPerformed(java.awt.event.ActionEvent evt) {
+                BtnPrint3ActionPerformed(evt);
+            }
+        });
+        BtnPrint3.addKeyListener(new java.awt.event.KeyAdapter() {
+            public void keyPressed(java.awt.event.KeyEvent evt) {
+                BtnPrint3KeyPressed(evt);
+            }
+        });
+        panelGlass5.add(BtnPrint3);
+
+        BtnPrint5.setIcon(new javax.swing.ImageIcon(getClass().getResource("/picture/Bar Chart (copy).png"))); // NOI18N
+        BtnPrint5.setMnemonic('G');
+        BtnPrint5.setText("Pie");
+        BtnPrint5.setToolTipText("Alt+G");
+        BtnPrint5.setName("BtnPrint5"); // NOI18N
+        BtnPrint5.setPreferredSize(new java.awt.Dimension(100, 30));
+        BtnPrint5.addActionListener(new java.awt.event.ActionListener() {
+            public void actionPerformed(java.awt.event.ActionEvent evt) {
+                BtnPrint5ActionPerformed(evt);
+            }
+        });
+        BtnPrint5.addKeyListener(new java.awt.event.KeyAdapter() {
+            public void keyPressed(java.awt.event.KeyEvent evt) {
+                BtnPrint5KeyPressed(evt);
+            }
+        });
+        panelGlass5.add(BtnPrint5);
+
+        BtnKeluar3.setIcon(new javax.swing.ImageIcon(getClass().getResource("/picture/exit.png"))); // NOI18N
+        BtnKeluar3.setMnemonic('K');
+        BtnKeluar3.setText("Keluar");
+        BtnKeluar3.setToolTipText("Alt+K");
+        BtnKeluar3.setName("BtnKeluar3"); // NOI18N
+        BtnKeluar3.setPreferredSize(new java.awt.Dimension(100, 30));
+        BtnKeluar3.addActionListener(new java.awt.event.ActionListener() {
+            public void actionPerformed(java.awt.event.ActionEvent evt) {
+                BtnKeluar3ActionPerformed(evt);
+            }
+        });
+        BtnKeluar3.addKeyListener(new java.awt.event.KeyAdapter() {
+            public void keyPressed(java.awt.event.KeyEvent evt) {
+                BtnKeluar3KeyPressed(evt);
+            }
+        });
+        panelGlass5.add(BtnKeluar3);
+
+        internalFrame1.add(panelGlass5, java.awt.BorderLayout.PAGE_END);
+
+        getContentPane().add(internalFrame1, java.awt.BorderLayout.CENTER);
+
+        pack();
+    }// </editor-fold>//GEN-END:initComponents
+
+    private void formWindowOpened(java.awt.event.WindowEvent evt) {//GEN-FIRST:event_formWindowOpened
+
+    }//GEN-LAST:event_formWindowOpened
+
+    private void formWindowActivated(java.awt.event.WindowEvent evt) {//GEN-FIRST:event_formWindowActivated
+
+    }//GEN-LAST:event_formWindowActivated
+
+    private void BtnPrint3ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_BtnPrint3ActionPerformed
+        DefaultCategoryDataset dcd = new DefaultCategoryDataset();
+        try {                
+            rs = koneksi.prepareStatement("select penjab.png_jawab,count(penjab.png_jawab) as jumlah "+
+                   "from reg_periksa inner join penjab on reg_periksa.kd_pj=penjab.kd_pj "+
+                   "where tgl_registrasi between '"+Valid.SetTgl(Tanggal1.getSelectedItem()+"")+"' and '"+Valid.SetTgl(Tanggal2.getSelectedItem()+"")+"' group by penjab.png_jawab").executeQuery();
+            while(rs.next()) {
+                dcd.setValue(rs.getDouble(2),rs.getString(1)+"("+rs.getString(2)+")",rs.getString(1));
+            }
+        } catch (Exception e) {
+            System.out.println("Notifikasi : " + e);
+        }
+
+       JFreeChart freeChart = ChartFactory.createBarChart("Grafik Periksa Per Cara Bayar Tanggal "+Valid.SetTgl(Tanggal1.getSelectedItem()+"")+" S.D. "+Valid.SetTgl(Tanggal2.getSelectedItem()+""),"Cara Bayar","Jumlah Pasien", dcd, PlotOrientation.VERTICAL,true, true,true); 
+        ChartFrame cf = new ChartFrame("Grafik Periksa Per Cara Bayar",freeChart);
+        cf.setSize(panelBiasa3.getWidth(),panelBiasa3.getHeight());   
+        cf.setLocationRelativeTo(panelBiasa3);
+        cf.setModalExclusionType(ModalExclusionType.APPLICATION_EXCLUDE);
+        cf.setAlwaysOnTop(true);
+        cf.setIconImage(new ImageIcon(super.getClass().getResource("/picture/addressbook-edit24.png")).getImage());
+        cf.setVisible(true);         
+    }//GEN-LAST:event_BtnPrint3ActionPerformed
+
+    private void BtnPrint3KeyPressed(java.awt.event.KeyEvent evt) {//GEN-FIRST:event_BtnPrint3KeyPressed
+
+    }//GEN-LAST:event_BtnPrint3KeyPressed
+
+    private void BtnKeluar3ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_BtnKeluar3ActionPerformed
+        dispose();
+    }//GEN-LAST:event_BtnKeluar3ActionPerformed
+
+    private void BtnKeluar3KeyPressed(java.awt.event.KeyEvent evt) {//GEN-FIRST:event_BtnKeluar3KeyPressed
+
+    }//GEN-LAST:event_BtnKeluar3KeyPressed
+
+    private void BtnPrint4ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_BtnPrint4ActionPerformed
+       grafiksql2 kas=new grafiksql2("Grafik Periksa Per Cara Bayar Tanggal "+Valid.SetTgl(Tanggal1.getSelectedItem()+"")+" S.D. "+Valid.SetTgl(Tanggal2.getSelectedItem()+""),
+               "select penjab.png_jawab,count(penjab.png_jawab) as jumlah "+
+                   "from reg_periksa inner join penjab on reg_periksa.kd_pj=penjab.kd_pj "+
+                   "where tgl_registrasi between '"+Valid.SetTgl(Tanggal1.getSelectedItem()+"")+"' and '"+Valid.SetTgl(Tanggal2.getSelectedItem()+"")+"' group by penjab.png_jawab","Cara Bayar");
+       kas.setSize(panelBiasa3.getWidth(),panelBiasa3.getHeight());  
+       kas.setModal(true);
+       kas.setAlwaysOnTop(true);
+       kas.setLocationRelativeTo(panelBiasa3);
+       kas.setVisible(true);
+    }//GEN-LAST:event_BtnPrint4ActionPerformed
+
+    private void BtnPrint4KeyPressed(java.awt.event.KeyEvent evt) {//GEN-FIRST:event_BtnPrint4KeyPressed
+        // TODO add your handling code here:
+    }//GEN-LAST:event_BtnPrint4KeyPressed
+
+    private void BtnPrint5ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_BtnPrint5ActionPerformed
+
+        DefaultPieDataset dpd = new DefaultPieDataset();
+        try {                
+            rs = koneksi.prepareStatement("select penjab.png_jawab,count(penjab.png_jawab) as jumlah "+
+                   "from reg_periksa inner join penjab on reg_periksa.kd_pj=penjab.kd_pj "+
+                   "where tgl_registrasi between '"+Valid.SetTgl(Tanggal1.getSelectedItem()+"")+"' and '"+Valid.SetTgl(Tanggal2.getSelectedItem()+"")+"' group by penjab.png_jawab").executeQuery();
+            while(rs.next()) {
+                dpd.setValue(rs.getString(1)+"("+rs.getString(2)+")",rs.getDouble(2));
+            }
+        } catch (Exception e) {
+            System.out.println("Notifikasi : " + e);
+        }
+
+        JFreeChart freeChart = ChartFactory.createPieChart("Grafik Periksa Per Cara Bayar Tanggal "+Valid.SetTgl(Tanggal1.getSelectedItem()+"")+" S.D. "+Valid.SetTgl(Tanggal2.getSelectedItem()+""),dpd,true,true, false);
+        ChartFrame cf = new ChartFrame("Grafik Periksa Per Cara Bayar",freeChart);
+        cf.setSize(panelBiasa3.getWidth(),panelBiasa3.getHeight());   
+        cf.setModalExclusionType(ModalExclusionType.APPLICATION_EXCLUDE);
+        cf.setLocationRelativeTo(panelBiasa3);
+        cf.setAlwaysOnTop(true);
+        cf.setIconImage(new ImageIcon(super.getClass().getResource("/picture/addressbook-edit24.png")).getImage());
+        cf.setVisible(true);
+    }//GEN-LAST:event_BtnPrint5ActionPerformed
+
+    private void BtnPrint5KeyPressed(java.awt.event.KeyEvent evt) {//GEN-FIRST:event_BtnPrint5KeyPressed
+        // TODO add your handling code here:
+    }//GEN-LAST:event_BtnPrint5KeyPressed
+
+    /**
+    * @param args the command line arguments
+    */
+    public static void main(String args[]) {
+        java.awt.EventQueue.invokeLater(() -> {
+            GrafikKunjunganPerCaraBayar dialog = new GrafikKunjunganPerCaraBayar(new javax.swing.JFrame(), true);
+            dialog.addWindowListener(new java.awt.event.WindowAdapter() {
+                @Override
+                public void windowClosing(java.awt.event.WindowEvent e) {
+                    System.exit(0);
+                }
+            });
+            dialog.setVisible(true);
+        });
+    }
+
+    // Variables declaration - do not modify//GEN-BEGIN:variables
+    private widget.Button BtnKeluar3;
+    private widget.Button BtnPrint3;
+    private widget.Button BtnPrint4;
+    private widget.Button BtnPrint5;
+    private widget.Tanggal Tanggal1;
+    private widget.Tanggal Tanggal2;
+    private widget.InternalFrame internalFrame1;
+    private widget.Label jLabel32;
+    private widget.Label jLabel33;
+    private widget.Label jLabel34;
+    private widget.PanelBiasa panelBiasa3;
+    private widget.panelisi panelGlass5;
+    // End of variables declaration//GEN-END:variables
+
+}
diff --git a/src/inventory/DlgCariPembelian.java b/src/inventory/DlgCariPembelian.java
@@ -1260,7 +1260,7 @@ private void tampil() {
                     ps2=koneksi.prepareStatement("select detailbeli.kode_brng,databarang.nama_brng, "+
                         "detailbeli.kode_sat,kodesatuan.satuan,detailbeli.jumlah,detailbeli.h_beli, "+
                         "detailbeli.subtotal,detailbeli.dis,detailbeli.besardis,detailbeli.total,"+
-                        "detailbeli.no_batch,industrifarmasi.nama_industri "+
+                        "detailbeli.no_batch,industrifarmasi.nama_industri,detailbeli.kadaluarsa "+
                         "from detailbeli inner join databarang inner join kodesatuan inner join jenis inner join industrifarmasi "+
                         " on detailbeli.kode_brng=databarang.kode_brng and databarang.kdjns=jenis.kdjns "+
                         " and detailbeli.kode_sat=kodesatuan.kode_sat and databarang.kode_industri=industrifarmasi.kode_industri where "+
@@ -1304,7 +1304,7 @@ private void tampil() {
                         rs2=ps2.executeQuery();
                         int no=1;
                         while(rs2.next()){
-                            tabMode.addRow(new Object[]{"","",no+". No.Batch : "+rs2.getString("no_batch"),"Ind.Farm : "+rs2.getString("nama_industri"),rs2.getString(1)+", "+rs2.getString(2),
+                            tabMode.addRow(new Object[]{"",no+". Batch : "+rs2.getString("no_batch"),"Exp : "+rs2.getString("kadaluarsa"),"I.F. : "+rs2.getString("nama_industri"),rs2.getString(1)+", "+rs2.getString(2),
                                             rs2.getString(3)+", "+rs2.getString(4),
                                             rs2.getString(5),Valid.SetAngka(rs2.getDouble(6)),Valid.SetAngka(rs2.getDouble(7)),
                                             Valid.SetAngka(rs2.getDouble(8)),Valid.SetAngka(rs2.getDouble(9)),Valid.SetAngka(rs2.getDouble(10))});

diff --git a/src/inventory/DlgCariPemesanan.java b/src/inventory/DlgCariPemesanan.java
@@ -1314,7 +1314,7 @@ private void tampil() {
                     ps2=koneksi.prepareStatement("select detailpesan.kode_brng,databarang.nama_brng, "+
                         "detailpesan.kode_sat,kodesatuan.satuan,detailpesan.jumlah,detailpesan.h_pesan, "+
                         "detailpesan.subtotal,detailpesan.dis,detailpesan.besardis,detailpesan.total,"+
-                        "detailpesan.no_batch,industrifarmasi.nama_industri "+
+                        "detailpesan.no_batch,industrifarmasi.nama_industri,detailpesan.kadaluarsa "+
                         "from detailpesan inner join databarang inner join kodesatuan inner join jenis inner join industrifarmasi "+
                         " on detailpesan.kode_brng=databarang.kode_brng and databarang.kdjns=jenis.kdjns "+
                         " and databarang.kode_industri=industrifarmasi.kode_industri and detailpesan.kode_sat=kodesatuan.kode_sat where "+
@@ -1359,7 +1359,7 @@ private void tampil() {
                         rs2=ps2.executeQuery();
                         int no=1;
                         while(rs2.next()){
-                                tabMode.addRow(new Object[]{"","",no+". No.Batch : "+rs2.getString("no_batch"),"Ind.Farm : "+rs2.getString("nama_industri"),rs2.getString(1)+", "+rs2.getString(2),
+                                tabMode.addRow(new Object[]{"",no+". Batch : "+rs2.getString("no_batch"),"Exp : "+rs2.getString("kadaluarsa"),"I.F. : "+rs2.getString("nama_industri"),rs2.getString(1)+", "+rs2.getString(2),
                                             rs2.getString(3)+", "+rs2.getString(4),
                                             rs2.getString(5),Valid.SetAngka(rs2.getDouble(6)),Valid.SetAngka(rs2.getDouble(7)),
                                             Valid.SetAngka(rs2.getDouble(8)),Valid.SetAngka(rs2.getDouble(9)),Valid.SetAngka(rs2.getDouble(10))});

diff --git a/src/inventory/DlgPembelian.java b/src/inventory/DlgPembelian.java
@@ -818,7 +818,7 @@ private void BtnSimpanActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIR
                         for(i=0;i<jml;i++){  
                             try {
                                 if(Valid.SetAngka(tbDokter.getValueAt(i,0).toString())>0){
-                                    if(Sequel.menyimpantf2("detailbeli","?,?,?,?,?,?,?,?,?,?,?","Transaksi Pembelian",11,new String[]{
+                                    if(Sequel.menyimpantf2("detailbeli","?,?,?,?,?,?,?,?,?,?,?,?","Transaksi Pembelian",12,new String[]{
                                            NoFaktur.getText(),
                                            tbDokter.getValueAt(i,2).toString(),
                                            tbDokter.getValueAt(i,1).toString(),
@@ -829,7 +829,8 @@ private void BtnSimpanActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIR
                                            tbDokter.getValueAt(i,10).toString(),
                                            tbDokter.getValueAt(i,11).toString(),
                                            tbDokter.getValueAt(i,13).toString(),
-                                           tbDokter.getValueAt(i,12).toString()
+                                           tbDokter.getValueAt(i,12).toString(),
+                                           Valid.SetTgl(tbDokter.getValueAt(i,6).toString()+"")
                                     })==true){
                                         Trackobat.catatRiwayat(tbDokter.getValueAt(i,2).toString(),Valid.SetAngka(tbDokter.getValueAt(i,12).toString()),0,"Pengadaan",var.getkode(),kdgudang.getText(),"Simpan");
                                         Sequel.menyimpan("gudangbarang","'"+tbDokter.getValueAt(i,2).toString()+"','"+kdgudang.getText()+"','"+tbDokter.getValueAt(i,12).toString()+"'", 

diff --git a/src/inventory/DlgPemesanan.java b/src/inventory/DlgPemesanan.java
@@ -850,7 +850,7 @@ private void BtnSimpanActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIR
                         for(i=0;i<jml;i++){  
                             try {
                                 if(Valid.SetAngka(tbDokter.getValueAt(i,0).toString())>0){
-                                    if(Sequel.menyimpantf2("detailpesan","?,?,?,?,?,?,?,?,?,?,?","Transaksi Pemesanan",11,new String[]{
+                                    if(Sequel.menyimpantf2("detailpesan","?,?,?,?,?,?,?,?,?,?,?,?","Transaksi Pemesanan",12,new String[]{
                                            NoFaktur.getText(),
                                            tbDokter.getValueAt(i,2).toString(),
                                            tbDokter.getValueAt(i,1).toString(),
@@ -861,7 +861,8 @@ private void BtnSimpanActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIR
                                            tbDokter.getValueAt(i,10).toString(),
                                            tbDokter.getValueAt(i,11).toString(),
                                            tbDokter.getValueAt(i,13).toString(),
-                                           tbDokter.getValueAt(i,12).toString()
+                                           tbDokter.getValueAt(i,12).toString(),
+                                           Valid.SetTgl(tbDokter.getValueAt(i,6).toString()+"")
                                     })==true){
                                         Trackobat.catatRiwayat(tbDokter.getValueAt(i,2).toString(),Valid.SetAngka(tbDokter.getValueAt(i,12).toString()),0,"Pemesanan",var.getkode(),kdgudang.getText(),"Simpan");
                                         Sequel.menyimpan("gudangbarang","'"+tbDokter.getValueAt(i,2).toString()+"','"+kdgudang.getText()+"','"+tbDokter.getValueAt(i,12).toString()+"'", 

diff --git a/src/setting/DlgUser.java b/src/setting/DlgUser.java
@@ -96,8 +96,8 @@ public DlgUser(java.awt.Frame parent, boolean modal) {
                     "[N]Kunjungan Reg Per Pekerjaan","[N]Kunjungan Reg Per Pendidikan","[N]Kunjungan Reg Per Tahun","[L]Berkas Digital Perawatan","[I]Pny Menular Ranap","[I]Pny Menular Ralan",
                     "[N]Kunjungan Reg Per Bulan","[N]Kunjungan Reg Per Tanggal","[N]Demografi Registrasi","[N]Reg Lama Per Tahun","[N]Reg Baru Per Tahun","[N]Reg Lama Per Bulan","[N]Reg Baru Per Bulan",
                     "[N]Reg Lama Per Tanggal","[N]Reg Baru Per Tanggal","[N]Batal Periksa Per Tahun","[N]Batal Periksa Per Bulan","[K]Referensi Diagnosa Pcare","[N]Batal Periksa Per Tanggal",
-                    "[D]Kategori Obat/Alkes/BHP","[D]Golongan Obat/Alkes/BHP","[D]Obat/Alkes/BHP Per Tanggal","[D]Penjualan Bebas Per Tanggal","[K]Referensi Dokter Pcare","[I]Pembatalan Periksa Per Dokter",
-                    "[H]Pembayaran Per Unit","[H]Rekap Pembayaran Per Unit"
+                    "[D]Kategori Obat/Alkes/BHP","[D]Golongan Obat/Alkes/BHP","[D]Obat/Alkes/BHP Per Tanggal","[D]Penjualan Bebas Per Tanggal","[K]Referensi Kesadaran Pcare","[I]Pembatalan Periksa Per Dokter",
+                    "[H]Pembayaran Per Unit","[H]Rekap Pembayaran Per Unit","[N]Kunjungan Reg Per Cara Bayar"
         };
 
         tabMode=new DefaultTableModel(null,row){
@@ -191,7 +191,7 @@ public Class getColumnClass(int columnIndex) {
         tbUser.setPreferredScrollableViewportSize(new Dimension(500,500));
         tbUser.setAutoResizeMode(JTable.AUTO_RESIZE_OFF);
 
-        for (i = 0; i < 275;i++) {
+        for (i = 0; i < 276;i++) {
             TableColumn column = tbUser.getColumnModel().getColumn(i);
             if(i==0){
                 column.setPreferredWidth(130);
@@ -370,13 +370,15 @@ public Class getColumnClass(int columnIndex) {
             }else if(i==270){
                 column.setPreferredWidth(160);
             }else if(i==271){
-                column.setPreferredWidth(130);
+                column.setPreferredWidth(150);
             }else if(i==272){
                 column.setPreferredWidth(165);
             }else if(i==273){
                 column.setPreferredWidth(123);
             }else if(i==274){
                 column.setPreferredWidth(154);
+            }else if(i==275){
+                column.setPreferredWidth(154);
             }else{
                 column.setPreferredWidth(120);
             }
@@ -811,7 +813,7 @@ private void BtnSimpanActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIR
                     "'false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false',"+
                     "'false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false',"+
                     "'false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false',"+
-                    "'false','false','false','false','false','false','false','false','false','false','false'","User")==true){
+                    "'false','false','false','false','false','false','false','false','false','false','false','false'","User")==true){
                 tampil();
                 emptTeks();
             }            
@@ -1125,10 +1127,11 @@ private void BtnEditActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST
                     "golongan_barang='"+tbUser.getValueAt(i,268).toString()+"',"+
                     "pemberian_obat_pertanggal='"+tbUser.getValueAt(i,269).toString()+"',"+
                     "penjualan_obat_pertanggal='"+tbUser.getValueAt(i,270).toString()+"',"+
-                    "pcare_cek_dokter='"+tbUser.getValueAt(i,271).toString()+"',"+
+                    "pcare_cek_kesadaran='"+tbUser.getValueAt(i,271).toString()+"',"+
                     "pembatalan_periksa_dokter='"+tbUser.getValueAt(i,272).toString()+"',"+
                     "pembayaran_per_unit='"+tbUser.getValueAt(i,273).toString()+"',"+
-                    "rekap_pembayaran_per_unit='"+tbUser.getValueAt(i,274).toString()+"'");
+                    "rekap_pembayaran_per_unit='"+tbUser.getValueAt(i,274).toString()+"',"+
+                    "grafik_kunjungan_percarabayar='"+tbUser.getValueAt(i,275).toString()+"'");
             }            
             tampil();
             emptTeks();
@@ -1399,8 +1402,8 @@ private void tampil() {
                         "grafik_kunjungan_statusdaftarbulan,grafik_kunjungan_statusdaftarbulan2,grafik_kunjungan_statusdaftartanggal,"+
                         "grafik_kunjungan_statusdaftartanggal2,grafik_kunjungan_statusbataltahun,grafik_kunjungan_statusbatalbulan,"+
                         "pcare_cek_penyakit,grafik_kunjungan_statusbataltanggal,kategori_barang,golongan_barang,pemberian_obat_pertanggal,"+
-                        "penjualan_obat_pertanggal,pcare_cek_dokter,pembatalan_periksa_dokter,pembayaran_per_unit,rekap_pembayaran_per_unit "+
-                        "from user order by AES_DECRYPT(id_user,'nur')");
+                        "penjualan_obat_pertanggal,pcare_cek_kesadaran,pembatalan_periksa_dokter,pembayaran_per_unit,rekap_pembayaran_per_unit, "+
+                        "grafik_kunjungan_percarabayar from user order by AES_DECRYPT(id_user,'nur')");
             try {
                 rs=ps.executeQuery();
                 while(rs.next()){
@@ -1683,10 +1686,11 @@ private void tampil() {
                                rs.getBoolean("golongan_barang"),
                                rs.getBoolean("pemberian_obat_pertanggal"),
                                rs.getBoolean("penjualan_obat_pertanggal"),
-                               rs.getBoolean("pcare_cek_dokter"),
+                               rs.getBoolean("pcare_cek_kesadaran"),
                                rs.getBoolean("pembatalan_periksa_dokter"),
                                rs.getBoolean("pembayaran_per_unit"),
-                               rs.getBoolean("rekap_pembayaran_per_unit")
+                               rs.getBoolean("rekap_pembayaran_per_unit"),
+                               rs.getBoolean("grafik_kunjungan_percarabayar")
                             });
                         }   
                     } catch (Exception e) {
@@ -1959,10 +1963,11 @@ private void tampil() {
                            rs.getBoolean("golongan_barang"),
                            rs.getBoolean("pemberian_obat_pertanggal"),
                            rs.getBoolean("penjualan_obat_pertanggal"),
-                           rs.getBoolean("pcare_cek_dokter"),
+                           rs.getBoolean("pcare_cek_kesadaran"),
                            rs.getBoolean("pembatalan_periksa_dokter"),
                            rs.getBoolean("pembayaran_per_unit"),
-                           rs.getBoolean("rekap_pembayaran_per_unit") 
+                           rs.getBoolean("rekap_pembayaran_per_unit"),
+                           rs.getBoolean("grafik_kunjungan_percarabayar") 
                         });
                     }                                             
                  }

diff --git a/src/simrskhanza/frmUtama.form b/src/simrskhanza/frmUtama.form
@@ -2159,7 +2159,7 @@
                         <Property name="icon" type="javax.swing.Icon" noResource="true" editor="org.netbeans.modules.form.editors2.IconEditor">
                           <Image iconType="3" name="/48x48/1360487078_shipping.png"/>
                         </Property>
-                        <Property name="text" type="java.lang.String" value="Barang"/>
+                        <Property name="text" type="java.lang.String" value="Barang Non Medis"/>
                         <Property name="iconTextGap" type="int" value="0"/>
                         <Property name="name" type="java.lang.String" value="btnBarangIpsrs" noResource="true"/>
                         <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
@@ -2175,7 +2175,7 @@
                         <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
                           <Image iconType="3" name="/48x48/inventory-maintenance.png"/>
                         </Property>
-                        <Property name="text" type="java.lang.String" value="Pengadaan Barang"/>
+                        <Property name="text" type="java.lang.String" value="Pengadaan Barang Non Medis"/>
                         <Property name="iconTextGap" type="int" value="0"/>
                         <Property name="name" type="java.lang.String" value="btnPembelianIpsrs" noResource="true"/>
                         <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
@@ -2191,7 +2191,7 @@
                         <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
                           <Image iconType="3" name="/48x48/shopping-basket-full.png"/>
                         </Property>
-                        <Property name="text" type="java.lang.String" value="Stok Keluar"/>
+                        <Property name="text" type="java.lang.String" value="Stok Keluar Non Medis"/>
                         <Property name="iconTextGap" type="int" value="0"/>
                         <Property name="name" type="java.lang.String" value="btnPengeluaranIpsrs" noResource="true"/>
                         <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
@@ -2207,7 +2207,7 @@
                         <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
                           <Image iconType="3" name="/48x48/shopping_cart.png"/>
                         </Property>
-                        <Property name="text" type="java.lang.String" value="Rekap Pengadaan"/>
+                        <Property name="text" type="java.lang.String" value="Rekap Pengadaan Non Medis"/>
                         <Property name="iconTextGap" type="int" value="0"/>
                         <Property name="name" type="java.lang.String" value="btnRHMasukIpsrs" noResource="true"/>
                         <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
@@ -2223,7 +2223,7 @@
                         <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
                           <Image iconType="3" name="/48x48/1360816018_tests.png"/>
                         </Property>
-                        <Property name="text" type="java.lang.String" value="Rekap Stok Keluar"/>
+                        <Property name="text" type="java.lang.String" value="Rekap Stok Keluar Non Medis"/>
                         <Property name="iconTextGap" type="int" value="0"/>
                         <Property name="name" type="java.lang.String" value="btnRHKeluarIpsrs" noResource="true"/>
                         <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
@@ -2239,7 +2239,7 @@
                         <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
                           <Image iconType="3" name="/48x48/1360486845_23.png"/>
                         </Property>
-                        <Property name="text" type="java.lang.String" value="Biaya Pengadaan"/>
+                        <Property name="text" type="java.lang.String" value="Biaya Pengadaan Non Medis"/>
                         <Property name="iconTextGap" type="int" value="0"/>
                         <Property name="name" type="java.lang.String" value="btnRBiayaIpsrs" noResource="true"/>
                         <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
@@ -4749,7 +4749,7 @@
                     <Component class="widget.ButtonBig" name="btnGrafikStatusRegPerTanggal">
                       <Properties>
                         <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
-                          <Image iconType="3" name="/48x48/1491582080_6.png"/>
+                          <Image iconType="3" name="/48x48/1491582015_11.png"/>
                         </Property>
                         <Property name="text" type="java.lang.String" value="Registrasi Lama Per Tanggal"/>
                         <Property name="iconTextGap" type="int" value="0"/>
@@ -4765,7 +4765,7 @@
                     <Component class="widget.ButtonBig" name="btnGrafikStatusRegPerTanggal2">
                       <Properties>
                         <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
-                          <Image iconType="3" name="/48x48/1491582015_11.png"/>
+                          <Image iconType="3" name="/48x48/1491582080_6.png"/>
                         </Property>
                         <Property name="text" type="java.lang.String" value="Registrasi Baru Per Tanggal"/>
                         <Property name="iconTextGap" type="int" value="0"/>
@@ -4781,7 +4781,7 @@
                     <Component class="widget.ButtonBig" name="btnGrafikStatusRegBatalPerTahun">
                       <Properties>
                         <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
-                          <Image iconType="3" name="/48x48/1491582080_6.png"/>
+                          <Image iconType="3" name="/48x48/1491582015_11.png"/>
                         </Property>
                         <Property name="text" type="java.lang.String" value="Batal Periksa Per Tahun"/>
                         <Property name="iconTextGap" type="int" value="0"/>
@@ -4797,7 +4797,7 @@
                     <Component class="widget.ButtonBig" name="btnGrafikStatusRegBatalPerBulan">
                       <Properties>
                         <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
-                          <Image iconType="3" name="/48x48/1491582015_11.png"/>
+                          <Image iconType="3" name="/48x48/1491582080_6.png"/>
                         </Property>
                         <Property name="text" type="java.lang.String" value="Batal Periksa Per Bulan"/>
                         <Property name="iconTextGap" type="int" value="0"/>
@@ -4829,7 +4829,7 @@
                     <Component class="widget.ButtonBig" name="btnGrafikStatusRegBatalPerTanggal">
                       <Properties>
                         <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
-                          <Image iconType="3" name="/48x48/1491582080_6.png"/>
+                          <Image iconType="3" name="/48x48/1491582015_11.png"/>
                         </Property>
                         <Property name="text" type="java.lang.String" value="Batal Periksa Per Tanggal"/>
                         <Property name="iconTextGap" type="int" value="0"/>
@@ -4906,20 +4906,20 @@
                         <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="btnPenjualanPerTanggalActionPerformed"/>
                       </Events>
                     </Component>
-                    <Component class="widget.ButtonBig" name="btnCekPCareDokter">
+                    <Component class="widget.ButtonBig" name="btnCekPCareKesadaran">
                       <Properties>
                         <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
                           <Image iconType="3" name="/48x48/doctor2.png"/>
                         </Property>
-                        <Property name="text" type="java.lang.String" value="Referensi Dokter PCare"/>
+                        <Property name="text" type="java.lang.String" value="Referensi Kesadaran PCare"/>
                         <Property name="iconTextGap" type="int" value="0"/>
-                        <Property name="name" type="java.lang.String" value="btnCekPCareDokter" noResource="true"/>
+                        <Property name="name" type="java.lang.String" value="btnCekPCareKesadaran" noResource="true"/>
                         <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
                           <Dimension value="[200, 90]"/>
                         </Property>
                       </Properties>
                       <Events>
-                        <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="btnCekPCareDokterActionPerformed"/>
+                        <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="btnCekPCareKesadaranActionPerformed"/>
                       </Events>
                     </Component>
                     <Component class="widget.ButtonBig" name="btnPembatalanPeriksaDokter">
@@ -4970,6 +4970,22 @@
                         <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="btnRekapPembayaranPerUnitActionPerformed"/>
                       </Events>
                     </Component>
+                    <Component class="widget.ButtonBig" name="btnGrafikKunjunganPerCarabayar">
+                      <Properties>
+                        <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
+                          <Image iconType="3" name="/48x48/1491582080_6.png"/>
+                        </Property>
+                        <Property name="text" type="java.lang.String" value="Kunjungan Reg Per Cara Bayar"/>
+                        <Property name="iconTextGap" type="int" value="0"/>
+                        <Property name="name" type="java.lang.String" value="btnGrafikKunjunganPerCarabayar" noResource="true"/>
+                        <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+                          <Dimension value="[200, 90]"/>
+                        </Property>
+                      </Properties>
+                      <Events>
+                        <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="btnGrafikKunjunganPerCarabayarActionPerformed"/>
+                      </Events>
+                    </Component>
                   </SubComponents>
                 </Container>
               </SubComponents>
@@ -4986,7 +5002,7 @@
         </Property>
         <Property name="model" type="javax.swing.ComboBoxModel" editor="org.netbeans.modules.form.editors2.ComboBoxModelEditor">
           <StringArray count="1">
-            <StringItem index="0" value="02/01/2018"/>
+            <StringItem index="0" value="06/01/2018"/>
           </StringArray>
         </Property>
         <Property name="displayFormat" type="java.lang.String" value="dd/MM/yyyy"/>

diff --git a/src/simrskhanza/frmUtama.java b/src/simrskhanza/frmUtama.java