diff --git a/src/main/java/com/reporting/controller/ReportingController.java b/src/main/java/com/reporting/controller/ReportingController.java index 6c10f8d..fc5ab5f 100644 --- a/src/main/java/com/reporting/controller/ReportingController.java +++ b/src/main/java/com/reporting/controller/ReportingController.java @@ -1706,7 +1706,7 @@ public class ReportingController { @RequestMapping(value = {"/daftar-tarif-ruangan"}, method = {RequestMethod.GET}) public void handleLpTarif( @RequestParam(value = "idInstalasi", required = false, defaultValue = "") Integer idInstalasi, - @RequestParam(value = "idUkp", required = false, defaultValue = "") Integer idUkp, + @RequestParam(value = "idUnit", required = false, defaultValue = "") Integer idUnit, @RequestParam(value = "idRuangan", required = false, defaultValue = "") Integer idRuangan, @RequestParam(value = "idProduk", required = false, defaultValue = "") Integer idProduk, @RequestParam(value = "idTarif", required = false, defaultValue = "") Integer idTarif, @@ -1718,7 +1718,7 @@ public class ReportingController { JasperPrint jasperPrint = null; try { // Generate report (common for both PDF/Excel) - jasperPrint = this.reportingService.exportLpTarif(idInstalasi, idUkp, idRuangan, idProduk, idTarif, printBy); + jasperPrint = this.reportingService.exportLpTarif(idInstalasi, idUnit, idRuangan, idProduk, idTarif, printBy); if ("excel".equalsIgnoreCase(format)) { // Handle Excel export diff --git a/src/main/java/com/reporting/dao/ReportingDao.java b/src/main/java/com/reporting/dao/ReportingDao.java index 3a2a77a..b419b82 100644 --- a/src/main/java/com/reporting/dao/ReportingDao.java +++ b/src/main/java/com/reporting/dao/ReportingDao.java @@ -1398,13 +1398,13 @@ public class ReportingDao { } return null; } - public JasperPrint exportLpTarif(Integer idInstalasi, Integer idUkp, Integer idRuangan, Integer idProduk, Integer idTarif, String printBy) { + public JasperPrint exportLpTarif(Integer idInstalasi, Integer idUnit, Integer idRuangan, Integer idProduk, Integer idTarif, String printBy) { try (Connection conn = this.jdbcTemplate1.getDataSource().getConnection()) { String path = jaspersim2DirPath + "tindakan_mba_ayu_putri.jrxml"; JasperReport jasperReport = JasperCompileManager.compileReport(path); Map parameters = new HashMap<>(); parameters.put("idInstalasi", idInstalasi); - parameters.put("idUkp", idUkp); + parameters.put("idUnit", idUnit); parameters.put("idRuangan", idRuangan); parameters.put("idProduk", idProduk); parameters.put("idTarif", idTarif); diff --git a/src/main/java/com/reporting/service/ReportingService.java b/src/main/java/com/reporting/service/ReportingService.java index 985a43f..1980923 100644 --- a/src/main/java/com/reporting/service/ReportingService.java +++ b/src/main/java/com/reporting/service/ReportingService.java @@ -455,9 +455,9 @@ public class ReportingService { return this.reportingDao.exportLpSatuSehat(tglAwal, tglAkhir, idInstalasi, idUnit, idRuangan, idPegawai, printBy); } - public JasperPrint exportLpTarif(Integer idInstalasi, Integer idUkp, Integer idRuangan, Integer idProduk, Integer idTarif, String printBy) { - log.info("Starting exportLpTarif with idInstalasi: {}, idProduk: {}, idTarif: {}, printBy: {}", idInstalasi, idUkp, idRuangan, idProduk, idTarif, printBy); - return this.reportingDao.exportLpTarif(idInstalasi, idUkp, idRuangan, idProduk, idTarif, printBy); + public JasperPrint exportLpTarif(Integer idInstalasi, Integer idUnit, Integer idRuangan, Integer idProduk, Integer idTarif, String printBy) { + log.info("Starting exportLpTarif with idInstalasi: {}, idProduk: {}, idTarif: {}, printBy: {}", idInstalasi, idUnit, idRuangan, idProduk, idTarif, printBy); + return this.reportingDao.exportLpTarif(idInstalasi, idUnit, idRuangan, idProduk, idTarif, printBy); } public JasperPrint exportLpRekapTidakan(String tglAwal, String tglAkhir, Integer idUnit, Integer idDokter, Integer idKp, Integer idProduk, String printBy) {