diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/ResepDokterDao.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/ResepDokterDao.java index b5383961..dbe28fb7 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/ResepDokterDao.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/ResepDokterDao.java @@ -17,15 +17,6 @@ import com.jasamedika.medifirst2000.entities.ResepDokter; */ @Repository("resepDokterDao") public interface ResepDokterDao extends PagingAndSortingRepository { - @Query("select distinct new Map(so.noRec as noRec," + "so.tglOrder as tglOrder," + "so.masalah as alergi," - + "so.diagnosis as beratBadan," + "ru.namaRuangan as ruangan," + "pg.namaLengkap as dokter," - + "pd.noRegistrasi as noRegistrasi," + "ps.namaPasien as namaPasien," + "ps.tglLahir as tglLahir," - + "ps.noCm as noCm, " + "rd.racikanKe as rKe," + "rd.namaObat as obat," + "rd.qtyProduk as jumlah," - + "rd.keteranganLainnya as instruksi," + "rd.keteranganPakai as aturanPakai) " + "from ResepDokter rd " - + "left join rd.strukOrder so " + "left join rd.ruangan ru " + "left join so.noRegistrasi pd " - + "left join so.noCm ps " + "inner join so.pegawaiOrder pg " + "where rd.strukOrderId = :strukOrderId") - List> findByStrukOrderId(@Param("strukOrderId") String strukOrderId); - @Query("select distinct new Map(so.noRec as noRec," + "so.tglOrder as tglOrder," + "so.masalah as alergi," + "so.diagnosis as beratBadan," + "ru.namaRuangan as ruangan," + "pg.namaLengkap as dokter," + "pd.noRegistrasi as noRegistrasi," + "ps.namaPasien as namaPasien," + "ps.tglLahir as tglLahir," @@ -37,6 +28,7 @@ public interface ResepDokterDao extends PagingAndSortingRepository> findResepBodyByStrukOrderId(@Param("strukOrderId") String strukOrderId); } 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 ae49b453..037c0244 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 @@ -13,8 +13,6 @@ import com.jasamedika.medifirst2000.vo.ResepDokterVO; */ public interface ResepDokterService extends BaseVoService { - public List> findByStrukOrderId(String strukOrderId); - public Map findHeaderResep(String strukOrderId); public List> findResepSatuan(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 68d09ea9..0839fbd5 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 @@ -140,15 +140,6 @@ public class ResepDokterServiceImpl extends BaseVoServiceImpl implements ResepDo return null; } - @Override - public List> findByStrukOrderId(String strukOrderId) { - List> result = resepDokterDao.findByStrukOrderId(strukOrderId); - if (CommonUtil.isNotNullOrEmpty(result)) { - return result; - } - return null; - } - @Override public Map findHeaderResep(String strukOrderId) { Map result = resepDokterDao.findResepHeaderByStrukOrderId(strukOrderId); @@ -170,13 +161,15 @@ public class ResepDokterServiceImpl extends BaseVoServiceImpl implements ResepDo Map rsMap = new HashMap(); for (Map map : data) { if (resepKe.equals(map.get("rKe"))) { - rsMap.putAll(map); jumlahResep++; + rsMap.putAll(map); } } - if (jumlahResep == 1) { - result.add(rsMap); + rsMap.put("isRacikan", false); + if (jumlahResep > 1) { + rsMap.put("isRacikan", true); } + result.add(rsMap); } return result; } diff --git a/jasamedika-reporting/pom.xml b/jasamedika-reporting/pom.xml index 0f35491b..ae87644d 100644 --- a/jasamedika-reporting/pom.xml +++ b/jasamedika-reporting/pom.xml @@ -201,13 +201,13 @@ net.sf.jasperreports jasperreports - 6.20.0 + 6.12.2 net.sf.jasperreports jasperreports-fonts - 6.20.0 + 6.12.2 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 acf95ba2..5c32a373 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 @@ -7504,33 +7504,6 @@ public class ReportingController extends LocaleController return m; } - @RequestMapping("/resep") - public ModelAndView generateResep(ModelAndView m, @RequestParam(value = "format", required = false) String format, - @RequestParam(value = "struk_order_id", required = true) String strukOrderId) { - Map headerResep = resepDokterService.findHeaderResep(strukOrderId); - List> dsResep = resepDokterService.findResepSatuan(strukOrderId); - List> sdsResep = resepDokterService.findResepRacikan(strukOrderId); - - m.addObject("dsResep", dsResep); - m.addObject("sdsResep", sdsResep); - m.addObject("noRec", headerResep.get("noRec")); - m.addObject("tglOrder", headerResep.get("tglOrder")); - m.addObject("alergi", headerResep.get("alergi")); - m.addObject("beratBadan", headerResep.get("beratBadan")); - m.addObject("ruangan", headerResep.get("ruangan")); - m.addObject("dokter", headerResep.get("dokter")); - m.addObject("noRegistrasi", headerResep.get("noRegistrasi")); - m.addObject("namaPasien", headerResep.get("namaPasien")); - m.addObject("tglLahir", headerResep.get("tglLahir")); - m.addObject("noCm", headerResep.get("noCm")); - m.addObject("format", "pdf"); - if (format != null && !format.isEmpty()) { - m.addObject("format", format); - } - - return m; - } - @RequestMapping("/suratPelimpahanTugas") public ModelAndView generateSuratPelimpahanTugas(ModelAndView m, @RequestParam(value = "format", required = false) String format, @@ -7812,5 +7785,33 @@ public class ReportingController extends LocaleController return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); } } + + @RequestMapping("/resep") + public ModelAndView generateResep(ModelAndView m, + @RequestParam(value = "format", required = false) String format, + @RequestParam(value = "struk_order_id", required = true) String strukOrderId) { + Map headerResep = resepDokterService.findHeaderResep(strukOrderId); + List> dsResep = resepDokterService.findResepSatuan(strukOrderId); + List> sdsResep = resepDokterService.findResepRacikan(strukOrderId); + + m.addObject("dsResep", dsResep); + m.addObject("sdsResep", sdsResep); + m.addObject("noRec", headerResep.get("noRec")); + m.addObject("tglOrder", headerResep.get("tglOrder")); + m.addObject("alergi", headerResep.get("alergi")); + m.addObject("beratBadan", headerResep.get("beratBadan")); + m.addObject("ruangan", headerResep.get("ruangan")); + m.addObject("dokter", headerResep.get("dokter")); + m.addObject("noRegistrasi", headerResep.get("noRegistrasi")); + m.addObject("namaPasien", headerResep.get("namaPasien")); + m.addObject("tglLahir", headerResep.get("tglLahir")); + m.addObject("noCm", headerResep.get("noCm")); + m.addObject("format", "pdf"); + if (format != null && !format.isEmpty()) { + m.addObject("format", format); + } + + return m; + } } diff --git a/jasamedika-reporting/src/main/webapp/WEB-INF/templates/images/Logo-Kemenkes.png b/jasamedika-reporting/src/main/webapp/WEB-INF/templates/images/Logo-Kemenkes.png new file mode 100644 index 00000000..bde21e62 Binary files /dev/null and b/jasamedika-reporting/src/main/webapp/WEB-INF/templates/images/Logo-Kemenkes.png differ diff --git a/jasamedika-reporting/src/main/webapp/WEB-INF/templates/images/harkit.png b/jasamedika-reporting/src/main/webapp/WEB-INF/templates/images/harkit.png new file mode 100644 index 00000000..bc50414b Binary files /dev/null and b/jasamedika-reporting/src/main/webapp/WEB-INF/templates/images/harkit.png differ diff --git a/jasamedika-reporting/src/main/webapp/WEB-INF/templates/images/kop.png b/jasamedika-reporting/src/main/webapp/WEB-INF/templates/images/kop.png new file mode 100644 index 00000000..1354175f Binary files /dev/null and b/jasamedika-reporting/src/main/webapp/WEB-INF/templates/images/kop.png differ 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 a412ef58..28a9e94e 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 @@ -1,5 +1,5 @@ - + @@ -12,370 +12,331 @@ - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + <band height="90" splitType="Stretch"> <image> <reportElement x="-4" y="-20" width="388" height="110" uuid="0d6d891e-46bc-4742-b8dd-ef5167539064"/> - <imageExpression><![CDATA["src/main/webapp/WEB-INF/images/kop.png"]]></imageExpression> + <imageExpression><![CDATA["../images/kop.png"]]></imageExpression> </image> </band> - - - - - - - - + + + + + + + + + + + + - - + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - + + + + + - + - - - - - - - - - + + + + + - + - - - - - - - - - + + + + + - + - - - - - - - - - + + + + + - + - - - - - - - - - + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + + + - - - - + + + + - - - - - - - - - - - - - - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/resep_racikan.jrxml b/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/resep_racikan.jrxml index db09d9d8..f3e9b3ac 100644 --- a/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/resep_racikan.jrxml +++ b/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/resep_racikan.jrxml @@ -1,81 +1,49 @@ - + - - - - - - - + + + + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + - - - - - + + + + + - - + + + + - - - - - - - - - - - - + + + - - - - - + + + + + - - + + + + diff --git a/jasamedika-sdm/src/main/java/com/jasamedika/medifirst2000/controller/PelayananController.java b/jasamedika-sdm/src/main/java/com/jasamedika/medifirst2000/controller/PelayananController.java index 564be927..76443cc9 100644 --- a/jasamedika-sdm/src/main/java/com/jasamedika/medifirst2000/controller/PelayananController.java +++ b/jasamedika-sdm/src/main/java/com/jasamedika/medifirst2000/controller/PelayananController.java @@ -207,25 +207,4 @@ public class PelayananController extends LocaleController { return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); } } - - @RequestMapping(value = "/get-resep-dokter", method = RequestMethod.GET) - public ResponseEntity>> getResepDokter(HttpServletRequest request, - @RequestParam(value = "struk_order_id") String strukOrderId) { - try { - List> result = resepDokterService.findByStrukOrderId(strukOrderId); - - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); - } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when get resep dokter", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); - } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when get resep dokter", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); - } - } - }