diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PelayananPasienServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PelayananPasienServiceImpl.java
index 6dd7653d..656ad140 100644
--- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PelayananPasienServiceImpl.java
+++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PelayananPasienServiceImpl.java
@@ -3702,24 +3702,15 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
 			}
 			return builder.build();
 		}
-		if (CommonUtil.isNotNullOrEmpty(d.get("persenDiskonD"))
-				&& Double.parseDouble(d.get("persenDiskonD").toString()) > 0.0
-				&& CommonUtil.isNotNullOrEmpty(d.get("diskonD"))
-				&& Double.parseDouble(d.get("diskonD").toString()) > 0.0
-				&& CommonUtil.isNotNullOrEmpty(d.get("persenDiskonAs"))
+		if (Double.parseDouble(d.get("persenDiskonD").toString()) > 0.0
+				&& Double.parseDouble(d.get("diskonD").toString()) >= 0.0
 				&& Double.parseDouble(d.get("persenDiskonAs").toString()) > 0.0
-				&& CommonUtil.isNotNullOrEmpty(d.get("diskonAs"))
-				&& Double.parseDouble(d.get("diskonAs").toString()) > 0.0
-				&& CommonUtil.isNotNullOrEmpty(d.get("persenDiskonAn"))
+				&& Double.parseDouble(d.get("diskonAs").toString()) >= 0.0
 				&& Double.parseDouble(d.get("persenDiskonAn").toString()) > 0.0
-				&& CommonUtil.isNotNullOrEmpty(d.get("diskonAn"))
-				&& Double.parseDouble(d.get("diskonAn").toString()) > 0.0
+				&& Double.parseDouble(d.get("diskonAn").toString()) >= 0.0
 				&& (CommonUtil.isNullOrEmpty(d.get("idSayatan")) || (CommonUtil.isNotNullOrEmpty(d.get("idSayatan"))
-						&& CommonUtil.isNotNullOrEmpty(d.get("persenDiskonSayatanD"))
-						&& Double.parseDouble(d.get("persenDiskonSayatanD").toString()) >= 0
-						&& CommonUtil.isNotNullOrEmpty(d.get("persenDiskonSayatanAs"))
-						&& Double.parseDouble(d.get("persenDiskonSayatanAs").toString()) >= 0
-						&& CommonUtil.isNotNullOrEmpty(d.get("persenDiskonSayatanAn"))
+						&& Double.parseDouble(d.get("persenDiskonSayatanD").toString()) >= 0 && Double
+								.parseDouble(d.get("persenDiskonSayatanAs").toString()) >= 0
 						&& Double.parseDouble(d.get("persenDiskonSayatanAn").toString()) >= 0))) {
 			double totalDiskon = Double.parseDouble(d.get("totalDiskonD").toString())
 					+ Double.parseDouble(d.get("totalDiskonAs").toString())
@@ -3749,22 +3740,15 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
 						+ d.get("persenDiskonD").toString() + "%, " + d.get("persenDiskonAs").toString() + "%, dan "
 						+ d.get("persenDiskonAn").toString() + "%");
 			}
-		} else if (CommonUtil.isNotNullOrEmpty(d.get("persenDiskonD"))
-				&& Double.parseDouble(d.get("persenDiskonD").toString()) > 0.0
-				&& CommonUtil.isNotNullOrEmpty(d.get("diskonD"))
-				&& Double.parseDouble(d.get("diskonD").toString()) > 0.0
-				&& CommonUtil.isNotNullOrEmpty(d.get("persenDiskonAs"))
+		} else if (Double.parseDouble(d.get("persenDiskonD").toString()) > 0.0
+				&& Double.parseDouble(d.get("diskonD").toString()) >= 0.0
 				&& Double.parseDouble(d.get("persenDiskonAs").toString()) > 0.0
-				&& CommonUtil.isNotNullOrEmpty(d.get("diskonAs"))
-				&& Double.parseDouble(d.get("diskonAs").toString()) > 0.0
-				&& (Double.parseDouble(d.get("persenDiskonAn").toString()) == 0.0
-						&& (CommonUtil.isNullOrEmpty(d.get("diskonAn"))
-								|| Double.parseDouble(d.get("diskonAn").toString()) <= 0.0))
+				&& Double.parseDouble(d.get("diskonAs").toString()) >= 0.0
+				&& Double.parseDouble(d.get("persenDiskonAn").toString()) == 0.0
+				&& Double.parseDouble(d.get("diskonAn").toString()) <= 0.0
 				&& (CommonUtil.isNullOrEmpty(d.get("idSayatan")) || (CommonUtil.isNotNullOrEmpty(d.get("idSayatan"))
-						&& CommonUtil.isNotNullOrEmpty(d.get("persenDiskonSayatanD"))
-						&& Double.parseDouble(d.get("persenDiskonSayatanD").toString()) >= 0
-						&& CommonUtil.isNotNullOrEmpty(d.get("persenDiskonSayatanAs"))
-						&& Double.parseDouble(d.get("persenDiskonSayatanAs").toString()) >= 0))) {
+						&& Double.parseDouble(d.get("persenDiskonSayatanD").toString()) >= 0 && Double
+								.parseDouble(d.get("persenDiskonSayatanAs").toString()) >= 0))) {
 			double totalDiskon = Double.parseDouble(d.get("totalDiskonD").toString())
 					+ Double.parseDouble(d.get("totalDiskonAs").toString())
 					+ Double.parseDouble(d.get("totalDiskonAn").toString());
@@ -3789,22 +3773,15 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
 						+ "% karena diskon komponen operator dan asisten berturut-turut "
 						+ d.get("persenDiskonD").toString() + "% dan " + d.get("persenDiskonAs").toString() + "%");
 			}
-		} else if (CommonUtil.isNotNullOrEmpty(d.get("persenDiskonD"))
-				&& Double.parseDouble(d.get("persenDiskonD").toString()) > 0.0
-				&& CommonUtil.isNotNullOrEmpty(d.get("diskonD"))
-				&& Double.parseDouble(d.get("diskonD").toString()) > 0.0
-				&& CommonUtil.isNotNullOrEmpty(d.get("persenDiskonAn"))
+		} else if (Double.parseDouble(d.get("persenDiskonD").toString()) > 0.0
+				&& Double.parseDouble(d.get("diskonD").toString()) >= 0.0
 				&& Double.parseDouble(d.get("persenDiskonAn").toString()) > 0.0
-				&& CommonUtil.isNotNullOrEmpty(d.get("diskonAn"))
-				&& Double.parseDouble(d.get("diskonAn").toString()) > 0.0
-				&& (Double.parseDouble(d.get("persenDiskonAs").toString()) == 0.0
-						&& (CommonUtil.isNullOrEmpty(d.get("diskonAs"))
-								|| Double.parseDouble(d.get("diskonAs").toString()) <= 0.0))
+				&& Double.parseDouble(d.get("diskonAn").toString()) >= 0.0
+				&& Double.parseDouble(d.get("persenDiskonAs").toString()) == 0.0
+				&& Double.parseDouble(d.get("diskonAs").toString()) <= 0.0
 				&& (CommonUtil.isNullOrEmpty(d.get("idSayatan")) || (CommonUtil.isNotNullOrEmpty(d.get("idSayatan"))
-						&& CommonUtil.isNotNullOrEmpty(d.get("persenDiskonSayatanD"))
-						&& Double.parseDouble(d.get("persenDiskonSayatanD").toString()) >= 0
-						&& CommonUtil.isNotNullOrEmpty(d.get("persenDiskonSayatanAn"))
-						&& Double.parseDouble(d.get("persenDiskonSayatanAn").toString()) >= 0))) {
+						&& Double.parseDouble(d.get("persenDiskonSayatanD").toString()) >= 0 && Double
+								.parseDouble(d.get("persenDiskonSayatanAn").toString()) >= 0))) {
 			double totalDiskon = Double.parseDouble(d.get("totalDiskonD").toString())
 					+ Double.parseDouble(d.get("totalDiskonAs").toString())
 					+ Double.parseDouble(d.get("totalDiskonAn").toString());
@@ -3829,22 +3806,15 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
 						+ "% karena diskon komponen operator dan anestesi berturut-turut "
 						+ d.get("persenDiskonD").toString() + "% dan " + d.get("persenDiskonAn").toString() + "%");
 			}
-		} else if (CommonUtil.isNotNullOrEmpty(d.get("persenDiskonAs"))
-				&& Double.parseDouble(d.get("persenDiskonAs").toString()) > 0.0
-				&& CommonUtil.isNotNullOrEmpty(d.get("diskonAs"))
-				&& Double.parseDouble(d.get("diskonAs").toString()) > 0.0
-				&& CommonUtil.isNotNullOrEmpty(d.get("persenDiskonAn"))
+		} else if (Double.parseDouble(d.get("persenDiskonAs").toString()) > 0.0
+				&& Double.parseDouble(d.get("diskonAs").toString()) >= 0.0
 				&& Double.parseDouble(d.get("persenDiskonAn").toString()) > 0.0
-				&& CommonUtil.isNotNullOrEmpty(d.get("diskonAn"))
-				&& Double.parseDouble(d.get("diskonAn").toString()) > 0.0
-				&& (Double.parseDouble(d.get("persenDiskonD").toString()) == 0.0
-						&& (CommonUtil.isNullOrEmpty(d.get("diskonD"))
-								|| Double.parseDouble(d.get("diskonD").toString()) <= 0.0))
+				&& Double.parseDouble(d.get("diskonAn").toString()) >= 0.0
+				&& Double.parseDouble(d.get("persenDiskonD").toString()) == 0.0
+				&& Double.parseDouble(d.get("diskonD").toString()) <= 0.0
 				&& (CommonUtil.isNullOrEmpty(d.get("idSayatan")) || (CommonUtil.isNotNullOrEmpty(d.get("idSayatan"))
-						&& CommonUtil.isNotNullOrEmpty(d.get("persenDiskonSayatanAs"))
-						&& Double.parseDouble(d.get("persenDiskonSayatanAs").toString()) >= 0
-						&& CommonUtil.isNotNullOrEmpty(d.get("persenDiskonSayatanAn"))
-						&& Double.parseDouble(d.get("persenDiskonSayatanAn").toString()) >= 0))) {
+						&& Double.parseDouble(d.get("persenDiskonSayatanAs").toString()) >= 0 && Double
+								.parseDouble(d.get("persenDiskonSayatanAn").toString()) >= 0))) {
 			double totalDiskon = Double.parseDouble(d.get("totalDiskonD").toString())
 					+ Double.parseDouble(d.get("totalDiskonAs").toString())
 					+ Double.parseDouble(d.get("totalDiskonAn").toString());
@@ -3869,18 +3839,13 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
 						+ "% karena diskon komponen asisten dan anestesi berturut-turut "
 						+ d.get("persenDiskonAs").toString() + "% dan " + d.get("persenDiskonAn").toString() + "%");
 			}
-		} else if (CommonUtil.isNotNullOrEmpty(d.get("persenDiskonD"))
-				&& Double.parseDouble(d.get("persenDiskonD").toString()) > 0.0
-				&& CommonUtil.isNotNullOrEmpty(d.get("diskonD"))
-				&& Double.parseDouble(d.get("diskonD").toString()) > 0.0
-				&& (Double.parseDouble(d.get("persenDiskonAs").toString()) == 0.0
-						&& (CommonUtil.isNullOrEmpty(d.get("diskonAs"))
-								|| Double.parseDouble(d.get("diskonAs").toString()) <= 0.0))
-				&& (Double.parseDouble(d.get("persenDiskonAn").toString()) == 0.0
-						&& (CommonUtil.isNullOrEmpty(d.get("diskonAn"))
-								|| Double.parseDouble(d.get("diskonAn").toString()) <= 0.0))
+		} else if (Double.parseDouble(d.get("persenDiskonD").toString()) > 0.0
+				&& Double.parseDouble(d.get("diskonD").toString()) >= 0.0
+				&& Double.parseDouble(d.get("persenDiskonAs").toString()) == 0.0
+				&& Double.parseDouble(d.get("diskonAs").toString()) <= 0.0
+				&& Double.parseDouble(d.get("persenDiskonAn").toString()) == 0.0
+				&& Double.parseDouble(d.get("diskonAn").toString()) <= 0.0
 				&& (CommonUtil.isNullOrEmpty(d.get("idSayatan")) || (CommonUtil.isNotNullOrEmpty(d.get("idSayatan"))
-						&& CommonUtil.isNotNullOrEmpty(d.get("persenDiskonSayatanD"))
 						&& Double.parseDouble(d.get("persenDiskonSayatanD").toString()) >= 0))) {
 			double totalDiskon = Double.parseDouble(d.get("totalDiskonD").toString())
 					+ Double.parseDouble(d.get("totalDiskonAs").toString())
@@ -3898,18 +3863,13 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
 						+ " terlebih dahulu dan diakhiri dengan pengalian " + persenRemunOperator
 						+ "% karena diskon komponen operator " + d.get("persenDiskonD").toString() + "%");
 			}
-		} else if (CommonUtil.isNotNullOrEmpty(d.get("persenDiskonAs"))
-				&& Double.parseDouble(d.get("persenDiskonAs").toString()) > 0.0
-				&& CommonUtil.isNotNullOrEmpty(d.get("diskonAs"))
-				&& Double.parseDouble(d.get("diskonAs").toString()) > 0.0
-				&& (Double.parseDouble(d.get("persenDiskonD").toString()) == 0.0
-						&& (CommonUtil.isNullOrEmpty(d.get("diskonD"))
-								|| Double.parseDouble(d.get("diskonD").toString()) <= 0.0))
-				&& (Double.parseDouble(d.get("persenDiskonAn").toString()) == 0.0
-						&& (CommonUtil.isNullOrEmpty(d.get("diskonAn"))
-								|| Double.parseDouble(d.get("diskonAn").toString()) <= 0.0))
+		} else if (Double.parseDouble(d.get("persenDiskonAs").toString()) > 0.0
+				&& Double.parseDouble(d.get("diskonAs").toString()) >= 0.0
+				&& Double.parseDouble(d.get("persenDiskonD").toString()) == 0.0
+				&& Double.parseDouble(d.get("diskonD").toString()) <= 0.0
+				&& Double.parseDouble(d.get("persenDiskonAn").toString()) == 0.0
+				&& Double.parseDouble(d.get("diskonAn").toString()) <= 0.0
 				&& (CommonUtil.isNullOrEmpty(d.get("idSayatan")) || (CommonUtil.isNotNullOrEmpty(d.get("idSayatan"))
-						&& CommonUtil.isNotNullOrEmpty(d.get("persenDiskonSayatanAs"))
 						&& Double.parseDouble(d.get("persenDiskonSayatanAs").toString()) >= 0))) {
 			double totalDiskon = Double.parseDouble(d.get("totalDiskonD").toString())
 					+ Double.parseDouble(d.get("totalDiskonAs").toString())
@@ -3927,18 +3887,13 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
 						+ " terlebih dahulu dan diakhiri dengan pengalian " + persenRemunAsisten
 						+ "% karena diskon komponen asisten " + d.get("persenDiskonAs").toString() + "%");
 			}
-		} else if (CommonUtil.isNotNullOrEmpty(d.get("persenDiskonAn"))
-				&& Double.parseDouble(d.get("persenDiskonAn").toString()) > 0.0
-				&& CommonUtil.isNotNullOrEmpty(d.get("diskonAn"))
-				&& Double.parseDouble(d.get("diskonAn").toString()) > 0.0
-				&& (Double.parseDouble(d.get("persenDiskonD").toString()) == 0.0
-						&& (CommonUtil.isNullOrEmpty(d.get("diskonD"))
-								|| Double.parseDouble(d.get("diskonD").toString()) <= 0.0))
-				&& (Double.parseDouble(d.get("persenDiskonAs").toString()) == 0.0
-						&& (CommonUtil.isNullOrEmpty(d.get("diskonAs"))
-								|| Double.parseDouble(d.get("diskonAs").toString()) <= 0.0))
+		} else if (Double.parseDouble(d.get("persenDiskonAn").toString()) > 0.0
+				&& Double.parseDouble(d.get("diskonAn").toString()) >= 0.0
+				&& Double.parseDouble(d.get("persenDiskonD").toString()) == 0.0
+				&& Double.parseDouble(d.get("diskonD").toString()) <= 0.0
+				&& Double.parseDouble(d.get("persenDiskonAs").toString()) == 0.0
+				&& Double.parseDouble(d.get("diskonAs").toString()) <= 0.0
 				&& (CommonUtil.isNullOrEmpty(d.get("idSayatan")) || (CommonUtil.isNotNullOrEmpty(d.get("idSayatan"))
-						&& CommonUtil.isNotNullOrEmpty(d.get("persenDiskonSayatanAn"))
 						&& Double.parseDouble(d.get("persenDiskonSayatanAn").toString()) >= 0))) {
 			double totalDiskon = Double.parseDouble(d.get("totalDiskonD").toString())
 					+ Double.parseDouble(d.get("totalDiskonAs").toString())