diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/PelayananPasienDao.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/PelayananPasienDao.java
index d63b0901..8a0b20d9 100644
--- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/PelayananPasienDao.java
+++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/PelayananPasienDao.java
@@ -206,13 +206,16 @@ public interface PelayananPasienDao extends JpaRepository<PelayananPasien, Strin
 			+ "apd.noRec as idAntrianPasienDiperiksa,apd.pegawaiId as idDPJP," + "apd.ruanganId as idRuangan,"
 			+ "case when lower(ru.namaRuangan) like '%eksekutif%' then 'Eksekutif' else 'Reguler' end as jenisRuangan,"
 			+ "ru.departemenId as idDepartemen," + "pd.noRec as idPasienDaftar,pd.pasienId as pasienId,"
-			+ "sum(case when ppp.ObjectJenisPetugasPeId = 4 and ppd.komponenHargaId = 35 then ppd.hargaDiscount else 0.0 end) as totalDiskonD,"
+			+ "sum(case when ppp.ObjectJenisPetugasPeId = 4 and ppd.komponenHargaId = 35 then ppd.hargaDiscount else 0.0 end) as diskonD,"
+			+ "sum(case when ppd.komponenHargaId = 35 then ppd.hargaDiscount else 0.0 end) as totalDiskonD,"
 			+ "sum(case when ppp.ObjectJenisPetugasPeId = 4 and ppd.komponenHargaId = 35 then ppd.persenDiskon else 0.0 end) as persenDiskonD,"
 			+ "sum(case when ppp.ObjectJenisPetugasPeId = 4 and ppd.komponenHargaId = 35 then ppd.persenDiskonSayatan else 0.0 end) as persenDiskonSayatanD,"
-			+ "sum(case when ppp.ObjectJenisPetugasPeId = 13 and ppd.komponenHargaId = 22 then ppd.hargaDiscount else 0.0 end) as totalDiskonAs,"
+			+ "sum(case when ppp.ObjectJenisPetugasPeId = 13 and ppd.komponenHargaId = 22 then ppd.hargaDiscount else 0.0 end) as diskonAs,"
+			+ "sum(case when ppd.komponenHargaId = 22 then ppd.hargaDiscount else 0.0 end) as totalDiskonAs,"
 			+ "sum(case when ppp.ObjectJenisPetugasPeId = 13 and ppd.komponenHargaId = 22 then ppd.persenDiskon else 0.0 end) as persenDiskonAs,"
 			+ "sum(case when ppp.ObjectJenisPetugasPeId = 13 and ppd.komponenHargaId = 22 then ppd.persenDiskonSayatan else 0.0 end) as persenDiskonSayatanAs,"
-			+ "sum(case when ppp.ObjectJenisPetugasPeId = 6 and ppd.komponenHargaId = 21 then ppd.hargaDiscount else 0.0 end) as totalDiskonAn,"
+			+ "sum(case when ppp.ObjectJenisPetugasPeId = 6 and ppd.komponenHargaId = 21 then ppd.hargaDiscount else 0.0 end) as diskonAn,"
+			+ "sum(case when ppd.komponenHargaId = 21 then ppd.hargaDiscount else 0.0 end) as totalDiskonAn,"
 			+ "sum(case when ppp.ObjectJenisPetugasPeId = 6 and ppd.komponenHargaId = 21 then ppd.persenDiskon else 0.0 end) as persenDiskonAn,"
 			+ "sum(case when ppp.ObjectJenisPetugasPeId = 6 and ppd.komponenHargaId = 21 then ppd.persenDiskonSayatan else 0.0 end) as persenDiskonSayatanAn) "
 			+ "from PelayananPasienDetail ppd, PelayananPasienPetugas ppp " + "inner join ppp.pelayananPasien pp "
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 395fb39c..e4585459 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
@@ -3630,16 +3630,16 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
 		}
 		if (CommonUtil.isNotNullOrEmpty(d.get("persenDiskonD"))
 				&& Double.parseDouble(d.get("persenDiskonD").toString()) > 0.0
-				&& CommonUtil.isNotNullOrEmpty(d.get("totalDiskonD"))
-				&& Double.parseDouble(d.get("totalDiskonD").toString()) > 0.0
+				&& CommonUtil.isNotNullOrEmpty(d.get("diskonD"))
+				&& Double.parseDouble(d.get("diskonD").toString()) > 0.0
 				&& CommonUtil.isNotNullOrEmpty(d.get("persenDiskonAs"))
 				&& Double.parseDouble(d.get("persenDiskonAs").toString()) > 0.0
-				&& CommonUtil.isNotNullOrEmpty(d.get("totalDiskonAs"))
-				&& Double.parseDouble(d.get("totalDiskonAs").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("persenDiskonAn").toString()) > 0.0
-				&& CommonUtil.isNotNullOrEmpty(d.get("totalDiskonAn"))
-				&& Double.parseDouble(d.get("totalDiskonAn").toString()) > 0.0
+				&& CommonUtil.isNotNullOrEmpty(d.get("diskonAn"))
+				&& 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
@@ -3677,22 +3677,23 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
 			}
 		} else if (CommonUtil.isNotNullOrEmpty(d.get("persenDiskonD"))
 				&& Double.parseDouble(d.get("persenDiskonD").toString()) > 0.0
-				&& CommonUtil.isNotNullOrEmpty(d.get("totalDiskonD"))
-				&& Double.parseDouble(d.get("totalDiskonD").toString()) > 0.0
+				&& CommonUtil.isNotNullOrEmpty(d.get("diskonD"))
+				&& Double.parseDouble(d.get("diskonD").toString()) > 0.0
 				&& CommonUtil.isNotNullOrEmpty(d.get("persenDiskonAs"))
 				&& Double.parseDouble(d.get("persenDiskonAs").toString()) > 0.0
-				&& CommonUtil.isNotNullOrEmpty(d.get("totalDiskonAs"))
-				&& Double.parseDouble(d.get("totalDiskonAs").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("totalDiskonAn"))
-								|| Double.parseDouble(d.get("totalDiskonAn").toString()) <= 0.0))
+						&& (CommonUtil.isNullOrEmpty(d.get("diskonAn"))
+								|| 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 totalDiskon = Double.parseDouble(d.get("totalDiskonD").toString())
-					+ Double.parseDouble(d.get("totalDiskonAs").toString());
+					+ Double.parseDouble(d.get("totalDiskonAs").toString())
+					+ Double.parseDouble(d.get("totalDiskonAn").toString());
 			double hargaJualSetelahDiskon = hargaJual - totalDiskon;
 			double hargaJasa = persenRemunerasi * hargaJualSetelahDiskon;
 			double persenRemunOperator = 100.00 - Double.parseDouble(d.get("persenDiskonD").toString());
@@ -3716,21 +3717,22 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
 			}
 		} else if (CommonUtil.isNotNullOrEmpty(d.get("persenDiskonD"))
 				&& Double.parseDouble(d.get("persenDiskonD").toString()) > 0.0
-				&& CommonUtil.isNotNullOrEmpty(d.get("totalDiskonD"))
-				&& Double.parseDouble(d.get("totalDiskonD").toString()) > 0.0
+				&& CommonUtil.isNotNullOrEmpty(d.get("diskonD"))
+				&& Double.parseDouble(d.get("diskonD").toString()) > 0.0
 				&& CommonUtil.isNotNullOrEmpty(d.get("persenDiskonAn"))
 				&& Double.parseDouble(d.get("persenDiskonAn").toString()) > 0.0
-				&& CommonUtil.isNotNullOrEmpty(d.get("totalDiskonAn"))
-				&& Double.parseDouble(d.get("totalDiskonAn").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("totalDiskonAs"))
-								|| Double.parseDouble(d.get("totalDiskonAs").toString()) <= 0.0))
+						&& (CommonUtil.isNullOrEmpty(d.get("diskonAs"))
+								|| 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 totalDiskon = Double.parseDouble(d.get("totalDiskonD").toString())
+					+ Double.parseDouble(d.get("totalDiskonAs").toString())
 					+ Double.parseDouble(d.get("totalDiskonAn").toString());
 			double hargaJualSetelahDiskon = hargaJual - totalDiskon;
 			double hargaJasa = persenRemunerasi * hargaJualSetelahDiskon;
@@ -3755,21 +3757,22 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
 			}
 		} else if (CommonUtil.isNotNullOrEmpty(d.get("persenDiskonAs"))
 				&& Double.parseDouble(d.get("persenDiskonAs").toString()) > 0.0
-				&& CommonUtil.isNotNullOrEmpty(d.get("totalDiskonAs"))
-				&& Double.parseDouble(d.get("totalDiskonAs").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("persenDiskonAn").toString()) > 0.0
-				&& CommonUtil.isNotNullOrEmpty(d.get("totalDiskonAn"))
-				&& Double.parseDouble(d.get("totalDiskonAn").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("totalDiskonD"))
-								|| Double.parseDouble(d.get("totalDiskonD").toString()) <= 0.0))
+						&& (CommonUtil.isNullOrEmpty(d.get("diskonD"))
+								|| 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 totalDiskon = Double.parseDouble(d.get("totalDiskonAs").toString())
+			double totalDiskon = Double.parseDouble(d.get("totalDiskonD").toString())
+					+ Double.parseDouble(d.get("totalDiskonAs").toString())
 					+ Double.parseDouble(d.get("totalDiskonAn").toString());
 			double hargaJualSetelahDiskon = hargaJual - totalDiskon;
 			double hargaJasa = persenRemunerasi * hargaJualSetelahDiskon;
@@ -3794,18 +3797,20 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
 			}
 		} else if (CommonUtil.isNotNullOrEmpty(d.get("persenDiskonD"))
 				&& Double.parseDouble(d.get("persenDiskonD").toString()) > 0.0
-				&& CommonUtil.isNotNullOrEmpty(d.get("totalDiskonD"))
-				&& Double.parseDouble(d.get("totalDiskonD").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("totalDiskonAs"))
-								|| Double.parseDouble(d.get("totalDiskonAs").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("totalDiskonAn"))
-								|| Double.parseDouble(d.get("totalDiskonAn").toString()) <= 0.0))
+						&& (CommonUtil.isNullOrEmpty(d.get("diskonAn"))
+								|| 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 totalDiskon = Double.parseDouble(d.get("totalDiskonD").toString())
+					+ Double.parseDouble(d.get("totalDiskonAs").toString())
+					+ Double.parseDouble(d.get("totalDiskonAn").toString());
 			double hargaJualSetelahDiskon = hargaJual - totalDiskon;
 			double hargaJasa = persenRemunerasi * hargaJualSetelahDiskon;
 			double persenRemunOperator = 100.00 - Double.parseDouble(d.get("persenDiskonD").toString());
@@ -3821,18 +3826,20 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
 			}
 		} else if (CommonUtil.isNotNullOrEmpty(d.get("persenDiskonAs"))
 				&& Double.parseDouble(d.get("persenDiskonAs").toString()) > 0.0
-				&& CommonUtil.isNotNullOrEmpty(d.get("totalDiskonAs"))
-				&& Double.parseDouble(d.get("totalDiskonAs").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("totalDiskonD"))
-								|| Double.parseDouble(d.get("totalDiskonD").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("totalDiskonAn"))
-								|| Double.parseDouble(d.get("totalDiskonAn").toString()) <= 0.0))
+						&& (CommonUtil.isNullOrEmpty(d.get("diskonAn"))
+								|| 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("totalDiskonAs").toString());
+			double totalDiskon = Double.parseDouble(d.get("totalDiskonD").toString())
+					+ Double.parseDouble(d.get("totalDiskonAs").toString())
+					+ Double.parseDouble(d.get("totalDiskonAn").toString());
 			double hargaJualSetelahDiskon = hargaJual - totalDiskon;
 			double hargaJasa = persenRemunerasi * hargaJualSetelahDiskon;
 			double persenRemunAsisten = 100.00 - Double.parseDouble(d.get("persenDiskonAs").toString());
@@ -3848,18 +3855,20 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
 			}
 		} else if (CommonUtil.isNotNullOrEmpty(d.get("persenDiskonAn"))
 				&& Double.parseDouble(d.get("persenDiskonAn").toString()) > 0.0
-				&& CommonUtil.isNotNullOrEmpty(d.get("totalDiskonAn"))
-				&& Double.parseDouble(d.get("totalDiskonAn").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("totalDiskonD"))
-								|| Double.parseDouble(d.get("totalDiskonD").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("totalDiskonAs"))
-								|| Double.parseDouble(d.get("totalDiskonAs").toString()) <= 0.0))
+						&& (CommonUtil.isNullOrEmpty(d.get("diskonAs"))
+								|| 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("totalDiskonAn").toString());
+			double totalDiskon = Double.parseDouble(d.get("totalDiskonD").toString())
+					+ Double.parseDouble(d.get("totalDiskonAs").toString())
+					+ Double.parseDouble(d.get("totalDiskonAn").toString());
 			double hargaJualSetelahDiskon = hargaJual - totalDiskon;
 			double hargaJasa = persenRemunerasi * hargaJualSetelahDiskon;
 			double persenRemunAnestesi = 100.00 - Double.parseDouble(d.get("persenDiskonAn").toString());