diff --git a/src/main/java/com/reporting/dao/ReportingDao.java b/src/main/java/com/reporting/dao/ReportingDao.java
index abc8f14..5aec99a 100644
--- a/src/main/java/com/reporting/dao/ReportingDao.java
+++ b/src/main/java/com/reporting/dao/ReportingDao.java
@@ -1107,7 +1107,7 @@ public class ReportingDao {
 
     //Export Excel
 
-    public JasperPrint exportVisit(Date tglAwal, Date tglAkhir, Integer idDokter, Integer idRuangan, String printBy) {
+    public JasperPrint exportVisit(String tglAwal, String tglAkhir, Integer idDokter, Integer idRuangan, String printBy) {
         try (Connection conn = this.jdbcTemplate1.getDataSource().getConnection()) {
             String path = jaspersim2DirPath + "visit.jrxml";
             JasperReport jasperReport = JasperCompileManager.compileReport(path);
@@ -1125,7 +1125,7 @@ public class ReportingDao {
         return null;
     }
 
-    public JasperPrint exportWaktuRawatJalan(Date tglAwal, Date tglAkhir, Integer idDokter, Integer idRuangan, String printBy) {
+    public JasperPrint exportWaktuRawatJalan(String tglAwal, String tglAkhir, Integer idDokter, Integer idRuangan, String printBy) {
         try (Connection conn = this.jdbcTemplate1.getDataSource().getConnection()) {
             String path = jaspersim2DirPath + "waktu_rawat_jalan.jrxml";
             JasperReport jasperReport = JasperCompileManager.compileReport(path);
@@ -1143,7 +1143,7 @@ public class ReportingDao {
         return null;
     }
 
-    public JasperPrint exportKunjunganPasien(Date tglAwal, Date tglAkhir, Integer idInstalasi, Integer idUnit, Integer idRuangan, String printBy) {
+    public JasperPrint exportKunjunganPasien(String tglAwal, String tglAkhir, Integer idInstalasi, Integer idUnit, Integer idRuangan, String printBy) {
         try (Connection conn = this.jdbcTemplate1.getDataSource().getConnection()) {
             String path = jaspersim2DirPath + "kunjungan_pasien.jrxml";
             JasperReport jasperReport = JasperCompileManager.compileReport(path);
@@ -1181,7 +1181,7 @@ public class ReportingDao {
         return null;
     }
 
-    public JasperPrint exportLpVolumeTindakan(Date tglAwal, Date tglAkhir, Integer idInstalasi, Integer idUnit, Integer idRuangan, Integer idProduk, Integer idPegawai, Integer idKp, String printBy) {
+    public JasperPrint exportLpVolumeTindakan(String tglAwal, String tglAkhir, Integer idInstalasi, Integer idUnit, Integer idRuangan, Integer idProduk, Integer idPegawai, Integer idKp, String printBy) {
         try (Connection conn = this.jdbcTemplate1.getDataSource().getConnection()) {
             String path = jaspersim2DirPath + "laporan_volume_tindakan_pasien.jrxml";
             JasperReport jasperReport = JasperCompileManager.compileReport(path);
@@ -1203,7 +1203,7 @@ public class ReportingDao {
         return null;
     }
 
-    public JasperPrint exportLpResumeMedis(Date tglAwal, Date tglAkhir, Integer idInstalasi, Integer idUnit, Integer idRuangan, Integer idPegawai, String printBy) {
+    public JasperPrint exportLpResumeMedis(String tglAwal, String tglAkhir, Integer idInstalasi, Integer idUnit, Integer idRuangan, Integer idPegawai, String printBy) {
         try (Connection conn = this.jdbcTemplate1.getDataSource().getConnection()) {
             String path = jaspersim2DirPath + "LaporanResumeMedis.jrxml";
             JasperReport jasperReport = JasperCompileManager.compileReport(path);
diff --git a/src/main/java/com/reporting/service/ReportingService.java b/src/main/java/com/reporting/service/ReportingService.java
index eacbcbf..9eeb310 100644
--- a/src/main/java/com/reporting/service/ReportingService.java
+++ b/src/main/java/com/reporting/service/ReportingService.java
@@ -324,7 +324,7 @@ public class ReportingService {
 
     // Export Excel
 
-    public JasperPrint exportVisit(String tglAwal, String tglAkhir, Integer idDokter, Integer idRuangan, String printBy) {
+/*    public JasperPrint exportVisit(String tglAwal, String tglAkhir, Integer idDokter, Integer idRuangan, String printBy) {
         try {
             SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd");
             Date parse = formatter.parse(tglAwal);
@@ -350,7 +350,7 @@ public class ReportingService {
         }
     }
 
-    public JasperPrint exportKunjunganPasien(String tglAwal, String tglAkhir, Integer idInstalasi, Integer idUnit, Integer idRuangan, String printBy) {
+    public JasperPrint exportKunjunganPasien(String tglAwal, String tglAkhir, Integer idDokter, Integer idRuangan, String printBy) {
         try {
             SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd");
             Date parse = formatter.parse(tglAwal);
@@ -361,6 +361,18 @@ public class ReportingService {
 
             return null;
         }
+    }*/
+
+    public JasperPrint exportVisit(String tglAwal, String tglAkhir,  Integer idDokter, Integer idRuangan, String printBy) {
+        return this.reportingDao.exportVisit(tglAwal, tglAkhir, idDokter, idRuangan, printBy);
+    }
+
+    public JasperPrint exportWaktuRawatJalan(String tglAwal, String tglAkhir,  Integer idDokter, Integer idRuangan, String printBy) {
+        return this.reportingDao.exportWaktuRawatJalan(tglAwal, tglAkhir, idDokter, idRuangan, printBy);
+    }
+
+    public JasperPrint exportKunjunganPasien(String tglAwal, String tglAkhir, Integer idInstalasi, Integer idUnit, Integer idRuangan, String printBy) {
+        return this.reportingDao.exportKunjunganPasien(tglAwal, tglAkhir,idInstalasi, idUnit, idRuangan, printBy);
     }
 
     public JasperPrint exportLpPendaftaranOnline(String tglAwal, String tglAkhir, Integer idUnit, Integer idRuangan, String printBy) {
@@ -376,7 +388,7 @@ public class ReportingService {
         }
     }
 
-    public JasperPrint exportLpVolumeTindakan(String tglAwal, String tglAkhir, Integer idInstalasi, Integer idUnit, Integer idRuangan, Integer idProduk, Integer idPegawai, Integer idKp, String printBy) {
+/*    public JasperPrint exportLpVolumeTindakan(String tglAwal, String tglAkhir, Integer idInstalasi, Integer idUnit, Integer idRuangan, Integer idProduk, Integer idPegawai, Integer idKp, String printBy) {
         try {
             SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd");
             Date parse = formatter.parse(tglAwal);
@@ -398,23 +410,17 @@ public class ReportingService {
         } catch (ParseException e) {
             log.error(e.getMessage());
 
-            return null;
-        }
-    }
-
-    /*public JasperPrint exportLpSatuSehat(String tglAwal, String tglAkhir, Integer idInstalasi, Integer idUnit, Integer idRuangan, Integer idPegawai, String printBy) {
-        try {
-            SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd");
-            Date parse = formatter.parse(tglAwal);
-            Date parse2 = formatter.parse(tglAkhir);
-            return this.reportingDao.exportLpSatuSehat(parse, parse2, idInstalasi, idUnit, idRuangan, idPegawai, printBy);
-        } catch (ParseException e) {
-            log.error(e.getMessage());
-
             return null;
         }
     }*/
 
+    public JasperPrint exportLpVolumeTindakan(String tglAwal, String tglAkhir, Integer idInstalasi, Integer idUnit, Integer idRuangan, Integer idProduk, Integer idPegawai, Integer idKp, String printBy) {
+        return this.reportingDao.exportLpVolumeTindakan(tglAwal, tglAkhir, idInstalasi, idUnit, idRuangan, idProduk, idPegawai, idKp, printBy);
+    }
+    public JasperPrint exportLpResumeMedis(String tglAwal, String tglAkhir, Integer idInstalasi, Integer idUnit, Integer idRuangan, Integer idPegawai, String printBy) {
+        return this.reportingDao.exportLpResumeMedis(tglAwal, tglAkhir, idInstalasi, idUnit, idRuangan, idPegawai, printBy);
+    }
+
     public JasperPrint exportLpSatuSehat(String tglAwal, String tglAkhir, Integer idInstalasi, Integer idUnit, Integer idRuangan, Integer idPegawai, String printBy) {
         return this.reportingDao.exportLpSatuSehat(tglAwal, tglAkhir, idInstalasi, idUnit, idRuangan, idPegawai, printBy);
     }