From e1b2a02304c272078ff93c3f5687a690310db002 Mon Sep 17 00:00:00 2001 From: salmanoe Date: Wed, 8 Jun 2022 20:17:11 +0700 Subject: [PATCH] Update LogbookKinerjaServiceImpl.java Perbaikan get logbook skor kinerja dokter anestesi bergantung jenis asa --- .../impl/LogbookKinerjaServiceImpl.java | 20 +++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) 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 42a93639..f7e0bba1 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 @@ -1125,8 +1125,25 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb */ for (ReferensiSkorAnestesiVO refSkor : listRefSkor) { for (Map mapLayanan : dataLayananAnestesi) { + double skor = 1.0; + mapLayanan.put("skor", skor); for (Map mapSkor : dataSkorAnestesi) { - if (refSkor.getPelayananId().equals(mapLayanan.get("noRec").toString()) + if (CommonUtil.isNotNullOrEmpty(refSkor.getPelayananId()) + && CommonUtil.isNotNullOrEmpty(mapLayanan.get("noRec")) + && CommonUtil.isNotNullOrEmpty(refSkor.getAsaId()) + && CommonUtil.isNotNullOrEmpty(mapLayanan.get("asaId")) + && CommonUtil.isNotNullOrEmpty(refSkor.getProdukId()) + && CommonUtil.isNotNullOrEmpty(mapLayanan.get("produkId")) + && CommonUtil.isNotNullOrEmpty(mapSkor.get("produkId")) + && CommonUtil.isNotNullOrEmpty(refSkor.getDokterAnestesiId()) + && CommonUtil.isNotNullOrEmpty(mapLayanan.get("pegawaiId")) + && CommonUtil.isNotNullOrEmpty(refSkor.getDokterPemeriksaId()) + && CommonUtil.isNotNullOrEmpty(mapSkor.get("pegawaiId")) + && CommonUtil.isNotNullOrEmpty(refSkor.getKelompokKerjaId()) + && CommonUtil.isNotNullOrEmpty(mapSkor.get("kelompokKerjaId")) + && CommonUtil.isNotNullOrEmpty(mapLayanan.get("tglPelayanan")) + && CommonUtil.isNotNullOrEmpty(mapSkor.get("tglMulaiBerlaku")) + && refSkor.getPelayananId().equals(mapLayanan.get("noRec").toString()) && refSkor.getAsaId().equals(Byte.valueOf(mapLayanan.get("asaId").toString())) && refSkor.getProdukId().equals(Integer.valueOf(mapLayanan.get("produkId").toString())) && refSkor.getProdukId().equals(Integer.valueOf(mapSkor.get("produkId").toString())) @@ -1141,7 +1158,6 @@ 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 = 0.0; if (refSkor.getAsaId() >= 3) { skor = 0.8 * Double.valueOf(mapSkor.get("skor").toString()); } else if (refSkor.getAsaId() == 2) {