diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/IkiDanRemunerasiServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/IkiDanRemunerasiServiceImpl.java index 4b7f5000..9b2bdbe9 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/IkiDanRemunerasiServiceImpl.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/IkiDanRemunerasiServiceImpl.java @@ -508,13 +508,13 @@ public class IkiDanRemunerasiServiceImpl extends BaseVoServiceImpl implements Ik List> listIkiDokter = new ArrayList<>(); List listSkorDokter = new ArrayList<>(); - Date tglHitung = new Date(); - LocalDate firstDayOfYear = LocalDate.now().with(TemporalAdjusters.firstDayOfYear()); - LocalDate firstDate = LocalDate.now().minusYears(1).withMonth(1); - LocalDate lastDate = LocalDate.now().minusYears(1).withMonth(12); - if (LocalDate.now().getYear() == 2022) { - firstDate = LocalDate.now().withYear(2019).withMonth(5); - lastDate = LocalDate.now().withYear(2020).withMonth(4); + LocalDate now = LocalDate.now(); + LocalDate firstDayOfYear = now.with(TemporalAdjusters.firstDayOfYear()); + LocalDate firstDate = now.minusYears(1).withMonth(1); + LocalDate lastDate = now.minusYears(1).withMonth(12); + if (now.getYear() == 2022) { + firstDate = now.withYear(2019).withMonth(5); + lastDate = now.withYear(2020).withMonth(4); } String bulanAwal = firstDate.getYear() + "-" + (firstDate.getMonthValue() < 10 ? "0" + firstDate.getMonthValue() : firstDate.getMonthValue()); @@ -601,7 +601,7 @@ public class IkiDanRemunerasiServiceImpl extends BaseVoServiceImpl implements Ik vo.setSubUnitKerjaPegawai(subunitKerjaVO); vo.setTotalSkorDasar(Double.parseDouble(totalSkor.get("totalSkorDasar").toString())); - vo.setTglHitung(tglHitung); + vo.setTglHitung(Date.from(now.atStartOfDay(ZoneId.systemDefault()).toInstant())); vo.setTmt(Date.from(firstDayOfYear.atStartOfDay().atZone(ZoneId.systemDefault()).toInstant())); /**