From ad0a4d98c4e3bd23d3db2a412fa5376ae0c74c85 Mon Sep 17 00:00:00 2001 From: Salman Manoe Date: Mon, 26 Jul 2021 09:33:35 +0700 Subject: [PATCH] perbaikan kondisi indikator tindakan reguler di logbook skor dalam jam kerja karena kasus tindakan dapat mapping lebih dari satu ruangan --- .../service/impl/LogbookKinerjaServiceImpl.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) 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 3604660f..ef27943e 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 @@ -1311,7 +1311,13 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb result.add(mapLayanan); } } - } else if (idIndikator.equals(Master.IndikatorKinerjaJamKerja.TINDAKAN_REG)) { + } else if (idIndikator.equals(Master.IndikatorKinerjaJamKerja.TINDAKAN_REG) + && !listKonsulTapiVisit.contains(mapLayanan.get("produkId")) + && !mapLayanan.get("namaProduk").toString().toLowerCase().contains(Master.VISIT) + && !mapLayanan.get("namaProduk").toString().toLowerCase().contains(Master.KONSUL) + && !listRuangEks.contains(mapLayanan.get("ruanganId")) + && !mapLayanan.get("departemenId").equals(Master.Departemen.IGD) + && !mapLayanan.get("ruanganId").equals(Master.Ruangan.OK)) { if (idJenisPetugas.equals(Master.JenisPetugasPelaksana.ASISTEN_SPESIALIS) && mapLayanan.get("jenisPetugasId").equals(Master.JenisPetugasPelaksana.ASISTEN_SPESIALIS)) { if (skor.equals(0.0) && Double.valueOf(mapLayanan.get("hargaDiskon").toString()) > 0.0