diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/LogbookKinerjaDao.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/LogbookKinerjaDao.java index 7900e81b..e146ae78 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/LogbookKinerjaDao.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/LogbookKinerjaDao.java @@ -74,7 +74,7 @@ public interface LogbookKinerjaDao extends PagingAndSortingRepository> findPenilaianKinerja(@Param("pegawaiId") Integer idPegawai, @Param("jabatanId") Integer idJabatan, @Param("bulan") String bulan); diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/LogbookKinerjaServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/LogbookKinerjaServiceImpl.java index 7f0d96d0..4a33620c 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/LogbookKinerjaServiceImpl.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/LogbookKinerjaServiceImpl.java @@ -403,6 +403,9 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb DecimalFormat kursINA = (DecimalFormat) DecimalFormat.getCurrencyInstance(); kursINA.setDecimalFormatSymbols(formatRp); + DecimalFormat df = new DecimalFormat("0.00"); + df.setRoundingMode(RoundingMode.HALF_UP); + List> rs = logbookKinerjaDao.findLogbookKinerja(idPegawai, idJabatan, mf.format(new Date(bulan))); Map anggaran = findAnggaranRemunerasi(idPegawai, idJabatan, yf.format(new Date(bulan))); @@ -429,10 +432,10 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb for (Map ld : logbookDokter) { capaian += Double.valueOf(ld.get("tSkor").toString()); } - double fragCapaian = capaian / Double.valueOf(map.get("target").toString()); + String fragCapaian = df.format(capaian / Double.valueOf(map.get("target").toString())); hasil += capaian / Double.valueOf(map.get("target").toString()) * Double.valueOf(map.get("bobot").toString()); - map.put("fragCapaian", fragCapaian); + map.put("fragCapaian", Double.parseDouble(fragCapaian)); map.put("persenCapaianDibulatkan", new BigDecimal(Double.valueOf(map.get("fragCapaian").toString()) * 100).setScale(2, RoundingMode.HALF_UP)); diff --git a/jasamedika-sdm/src/main/java/com/jasamedika/medifirst2000/controller/SdmController.java b/jasamedika-sdm/src/main/java/com/jasamedika/medifirst2000/controller/SdmController.java index 4f134ca7..590e1e8b 100644 --- a/jasamedika-sdm/src/main/java/com/jasamedika/medifirst2000/controller/SdmController.java +++ b/jasamedika-sdm/src/main/java/com/jasamedika/medifirst2000/controller/SdmController.java @@ -122,7 +122,6 @@ import com.jasamedika.medifirst2000.service.StatusMeninggalDuniaService; import com.jasamedika.medifirst2000.service.StatusPegawaiService; import com.jasamedika.medifirst2000.service.TahunUmrService; import com.jasamedika.medifirst2000.service.TanggunganService; -import com.jasamedika.medifirst2000.service.TargetLayananService; import com.jasamedika.medifirst2000.service.TipeKeanggotaanService; import com.jasamedika.medifirst2000.service.TipeKoleksiService; import com.jasamedika.medifirst2000.service.UnitKerjaPegawaiService;