diff --git a/jasamedika-bridging/src/main/java/com/jasamedika/medifirst2000/controller/ReportingController.java b/jasamedika-bridging/src/main/java/com/jasamedika/medifirst2000/controller/ReportingController.java index b98adde1..ae557e0e 100644 --- a/jasamedika-bridging/src/main/java/com/jasamedika/medifirst2000/controller/ReportingController.java +++ b/jasamedika-bridging/src/main/java/com/jasamedika/medifirst2000/controller/ReportingController.java @@ -5705,10 +5705,12 @@ public class ReportingController extends LocaleController @RequestParam(value = "format", required = false) String format, @RequestParam(value = "periode", required = true) String periode, @RequestParam(value = "idPegawai", required = false) Integer idPegawai) { + Date start = DateUtil.startMonth(periode); + Date end = DateUtil.endMonth(periode); Pegawai pegawaiLoggedIn = indekKinerjaService.getPegawaiByUserLogin(); Map pegawai = pegawaiDao.findPegawaiById(pegawaiLoggedIn.getId()); - List> result = indekKinerjaDao.findTindakanByIdPegawaiAndPeriod(periode, + List> result = indekKinerjaDao.findTindakanByIdPegawaiAndPeriod(start, end, pegawaiLoggedIn.getId(), indekKinerjaService.splitIdProdukAdministrasi()); if (CommonUtil.isNullOrEmpty(result)) { Map data = new HashMap(); @@ -5730,7 +5732,7 @@ public class ReportingController extends LocaleController m.addObject("jabatanAtasan", atasan.get("jabatanInternal")); m.addObject("atasan", atasan.get("nama")); m.addObject("nipAtasan", atasan.get("nipPns")); - m.addObject("total", indekKinerjaDao.findTotalTindakanPerMonth(pegawaiLoggedIn.getId(), periode, + m.addObject("total", indekKinerjaDao.findTotalTindakanPerMonth(pegawaiLoggedIn.getId(), start, end, indekKinerjaService.splitIdProdukAdministrasi())); m.addObject("format", "pdf"); diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/IndekKinerjaDao.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/IndekKinerjaDao.java index fab8b9ab..56a011bb 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/IndekKinerjaDao.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/IndekKinerjaDao.java @@ -111,10 +111,10 @@ public interface IndekKinerjaDao extends PagingAndSortingRepository> findTindakanByIdUser(@Param("id") Integer id, @Param("tgl") String tgl, - @Param("listIdJenisProduk") List listIdJenisProduk); + public List> findTindakanByIdUser(@Param("id") Integer id, @Param("start") Date start, + @Param("end") Date end, @Param("listIdJenisProduk") List listIdJenisProduk); @Query(" select new map (produk.namaProduk as namaProduk,produk.id as produkId," + " count(produk.namaProduk) as count,to_char(pelayananPasien.tglPelayanan,'yyyy-MM-dd') as tglPelayanan )" @@ -124,11 +124,11 @@ public interface IndekKinerjaDao extends PagingAndSortingRepository> findTindakanByIdUserAndPeriod(@Param("id") Integer id, @Param("date") String date, - @Param("listIdJenisProduk") List listIdJenisProduk); + public List> findTindakanByIdUserAndPeriod(@Param("id") Integer id, @Param("start") Date start, + @Param("end") Date end, @Param("listIdJenisProduk") List listIdJenisProduk); @Query(" select new map (produk.namaProduk as namaProduk,produk.id as produkId," + " count(produk.namaProduk) as count,to_char(pelayananPasien.tglPelayanan,'yyyy-MM-dd') as tglPelayanan )" @@ -138,11 +138,12 @@ public interface IndekKinerjaDao extends PagingAndSortingRepository> findTindakanByIdUserAndPeriodWithException(@Param("id") Integer id, - @Param("date") String date, @Param("listIdJenisProduk") List listIdJenisProduk, + @Param("start") Date start, @Param("end") Date end, + @Param("listIdJenisProduk") List listIdJenisProduk, @Param("listIdDetailJenisProduk") List listIdDetailJenisProduk); @Query(" select new Map(rincianKegiatan.rincianKegiatan as rincianKegiatan, rincianKegiatan.id as idRincianKegiatan, " @@ -167,11 +168,11 @@ public interface IndekKinerjaDao extends PagingAndSortingRepository> findCountTindakanByIdUserAndPeriod(@Param("id") Integer id, - @Param("startDate") String startDate, @Param("endDate") String endDate, + @Param("start") Date start, @Param("end") Date end, @Param("listIdJenisProduk") List listIdJenisProduk); @Query(" select new Map( produk.namaProduk as namaProduk, count( distinct pelayananPasien.noRec) as count,jenisProduk.id as idJenisProduk)" @@ -269,7 +270,7 @@ public interface IndekKinerjaDao extends PagingAndSortingRepository> findByHeadId(@Param("noRec") String noRec) throws JpaSystemException; @Query("select tsd.skor " + "from TargetSkorDokterDetail tsd " + "inner join tsd.targetSkor ts " - + "where tsd.pegawaiId = :pegawaiId " + "and ts.tmt <= :endMonth " + "ts.tmt between :start and :end " + + "where tsd.pegawaiId = :pegawaiId " + "and ts.tmt <= :endMonth " + " and ts.tmt between :start and :end " + "order by ts.tmt desc") public List findTargetByPegawai(@Param("pegawaiId") Integer idPegawai, @Param("endMonth") Date endMonth, @Param("start") Date start, @Param("end") Date end) throws JpaSystemException; @Query("select new Map(tsd.pegawaiId as pegawaiId,tsd.skor as skor) " + "from TargetSkorDokterDetail tsd " + "inner join tsd.targetSkor ts " + "where tsd.pegawaiId in (:listIdPegawai) " + "and ts.tmt <= :endMonth " - + "ts.tmt between :start and :end " + "order by ts.tmt desc") + + "and ts.tmt between :start and :end " + "order by ts.tmt desc") public List> findTargetByPegawai(@Param("listIdPegawai") List listIdPegawai, @Param("endMonth") Date endMonth, @Param("start") Date start, @Param("end") Date end) throws JpaSystemException; diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/IndekKinerjaServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/IndekKinerjaServiceImpl.java index f0e16f47..1020c34a 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/IndekKinerjaServiceImpl.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/IndekKinerjaServiceImpl.java @@ -371,6 +371,8 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK @Override public List> findTindakanByIdUserAndPeriod(String month) { + Date start = DateUtil.startMonth(month); + Date end = DateUtil.endMonth(month); Pegawai pegawai = new Pegawai(); pegawai = this.getPegawaiByUserLogin(); List> result = new ArrayList>(); @@ -388,11 +390,11 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK int idPegawai = pegawai.getId(); Long totalPerTanggal; if (CommonUtil.isNullOrEmpty(listDetailException)) { - result = indekKinerjaDao.findTindakanByIdUserAndPeriod(idPegawai, date, splitIdProdukAdministrasi()); + result = indekKinerjaDao.findTindakanByIdUserAndPeriod(idPegawai, start, end, splitIdProdukAdministrasi()); totalPerTanggal = indekKinerjaDao.findTotalTindakanPerTanggal(idPegawai, date, splitIdProdukAdministrasi()); } else { - result = indekKinerjaDao.findTindakanByIdUserAndPeriodWithException(idPegawai, date, + result = indekKinerjaDao.findTindakanByIdUserAndPeriodWithException(idPegawai, start, end, splitIdProdukAdministrasi(), listDetailException); totalPerTanggal = indekKinerjaDao.findTotalTindakanPerTanggalWithException(idPegawai, date, splitIdProdukAdministrasi(), listDetailException); 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 af1e1ca3..a3147dde 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 @@ -337,7 +337,7 @@ public class ReportingController extends LocaleController @Autowired private CatatanPerkembanganPasienTerintegrasiService cpptService; - + @Autowired private ResepDokterService resepDokterService; @@ -5745,10 +5745,11 @@ public class ReportingController extends LocaleController @RequestParam(value = "format", required = false) String format, @RequestParam(value = "periode", required = true) String periode, @RequestParam(value = "idPegawai", required = false) Integer idPegawai) { - + Date start = DateUtil.startMonth(periode); + Date end = DateUtil.endMonth(periode); Pegawai pegawaiLoggedIn = indekKinerjaService.getPegawaiByUserLogin(); Map pegawai = pegawaiDao.findPegawaiById(pegawaiLoggedIn.getId()); - List> result = indekKinerjaDao.findTindakanByIdPegawaiAndPeriod(periode, + List> result = indekKinerjaDao.findTindakanByIdPegawaiAndPeriod(start, end, pegawaiLoggedIn.getId(), indekKinerjaService.splitIdProdukAdministrasi()); if (CommonUtil.isNullOrEmpty(result)) { // Map data = new HashMap(); @@ -5770,7 +5771,7 @@ public class ReportingController extends LocaleController m.addObject("jabatanAtasan", atasan.get("jabatanInternal")); m.addObject("atasan", atasan.get("nama")); m.addObject("nipAtasan", atasan.get("nipPns")); - m.addObject("total", indekKinerjaDao.findTotalTindakanPerMonth(pegawaiLoggedIn.getId(), periode, + m.addObject("total", indekKinerjaDao.findTotalTindakanPerMonth(pegawaiLoggedIn.getId(), start, end, indekKinerjaService.splitIdProdukAdministrasi())); m.addObject("format", "pdf"); @@ -6628,7 +6629,7 @@ public class ReportingController extends LocaleController return m; } - + @RequestMapping("/logbookPelayananDokterDetailPasien") public ModelAndView generateLogbookPelayananDokterDetailPasien(ModelAndView m, @RequestParam(value = "format", required = false) String format, @@ -7178,7 +7179,7 @@ public class ReportingController extends LocaleController return m; } - + @RequestMapping("/lapLogbookPelayananStaffMedis") public ModelAndView generatelapLogbookPelayananStaffMedis(ModelAndView m, @RequestParam(value = "format", required = false) String format, @@ -7914,15 +7915,14 @@ 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, + 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"));