diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/constants/Master.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/constants/Master.java
index 4d0e885b..026d95b0 100644
--- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/constants/Master.java
+++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/constants/Master.java
@@ -334,6 +334,8 @@ public class Master {
 		public static final int LABORATORIUM_SGM = 587;
 
 		public static final int OK = 44;
+		public static final int POLI_THT = 6;
+		public static final int POLI_MATA = 5;
 		public static final int RADIOLOGI = 35;
 	}
 
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 99b47e70..f5ae3a06 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
@@ -159,6 +159,10 @@ public interface PelayananPasienDao extends PagingAndSortingRepository<Pelayanan
 	@Query("select new Map(pp.noRec as noRec,(case "
 			+ "when :jenisDiskon = 1 and ru.id = :klinik and pr.id in (:produkKlinik) and coalesce(pp.hargaDiscount,0) >= pp.hargaJual then coalesce(pp.hargaDiscount,0) "
 			+ "when :jenisDiskon = 1 and ru.id = :klinik and pr.id in (:produkKlinik) and coalesce(pp.hargaDiscount,0) < pp.hargaJual then pp.hargaJual "
+			+ "when :jenisDiskon = 1 and ru.id = :tht and pr.id in (:produkTht) and coalesce(pp.hargaDiscount,0) >= pp.hargaJual then coalesce(pp.hargaDiscount,0) "
+			+ "when :jenisDiskon = 1 and ru.id = :tht and pr.id in (:produkTht) and coalesce(pp.hargaDiscount,0) < pp.hargaJual then pp.hargaJual "
+			+ "when :jenisDiskon = 1 and ru.id = :mata and pr.id in (:produkMata) and coalesce(pp.hargaDiscount,0) >= pp.hargaJual then coalesce(pp.hargaDiscount,0) "
+			+ "when :jenisDiskon = 1 and ru.id = :mata and pr.id in (:produkMata) and coalesce(pp.hargaDiscount,0) < pp.hargaJual then pp.hargaJual "
 			+ "when :jenisDiskon = 1 and ru.id = :klinik and lower(pr.namaProduk) like '%konsul%dokter%' and coalesce(pp.hargaDiscount,0) >= pp.hargaJual then coalesce(pp.hargaDiscount,0) "
 			+ "when :jenisDiskon = 1 and ru.id = :klinik and lower(pr.namaProduk) like '%konsul%dokter%' and coalesce(pp.hargaDiscount,0) < pp.hargaJual then pp.hargaJual "
 			+ "when :jenisDiskon = 1 and ru.id in (:labRadiologi) and pr.id in (:produkLabRadiologi) and coalesce(pp.hargaDiscount,0) >= pp.hargaJual then coalesce(pp.hargaDiscount,0) "
@@ -176,7 +180,9 @@ public interface PelayananPasienDao extends PagingAndSortingRepository<Pelayanan
 			+ "and pd.noRegistrasi = :noRegistrasi " + "order by pp.produkId")
 	List<Map<String, Object>> findLayananTagihan(@Param("noRegistrasi") String noRegistrasi,
 			@Param("jenisDiskon") Integer jenisDiskon, @Param("klinik") Integer klinik,
-			@Param("produkKlinik") List<Integer> produkKlinik, @Param("gigi") Integer gigi,
+			@Param("produkKlinik") List<Integer> produkKlinik, @Param("tht") Integer tht,
+			@Param("produkTht") List<Integer> produkTht, @Param("mata") Integer mata,
+			@Param("produkMata") List<Integer> produkMata, @Param("gigi") Integer gigi,
 			@Param("produkGigi") List<Integer> produkGigi, @Param("labRadiologi") List<Integer> labRadiologi,
 			@Param("produkLabRadiologi") List<Integer> produkLabRadiologi,
 			@Param("produkFarmasi") List<Integer> produkFarmasi, @Param("produkMpp") List<Integer> produkMpp);
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 4afab129..50608390 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
@@ -270,13 +270,16 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
 		labRadiologi.add(Master.Ruangan.RADIOLOGI);
 
 		List<Integer> listProdukKlinik = splitDataSettingDatafixed("listProdukDiskonPegawai");
+		List<Integer> listProdukTht = splitDataSettingDatafixed("listProdukDiskonThtPegawai");
+		List<Integer> listProdukMata = splitDataSettingDatafixed("listProdukDiskonMataPegawai");
 		List<Integer> listProdukGigi = splitDataSettingDatafixed("listProdukDiskonGigiPegawai");
 		List<Integer> listProdukLabRadiologi = splitDataSettingDatafixed("listProdukDiskonLabRadiologiPasien");
 		List<Integer> listProdukFarmasi = splitDataSettingDatafixed("listProdukDiskonObatPegawai");
 		List<Integer> listProdukMpp = splitDataSettingDatafixed("listProdukDiskonPasien");
 
 		List<Map<String, Object>> data = pelayananPasienDao.findLayananTagihan(noRegistrasi, jenisDiskon,
-				Master.Ruangan.KLINIK_KARYAWAN, listProdukKlinik, Master.Ruangan.KLINIK_GIGI_KARYAWAN, listProdukGigi,
+				Master.Ruangan.KLINIK_KARYAWAN, listProdukKlinik, Master.Ruangan.POLI_THT, listProdukTht,
+				Master.Ruangan.POLI_MATA, listProdukMata, Master.Ruangan.KLINIK_GIGI_KARYAWAN, listProdukGigi,
 				labRadiologi, listProdukLabRadiologi, listProdukFarmasi, listProdukMpp);
 
 		List<PelayananPasien> models = new ArrayList<>();
@@ -368,7 +371,7 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
 					}
 				}
 			}
-			 pelayananPasienDao.save(layanan);
+			pelayananPasienDao.save(layanan);
 
 			/*
 			 * Update Flag Jenis Diskon Pasien Daftar
@@ -376,7 +379,7 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
 			for (PasienDaftar pd : pendaftaran) {
 				pd.setDiskonPegawai(0);
 			}
-			 pasienDaftarDao.save(pendaftaran);
+			pasienDaftarDao.save(pendaftaran);
 
 			result = "SUKSES";
 		}