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 1e3d8bec..435b594c 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 @@ -1133,9 +1133,6 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb */ for (ReferensiSkorAnestesiVO refSkor : listRefSkor) { for (Map mapLayanan : dataLayananAnestesi) { - if (mapLayanan.containsKey("skor")) { - break; - } for (Map mapSkor : dataSkorAnestesi) { if (CommonUtil.isNotNullOrEmpty(refSkor.getPelayananId()) && CommonUtil.isNotNullOrEmpty(mapLayanan.get("noRec")) @@ -1167,16 +1164,21 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb && (((Date) mapLayanan.get("tglPelayanan")).after((Date) mapSkor.get("tglMulaiBerlaku")) || ((Date) mapLayanan.get("tglPelayanan")) .equals((Date) mapSkor.get("tglMulaiBerlaku")))) { - double skor = 1.0; - if (refSkor.getAsaId() >= 3) { - skor = 0.8 * Double.valueOf(mapSkor.get("skor").toString()); - } else if (refSkor.getAsaId() == 2) { - skor = 0.5 * Double.valueOf(mapSkor.get("skor").toString()); - } else { - skor = 0.4 * Double.valueOf(mapSkor.get("skor").toString()); + if (!mapLayanan.containsKey("skor")) { + if (refSkor.getAsaId() >= 3) { + double skor = 0.8 * Double.valueOf(mapSkor.get("skor").toString()); + mapLayanan.put("skor", skor); + break; + } else if (refSkor.getAsaId() == 2) { + double skor = 0.5 * Double.valueOf(mapSkor.get("skor").toString()); + mapLayanan.put("skor", skor); + break; + } else if (refSkor.getAsaId() == 1) { + double skor = 0.4 * Double.valueOf(mapSkor.get("skor").toString()); + mapLayanan.put("skor", skor); + break; + } } - mapLayanan.put("skor", skor); - break; } } }