diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/BaseVoServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/BaseVoServiceImpl.java
index aa9f3e64..367d4a3e 100644
--- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/BaseVoServiceImpl.java
+++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/BaseVoServiceImpl.java
@@ -25,8 +25,7 @@ import java.util.*;
  */
 public abstract class BaseVoServiceImpl {
 
-	private static Logger LOGGER = LoggerFactory
-			.getLogger(BaseVoServiceImpl.class);
+	private static Logger LOGGER = LoggerFactory.getLogger(BaseVoServiceImpl.class);
 
 	protected String constructLikeParam(String str) {
 		if (null != str)
@@ -39,16 +38,15 @@ public abstract class BaseVoServiceImpl {
 			return "%" + str + "%";
 		return str;
 	}
-	
+
 	@Value("${urlService}")
 	String urlService;
-	
+
 	@Value("${urlServiceSarPras}")
 	String urlServiceSarPras;
 
 	@SuppressWarnings("rawtypes")
-	protected Map<String, Object> constructMapReturn(List voList,
-			long totalElements, int totalPages) {
+	protected Map<String, Object> constructMapReturn(List voList, long totalElements, int totalPages) {
 		Map<String, Object> map = new HashMap<String, Object>();
 
 		map.put(WebConstants.PageParameter.LIST_DATA, voList);
@@ -73,8 +71,7 @@ public abstract class BaseVoServiceImpl {
 			return new Sort(Sort.Direction.DESC, sortBy);
 		}
 	}
-	
-	
+
 	public QueryOrder getSortByForQueryDirection(String sortBy, String direction) {
 		if (StringUtils.equalsIgnoreCase(direction, "asc")) {
 			return new QueryOrder(sortBy, QueryOrderDirection.ASC);
@@ -82,19 +79,18 @@ public abstract class BaseVoServiceImpl {
 			return new QueryOrder(sortBy, QueryOrderDirection.DESC);
 		}
 	}
-	
+
 	@PersistenceContext
 	protected EntityManager em;
-	
-	
+
 	public String getSettingDataFixed(String prefix) {
 		StringBuffer buffer = new StringBuffer();
-		buffer.append("select model.nilaiField from SettingDataFixed model where model.namaField='"+prefix+"'");
+		buffer.append("select model.nilaiField from SettingDataFixed model where model.namaField='" + prefix + "'");
 		Query query = em.createQuery(buffer.toString());
 
-		return (String)query.getSingleResult();
+		return (String) query.getSingleResult();
 	}
-	
+
 	public List<Integer> splitDataSettingDatafixed(String previx) {
 		String tmpStr = getSettingDataFixed(previx);
 		String arr[] = tmpStr.split(",");
@@ -104,7 +100,7 @@ public abstract class BaseVoServiceImpl {
 		}
 		return listStr;
 	}
-	
+
 	public List<String> stringSplitDataSettingDatafixed(String previx) {
 		String tmpStr = getSettingDataFixed(previx);
 		String arr[] = tmpStr.split(",");
@@ -115,8 +111,7 @@ public abstract class BaseVoServiceImpl {
 		return listStr;
 	}
 
-	public Map<String, Object> findDetailSpekAnggaranByParent(String noRec,
-			String entity) { 
+	public Map<String, Object> findDetailSpekAnggaranByParent(String noRec, String entity) {
 		return null;
 	}
 
@@ -130,22 +125,31 @@ public abstract class BaseVoServiceImpl {
 
 	public List<Integer> toListIntegerSettingFix(String namaField, Date date) {
 		List<Integer> result = new ArrayList<>();
-		Gson gson = new Gson();
-		Type effectiveDateDataFixType = new TypeToken<List<EffectiveDateDataFixDTO>>() {
-		}.getType();
-		String jsonProdukDokterUmum = getSettingDataFixed(namaField);
-		if (jsonProdukDokterUmum.isEmpty())
-			return result;
-		List<EffectiveDateDataFixDTO> dataFixDTOList = gson.fromJson(jsonProdukDokterUmum, effectiveDateDataFixType);
-		Optional<EffectiveDateDataFixDTO> first = dataFixDTOList.stream()
-				.sorted(Comparator.comparing(EffectiveDateDataFixDTO::getTmt, Comparator.reverseOrder()))
-				.filter(dto -> dto.getTmt() <= date.getTime()).findFirst();
-		if (first.isPresent()) {
-			String[] split = first.get().getNilaiField().replace(" ","").split(",");
+		Optional<EffectiveDateDataFixDTO> tmtSettingFix = getTmtSettingFix(namaField, date);
+		if (tmtSettingFix.isPresent()) {
+			String[] split = tmtSettingFix.get().getNilaiField().replace(" ", "").split(",");
 			for (String s : split)
 				result.add(Integer.valueOf(s));
 		}
 		return result;
 	}
-	
+
+	public Double toDoubleSettingFix(String namaField, Date date) {
+		Optional<EffectiveDateDataFixDTO> tmtSettingFix = getTmtSettingFix(namaField, date);
+		return tmtSettingFix.map(dto -> Double.parseDouble(dto.getNilaiField())).orElse(0.0);
+	}
+
+	private Optional<EffectiveDateDataFixDTO> getTmtSettingFix(String namaField, Date date) {
+		Gson gson = new Gson();
+		Type effectiveDateDataFixType = new TypeToken<List<EffectiveDateDataFixDTO>>() {
+		}.getType();
+		String jsonProdukDokterUmum = getSettingDataFixed(namaField);
+		if (jsonProdukDokterUmum.isEmpty())
+			return Optional.empty();
+		List<EffectiveDateDataFixDTO> dataFixDTOList = gson.fromJson(jsonProdukDokterUmum, effectiveDateDataFixType);
+		return dataFixDTOList.stream()
+				.sorted(Comparator.comparing(EffectiveDateDataFixDTO::getTmt, Comparator.reverseOrder()))
+				.filter(dto -> dto.getTmt() <= date.getTime()).findFirst();
+	}
+
 }
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 6456084c..d726febd 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
@@ -677,21 +677,21 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
 		/*
 		 * Mendapatkan persentase jasa
 		 */
-		double persenOperator = Double.parseDouble(getSettingDataFixed("persenRemunOperatorIBS"));
-		double persenAsistenIBS = Double.parseDouble(getSettingDataFixed("persenRemunAsistenIBS"));
-		double persenAnestesi = Double.parseDouble(getSettingDataFixed("persenRemunAnestesiIBS"));
-		double persenRadiologi = Double.parseDouble(getSettingDataFixed("persenRemunRadiologi"));
-		double persenLaboratorium = Double.parseDouble(getSettingDataFixed("persenRemunLaboratorium"));
-		double persenRehabMedik = Double.parseDouble(getSettingDataFixed("persenRemunRehabMedik"));
-		double persenKonsultasi = Double.parseDouble(getSettingDataFixed("persenRemunKonsultasiDokter"));
-		double persenVisite = Double.parseDouble(getSettingDataFixed("persenRemunVisiteDokter"));
-		double persenTindakan = Double.parseDouble(getSettingDataFixed("persenRemunTindakanDokter"));
-		double persenTarifJasaBedah = Double.parseDouble(getSettingDataFixed("persenTarifJasaBedah"));
-		double persenTarifJasaICU = Double.parseDouble(getSettingDataFixed("persenTarifJasaICU"));
-		double persenRemunDokterPA = Double.parseDouble(getSettingDataFixed("persenRemunDokterPA"));
-		double persenRemunDokterUmumHD = Double.parseDouble(getSettingDataFixed("persenRemunDokterUmumHD"));
-		double persenRemunLabGenetika = Double.parseDouble(getSettingDataFixed("persenRemunLabGenetika"));
-		double persenRemunTerapis = Double.parseDouble(getSettingDataFixed("persenRemunTerapis"));
+		double persenOperator = toDoubleSettingFix("persenRemunOperatorIBS", tglAkhir);
+		double persenAsistenIBS = toDoubleSettingFix("persenRemunAsistenIBS", tglAkhir);
+		double persenAnestesi = toDoubleSettingFix("persenRemunAnestesiIBS", tglAkhir);
+		double persenRadiologi = toDoubleSettingFix("persenRemunRadiologi", tglAkhir);
+		double persenLaboratorium = toDoubleSettingFix("persenRemunLaboratorium", tglAkhir);
+		double persenRehabMedik = toDoubleSettingFix("persenRemunRehabMedik", tglAkhir);
+		double persenKonsultasi = toDoubleSettingFix("persenRemunKonsultasiDokter", tglAkhir);
+		double persenVisite = toDoubleSettingFix("persenRemunVisiteDokter", tglAkhir);
+		double persenTindakan = toDoubleSettingFix("persenRemunTindakanDokter", tglAkhir);
+		double persenTarifJasaBedah = toDoubleSettingFix("persenTarifJasaBedah", tglAkhir);
+		double persenTarifJasaICU = toDoubleSettingFix("persenTarifJasaICU", tglAkhir);
+		double persenRemunDokterPA = toDoubleSettingFix("persenRemunDokterPA", tglAkhir);
+		double persenRemunDokterUmumHD = toDoubleSettingFix("persenRemunDokterUmumHD", tglAkhir);
+		double persenRemunLabGenetika = toDoubleSettingFix("persenRemunLabGenetika", tglAkhir);
+		double persenRemunTerapis = toDoubleSettingFix("persenRemunTerapis", tglAkhir);
 		/*
 		 * Persiapan filter logic remunerasi
 		 */
@@ -2201,25 +2201,25 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
 		/*
 		 * Mendapatkan persentase jasa
 		 */
-		double persenOperator = Double.parseDouble(getSettingDataFixed("persenRemunOperatorIBS"));
-		double persenAsistenIBS = Double.parseDouble(getSettingDataFixed("persenRemunAsistenIBS"));
-		double persenAnestesi = Double.parseDouble(getSettingDataFixed("persenRemunAnestesiIBS"));
-		double persenRadiologi = Double.parseDouble(getSettingDataFixed("persenRemunRadiologi"));
-		double persenLaboratorium = Double.parseDouble(getSettingDataFixed("persenRemunLaboratorium"));
-		double persenRehabMedik = Double.parseDouble(getSettingDataFixed("persenRemunRehabMedik"));
-		double persenKonsultasi = Double.parseDouble(getSettingDataFixed("persenRemunKonsultasiDokter"));
-		double persenVisite = Double.parseDouble(getSettingDataFixed("persenRemunVisiteDokter"));
-		double persenTindakan = Double.parseDouble(getSettingDataFixed("persenRemunTindakanDokter"));
-		double persenTarifJasaBedah = Double.parseDouble(getSettingDataFixed("persenTarifJasaBedah"));
-		double persenTarifJasaICU = Double.parseDouble(getSettingDataFixed("persenTarifJasaICU"));
-		double persenRemunDokterPA = Double.parseDouble(getSettingDataFixed("persenRemunDokterPA"));
-		double persenRemunDokterUmumHD = Double.parseDouble(getSettingDataFixed("persenRemunDokterUmumHD"));
-		double persenRemunLabGenetika = Double.parseDouble(getSettingDataFixed("persenRemunLabGenetika"));
-		double persenRemunTerapis = Double.parseDouble(getSettingDataFixed("persenRemunTerapis"));
+		Date tglAkhir = DateUtil.endMonth(bulan);
+		double persenOperator = toDoubleSettingFix("persenRemunOperatorIBS", tglAkhir);
+		double persenAsistenIBS = toDoubleSettingFix("persenRemunAsistenIBS", tglAkhir);
+		double persenAnestesi = toDoubleSettingFix("persenRemunAnestesiIBS", tglAkhir);
+		double persenRadiologi = toDoubleSettingFix("persenRemunRadiologi", tglAkhir);
+		double persenLaboratorium = toDoubleSettingFix("persenRemunLaboratorium", tglAkhir);
+		double persenRehabMedik = toDoubleSettingFix("persenRemunRehabMedik", tglAkhir);
+		double persenKonsultasi = toDoubleSettingFix("persenRemunKonsultasiDokter", tglAkhir);
+		double persenVisite = toDoubleSettingFix("persenRemunVisiteDokter", tglAkhir);
+		double persenTindakan = toDoubleSettingFix("persenRemunTindakanDokter", tglAkhir);
+		double persenTarifJasaBedah = toDoubleSettingFix("persenTarifJasaBedah", tglAkhir);
+		double persenTarifJasaICU = toDoubleSettingFix("persenTarifJasaICU", tglAkhir);
+		double persenRemunDokterPA = toDoubleSettingFix("persenRemunDokterPA", tglAkhir);
+		double persenRemunDokterUmumHD = toDoubleSettingFix("persenRemunDokterUmumHD", tglAkhir);
+		double persenRemunLabGenetika = toDoubleSettingFix("persenRemunLabGenetika", tglAkhir);
+		double persenRemunTerapis = toDoubleSettingFix("persenRemunTerapis", tglAkhir);
 		/*
 		 * Persiapan filter logic remunerasi
 		 */
-		Date tglAkhir = DateUtil.endMonth(bulan);
 		List<Integer> drKkPatologiAnatomiList = pegawaiDao.getDokterByKelompokKerja(KK_PATOLOGI_ANATOMI);
 		List<Integer> drKsmUmumList = pegawaiDao.getDokterByKelompokKerja(KK_UMUM);
 		List<Integer> drKkGenetika = pegawaiDao.getDokterByKelompokKerja(KK_GENETIKA);
@@ -2596,24 +2596,24 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
 		/*
 		 * Mendapatkan persentase jasa
 		 */
-		double persenBPJS = Double.parseDouble(getSettingDataFixed("persenJasaBPJS"));
-		double persenOperator = Double.parseDouble(getSettingDataFixed("persenJasaOperatorIBS"));
-		double persenAsistenIBS = Double.parseDouble(getSettingDataFixed("persenJasaAsistenIBS"));
-		double persenAnestesi = Double.parseDouble(getSettingDataFixed("persenJasaAnestesiIBS"));
-		double persenRadiologi = Double.parseDouble(getSettingDataFixed("persenJasaRadiologi"));
-		double persenLaboratorium = Double.parseDouble(getSettingDataFixed("persenJasaLaboratorium"));
-		double persenRehabMedik = Double.parseDouble(getSettingDataFixed("persenJasaRehabMedik"));
-		double persenKonsultasi = Double.parseDouble(getSettingDataFixed("persenJasaKonsultasiDokter"));
-		double persenVisite = Double.parseDouble(getSettingDataFixed("persenJasaVisiteDokter"));
-		double persenTindakan = Double.parseDouble(getSettingDataFixed("persenJasaTindakanDokter"));
-		double persenJasaDokterPA = Double.parseDouble(getSettingDataFixed("persenJasaDokterPA"));
-		double persenJasaDokterUmumHD = Double.parseDouble(getSettingDataFixed("persenJasaDokterUmumHD"));
-		double persenJasaLabGenetika = Double.parseDouble(getSettingDataFixed("persenJasaLabGenetika"));
-		double persenJasaTerapis = Double.parseDouble(getSettingDataFixed("persenJasaTerapis"));
+		Date tglAkhir = DateUtil.endMonth(bulan);
+		double persenBPJS = toDoubleSettingFix("persenJasaBPJS", tglAkhir);
+		double persenOperator = toDoubleSettingFix("persenJasaOperatorIBS", tglAkhir);
+		double persenAsistenIBS = toDoubleSettingFix("persenJasaAsistenIBS", tglAkhir);
+		double persenAnestesi = toDoubleSettingFix("persenJasaAnestesiIBS", tglAkhir);
+		double persenRadiologi = toDoubleSettingFix("persenJasaRadiologi", tglAkhir);
+		double persenLaboratorium = toDoubleSettingFix("persenJasaLaboratorium", tglAkhir);
+		double persenRehabMedik = toDoubleSettingFix("persenJasaRehabMedik", tglAkhir);
+		double persenKonsultasi = toDoubleSettingFix("persenJasaKonsultasiDokter", tglAkhir);
+		double persenVisite = toDoubleSettingFix("persenJasaVisiteDokter", tglAkhir);
+		double persenTindakan = toDoubleSettingFix("persenJasaTindakanDokter", tglAkhir);
+		double persenJasaDokterPA = toDoubleSettingFix("persenJasaDokterPA", tglAkhir);
+		double persenJasaDokterUmumHD = toDoubleSettingFix("persenJasaDokterUmumHD", tglAkhir);
+		double persenJasaLabGenetika = toDoubleSettingFix("persenJasaLabGenetika", tglAkhir);
+		double persenJasaTerapis = toDoubleSettingFix("persenJasaTerapis", tglAkhir);
 		/*
 		 * Persiapan filter logic remunerasi
 		 */
-		Date tglAkhir = DateUtil.endMonth(bulan);
 		List<Integer> drKkPatologiAnatomiList = pegawaiDao.getDokterByKelompokKerja(KK_PATOLOGI_ANATOMI);
 		List<Integer> drKsmUmumList = pegawaiDao.getDokterByKelompokKerja(KK_UMUM);
 		List<Integer> drKkGenetika = pegawaiDao.getDokterByKelompokKerja(KK_GENETIKA);
@@ -2865,25 +2865,25 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
 		/*
 		 * Mendapatkan persentase jasa
 		 */
-		double persenBPJS = Double.parseDouble(getSettingDataFixed("persenJasaBPJS"));
-		double persenOperator = Double.parseDouble(getSettingDataFixed("persenJasaOperatorIBS"));
-		double persenAsistenIBS = Double.parseDouble(getSettingDataFixed("persenJasaAsistenIBS"));
-		double persenAnestesi = Double.parseDouble(getSettingDataFixed("persenJasaAnestesiIBS"));
-		double persenRadiologi = Double.parseDouble(getSettingDataFixed("persenJasaRadiologi"));
-		double persenLaboratorium = Double.parseDouble(getSettingDataFixed("persenJasaLaboratorium"));
-		double persenRehabMedik = Double.parseDouble(getSettingDataFixed("persenJasaRehabMedik"));
-		double persenKonsultasi = Double.parseDouble(getSettingDataFixed("persenJasaKonsultasiDokter"));
-		double persenVisite = Double.parseDouble(getSettingDataFixed("persenJasaVisiteDokter"));
-		double persenTindakan = Double.parseDouble(getSettingDataFixed("persenJasaTindakanDokter"));
-		double persenJasaDokterPA = Double.parseDouble(getSettingDataFixed("persenJasaDokterPA"));
-		double persenJasaDokterUmumHD = Double.parseDouble(getSettingDataFixed("persenJasaDokterUmumHD"));
-		double persenJasaLabGenetika = Double.parseDouble(getSettingDataFixed("persenJasaLabGenetika"));
-		double persenJasaTerapis = Double.parseDouble(getSettingDataFixed("persenJasaTerapis"));
-		double persenJasaLuarTerapis = Double.parseDouble(getSettingDataFixed("persenJasaLuarTerapis"));
+		Date tglAkhir = DateUtil.endMonth(bulan);
+		double persenBPJS = toDoubleSettingFix("persenJasaBPJS", tglAkhir);
+		double persenOperator = toDoubleSettingFix("persenJasaOperatorIBS", tglAkhir);
+		double persenAsistenIBS = toDoubleSettingFix("persenJasaAsistenIBS", tglAkhir);
+		double persenAnestesi = toDoubleSettingFix("persenJasaAnestesiIBS", tglAkhir);
+		double persenRadiologi = toDoubleSettingFix("persenJasaRadiologi", tglAkhir);
+		double persenLaboratorium = toDoubleSettingFix("persenJasaLaboratorium", tglAkhir);
+		double persenRehabMedik = toDoubleSettingFix("persenJasaRehabMedik", tglAkhir);
+		double persenKonsultasi = toDoubleSettingFix("persenJasaKonsultasiDokter", tglAkhir);
+		double persenVisite = toDoubleSettingFix("persenJasaVisiteDokter", tglAkhir);
+		double persenTindakan = toDoubleSettingFix("persenJasaTindakanDokter", tglAkhir);
+		double persenJasaDokterPA = toDoubleSettingFix("persenJasaDokterPA", tglAkhir);
+		double persenJasaDokterUmumHD = toDoubleSettingFix("persenJasaDokterUmumHD", tglAkhir);
+		double persenJasaLabGenetika = toDoubleSettingFix("persenJasaLabGenetika", tglAkhir);
+		double persenJasaTerapis = toDoubleSettingFix("persenJasaTerapis", tglAkhir);
+		double persenJasaLuarTerapis = toDoubleSettingFix("persenJasaLuarTerapis", tglAkhir);
 		/*
 		 * Persiapan filter logic remunerasi
 		 */
-		Date tglAkhir = DateUtil.endMonth(bulan);
 		List<Integer> drKkPatologiAnatomiList = pegawaiDao.getDokterByKelompokKerja(KK_PATOLOGI_ANATOMI);
 		List<Integer> drKsmUmumList = pegawaiDao.getDokterByKelompokKerja(KK_UMUM);
 		List<Integer> drKkGenetika = pegawaiDao.getDokterByKelompokKerja(KK_GENETIKA);
@@ -3234,24 +3234,24 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
 		/*
 		 * Mendapatkan persentase jasa
 		 */
-		double persenBPJS = Double.parseDouble(getSettingDataFixed("persenJasaBPJS"));
-		double persenOperatorIBS = Double.parseDouble(getSettingDataFixed("persenJasaOperatorIBS"));
-		double persenAsistenIBS = Double.parseDouble(getSettingDataFixed("persenJasaAsistenIBS"));
-		double persenAnestesi = Double.parseDouble(getSettingDataFixed("persenJasaAnestesiIBS"));
-		double persenRadiologi = Double.parseDouble(getSettingDataFixed("persenJasaRadiologi"));
-		double persenLaboratorium = Double.parseDouble(getSettingDataFixed("persenJasaLaboratorium"));
-		double persenRehabMedik = Double.parseDouble(getSettingDataFixed("persenJasaRehabMedik"));
-		double persenKonsultasi = Double.parseDouble(getSettingDataFixed("persenJasaKonsultasiDokter"));
-		double persenVisite = Double.parseDouble(getSettingDataFixed("persenJasaVisiteDokter"));
-		double persenTindakan = Double.parseDouble(getSettingDataFixed("persenJasaTindakanDokter"));
-		double persenJasaDokterPA = Double.parseDouble(getSettingDataFixed("persenJasaDokterPA"));
-		double persenJasaDokterUmumHD = Double.parseDouble(getSettingDataFixed("persenJasaDokterUmumHD"));
-		double persenJasaLabGenetika = Double.parseDouble(getSettingDataFixed("persenJasaLabGenetika"));
-		double persenJasaTerapis = Double.parseDouble(getSettingDataFixed("persenJasaTerapis"));
+		Date tglAkhir = DateUtil.endMonth(bulan);
+		double persenBPJS = toDoubleSettingFix("persenJasaBPJS", tglAkhir);
+		double persenOperatorIBS = toDoubleSettingFix("persenJasaOperatorIBS", tglAkhir);
+		double persenAsistenIBS = toDoubleSettingFix("persenJasaAsistenIBS", tglAkhir);
+		double persenAnestesi = toDoubleSettingFix("persenJasaAnestesiIBS", tglAkhir);
+		double persenRadiologi = toDoubleSettingFix("persenJasaRadiologi", tglAkhir);
+		double persenLaboratorium = toDoubleSettingFix("persenJasaLaboratorium", tglAkhir);
+		double persenRehabMedik = toDoubleSettingFix("persenJasaRehabMedik", tglAkhir);
+		double persenKonsultasi = toDoubleSettingFix("persenJasaKonsultasiDokter", tglAkhir);
+		double persenVisite = toDoubleSettingFix("persenJasaVisiteDokter", tglAkhir);
+		double persenTindakan = toDoubleSettingFix("persenJasaTindakanDokter", tglAkhir);
+		double persenJasaDokterPA = toDoubleSettingFix("persenJasaDokterPA", tglAkhir);
+		double persenJasaDokterUmumHD = toDoubleSettingFix("persenJasaDokterUmumHD", tglAkhir);
+		double persenJasaLabGenetika = toDoubleSettingFix("persenJasaLabGenetika", tglAkhir);
+		double persenJasaTerapis = toDoubleSettingFix("persenJasaTerapis", tglAkhir);
 		/*
 		 * Persiapan filter logic remunerasi
 		 */
-		Date tglAkhir = DateUtil.endMonth(bulan);
 		List<Integer> drKkPatologiAnatomiList = pegawaiDao.getDokterByKelompokKerja(KK_PATOLOGI_ANATOMI);
 		List<Integer> drKsmUmumList = pegawaiDao.getDokterByKelompokKerja(KK_UMUM);
 		List<Integer> drKkGenetika = pegawaiDao.getDokterByKelompokKerja(KK_GENETIKA);
diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/RemunerasiServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/RemunerasiServiceImpl.java
index 9bb76ff5..539b067f 100644
--- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/RemunerasiServiceImpl.java
+++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/RemunerasiServiceImpl.java
@@ -306,23 +306,23 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera
 		/*
 		 * Mendapatkan persentase jasa
 		 */
-		double persenOperator = Double.parseDouble(getSettingDataFixed("persenRemunOperatorIBS"));
-		double persenAsistenIBS = Double.parseDouble(getSettingDataFixed("persenRemunAsistenIBS"));
-		double persenAnestesi = Double.parseDouble(getSettingDataFixed("persenRemunAnestesiIBS"));
-		double persenRadiologi = Double.parseDouble(getSettingDataFixed("persenRemunRadiologi"));
-		double persenLaboratorium = Double.parseDouble(getSettingDataFixed("persenRemunLaboratorium"));
-		double persenRehabMedik = Double.parseDouble(getSettingDataFixed("persenRemunRehabMedik"));
-		double persenKonsultasi = Double.parseDouble(getSettingDataFixed("persenRemunKonsultasiDokter"));
-		double persenVisite = Double.parseDouble(getSettingDataFixed("persenRemunVisiteDokter"));
-		double persenTindakan = Double.parseDouble(getSettingDataFixed("persenRemunTindakanDokter"));
-		double persenTarifJasaBedah = Double.parseDouble(getSettingDataFixed("persenTarifJasaBedah"));
-		double persenTarifJasaICU = Double.parseDouble(getSettingDataFixed("persenTarifJasaICU"));
-		double persenRemunDokterPA = Double.parseDouble(getSettingDataFixed("persenRemunDokterPA"));
-		double persenRemunDokterUmumHD = Double.parseDouble(getSettingDataFixed("persenRemunDokterUmumHD"));
-		double persenRemunLabGenetika = Double.parseDouble(getSettingDataFixed("persenRemunLabGenetika"));
-		double persenRemunTerapis = Double.parseDouble(getSettingDataFixed("persenRemunTerapis"));
-		double persenRemunVisiteDokterKelompokBudiRahmat = Double
-				.parseDouble(getSettingDataFixed("persenRemunVisiteDokterKelompokBudiRahmat"));
+		double persenOperator = toDoubleSettingFix("persenRemunOperatorIBS", tglAkhir);
+		double persenAsistenIBS = toDoubleSettingFix("persenRemunAsistenIBS", tglAkhir);
+		double persenAnestesi = toDoubleSettingFix("persenRemunAnestesiIBS", tglAkhir);
+		double persenRadiologi = toDoubleSettingFix("persenRemunRadiologi", tglAkhir);
+		double persenLaboratorium = toDoubleSettingFix("persenRemunLaboratorium", tglAkhir);
+		double persenRehabMedik = toDoubleSettingFix("persenRemunRehabMedik", tglAkhir);
+		double persenKonsultasi = toDoubleSettingFix("persenRemunKonsultasiDokter", tglAkhir);
+		double persenVisite = toDoubleSettingFix("persenRemunVisiteDokter", tglAkhir);
+		double persenTindakan = toDoubleSettingFix("persenRemunTindakanDokter", tglAkhir);
+		double persenTarifJasaBedah = toDoubleSettingFix("persenTarifJasaBedah", tglAkhir);
+		double persenTarifJasaICU = toDoubleSettingFix("persenTarifJasaICU", tglAkhir);
+		double persenRemunDokterPA = toDoubleSettingFix("persenRemunDokterPA", tglAkhir);
+		double persenRemunDokterUmumHD = toDoubleSettingFix("persenRemunDokterUmumHD", tglAkhir);
+		double persenRemunLabGenetika = toDoubleSettingFix("persenRemunLabGenetika", tglAkhir);
+		double persenRemunTerapis = toDoubleSettingFix("persenRemunTerapis", tglAkhir);
+		double persenRemunVisiteDokterKelompokBudiRahmat = toDoubleSettingFix(
+				"persenRemunVisiteDokterKelompokBudiRahmat", tglAkhir);
 		long millisTarif2024 = Long.parseLong(getSettingDataFixed("tmtTarif2024"));
 		/*
 		 * Persiapan filter logic remunerasi
@@ -2180,27 +2180,27 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera
 		/*
 		 * Mendapatkan persentase jasa
 		 */
-		double persenOperator = Double.parseDouble(getSettingDataFixed("persenRemunOperatorIBS"));
-		double persenAsistenIBS = Double.parseDouble(getSettingDataFixed("persenRemunAsistenIBS"));
-		double persenAnestesi = Double.parseDouble(getSettingDataFixed("persenRemunAnestesiIBS"));
-		double persenRadiologi = Double.parseDouble(getSettingDataFixed("persenRemunRadiologi"));
-		double persenLaboratorium = Double.parseDouble(getSettingDataFixed("persenRemunLaboratorium"));
-		double persenRehabMedik = Double.parseDouble(getSettingDataFixed("persenRemunRehabMedik"));
-		double persenKonsultasi = Double.parseDouble(getSettingDataFixed("persenRemunKonsultasiDokter"));
-		double persenVisite = Double.parseDouble(getSettingDataFixed("persenRemunVisiteDokter"));
-		double persenTindakan = Double.parseDouble(getSettingDataFixed("persenRemunTindakanDokter"));
-		double persenTarifJasaBedah = Double.parseDouble(getSettingDataFixed("persenTarifJasaBedah"));
-		double persenTarifJasaICU = Double.parseDouble(getSettingDataFixed("persenTarifJasaICU"));
-		double persenRemunDokterPA = Double.parseDouble(getSettingDataFixed("persenRemunDokterPA"));
-		double persenRemunDokterUmumHD = Double.parseDouble(getSettingDataFixed("persenRemunDokterUmumHD"));
-		double persenRemunLabGenetika = Double.parseDouble(getSettingDataFixed("persenRemunLabGenetika"));
-		double persenRemunTerapis = Double.parseDouble(getSettingDataFixed("persenRemunTerapis"));
-		double persenRemunVisiteDokterKelompokBudiRahmat = Double
-				.parseDouble(getSettingDataFixed("persenRemunVisiteDokterKelompokBudiRahmat"));
+		Date tglAkhir = DateUtil.endMonth(bulan);
+		double persenOperator = toDoubleSettingFix("persenRemunOperatorIBS", tglAkhir);
+		double persenAsistenIBS = toDoubleSettingFix("persenRemunAsistenIBS", tglAkhir);
+		double persenAnestesi = toDoubleSettingFix("persenRemunAnestesiIBS", tglAkhir);
+		double persenRadiologi = toDoubleSettingFix("persenRemunRadiologi", tglAkhir);
+		double persenLaboratorium = toDoubleSettingFix("persenRemunLaboratorium", tglAkhir);
+		double persenRehabMedik = toDoubleSettingFix("persenRemunRehabMedik", tglAkhir);
+		double persenKonsultasi = toDoubleSettingFix("persenRemunKonsultasiDokter", tglAkhir);
+		double persenVisite = toDoubleSettingFix("persenRemunVisiteDokter", tglAkhir);
+		double persenTindakan = toDoubleSettingFix("persenRemunTindakanDokter", tglAkhir);
+		double persenTarifJasaBedah = toDoubleSettingFix("persenTarifJasaBedah", tglAkhir);
+		double persenTarifJasaICU = toDoubleSettingFix("persenTarifJasaICU", tglAkhir);
+		double persenRemunDokterPA = toDoubleSettingFix("persenRemunDokterPA", tglAkhir);
+		double persenRemunDokterUmumHD = toDoubleSettingFix("persenRemunDokterUmumHD", tglAkhir);
+		double persenRemunLabGenetika = toDoubleSettingFix("persenRemunLabGenetika", tglAkhir);
+		double persenRemunTerapis = toDoubleSettingFix("persenRemunTerapis", tglAkhir);
+		double persenRemunVisiteDokterKelompokBudiRahmat = toDoubleSettingFix(
+				"persenRemunVisiteDokterKelompokBudiRahmat", tglAkhir);
 		/*
 		 * Persiapan filter logic remunerasi
 		 */
-		Date tglAkhir = DateUtil.endMonth(bulan);
 		List<Integer> drKkPatologiAnatomiList = pegawaiDao.getDokterByKelompokKerja(KK_PATOLOGI_ANATOMI);
 		List<Integer> drKsmUmumList = pegawaiDao.getDokterByKelompokKerja(KK_UMUM);
 		List<Integer> drKkGenetika = pegawaiDao.getDokterByKelompokKerja(KK_GENETIKA);
@@ -2558,27 +2558,27 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera
 		/*
 		 * Mendapatkan persentase jasa
 		 */
-		double persenBPJS = Double.parseDouble(getSettingDataFixed("persenJasaBPJS"));
-		double persenOperator = Double.parseDouble(getSettingDataFixed("persenJasaOperatorIBS"));
-		double persenAsistenIBS = Double.parseDouble(getSettingDataFixed("persenJasaAsistenIBS"));
-		double persenAnestesi = Double.parseDouble(getSettingDataFixed("persenJasaAnestesiIBS"));
-		double persenRadiologi = Double.parseDouble(getSettingDataFixed("persenJasaRadiologi"));
-		double persenLaboratorium = Double.parseDouble(getSettingDataFixed("persenJasaLaboratorium"));
-		double persenRehabMedik = Double.parseDouble(getSettingDataFixed("persenJasaRehabMedik"));
-		double persenKonsultasi = Double.parseDouble(getSettingDataFixed("persenJasaKonsultasiDokter"));
-		double persenVisite = Double.parseDouble(getSettingDataFixed("persenJasaVisiteDokter"));
-		double persenTindakan = Double.parseDouble(getSettingDataFixed("persenJasaTindakanDokter"));
-		double persenJasaDokterPA = Double.parseDouble(getSettingDataFixed("persenJasaDokterPA"));
-		double persenJasaDokterUmumHD = Double.parseDouble(getSettingDataFixed("persenJasaDokterUmumHD"));
-		double persenJasaLabGenetika = Double.parseDouble(getSettingDataFixed("persenJasaLabGenetika"));
-		double persenJasaTerapis = Double.parseDouble(getSettingDataFixed("persenJasaTerapis"));
-		double persenJasaTerapis24 = Double.parseDouble(getSettingDataFixed("persenFfsTerapisTmt21Okt24"));
+		Date tglAkhir = DateUtil.endMonth(bulan);
+		double persenBPJS = toDoubleSettingFix("persenJasaBPJS", tglAkhir);
+		double persenOperator = toDoubleSettingFix("persenJasaOperatorIBS", tglAkhir);
+		double persenAsistenIBS = toDoubleSettingFix("persenJasaAsistenIBS", tglAkhir);
+		double persenAnestesi = toDoubleSettingFix("persenJasaAnestesiIBS", tglAkhir);
+		double persenRadiologi = toDoubleSettingFix("persenJasaRadiologi", tglAkhir);
+		double persenLaboratorium = toDoubleSettingFix("persenJasaLaboratorium", tglAkhir);
+		double persenRehabMedik = toDoubleSettingFix("persenJasaRehabMedik", tglAkhir);
+		double persenKonsultasi = toDoubleSettingFix("persenJasaKonsultasiDokter", tglAkhir);
+		double persenVisite = toDoubleSettingFix("persenJasaVisiteDokter", tglAkhir);
+		double persenTindakan = toDoubleSettingFix("persenJasaTindakanDokter", tglAkhir);
+		double persenJasaDokterPA = toDoubleSettingFix("persenJasaDokterPA", tglAkhir);
+		double persenJasaDokterUmumHD = toDoubleSettingFix("persenJasaDokterUmumHD", tglAkhir);
+		double persenJasaLabGenetika = toDoubleSettingFix("persenJasaLabGenetika", tglAkhir);
+		double persenJasaTerapis = toDoubleSettingFix("persenJasaTerapis", tglAkhir);
+		double persenJasaTerapis24 = toDoubleSettingFix("persenFfsTerapisTmt21Okt24", tglAkhir);
 		// Custom rule persentase jasa terapis 21 Oktober 2024
 		LocalDateTime tmtJasaTerapis24 = LocalDateTime.of(2024, 11, 1, 0, 0, 0, 0);
 		/*
 		 * Persiapan filter logic remunerasi
 		 */
-		Date tglAkhir = DateUtil.endMonth(bulan);
 		List<Integer> drKkPatologiAnatomiList = pegawaiDao.getDokterByKelompokKerja(KK_PATOLOGI_ANATOMI);
 		List<Integer> drKsmUmumList = pegawaiDao.getDokterByKelompokKerja(KK_UMUM);
 		List<Integer> drKkGenetika = pegawaiDao.getDokterByKelompokKerja(KK_GENETIKA);
@@ -2917,28 +2917,28 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera
 		/*
 		 * Mendapatkan persentase jasa
 		 */
-		double persenBPJS = Double.parseDouble(getSettingDataFixed("persenJasaBPJS"));
-		double persenOperator = Double.parseDouble(getSettingDataFixed("persenJasaOperatorIBS"));
-		double persenAsistenIBS = Double.parseDouble(getSettingDataFixed("persenJasaAsistenIBS"));
-		double persenAnestesi = Double.parseDouble(getSettingDataFixed("persenJasaAnestesiIBS"));
-		double persenRadiologi = Double.parseDouble(getSettingDataFixed("persenJasaRadiologi"));
-		double persenLaboratorium = Double.parseDouble(getSettingDataFixed("persenJasaLaboratorium"));
-		double persenRehabMedik = Double.parseDouble(getSettingDataFixed("persenJasaRehabMedik"));
-		double persenKonsultasi = Double.parseDouble(getSettingDataFixed("persenJasaKonsultasiDokter"));
-		double persenVisite = Double.parseDouble(getSettingDataFixed("persenJasaVisiteDokter"));
-		double persenTindakan = Double.parseDouble(getSettingDataFixed("persenJasaTindakanDokter"));
-		double persenJasaDokterPA = Double.parseDouble(getSettingDataFixed("persenJasaDokterPA"));
-		double persenJasaDokterUmumHD = Double.parseDouble(getSettingDataFixed("persenJasaDokterUmumHD"));
-		double persenJasaLabGenetika = Double.parseDouble(getSettingDataFixed("persenJasaLabGenetika"));
-		double persenJasaTerapis = Double.parseDouble(getSettingDataFixed("persenJasaTerapis"));
-		double persenJasaTerapis24 = Double.parseDouble(getSettingDataFixed("persenFfsTerapisTmt21Okt24"));
-		double persenJasaLuarTerapis = Double.parseDouble(getSettingDataFixed("persenJasaLuarTerapis"));
+		Date tglAkhir = DateUtil.endMonth(bulan);
+		double persenBPJS = toDoubleSettingFix("persenJasaBPJS", tglAkhir);
+		double persenOperator = toDoubleSettingFix("persenJasaOperatorIBS", tglAkhir);
+		double persenAsistenIBS = toDoubleSettingFix("persenJasaAsistenIBS", tglAkhir);
+		double persenAnestesi = toDoubleSettingFix("persenJasaAnestesiIBS", tglAkhir);
+		double persenRadiologi = toDoubleSettingFix("persenJasaRadiologi", tglAkhir);
+		double persenLaboratorium = toDoubleSettingFix("persenJasaLaboratorium", tglAkhir);
+		double persenRehabMedik = toDoubleSettingFix("persenJasaRehabMedik", tglAkhir);
+		double persenKonsultasi = toDoubleSettingFix("persenJasaKonsultasiDokter", tglAkhir);
+		double persenVisite = toDoubleSettingFix("persenJasaVisiteDokter", tglAkhir);
+		double persenTindakan = toDoubleSettingFix("persenJasaTindakanDokter", tglAkhir);
+		double persenJasaDokterPA = toDoubleSettingFix("persenJasaDokterPA", tglAkhir);
+		double persenJasaDokterUmumHD = toDoubleSettingFix("persenJasaDokterUmumHD", tglAkhir);
+		double persenJasaLabGenetika = toDoubleSettingFix("persenJasaLabGenetika", tglAkhir);
+		double persenJasaTerapis = toDoubleSettingFix("persenJasaTerapis", tglAkhir);
+		double persenJasaTerapis24 = toDoubleSettingFix("persenFfsTerapisTmt21Okt24", tglAkhir);
+		double persenJasaLuarTerapis = toDoubleSettingFix("persenJasaLuarTerapis", tglAkhir);
 		// Custom rule persentase jasa terapis 21 Oktober 2024
 		LocalDateTime tmtJasaTerapis24 = LocalDateTime.of(2024, 11, 1, 0, 0, 0, 0);
 		/*
 		 * Persiapan filter logic remunerasi
 		 */
-		Date tglAkhir = DateUtil.endMonth(bulan);
 		List<Integer> drKkPatologiAnatomiList = pegawaiDao.getDokterByKelompokKerja(KK_PATOLOGI_ANATOMI);
 		List<Integer> drKsmUmumList = pegawaiDao.getDokterByKelompokKerja(KK_UMUM);
 		List<Integer> drKkGenetika = pegawaiDao.getDokterByKelompokKerja(KK_GENETIKA);
@@ -3178,27 +3178,27 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera
 		/*
 		 * Mendapatkan persentase jasa
 		 */
-		double persenBPJS = Double.parseDouble(getSettingDataFixed("persenJasaBPJS"));
-		double persenOperatorIBS = Double.parseDouble(getSettingDataFixed("persenJasaOperatorIBS"));
-		double persenAsistenIBS = Double.parseDouble(getSettingDataFixed("persenJasaAsistenIBS"));
-		double persenAnestesi = Double.parseDouble(getSettingDataFixed("persenJasaAnestesiIBS"));
-		double persenRadiologi = Double.parseDouble(getSettingDataFixed("persenJasaRadiologi"));
-		double persenLaboratorium = Double.parseDouble(getSettingDataFixed("persenJasaLaboratorium"));
-		double persenRehabMedik = Double.parseDouble(getSettingDataFixed("persenJasaRehabMedik"));
-		double persenKonsultasi = Double.parseDouble(getSettingDataFixed("persenJasaKonsultasiDokter"));
-		double persenVisite = Double.parseDouble(getSettingDataFixed("persenJasaVisiteDokter"));
-		double persenTindakan = Double.parseDouble(getSettingDataFixed("persenJasaTindakanDokter"));
-		double persenJasaDokterPA = Double.parseDouble(getSettingDataFixed("persenJasaDokterPA"));
-		double persenJasaDokterUmumHD = Double.parseDouble(getSettingDataFixed("persenJasaDokterUmumHD"));
-		double persenJasaLabGenetika = Double.parseDouble(getSettingDataFixed("persenJasaLabGenetika"));
-		double persenJasaTerapis = Double.parseDouble(getSettingDataFixed("persenJasaTerapis"));
-		double persenJasaTerapis24 = Double.parseDouble(getSettingDataFixed("persenFfsTerapisTmt21Okt24"));
+		Date tglAkhir = DateUtil.endMonth(bulan);
+		double persenBPJS = toDoubleSettingFix("persenJasaBPJS", tglAkhir);
+		double persenOperatorIBS = toDoubleSettingFix("persenJasaOperatorIBS", tglAkhir);
+		double persenAsistenIBS = toDoubleSettingFix("persenJasaAsistenIBS", tglAkhir);
+		double persenAnestesi = toDoubleSettingFix("persenJasaAnestesiIBS", tglAkhir);
+		double persenRadiologi = toDoubleSettingFix("persenJasaRadiologi", tglAkhir);
+		double persenLaboratorium = toDoubleSettingFix("persenJasaLaboratorium", tglAkhir);
+		double persenRehabMedik = toDoubleSettingFix("persenJasaRehabMedik", tglAkhir);
+		double persenKonsultasi = toDoubleSettingFix("persenJasaKonsultasiDokter", tglAkhir);
+		double persenVisite = toDoubleSettingFix("persenJasaVisiteDokter", tglAkhir);
+		double persenTindakan = toDoubleSettingFix("persenJasaTindakanDokter", tglAkhir);
+		double persenJasaDokterPA = toDoubleSettingFix("persenJasaDokterPA", tglAkhir);
+		double persenJasaDokterUmumHD = toDoubleSettingFix("persenJasaDokterUmumHD", tglAkhir);
+		double persenJasaLabGenetika = toDoubleSettingFix("persenJasaLabGenetika", tglAkhir);
+		double persenJasaTerapis = toDoubleSettingFix("persenJasaTerapis", tglAkhir);
+		double persenJasaTerapis24 = toDoubleSettingFix("persenFfsTerapisTmt21Okt24", tglAkhir);
 		// Custom rule persentase jasa terapis 21 Oktober 2024
 		LocalDateTime tmtJasaTerapis24 = LocalDateTime.of(2024, 11, 1, 0, 0, 0, 0);
 		/*
 		 * Persiapan filter logic remunerasi
 		 */
-		Date tglAkhir = DateUtil.endMonth(bulan);
 		List<Integer> drKkPatologiAnatomiList = pegawaiDao.getDokterByKelompokKerja(KK_PATOLOGI_ANATOMI);
 		List<Integer> drKsmUmumList = pegawaiDao.getDokterByKelompokKerja(KK_UMUM);
 		List<Integer> drKkGenetika = pegawaiDao.getDokterByKelompokKerja(KK_GENETIKA);