diff --git a/jasamedika-bridging/src/main/webapp/WEB-INF/templates/images/bpjs.png b/jasamedika-bridging/src/main/webapp/WEB-INF/templates/images/bpjs.png
deleted file mode 100644
index 7befb396..00000000
Binary files a/jasamedika-bridging/src/main/webapp/WEB-INF/templates/images/bpjs.png and /dev/null differ
diff --git a/jasamedika-bridging/src/main/webapp/WEB-INF/templates/images/logoHarkit.png b/jasamedika-bridging/src/main/webapp/WEB-INF/templates/images/logoHarkit.png
deleted file mode 100644
index f0b293a7..00000000
Binary files a/jasamedika-bridging/src/main/webapp/WEB-INF/templates/images/logoHarkit.png and /dev/null differ
diff --git a/jasamedika-bridging/src/main/webapp/WEB-INF/templates/jrxml/lapBukuRegisterMasukRi.jrxml b/jasamedika-bridging/src/main/webapp/WEB-INF/templates/jrxml/lapBukuRegisterMasukRi.jrxml
index a8bd3cad..709ec84d 100644
--- a/jasamedika-bridging/src/main/webapp/WEB-INF/templates/jrxml/lapBukuRegisterMasukRi.jrxml
+++ b/jasamedika-bridging/src/main/webapp/WEB-INF/templates/jrxml/lapBukuRegisterMasukRi.jrxml
@@ -43,7 +43,7 @@
-
+
diff --git a/jasamedika-bridging/src/main/webapp/WEB-INF/templates/jrxml/lapBukuRegisterPelayananRi.jrxml b/jasamedika-bridging/src/main/webapp/WEB-INF/templates/jrxml/lapBukuRegisterPelayananRi.jrxml
index 6c03df6f..6aa66038 100644
--- a/jasamedika-bridging/src/main/webapp/WEB-INF/templates/jrxml/lapBukuRegisterPelayananRi.jrxml
+++ b/jasamedika-bridging/src/main/webapp/WEB-INF/templates/jrxml/lapBukuRegisterPelayananRi.jrxml
@@ -50,7 +50,7 @@
-
+
diff --git a/jasamedika-bridging/src/main/webapp/WEB-INF/templates/jrxml/lapHasilLaboratorium.jrxml b/jasamedika-bridging/src/main/webapp/WEB-INF/templates/jrxml/lapHasilLaboratorium.jrxml
index 63007c24..116871c4 100644
--- a/jasamedika-bridging/src/main/webapp/WEB-INF/templates/jrxml/lapHasilLaboratorium.jrxml
+++ b/jasamedika-bridging/src/main/webapp/WEB-INF/templates/jrxml/lapHasilLaboratorium.jrxml
@@ -36,7 +36,7 @@
-
+
diff --git a/jasamedika-bridging/src/main/webapp/WEB-INF/templates/jrxml/lapKunjunganBdsWilayah.jrxml b/jasamedika-bridging/src/main/webapp/WEB-INF/templates/jrxml/lapKunjunganBdsWilayah.jrxml
index d52a17bf..e950a5a5 100644
--- a/jasamedika-bridging/src/main/webapp/WEB-INF/templates/jrxml/lapKunjunganBdsWilayah.jrxml
+++ b/jasamedika-bridging/src/main/webapp/WEB-INF/templates/jrxml/lapKunjunganBdsWilayah.jrxml
@@ -25,7 +25,7 @@
-
+
diff --git a/jasamedika-bridging/src/main/webapp/WEB-INF/templates/jrxml/lapLaboratorium.jrxml b/jasamedika-bridging/src/main/webapp/WEB-INF/templates/jrxml/lapLaboratorium.jrxml
index 98413ec3..9497e9cd 100644
--- a/jasamedika-bridging/src/main/webapp/WEB-INF/templates/jrxml/lapLaboratorium.jrxml
+++ b/jasamedika-bridging/src/main/webapp/WEB-INF/templates/jrxml/lapLaboratorium.jrxml
@@ -37,7 +37,7 @@
-
+
diff --git a/jasamedika-bridging/src/main/webapp/WEB-INF/templates/jrxml/lapObatAntibiotik.jrxml b/jasamedika-bridging/src/main/webapp/WEB-INF/templates/jrxml/lapObatAntibiotik.jrxml
index e02daf3c..a198b5d9 100644
--- a/jasamedika-bridging/src/main/webapp/WEB-INF/templates/jrxml/lapObatAntibiotik.jrxml
+++ b/jasamedika-bridging/src/main/webapp/WEB-INF/templates/jrxml/lapObatAntibiotik.jrxml
@@ -36,7 +36,7 @@
-
+
diff --git a/jasamedika-bridging/src/main/webapp/WEB-INF/templates/jrxml/lapObatGenerik.jrxml b/jasamedika-bridging/src/main/webapp/WEB-INF/templates/jrxml/lapObatGenerik.jrxml
index e90a7342..29b06904 100644
--- a/jasamedika-bridging/src/main/webapp/WEB-INF/templates/jrxml/lapObatGenerik.jrxml
+++ b/jasamedika-bridging/src/main/webapp/WEB-INF/templates/jrxml/lapObatGenerik.jrxml
@@ -37,7 +37,7 @@
-
+
diff --git a/jasamedika-bridging/src/main/webapp/WEB-INF/templates/jrxml/lapObatNarkotika.jrxml b/jasamedika-bridging/src/main/webapp/WEB-INF/templates/jrxml/lapObatNarkotika.jrxml
index 9c440edb..f93d12cc 100644
--- a/jasamedika-bridging/src/main/webapp/WEB-INF/templates/jrxml/lapObatNarkotika.jrxml
+++ b/jasamedika-bridging/src/main/webapp/WEB-INF/templates/jrxml/lapObatNarkotika.jrxml
@@ -36,7 +36,7 @@
-
+
diff --git a/jasamedika-bridging/src/main/webapp/WEB-INF/templates/jrxml/lapObatPsikotropika.jrxml b/jasamedika-bridging/src/main/webapp/WEB-INF/templates/jrxml/lapObatPsikotropika.jrxml
index 6346fe2e..7f879b29 100644
--- a/jasamedika-bridging/src/main/webapp/WEB-INF/templates/jrxml/lapObatPsikotropika.jrxml
+++ b/jasamedika-bridging/src/main/webapp/WEB-INF/templates/jrxml/lapObatPsikotropika.jrxml
@@ -35,7 +35,7 @@
-
+
diff --git a/jasamedika-bridging/src/main/webapp/WEB-INF/templates/jrxml/lapSensusHarian.jrxml b/jasamedika-bridging/src/main/webapp/WEB-INF/templates/jrxml/lapSensusHarian.jrxml
index 953d49bc..19c0b625 100644
--- a/jasamedika-bridging/src/main/webapp/WEB-INF/templates/jrxml/lapSensusHarian.jrxml
+++ b/jasamedika-bridging/src/main/webapp/WEB-INF/templates/jrxml/lapSensusHarian.jrxml
@@ -38,7 +38,7 @@
-
+
diff --git a/jasamedika-bridging/src/main/webapp/WEB-INF/templates/jrxml/lapSensusHarian2.jrxml b/jasamedika-bridging/src/main/webapp/WEB-INF/templates/jrxml/lapSensusHarian2.jrxml
index c3a49bdb..0c0e020f 100644
--- a/jasamedika-bridging/src/main/webapp/WEB-INF/templates/jrxml/lapSensusHarian2.jrxml
+++ b/jasamedika-bridging/src/main/webapp/WEB-INF/templates/jrxml/lapSensusHarian2.jrxml
@@ -33,7 +33,7 @@
-
+
diff --git a/jasamedika-bridging/src/main/webapp/WEB-INF/templates/jrxml/reportIndexPenyakitRawatJalan.jrxml b/jasamedika-bridging/src/main/webapp/WEB-INF/templates/jrxml/reportIndexPenyakitRawatJalan.jrxml
index 4ff602d9..80aa48d7 100644
--- a/jasamedika-bridging/src/main/webapp/WEB-INF/templates/jrxml/reportIndexPenyakitRawatJalan.jrxml
+++ b/jasamedika-bridging/src/main/webapp/WEB-INF/templates/jrxml/reportIndexPenyakitRawatJalan.jrxml
@@ -31,7 +31,7 @@
-
+
diff --git a/jasamedika-bridging/src/main/webapp/WEB-INF/templates/jrxml/reportStatistikRawatInapBulanan.jrxml b/jasamedika-bridging/src/main/webapp/WEB-INF/templates/jrxml/reportStatistikRawatInapBulanan.jrxml
index 1f22399a..3731f364 100644
--- a/jasamedika-bridging/src/main/webapp/WEB-INF/templates/jrxml/reportStatistikRawatInapBulanan.jrxml
+++ b/jasamedika-bridging/src/main/webapp/WEB-INF/templates/jrxml/reportStatistikRawatInapBulanan.jrxml
@@ -17,7 +17,7 @@
-
+
diff --git a/jasamedika-reporting/src/main/webapp/WEB-INF/templates/images/Logo-Kemenkes.png b/jasamedika-reporting/src/main/webapp/WEB-INF/templates/images/Logo-Kemenkes.png
deleted file mode 100644
index bde21e62..00000000
Binary files a/jasamedika-reporting/src/main/webapp/WEB-INF/templates/images/Logo-Kemenkes.png and /dev/null differ
diff --git a/jasamedika-reporting/src/main/webapp/WEB-INF/templates/images/Logo-RSABHK-01.png b/jasamedika-reporting/src/main/webapp/WEB-INF/templates/images/Logo-RSABHK-01.png
deleted file mode 100644
index 548c8f14..00000000
Binary files a/jasamedika-reporting/src/main/webapp/WEB-INF/templates/images/Logo-RSABHK-01.png and /dev/null differ
diff --git a/jasamedika-reporting/src/main/webapp/WEB-INF/templates/images/bpjs.png b/jasamedika-reporting/src/main/webapp/WEB-INF/templates/images/bpjs.png
deleted file mode 100644
index 7befb396..00000000
Binary files a/jasamedika-reporting/src/main/webapp/WEB-INF/templates/images/bpjs.png and /dev/null differ
diff --git a/jasamedika-reporting/src/main/webapp/WEB-INF/templates/images/checkList.png b/jasamedika-reporting/src/main/webapp/WEB-INF/templates/images/checkList.png
deleted file mode 100644
index 703b24a6..00000000
Binary files a/jasamedika-reporting/src/main/webapp/WEB-INF/templates/images/checkList.png and /dev/null differ
diff --git a/jasamedika-reporting/src/main/webapp/WEB-INF/templates/images/harkit.png b/jasamedika-reporting/src/main/webapp/WEB-INF/templates/images/harkit.png
deleted file mode 100644
index bc50414b..00000000
Binary files a/jasamedika-reporting/src/main/webapp/WEB-INF/templates/images/harkit.png and /dev/null differ
diff --git a/jasamedika-reporting/src/main/webapp/WEB-INF/templates/images/kop.png b/jasamedika-reporting/src/main/webapp/WEB-INF/templates/images/kop.png
deleted file mode 100644
index 1354175f..00000000
Binary files a/jasamedika-reporting/src/main/webapp/WEB-INF/templates/images/kop.png and /dev/null differ
diff --git a/jasamedika-reporting/src/main/webapp/WEB-INF/templates/images/logoHarkit.png b/jasamedika-reporting/src/main/webapp/WEB-INF/templates/images/logoHarkit.png
deleted file mode 100644
index f0b293a7..00000000
Binary files a/jasamedika-reporting/src/main/webapp/WEB-INF/templates/images/logoHarkit.png and /dev/null differ
diff --git a/jasamedika-reporting/src/main/webapp/WEB-INF/templates/images/logoHarkitLKK.png b/jasamedika-reporting/src/main/webapp/WEB-INF/templates/images/logoHarkitLKK.png
deleted file mode 100644
index 8f2786c9..00000000
Binary files a/jasamedika-reporting/src/main/webapp/WEB-INF/templates/images/logoHarkitLKK.png and /dev/null differ
diff --git a/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/lapBukuRegisterMasukRi.jrxml b/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/lapBukuRegisterMasukRi.jrxml
index c2e91c75..c47ca45b 100644
--- a/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/lapBukuRegisterMasukRi.jrxml
+++ b/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/lapBukuRegisterMasukRi.jrxml
@@ -34,7 +34,7 @@
-
+
diff --git a/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/lapBukuRegisterPelayananRi.jrxml b/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/lapBukuRegisterPelayananRi.jrxml
index abc0da5f..dd5a1726 100644
--- a/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/lapBukuRegisterPelayananRi.jrxml
+++ b/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/lapBukuRegisterPelayananRi.jrxml
@@ -53,7 +53,7 @@
-
+
diff --git a/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/lapCapaianKinerja.jrxml b/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/lapCapaianKinerja.jrxml
index 13db8f88..5a649747 100644
--- a/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/lapCapaianKinerja.jrxml
+++ b/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/lapCapaianKinerja.jrxml
@@ -45,7 +45,7 @@
-
+
diff --git a/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/lapDaftarHadir.jrxml b/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/lapDaftarHadir.jrxml
index dac531f1..7baab4f9 100644
--- a/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/lapDaftarHadir.jrxml
+++ b/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/lapDaftarHadir.jrxml
@@ -30,7 +30,7 @@
-
+
diff --git a/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/lapHasilLaboratorium.jrxml b/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/lapHasilLaboratorium.jrxml
index 63007c24..116871c4 100644
--- a/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/lapHasilLaboratorium.jrxml
+++ b/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/lapHasilLaboratorium.jrxml
@@ -36,7 +36,7 @@
-
+
diff --git a/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/lapKunjunganBdsWilayah.jrxml b/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/lapKunjunganBdsWilayah.jrxml
index d52a17bf..e950a5a5 100644
--- a/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/lapKunjunganBdsWilayah.jrxml
+++ b/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/lapKunjunganBdsWilayah.jrxml
@@ -25,7 +25,7 @@
-
+
diff --git a/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/lapLaboratorium.jrxml b/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/lapLaboratorium.jrxml
index 98413ec3..9497e9cd 100644
--- a/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/lapLaboratorium.jrxml
+++ b/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/lapLaboratorium.jrxml
@@ -37,7 +37,7 @@
-
+
diff --git a/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/lapLogbook.jrxml b/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/lapLogbook.jrxml
index 16acffa7..2705e4a3 100644
--- a/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/lapLogbook.jrxml
+++ b/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/lapLogbook.jrxml
@@ -46,7 +46,7 @@
-
+
diff --git a/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/lapLogbookRekapVer2.jrxml b/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/lapLogbookRekapVer2.jrxml
index f0d6d8b9..5201781f 100644
--- a/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/lapLogbookRekapVer2.jrxml
+++ b/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/lapLogbookRekapVer2.jrxml
@@ -43,7 +43,7 @@
-
+
diff --git a/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/lapLogbookRekapVer2WithPasien.jrxml b/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/lapLogbookRekapVer2WithPasien.jrxml
index 11077d86..749bda07 100644
--- a/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/lapLogbookRekapVer2WithPasien.jrxml
+++ b/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/lapLogbookRekapVer2WithPasien.jrxml
@@ -41,7 +41,7 @@
-
+
diff --git a/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/lapLogbookRekapVer2WithPasienV2.jrxml b/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/lapLogbookRekapVer2WithPasienV2.jrxml
index 8935e1d3..a9cb3412 100644
--- a/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/lapLogbookRekapVer2WithPasienV2.jrxml
+++ b/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/lapLogbookRekapVer2WithPasienV2.jrxml
@@ -50,7 +50,7 @@
-
+
diff --git a/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/lapLogbookVer2.jrxml b/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/lapLogbookVer2.jrxml
index 4e189850..f7f2ded6 100644
--- a/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/lapLogbookVer2.jrxml
+++ b/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/lapLogbookVer2.jrxml
@@ -40,7 +40,7 @@
-
+
diff --git a/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/lapObatAntibiotik.jrxml b/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/lapObatAntibiotik.jrxml
index e02daf3c..a198b5d9 100644
--- a/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/lapObatAntibiotik.jrxml
+++ b/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/lapObatAntibiotik.jrxml
@@ -36,7 +36,7 @@
-
+
diff --git a/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/lapObatGenerik.jrxml b/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/lapObatGenerik.jrxml
index e90a7342..29b06904 100644
--- a/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/lapObatGenerik.jrxml
+++ b/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/lapObatGenerik.jrxml
@@ -37,7 +37,7 @@
-
+
diff --git a/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/lapObatNarkotika.jrxml b/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/lapObatNarkotika.jrxml
index 9c440edb..f93d12cc 100644
--- a/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/lapObatNarkotika.jrxml
+++ b/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/lapObatNarkotika.jrxml
@@ -36,7 +36,7 @@
-
+
diff --git a/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/lapObatPsikotropika.jrxml b/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/lapObatPsikotropika.jrxml
index 6346fe2e..7f879b29 100644
--- a/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/lapObatPsikotropika.jrxml
+++ b/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/lapObatPsikotropika.jrxml
@@ -35,7 +35,7 @@
-
+
diff --git a/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/lapRekapitulasiIKI.jrxml b/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/lapRekapitulasiIKI.jrxml
index 4218a443..8b611ff8 100644
--- a/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/lapRekapitulasiIKI.jrxml
+++ b/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/lapRekapitulasiIKI.jrxml
@@ -41,7 +41,7 @@
-
+
diff --git a/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/lapRekapitulasiKehadiran.jrxml b/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/lapRekapitulasiKehadiran.jrxml
index 4c297196..e538a883 100644
--- a/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/lapRekapitulasiKehadiran.jrxml
+++ b/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/lapRekapitulasiKehadiran.jrxml
@@ -37,7 +37,7 @@
-
+
diff --git a/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/lapResumeMedis.jrxml b/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/lapResumeMedis.jrxml
index d458b606..deebfc44 100644
--- a/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/lapResumeMedis.jrxml
+++ b/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/lapResumeMedis.jrxml
@@ -108,7 +108,7 @@
-
+
diff --git a/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/lapSensusHarian.jrxml b/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/lapSensusHarian.jrxml
index 02413c13..0af535d5 100644
--- a/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/lapSensusHarian.jrxml
+++ b/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/lapSensusHarian.jrxml
@@ -33,7 +33,7 @@
-
+
diff --git a/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/lapSensusHarian2.jrxml b/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/lapSensusHarian2.jrxml
index c3a49bdb..0c0e020f 100644
--- a/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/lapSensusHarian2.jrxml
+++ b/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/lapSensusHarian2.jrxml
@@ -33,7 +33,7 @@
-
+
diff --git a/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/lapSuratIzin.jrxml b/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/lapSuratIzin.jrxml
index 47934e89..ce8e5054 100644
--- a/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/lapSuratIzin.jrxml
+++ b/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/lapSuratIzin.jrxml
@@ -34,7 +34,7 @@
-
+
diff --git a/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/lapSuratIzinCuti.jrxml b/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/lapSuratIzinCuti.jrxml
index 9f4ffc91..253cce8d 100644
--- a/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/lapSuratIzinCuti.jrxml
+++ b/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/lapSuratIzinCuti.jrxml
@@ -36,7 +36,7 @@
-
+
diff --git a/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/laporanFeeForServiceDokter.jrxml b/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/laporanFeeForServiceDokter.jrxml
index 0f3629ac..47568db9 100644
--- a/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/laporanFeeForServiceDokter.jrxml
+++ b/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/laporanFeeForServiceDokter.jrxml
@@ -48,7 +48,7 @@
-
+
diff --git a/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/laporanPendapatanPelayanan.jrxml b/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/laporanPendapatanPelayanan.jrxml
index d1df12b8..43bb7b78 100644
--- a/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/laporanPendapatanPelayanan.jrxml
+++ b/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/laporanPendapatanPelayanan.jrxml
@@ -169,7 +169,7 @@
-
+
diff --git a/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/reportIndexPenyakitRawatJalan.jrxml b/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/reportIndexPenyakitRawatJalan.jrxml
index 4ff602d9..80aa48d7 100644
--- a/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/reportIndexPenyakitRawatJalan.jrxml
+++ b/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/reportIndexPenyakitRawatJalan.jrxml
@@ -31,7 +31,7 @@
-
+
diff --git a/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/reportStatistikRawatInapBulanan.jrxml b/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/reportStatistikRawatInapBulanan.jrxml
index 1f22399a..3731f364 100644
--- a/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/reportStatistikRawatInapBulanan.jrxml
+++ b/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/reportStatistikRawatInapBulanan.jrxml
@@ -17,7 +17,7 @@
-
+
diff --git a/jasamedika-web/src/main/webapp/WEB-INF/templates/images/bpjs.png b/jasamedika-web/src/main/webapp/WEB-INF/templates/images/bpjs.png
deleted file mode 100644
index 7befb396..00000000
Binary files a/jasamedika-web/src/main/webapp/WEB-INF/templates/images/bpjs.png and /dev/null differ
diff --git a/jasamedika-web/src/main/webapp/WEB-INF/templates/images/checkList.png b/jasamedika-web/src/main/webapp/WEB-INF/templates/images/checkList.png
deleted file mode 100644
index 703b24a6..00000000
Binary files a/jasamedika-web/src/main/webapp/WEB-INF/templates/images/checkList.png and /dev/null differ
diff --git a/jasamedika-web/src/main/webapp/WEB-INF/templates/images/logoHarkit.png b/jasamedika-web/src/main/webapp/WEB-INF/templates/images/logoHarkit.png
deleted file mode 100644
index f0b293a7..00000000
Binary files a/jasamedika-web/src/main/webapp/WEB-INF/templates/images/logoHarkit.png and /dev/null differ
diff --git a/jasamedika-web/src/main/webapp/WEB-INF/templates/images/logoHarkitLKK.png b/jasamedika-web/src/main/webapp/WEB-INF/templates/images/logoHarkitLKK.png
deleted file mode 100644
index 8f2786c9..00000000
Binary files a/jasamedika-web/src/main/webapp/WEB-INF/templates/images/logoHarkitLKK.png and /dev/null differ
diff --git a/jasamedika-web/src/main/webapp/WEB-INF/templates/jrxml/lapBukuRegisterMasukRi.jrxml b/jasamedika-web/src/main/webapp/WEB-INF/templates/jrxml/lapBukuRegisterMasukRi.jrxml
index c2e91c75..c47ca45b 100644
--- a/jasamedika-web/src/main/webapp/WEB-INF/templates/jrxml/lapBukuRegisterMasukRi.jrxml
+++ b/jasamedika-web/src/main/webapp/WEB-INF/templates/jrxml/lapBukuRegisterMasukRi.jrxml
@@ -34,7 +34,7 @@
-
+
diff --git a/jasamedika-web/src/main/webapp/WEB-INF/templates/jrxml/lapBukuRegisterPelayananRi.jrxml b/jasamedika-web/src/main/webapp/WEB-INF/templates/jrxml/lapBukuRegisterPelayananRi.jrxml
index abc0da5f..dd5a1726 100644
--- a/jasamedika-web/src/main/webapp/WEB-INF/templates/jrxml/lapBukuRegisterPelayananRi.jrxml
+++ b/jasamedika-web/src/main/webapp/WEB-INF/templates/jrxml/lapBukuRegisterPelayananRi.jrxml
@@ -53,7 +53,7 @@
-
+
diff --git a/jasamedika-web/src/main/webapp/WEB-INF/templates/jrxml/lapCapaianKinerja.jrxml b/jasamedika-web/src/main/webapp/WEB-INF/templates/jrxml/lapCapaianKinerja.jrxml
index 13db8f88..5a649747 100644
--- a/jasamedika-web/src/main/webapp/WEB-INF/templates/jrxml/lapCapaianKinerja.jrxml
+++ b/jasamedika-web/src/main/webapp/WEB-INF/templates/jrxml/lapCapaianKinerja.jrxml
@@ -45,7 +45,7 @@
-
+
diff --git a/jasamedika-web/src/main/webapp/WEB-INF/templates/jrxml/lapDaftarHadir.jrxml b/jasamedika-web/src/main/webapp/WEB-INF/templates/jrxml/lapDaftarHadir.jrxml
index dac531f1..7baab4f9 100644
--- a/jasamedika-web/src/main/webapp/WEB-INF/templates/jrxml/lapDaftarHadir.jrxml
+++ b/jasamedika-web/src/main/webapp/WEB-INF/templates/jrxml/lapDaftarHadir.jrxml
@@ -30,7 +30,7 @@
-
+
diff --git a/jasamedika-web/src/main/webapp/WEB-INF/templates/jrxml/lapHasilLaboratorium.jrxml b/jasamedika-web/src/main/webapp/WEB-INF/templates/jrxml/lapHasilLaboratorium.jrxml
index 63007c24..116871c4 100644
--- a/jasamedika-web/src/main/webapp/WEB-INF/templates/jrxml/lapHasilLaboratorium.jrxml
+++ b/jasamedika-web/src/main/webapp/WEB-INF/templates/jrxml/lapHasilLaboratorium.jrxml
@@ -36,7 +36,7 @@
-
+
diff --git a/jasamedika-web/src/main/webapp/WEB-INF/templates/jrxml/lapKunjunganBdsWilayah.jrxml b/jasamedika-web/src/main/webapp/WEB-INF/templates/jrxml/lapKunjunganBdsWilayah.jrxml
index d52a17bf..e950a5a5 100644
--- a/jasamedika-web/src/main/webapp/WEB-INF/templates/jrxml/lapKunjunganBdsWilayah.jrxml
+++ b/jasamedika-web/src/main/webapp/WEB-INF/templates/jrxml/lapKunjunganBdsWilayah.jrxml
@@ -25,7 +25,7 @@
-
+
diff --git a/jasamedika-web/src/main/webapp/WEB-INF/templates/jrxml/lapLaboratorium.jrxml b/jasamedika-web/src/main/webapp/WEB-INF/templates/jrxml/lapLaboratorium.jrxml
index 98413ec3..9497e9cd 100644
--- a/jasamedika-web/src/main/webapp/WEB-INF/templates/jrxml/lapLaboratorium.jrxml
+++ b/jasamedika-web/src/main/webapp/WEB-INF/templates/jrxml/lapLaboratorium.jrxml
@@ -37,7 +37,7 @@
-
+
diff --git a/jasamedika-web/src/main/webapp/WEB-INF/templates/jrxml/lapLogbook.jrxml b/jasamedika-web/src/main/webapp/WEB-INF/templates/jrxml/lapLogbook.jrxml
index 16acffa7..2705e4a3 100644
--- a/jasamedika-web/src/main/webapp/WEB-INF/templates/jrxml/lapLogbook.jrxml
+++ b/jasamedika-web/src/main/webapp/WEB-INF/templates/jrxml/lapLogbook.jrxml
@@ -46,7 +46,7 @@
-
+
diff --git a/jasamedika-web/src/main/webapp/WEB-INF/templates/jrxml/lapLogbookRekapVer2.jrxml b/jasamedika-web/src/main/webapp/WEB-INF/templates/jrxml/lapLogbookRekapVer2.jrxml
index 422facc4..64f1aeba 100644
--- a/jasamedika-web/src/main/webapp/WEB-INF/templates/jrxml/lapLogbookRekapVer2.jrxml
+++ b/jasamedika-web/src/main/webapp/WEB-INF/templates/jrxml/lapLogbookRekapVer2.jrxml
@@ -41,7 +41,7 @@
-
+
diff --git a/jasamedika-web/src/main/webapp/WEB-INF/templates/jrxml/lapLogbookRekapVer2WithPasien.jrxml b/jasamedika-web/src/main/webapp/WEB-INF/templates/jrxml/lapLogbookRekapVer2WithPasien.jrxml
index 11077d86..749bda07 100644
--- a/jasamedika-web/src/main/webapp/WEB-INF/templates/jrxml/lapLogbookRekapVer2WithPasien.jrxml
+++ b/jasamedika-web/src/main/webapp/WEB-INF/templates/jrxml/lapLogbookRekapVer2WithPasien.jrxml
@@ -41,7 +41,7 @@
-
+
diff --git a/jasamedika-web/src/main/webapp/WEB-INF/templates/jrxml/lapLogbookRekapVer2WithPasienV2.jrxml b/jasamedika-web/src/main/webapp/WEB-INF/templates/jrxml/lapLogbookRekapVer2WithPasienV2.jrxml
index 3cd5284c..975b0df5 100644
--- a/jasamedika-web/src/main/webapp/WEB-INF/templates/jrxml/lapLogbookRekapVer2WithPasienV2.jrxml
+++ b/jasamedika-web/src/main/webapp/WEB-INF/templates/jrxml/lapLogbookRekapVer2WithPasienV2.jrxml
@@ -47,7 +47,7 @@
-
+
diff --git a/jasamedika-web/src/main/webapp/WEB-INF/templates/jrxml/lapLogbookVer2.jrxml b/jasamedika-web/src/main/webapp/WEB-INF/templates/jrxml/lapLogbookVer2.jrxml
index 9f22c55b..0dc67a99 100644
--- a/jasamedika-web/src/main/webapp/WEB-INF/templates/jrxml/lapLogbookVer2.jrxml
+++ b/jasamedika-web/src/main/webapp/WEB-INF/templates/jrxml/lapLogbookVer2.jrxml
@@ -40,7 +40,7 @@
-
+
diff --git a/jasamedika-web/src/main/webapp/WEB-INF/templates/jrxml/lapMonitoringAbsensi.jasper b/jasamedika-web/src/main/webapp/WEB-INF/templates/jrxml/lapMonitoringAbsensi.jasper
deleted file mode 100644
index d113b5ab..00000000
Binary files a/jasamedika-web/src/main/webapp/WEB-INF/templates/jrxml/lapMonitoringAbsensi.jasper and /dev/null differ
diff --git a/jasamedika-web/src/main/webapp/WEB-INF/templates/jrxml/lapObatAntibiotik.jrxml b/jasamedika-web/src/main/webapp/WEB-INF/templates/jrxml/lapObatAntibiotik.jrxml
index e02daf3c..a198b5d9 100644
--- a/jasamedika-web/src/main/webapp/WEB-INF/templates/jrxml/lapObatAntibiotik.jrxml
+++ b/jasamedika-web/src/main/webapp/WEB-INF/templates/jrxml/lapObatAntibiotik.jrxml
@@ -36,7 +36,7 @@
-
+
diff --git a/jasamedika-web/src/main/webapp/WEB-INF/templates/jrxml/lapObatGenerik.jrxml b/jasamedika-web/src/main/webapp/WEB-INF/templates/jrxml/lapObatGenerik.jrxml
index e90a7342..29b06904 100644
--- a/jasamedika-web/src/main/webapp/WEB-INF/templates/jrxml/lapObatGenerik.jrxml
+++ b/jasamedika-web/src/main/webapp/WEB-INF/templates/jrxml/lapObatGenerik.jrxml
@@ -37,7 +37,7 @@
-
+
diff --git a/jasamedika-web/src/main/webapp/WEB-INF/templates/jrxml/lapObatNarkotika.jrxml b/jasamedika-web/src/main/webapp/WEB-INF/templates/jrxml/lapObatNarkotika.jrxml
index 9c440edb..f93d12cc 100644
--- a/jasamedika-web/src/main/webapp/WEB-INF/templates/jrxml/lapObatNarkotika.jrxml
+++ b/jasamedika-web/src/main/webapp/WEB-INF/templates/jrxml/lapObatNarkotika.jrxml
@@ -36,7 +36,7 @@
-
+
diff --git a/jasamedika-web/src/main/webapp/WEB-INF/templates/jrxml/lapObatPsikotropika.jrxml b/jasamedika-web/src/main/webapp/WEB-INF/templates/jrxml/lapObatPsikotropika.jrxml
index 6346fe2e..7f879b29 100644
--- a/jasamedika-web/src/main/webapp/WEB-INF/templates/jrxml/lapObatPsikotropika.jrxml
+++ b/jasamedika-web/src/main/webapp/WEB-INF/templates/jrxml/lapObatPsikotropika.jrxml
@@ -35,7 +35,7 @@
-
+
diff --git a/jasamedika-web/src/main/webapp/WEB-INF/templates/jrxml/lapRekapitulasiIKI.jrxml b/jasamedika-web/src/main/webapp/WEB-INF/templates/jrxml/lapRekapitulasiIKI.jrxml
index 4218a443..8b611ff8 100644
--- a/jasamedika-web/src/main/webapp/WEB-INF/templates/jrxml/lapRekapitulasiIKI.jrxml
+++ b/jasamedika-web/src/main/webapp/WEB-INF/templates/jrxml/lapRekapitulasiIKI.jrxml
@@ -41,7 +41,7 @@
-
+
diff --git a/jasamedika-web/src/main/webapp/WEB-INF/templates/jrxml/lapRekapitulasiKehadiran.jrxml b/jasamedika-web/src/main/webapp/WEB-INF/templates/jrxml/lapRekapitulasiKehadiran.jrxml
index 4c297196..e538a883 100644
--- a/jasamedika-web/src/main/webapp/WEB-INF/templates/jrxml/lapRekapitulasiKehadiran.jrxml
+++ b/jasamedika-web/src/main/webapp/WEB-INF/templates/jrxml/lapRekapitulasiKehadiran.jrxml
@@ -37,7 +37,7 @@
-
+
diff --git a/jasamedika-web/src/main/webapp/WEB-INF/templates/jrxml/lapResumeMedis.jrxml b/jasamedika-web/src/main/webapp/WEB-INF/templates/jrxml/lapResumeMedis.jrxml
index d458b606..deebfc44 100644
--- a/jasamedika-web/src/main/webapp/WEB-INF/templates/jrxml/lapResumeMedis.jrxml
+++ b/jasamedika-web/src/main/webapp/WEB-INF/templates/jrxml/lapResumeMedis.jrxml
@@ -108,7 +108,7 @@
-
+
diff --git a/jasamedika-web/src/main/webapp/WEB-INF/templates/jrxml/lapSensusHarian.jrxml b/jasamedika-web/src/main/webapp/WEB-INF/templates/jrxml/lapSensusHarian.jrxml
index 02413c13..0af535d5 100644
--- a/jasamedika-web/src/main/webapp/WEB-INF/templates/jrxml/lapSensusHarian.jrxml
+++ b/jasamedika-web/src/main/webapp/WEB-INF/templates/jrxml/lapSensusHarian.jrxml
@@ -33,7 +33,7 @@
-
+
diff --git a/jasamedika-web/src/main/webapp/WEB-INF/templates/jrxml/lapSensusHarian2.jrxml b/jasamedika-web/src/main/webapp/WEB-INF/templates/jrxml/lapSensusHarian2.jrxml
index c3a49bdb..0c0e020f 100644
--- a/jasamedika-web/src/main/webapp/WEB-INF/templates/jrxml/lapSensusHarian2.jrxml
+++ b/jasamedika-web/src/main/webapp/WEB-INF/templates/jrxml/lapSensusHarian2.jrxml
@@ -33,7 +33,7 @@
-
+
diff --git a/jasamedika-web/src/main/webapp/WEB-INF/templates/jrxml/lapSuratIzin.jrxml b/jasamedika-web/src/main/webapp/WEB-INF/templates/jrxml/lapSuratIzin.jrxml
index 2e375bd2..47f97853 100644
--- a/jasamedika-web/src/main/webapp/WEB-INF/templates/jrxml/lapSuratIzin.jrxml
+++ b/jasamedika-web/src/main/webapp/WEB-INF/templates/jrxml/lapSuratIzin.jrxml
@@ -32,7 +32,7 @@
-
+
diff --git a/jasamedika-web/src/main/webapp/WEB-INF/templates/jrxml/lapSuratIzinCuti.jrxml b/jasamedika-web/src/main/webapp/WEB-INF/templates/jrxml/lapSuratIzinCuti.jrxml
index 9f4ffc91..253cce8d 100644
--- a/jasamedika-web/src/main/webapp/WEB-INF/templates/jrxml/lapSuratIzinCuti.jrxml
+++ b/jasamedika-web/src/main/webapp/WEB-INF/templates/jrxml/lapSuratIzinCuti.jrxml
@@ -36,7 +36,7 @@
-
+
diff --git a/jasamedika-web/src/main/webapp/WEB-INF/templates/jrxml/logbookKinerjaStaffMedis.jasper b/jasamedika-web/src/main/webapp/WEB-INF/templates/jrxml/logbookKinerjaStaffMedis.jasper
deleted file mode 100644
index c83597e1..00000000
Binary files a/jasamedika-web/src/main/webapp/WEB-INF/templates/jrxml/logbookKinerjaStaffMedis.jasper and /dev/null differ
diff --git a/jasamedika-web/src/main/webapp/WEB-INF/templates/jrxml/reportIndexPenyakitRawatJalan.jrxml b/jasamedika-web/src/main/webapp/WEB-INF/templates/jrxml/reportIndexPenyakitRawatJalan.jrxml
index 4ff602d9..80aa48d7 100644
--- a/jasamedika-web/src/main/webapp/WEB-INF/templates/jrxml/reportIndexPenyakitRawatJalan.jrxml
+++ b/jasamedika-web/src/main/webapp/WEB-INF/templates/jrxml/reportIndexPenyakitRawatJalan.jrxml
@@ -31,7 +31,7 @@
-
+
diff --git a/jasamedika-web/src/main/webapp/WEB-INF/templates/jrxml/reportStatistikRawatInapBulanan.jrxml b/jasamedika-web/src/main/webapp/WEB-INF/templates/jrxml/reportStatistikRawatInapBulanan.jrxml
index 1f22399a..3731f364 100644
--- a/jasamedika-web/src/main/webapp/WEB-INF/templates/jrxml/reportStatistikRawatInapBulanan.jrxml
+++ b/jasamedika-web/src/main/webapp/WEB-INF/templates/jrxml/reportStatistikRawatInapBulanan.jrxml
@@ -17,7 +17,7 @@
-
+