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 8bb73bf3..1efb3de6 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
@@ -258,17 +258,27 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
 	public List<String> updateKlaimDiskonKaryawan(String noRegistrasi, Double totalKlaim, Integer jenisDiskon) {
 		List<String> result = new ArrayList<>();
 
-		List<Integer> listIdProdukDiskonPegawai = splitDataSettingDatafixed("listProdukDiskonPegawai");
-		List<Integer> listIdProdukDiskonPasien = splitDataSettingDatafixed("listProdukDiskonPasien");
+		List<Integer> labRadiologi = new ArrayList<>();
+		labRadiologi.add(Master.Ruangan.LABORATORIUM_PATOLOGI_ANATOMI);
+		labRadiologi.add(Master.Ruangan.LABORATORIUM_PATOLOGI_KLINIK);
+		labRadiologi.add(Master.Ruangan.RADIOLOGI);
+
+		List<Integer> listProdukKlinik = splitDataSettingDatafixed("listProdukDiskonPegawai");
+		List<Integer> listProdukGigi = splitDataSettingDatafixed("listProdukDiskonGigiPegawai");
+		List<Integer> listProdukLabRadiologi = splitDataSettingDatafixed("listProdukDiskonLabRadiologiPasien");
+		List<Integer> listProdukFarmasi = splitDataSettingDatafixed("listProdukDiskonObatPegawai");
 
 		List<Map<String, Object>> data = pelayananPasienDao.findLayananTagihan(noRegistrasi, jenisDiskon,
-				Arrays.asList(Master.Departemen.GRUP_RAWAT_JALAN), Master.Ruangan.KLINIK_KARYAWAN,
-				listIdProdukDiskonPegawai, listIdProdukDiskonPasien);
+				Master.Ruangan.KLINIK_KARYAWAN, listProdukKlinik, Master.Ruangan.KLINIK_GIGI_KARYAWAN, listProdukGigi,
+				labRadiologi, listProdukLabRadiologi, listProdukFarmasi);
 
 		List<PelayananPasien> models = new ArrayList<>();
 		for (Map<String, Object> map : data) {
 			PelayananPasien pp = pelayananPasienDao.findOne(map.get("noRec").toString());
 			pp.setHargaDiscount(Double.valueOf(map.get("hargaDiskon").toString()));
+			if (CommonUtil.isNotNullOrEmpty(map.get("jasa"))) {
+				pp.setJasa(Double.valueOf(map.get("jasa").toString()));
+			}
 			models.add(pp);
 		}