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 56a0e79e..7e6bef67 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
@@ -1754,7 +1754,7 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb
 						mapLayanan.remove("ruanganId");
 						mapLayanan.remove("hargaDiskon");
 						result.add(mapLayanan);
-					} else if (!skor.equals(0.0) && Double.valueOf(mapLayanan.get("hargaDiskon").toString()) == 0.0) {
+					} else if (!skor.equals(0.0)) {
 						mapLayanan.remove("noRec");
 						mapLayanan.remove("statusDiskon");
 						mapLayanan.remove("departemenId");
@@ -1773,7 +1773,7 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb
 						mapLayanan.remove("ruanganId");
 						mapLayanan.remove("hargaDiskon");
 						result.add(mapLayanan);
-					} else if (!skor.equals(0.0) && Double.valueOf(mapLayanan.get("hargaDiskon").toString()) == 0.0) {
+					} else if (!skor.equals(0.0)) {
 						mapLayanan.remove("noRec");
 						mapLayanan.remove("statusDiskon");
 						mapLayanan.remove("departemenId");
@@ -1796,7 +1796,7 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb
 						mapLayanan.remove("ruanganId");
 						mapLayanan.remove("hargaDiskon");
 						result.add(mapLayanan);
-					} else if (!skor.equals(0.0) && Double.valueOf(mapLayanan.get("hargaDiskon").toString()) == 0.0) {
+					} else if (!skor.equals(0.0)) {
 						mapLayanan.remove("noRec");
 						mapLayanan.remove("statusDiskon");
 						mapLayanan.remove("departemenId");
@@ -1815,7 +1815,7 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb
 						mapLayanan.remove("ruanganId");
 						mapLayanan.remove("hargaDiskon");
 						result.add(mapLayanan);
-					} else if (!skor.equals(0.0) && Double.valueOf(mapLayanan.get("hargaDiskon").toString()) == 0.0) {
+					} else if (!skor.equals(0.0)) {
 						mapLayanan.remove("noRec");
 						mapLayanan.remove("statusDiskon");
 						mapLayanan.remove("departemenId");
@@ -1838,7 +1838,7 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb
 						mapLayanan.remove("ruanganId");
 						mapLayanan.remove("hargaDiskon");
 						result.add(mapLayanan);
-					} else if (!skor.equals(0.0) && Double.valueOf(mapLayanan.get("hargaDiskon").toString()) == 0.0) {
+					} else if (!skor.equals(0.0)) {
 						mapLayanan.remove("noRec");
 						mapLayanan.remove("statusDiskon");
 						mapLayanan.remove("departemenId");
@@ -1857,7 +1857,7 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb
 						mapLayanan.remove("ruanganId");
 						mapLayanan.remove("hargaDiskon");
 						result.add(mapLayanan);
-					} else if (!skor.equals(0.0) && Double.valueOf(mapLayanan.get("hargaDiskon").toString()) == 0.0) {
+					} else if (!skor.equals(0.0)) {
 						mapLayanan.remove("noRec");
 						mapLayanan.remove("statusDiskon");
 						mapLayanan.remove("departemenId");
@@ -1879,7 +1879,7 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb
 						mapLayanan.remove("ruanganId");
 						mapLayanan.remove("hargaDiskon");
 						result.add(mapLayanan);
-					} else if (!skor.equals(0.0) && Double.valueOf(mapLayanan.get("hargaDiskon").toString()) == 0.0) {
+					} else if (!skor.equals(0.0)) {
 						mapLayanan.remove("noRec");
 						mapLayanan.remove("statusDiskon");
 						mapLayanan.remove("departemenId");
@@ -1898,7 +1898,7 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb
 						mapLayanan.remove("ruanganId");
 						mapLayanan.remove("hargaDiskon");
 						result.add(mapLayanan);
-					} else if (!skor.equals(0.0) && Double.valueOf(mapLayanan.get("hargaDiskon").toString()) == 0.0) {
+					} else if (!skor.equals(0.0)) {
 						mapLayanan.remove("noRec");
 						mapLayanan.remove("statusDiskon");
 						mapLayanan.remove("departemenId");
@@ -1920,7 +1920,7 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb
 						mapLayanan.remove("ruanganId");
 						mapLayanan.remove("hargaDiskon");
 						result.add(mapLayanan);
-					} else if (!skor.equals(0.0) && Double.valueOf(mapLayanan.get("hargaDiskon").toString()) == 0.0) {
+					} else if (!skor.equals(0.0)) {
 						mapLayanan.remove("noRec");
 						mapLayanan.remove("statusDiskon");
 						mapLayanan.remove("departemenId");
@@ -1939,7 +1939,7 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb
 						mapLayanan.remove("ruanganId");
 						mapLayanan.remove("hargaDiskon");
 						result.add(mapLayanan);
-					} else if (!skor.equals(0.0) && Double.valueOf(mapLayanan.get("hargaDiskon").toString()) == 0.0) {
+					} else if (!skor.equals(0.0)) {
 						mapLayanan.remove("noRec");
 						mapLayanan.remove("statusDiskon");
 						mapLayanan.remove("departemenId");
@@ -1961,7 +1961,7 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb
 						mapLayanan.remove("ruanganId");
 						mapLayanan.remove("hargaDiskon");
 						result.add(mapLayanan);
-					} else if (!skor.equals(0.0) && Double.valueOf(mapLayanan.get("hargaDiskon").toString()) == 0.0) {
+					} else if (!skor.equals(0.0)) {
 						mapLayanan.remove("noRec");
 						mapLayanan.remove("statusDiskon");
 						mapLayanan.remove("departemenId");
@@ -1980,7 +1980,7 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb
 						mapLayanan.remove("ruanganId");
 						mapLayanan.remove("hargaDiskon");
 						result.add(mapLayanan);
-					} else if (!skor.equals(0.0) && Double.valueOf(mapLayanan.get("hargaDiskon").toString()) == 0.0) {
+					} else if (!skor.equals(0.0)) {
 						mapLayanan.remove("noRec");
 						mapLayanan.remove("statusDiskon");
 						mapLayanan.remove("departemenId");
@@ -2002,7 +2002,7 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb
 						mapLayanan.remove("ruanganId");
 						mapLayanan.remove("hargaDiskon");
 						result.add(mapLayanan);
-					} else if (!skor.equals(0.0) && Double.valueOf(mapLayanan.get("hargaDiskon").toString()) == 0.0) {
+					} else if (!skor.equals(0.0)) {
 						mapLayanan.remove("noRec");
 						mapLayanan.remove("statusDiskon");
 						mapLayanan.remove("departemenId");
@@ -2021,7 +2021,7 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb
 						mapLayanan.remove("ruanganId");
 						mapLayanan.remove("hargaDiskon");
 						result.add(mapLayanan);
-					} else if (!skor.equals(0.0) && Double.valueOf(mapLayanan.get("hargaDiskon").toString()) == 0.0) {
+					} else if (!skor.equals(0.0)) {
 						mapLayanan.remove("noRec");
 						mapLayanan.remove("statusDiskon");
 						mapLayanan.remove("departemenId");
@@ -2048,7 +2048,7 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb
 						mapLayanan.remove("ruanganId");
 						mapLayanan.remove("hargaDiskon");
 						result.add(mapLayanan);
-					} else if (!skor.equals(0.0) && Double.valueOf(mapLayanan.get("hargaDiskon").toString()) == 0.0) {
+					} else if (!skor.equals(0.0)) {
 						mapLayanan.remove("noRec");
 						mapLayanan.remove("statusDiskon");
 						mapLayanan.remove("departemenId");
@@ -2067,7 +2067,7 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb
 						mapLayanan.remove("ruanganId");
 						mapLayanan.remove("hargaDiskon");
 						result.add(mapLayanan);
-					} else if (!skor.equals(0.0) && Double.valueOf(mapLayanan.get("hargaDiskon").toString()) == 0.0) {
+					} else if (!skor.equals(0.0)) {
 						mapLayanan.remove("noRec");
 						mapLayanan.remove("statusDiskon");
 						mapLayanan.remove("departemenId");
@@ -2145,7 +2145,7 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb
 						mapLayanan.remove("ruanganId");
 						mapLayanan.remove("hargaDiskon");
 						result.add(mapLayanan);
-					} else if (!skor.equals(0.0) && Double.valueOf(mapLayanan.get("hargaDiskon").toString()) == 0.0) {
+					} else if (!skor.equals(0.0)) {
 						mapLayanan.remove("noRec");
 						mapLayanan.remove("statusDiskon");
 						mapLayanan.remove("departemenId");
@@ -2164,7 +2164,7 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb
 						mapLayanan.remove("ruanganId");
 						mapLayanan.remove("hargaDiskon");
 						result.add(mapLayanan);
-					} else if (!skor.equals(0.0) && Double.valueOf(mapLayanan.get("hargaDiskon").toString()) == 0.0) {
+					} else if (!skor.equals(0.0)) {
 						mapLayanan.remove("noRec");
 						mapLayanan.remove("statusDiskon");
 						mapLayanan.remove("departemenId");
@@ -2187,7 +2187,7 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb
 						mapLayanan.remove("ruanganId");
 						mapLayanan.remove("hargaDiskon");
 						result.add(mapLayanan);
-					} else if (!skor.equals(0.0) && Double.valueOf(mapLayanan.get("hargaDiskon").toString()) == 0.0) {
+					} else if (!skor.equals(0.0)) {
 						mapLayanan.remove("noRec");
 						mapLayanan.remove("statusDiskon");
 						mapLayanan.remove("departemenId");
@@ -2206,7 +2206,7 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb
 						mapLayanan.remove("ruanganId");
 						mapLayanan.remove("hargaDiskon");
 						result.add(mapLayanan);
-					} else if (!skor.equals(0.0) && Double.valueOf(mapLayanan.get("hargaDiskon").toString()) == 0.0) {
+					} else if (!skor.equals(0.0)) {
 						mapLayanan.remove("noRec");
 						mapLayanan.remove("statusDiskon");
 						mapLayanan.remove("departemenId");
@@ -2229,7 +2229,7 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb
 						mapLayanan.remove("ruanganId");
 						mapLayanan.remove("hargaDiskon");
 						result.add(mapLayanan);
-					} else if (!skor.equals(0.0) && Double.valueOf(mapLayanan.get("hargaDiskon").toString()) == 0.0) {
+					} else if (!skor.equals(0.0)) {
 						mapLayanan.remove("noRec");
 						mapLayanan.remove("statusDiskon");
 						mapLayanan.remove("departemenId");
@@ -2248,7 +2248,7 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb
 						mapLayanan.remove("ruanganId");
 						mapLayanan.remove("hargaDiskon");
 						result.add(mapLayanan);
-					} else if (!skor.equals(0.0) && Double.valueOf(mapLayanan.get("hargaDiskon").toString()) == 0.0) {
+					} else if (!skor.equals(0.0)) {
 						mapLayanan.remove("noRec");
 						mapLayanan.remove("statusDiskon");
 						mapLayanan.remove("departemenId");
@@ -2270,7 +2270,7 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb
 						mapLayanan.remove("ruanganId");
 						mapLayanan.remove("hargaDiskon");
 						result.add(mapLayanan);
-					} else if (!skor.equals(0.0) && Double.valueOf(mapLayanan.get("hargaDiskon").toString()) == 0.0) {
+					} else if (!skor.equals(0.0)) {
 						mapLayanan.remove("noRec");
 						mapLayanan.remove("statusDiskon");
 						mapLayanan.remove("departemenId");
@@ -2289,7 +2289,7 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb
 						mapLayanan.remove("ruanganId");
 						mapLayanan.remove("hargaDiskon");
 						result.add(mapLayanan);
-					} else if (!skor.equals(0.0) && Double.valueOf(mapLayanan.get("hargaDiskon").toString()) == 0.0) {
+					} else if (!skor.equals(0.0)) {
 						mapLayanan.remove("noRec");
 						mapLayanan.remove("statusDiskon");
 						mapLayanan.remove("departemenId");
@@ -2311,7 +2311,7 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb
 						mapLayanan.remove("ruanganId");
 						mapLayanan.remove("hargaDiskon");
 						result.add(mapLayanan);
-					} else if (!skor.equals(0.0) && Double.valueOf(mapLayanan.get("hargaDiskon").toString()) == 0.0) {
+					} else if (!skor.equals(0.0)) {
 						mapLayanan.remove("noRec");
 						mapLayanan.remove("statusDiskon");
 						mapLayanan.remove("departemenId");
@@ -2330,7 +2330,7 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb
 						mapLayanan.remove("ruanganId");
 						mapLayanan.remove("hargaDiskon");
 						result.add(mapLayanan);
-					} else if (!skor.equals(0.0) && Double.valueOf(mapLayanan.get("hargaDiskon").toString()) == 0.0) {
+					} else if (!skor.equals(0.0)) {
 						mapLayanan.remove("noRec");
 						mapLayanan.remove("statusDiskon");
 						mapLayanan.remove("departemenId");
@@ -2352,7 +2352,7 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb
 						mapLayanan.remove("ruanganId");
 						mapLayanan.remove("hargaDiskon");
 						result.add(mapLayanan);
-					} else if (!skor.equals(0.0) && Double.valueOf(mapLayanan.get("hargaDiskon").toString()) == 0.0) {
+					} else if (!skor.equals(0.0)) {
 						mapLayanan.remove("noRec");
 						mapLayanan.remove("statusDiskon");
 						mapLayanan.remove("departemenId");
@@ -2371,7 +2371,7 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb
 						mapLayanan.remove("ruanganId");
 						mapLayanan.remove("hargaDiskon");
 						result.add(mapLayanan);
-					} else if (!skor.equals(0.0) && Double.valueOf(mapLayanan.get("hargaDiskon").toString()) == 0.0) {
+					} else if (!skor.equals(0.0)) {
 						mapLayanan.remove("noRec");
 						mapLayanan.remove("statusDiskon");
 						mapLayanan.remove("departemenId");
@@ -2393,7 +2393,7 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb
 						mapLayanan.remove("ruanganId");
 						mapLayanan.remove("hargaDiskon");
 						result.add(mapLayanan);
-					} else if (!skor.equals(0.0) && Double.valueOf(mapLayanan.get("hargaDiskon").toString()) == 0.0) {
+					} else if (!skor.equals(0.0)) {
 						mapLayanan.remove("noRec");
 						mapLayanan.remove("statusDiskon");
 						mapLayanan.remove("departemenId");
@@ -2412,7 +2412,7 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb
 						mapLayanan.remove("ruanganId");
 						mapLayanan.remove("hargaDiskon");
 						result.add(mapLayanan);
-					} else if (!skor.equals(0.0) && Double.valueOf(mapLayanan.get("hargaDiskon").toString()) == 0.0) {
+					} else if (!skor.equals(0.0)) {
 						mapLayanan.remove("noRec");
 						mapLayanan.remove("statusDiskon");
 						mapLayanan.remove("departemenId");
@@ -2439,7 +2439,7 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb
 						mapLayanan.remove("ruanganId");
 						mapLayanan.remove("hargaDiskon");
 						result.add(mapLayanan);
-					} else if (!skor.equals(0.0) && Double.valueOf(mapLayanan.get("hargaDiskon").toString()) == 0.0) {
+					} else if (!skor.equals(0.0)) {
 						mapLayanan.remove("noRec");
 						mapLayanan.remove("statusDiskon");
 						mapLayanan.remove("departemenId");
@@ -2458,7 +2458,7 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb
 						mapLayanan.remove("ruanganId");
 						mapLayanan.remove("hargaDiskon");
 						result.add(mapLayanan);
-					} else if (!skor.equals(0.0) && Double.valueOf(mapLayanan.get("hargaDiskon").toString()) == 0.0) {
+					} else if (!skor.equals(0.0)) {
 						mapLayanan.remove("noRec");
 						mapLayanan.remove("statusDiskon");
 						mapLayanan.remove("departemenId");