From 90e7c9c721d95d3397376c8263fbd77cae32429d Mon Sep 17 00:00:00 2001
From: ridwan <muhamad.ridwan@rsabhk.co.id>
Date: Mon, 7 Jul 2025 14:57:35 +0700
Subject: [PATCH] UP Permintaan Makanan dan Minuman Gizi

---
 .../controller/ReportingController.java        |  1 +
 .../java/com/reporting/dao/ReportingDao.java   | 18 ++++++++++++++++++
 .../reporting/service/ReportingService.java    |  6 +++++-
 3 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/reporting/controller/ReportingController.java b/src/main/java/com/reporting/controller/ReportingController.java
index 6929fe9..3bc9c78 100644
--- a/src/main/java/com/reporting/controller/ReportingController.java
+++ b/src/main/java/com/reporting/controller/ReportingController.java
@@ -497,6 +497,7 @@ public class ReportingController {
         JasperExportManager.exportReportToPdfStream(jasperPrint, response.getOutputStream());
     }
 
+
     // Klinik Utama Bintaro
 
     @RequestMapping(value = {"/bukti-layanan-farmasi-bintaro/{norec}/{user}"}, method = {RequestMethod.GET})
diff --git a/src/main/java/com/reporting/dao/ReportingDao.java b/src/main/java/com/reporting/dao/ReportingDao.java
index ec33436..781a058 100644
--- a/src/main/java/com/reporting/dao/ReportingDao.java
+++ b/src/main/java/com/reporting/dao/ReportingDao.java
@@ -326,6 +326,24 @@ public class ReportingDao {
         return null;
     }
 
+    public JasperPrint exportPdfPermintaanMinuman(int idRu, String tglAwal, String tglAkhir, String jenisDiet, String tglLayanan) {
+        try (Connection conn = this.jdbcTemplate1.getDataSource().getConnection()) {
+            String path = jasperDirPath + "pl_permintaan_minuman.jrxml";
+            JasperReport jasperReport = JasperCompileManager.compileReport(path);
+            Map<String, Object> parameters = new HashMap<>();
+            parameters.put("idRu", idRu);
+            parameters.put("tglAwal", tglAwal);
+            parameters.put("tglAkhir", tglAkhir);
+            parameters.put("jenisDiet", jenisDiet);
+            parameters.put("tglLayanan", tglLayanan);
+            return JasperFillManager.fillReport(jasperReport, parameters, conn);
+        } catch (Exception var17) {
+            LOG.error("Exception at exportPdfPermintaanMinuman");
+            LOG.error(ReportingDao.class, var17);
+        }
+        return null;
+    }
+
     public JasperPrint exportPdfRekapMakanan(int idRu, String tglAwal, String tglAkhir) {
         try (Connection conn = this.jdbcTemplate1.getDataSource().getConnection()) {
             String path = jasperDirPath + "pl_rekap_makan.jrxml";
diff --git a/src/main/java/com/reporting/service/ReportingService.java b/src/main/java/com/reporting/service/ReportingService.java
index 0f4d434..cbec99b 100644
--- a/src/main/java/com/reporting/service/ReportingService.java
+++ b/src/main/java/com/reporting/service/ReportingService.java
@@ -93,7 +93,11 @@ public class ReportingService {
     }
 
     public JasperPrint printPdfPermintaanMakanan(int idRu, String tglAwal, String tglAkhir, String jenisDiet, String tglLayanan) {
-        return this.reportingDao.exportPdfPermintaanMakanan(idRu, tglAwal, tglAkhir, jenisDiet, tglLayanan);
+        if (Objects.equals(jenisDiet, "MINUMAN")) {
+            return this.reportingDao.exportPdfPermintaanMinuman(idRu, tglAwal, tglAkhir, jenisDiet, tglLayanan);
+        } else {
+            return this.reportingDao.exportPdfPermintaanMakanan(idRu, tglAwal, tglAkhir, jenisDiet, tglLayanan);
+        }
     }
 
     public JasperPrint printPdfRekapMakanan(int idRu, String tglAwal, String tglAkhir) {