From 6662d698927f1bd103ce464f49a7c9a5cf46273f Mon Sep 17 00:00:00 2001 From: Salman Manoe Date: Thu, 7 Apr 2022 21:35:13 +0700 Subject: [PATCH] Update LogbookKinerjaService Perbaikan formula perhitungan P1 di dashboard pencatatan kinerja dan rekapitulasi penilaian kinerja --- .../java/com/jasamedika/medifirst2000/constants/Master.java | 1 + .../service/impl/LogbookKinerjaServiceImpl.java | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/constants/Master.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/constants/Master.java index f637f235..a109cbcb 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/constants/Master.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/constants/Master.java @@ -299,6 +299,7 @@ public class Master { public static final class Remunerasi { public static final Integer[] JENIS_INDIKATOR = { 1, 2, 3 }; + public static final Double IK_STANDAR = 1.0; public static final Double IKI_STANDAR = 1.0; public static final Double IKU = 1.0; 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 f492202e..fcae25e2 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 @@ -888,11 +888,11 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb } } - double targetRupiahP1 = nilaiJabatan * Master.Remunerasi.IKI_STANDAR * pir * Master.Remunerasi.PERSEN_P1; + double targetRupiahP1 = nilaiJabatan * Master.Remunerasi.IK_STANDAR * pir * Master.Remunerasi.PERSEN_P1; double targetRupiahP2 = nilaiJabatan * Master.Remunerasi.IKU * Master.Remunerasi.IKI_STANDAR * pir * Master.Remunerasi.PERSEN_P2; - double capaianRupiahP1 = nilaiJabatan * iki * pir * Master.Remunerasi.PERSEN_P1; + double capaianRupiahP1 = nilaiJabatan * Master.Remunerasi.IK_STANDAR * pir * Master.Remunerasi.PERSEN_P1; double capaianRupiahP2 = nilaiJabatan * Master.Remunerasi.IKU * iki * pir * Master.Remunerasi.PERSEN_P2; if (CommonUtil.isNotNullOrEmpty(idJabatan)) { @@ -2720,7 +2720,7 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb break; } } - double p1 = Double.valueOf(rd.get("nilaiJabatan").toString()) * Double.valueOf(rd.get("iki").toString()) + double p1 = Double.valueOf(rd.get("nilaiJabatan").toString()) * Master.Remunerasi.IK_STANDAR * Double.valueOf(rd.get("pir").toString()) * Master.Remunerasi.PERSEN_P1; double p2 = Double.valueOf(rd.get("nilaiJabatan").toString()) * Double.valueOf(rd.get("iki").toString()) * Master.Remunerasi.IKU * Double.valueOf(rd.get("pir").toString()) * Master.Remunerasi.PERSEN_P2;