From a46d1483c0bcaa18402c6b84753077a968fe6606 Mon Sep 17 00:00:00 2001 From: salmanoersabhk Date: Mon, 15 Aug 2022 11:32:07 +0700 Subject: [PATCH] Update ResepDokterService Persiapan pembuatan cetakan resep dokter --- .../service/ResepDokterService.java | 6 ++++ .../service/impl/ResepDokterServiceImpl.java | 28 +++++++++++++++++++ .../controller/ReportingController.java | 5 ++-- .../WEB-INF/templates/jrxml/resep.jrxml | 10 +++---- 4 files changed, 41 insertions(+), 8 deletions(-) diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/ResepDokterService.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/ResepDokterService.java index 4015e267..89a67103 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/ResepDokterService.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/ResepDokterService.java @@ -12,5 +12,11 @@ import com.jasamedika.medifirst2000.vo.ResepDokterVO; * */ public interface ResepDokterService extends BaseVoService { + public List> findByStrukOrderId(String strukOrderId); + + public List> findHeaderResep(String strukOrderId); + + public List> findResepRacikan(String strukOrderId); + } diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/ResepDokterServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/ResepDokterServiceImpl.java index 45f288ec..042ce547 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/ResepDokterServiceImpl.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/ResepDokterServiceImpl.java @@ -148,4 +148,32 @@ public class ResepDokterServiceImpl extends BaseVoServiceImpl implements ResepDo return null; } + @Override + public List> findHeaderResep(String strukOrderId) { + List> result = new ArrayList<>(); + List> data = resepDokterDao.findByStrukOrderId(strukOrderId); + List listResepKe = new ArrayList<>(); + for (Map map : data) { + if (!listResepKe.contains(map.get("rKe"))) { + listResepKe.add(map.get("rKe").toString()); + } + } + int jumlahResep = 0; + for (String resepKe : listResepKe) { + for (Map map : data) { + if (resepKe.equals(map.get("rKe"))) { + + } + } + } + return null; + } + + @Override + public List> findResepRacikan(String strukOrderId) { + List> result = new ArrayList<>(); + List> data = resepDokterDao.findByStrukOrderId(strukOrderId); + return null; + } + } diff --git a/jasamedika-reporting/src/main/java/com/jasamedika/medifirst2000/controller/ReportingController.java b/jasamedika-reporting/src/main/java/com/jasamedika/medifirst2000/controller/ReportingController.java index 03ecbf9e..8ecf4888 100644 --- a/jasamedika-reporting/src/main/java/com/jasamedika/medifirst2000/controller/ReportingController.java +++ b/jasamedika-reporting/src/main/java/com/jasamedika/medifirst2000/controller/ReportingController.java @@ -7499,10 +7499,9 @@ public class ReportingController extends LocaleController return m; } - + @RequestMapping("/resep") - public ModelAndView generateResep(ModelAndView m, - @RequestParam(value = "format", required = false) String format, + public ModelAndView generateResep(ModelAndView m, @RequestParam(value = "format", required = false) String format, @RequestParam(value = "startDate", required = true) String startDate, @RequestParam(value = "endDate", required = true) String endDate) { diff --git a/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/resep.jrxml b/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/resep.jrxml index 5300cf06..a412ef58 100644 --- a/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/resep.jrxml +++ b/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/resep.jrxml @@ -10,8 +10,8 @@ - - + + @@ -39,7 +39,7 @@ - + @@ -62,7 +62,7 @@ - + @@ -241,7 +241,7 @@ - +