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 bfb536cb..f43bee80 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
@@ -1503,6 +1503,9 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
 	}
 
 	private List<Map<String, Object>> setPelayananPaket(List<Map<String, Object>> listData) {
+		/*
+		 * Transformasi data paket menggunakan mapprodukpaket dan mapprodukpakettoproduk
+		 */
 		List<Map<String, Object>> listFixedPay = transformPelayananPaket(listData);
 		/*
 		 * Populate data filter
@@ -1613,7 +1616,7 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
 					listUndonePaketUtama.add(voucher.getNoRec());
 			});
 		}
-		List<Map<String, Object>> listData1;
+		List<Map<String, Object>> dataExcludeUndone;
 		{
 			/*
 			 * Penerapan hasil pengecekan lintas logbook untuk logbook yang
@@ -1637,29 +1640,29 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
 					.collect(Collectors.toList());
 			Set<String> setIdPelayanan = listDataUndone.stream().map(d -> d.get("idPelayananPasien").toString())
 					.collect(Collectors.toSet());
-			listData1 = listData.stream().filter(d -> !setIdPelayanan.contains(d.get("idPelayananPasien").toString()))
+			dataExcludeUndone = listData.stream().filter(d -> !setIdPelayanan.contains(d.get("idPelayananPasien").toString()))
 					.collect(Collectors.toList());
 		}
-		Set<String> setIdVoucherFiltered = listData1.stream().map(d -> d.get("idVoucherDaftar").toString())
+		Set<String> setIdVoucherExcludeUndone = dataExcludeUndone.stream().map(d -> d.get("idVoucherDaftar").toString())
 				.collect(Collectors.toSet());
-		List<VoucherPaket> listVoucherFiltered = voucherPaketDao.findAllByNoRecIn(setIdVoucherFiltered);
-		List<Integer> listIdPaket = listVoucherFiltered.stream().map(VoucherPaket::getPaketId)
+		List<VoucherPaket> listVoucherExcludeUndone = voucherPaketDao.findAllByNoRecIn(setIdVoucherExcludeUndone);
+		List<Integer> listIdPaketExcludeUndone = listVoucherExcludeUndone.stream().map(VoucherPaket::getPaketId)
 				.collect(Collectors.toList());
-		List<Map<String, Object>> listData3 = new ArrayList<>();
+		List<Map<String, Object>> result = new ArrayList<>();
 		{
 			/*
 			 * Transformasi data tindakan utama dan reduce visite utama
 			 */
-			List<Map<String, Object>> listData2 = pelayananPasienDao.findPelayananPasienByPaket(setIdVoucherFiltered,
-					listIdPaket);
-			listData3.addAll(listData2);
+			List<Map<String, Object>> layananKepalaPaket = pelayananPasienDao.findPelayananPasienByPaket(setIdVoucherExcludeUndone,
+					listIdPaketExcludeUndone);
+			result.addAll(layananKepalaPaket);
 		}
 		{
 			/*
 			 * Transformasi data tindakan lain-lain
 			 */
 			List<MapProdukPaket> listPaketUtama = listMapPaket.stream()
-					.filter(mpaket -> listIdPaket.contains(mpaket.getPaketId())
+					.filter(mpaket -> listIdPaketExcludeUndone.contains(mpaket.getPaketId())
 							&& (TINDAKAN_UTAMA.equals(mpaket.getJenisMapping())
 									|| VISITE_UTAMA.equals(mpaket.getJenisMapping())))
 					.collect(Collectors.toList());
@@ -1668,18 +1671,18 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
 			List<Integer> listIdEntri = listMapProduk.stream()
 					.filter(mproduk -> listIdMapPaket.contains(mproduk.getMapProdukPaketId()))
 					.map(MapProdukPaketToProduk::getProdukId).collect(Collectors.toList());
-			List<Map<String, Object>> listDataUtama = listData1.stream()
+			List<Map<String, Object>> listDataUtama = dataExcludeUndone.stream()
 					.filter(d -> CommonUtil.isNotNullOrEmpty(d.get("idVoucherDaftar"))
-							&& setIdVoucherFiltered.contains(d.get("idVoucherDaftar").toString())
+							&& setIdVoucherExcludeUndone.contains(d.get("idVoucherDaftar").toString())
 							&& listIdEntri.contains(Integer.parseInt(d.get("idProduk").toString())))
 					.collect(Collectors.toList());
 			Set<String> setIdPelayananUtama = listDataUtama.stream().map(d -> d.get("idPelayananPasien").toString())
 					.collect(Collectors.toSet());
-			listData3.addAll(
-					listData1.stream().filter(d -> !setIdPelayananUtama.contains(d.get("idPelayananPasien").toString()))
+			result.addAll(
+					dataExcludeUndone.stream().filter(d -> !setIdPelayananUtama.contains(d.get("idPelayananPasien").toString()))
 							.collect(Collectors.toList()));
 		}
-		return listData3;
+		return result;
 	}
 
 	@Override