diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/ReportServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/ReportServiceImpl.java
index bfa1e99a..f8170f95 100644
--- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/ReportServiceImpl.java
+++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/ReportServiceImpl.java
@@ -3221,7 +3221,6 @@ public class ReportServiceImpl extends BaseVoServiceImpl implements ReportServic
result.put("pembulatan", "-");
result.put("remunerasiKinerja", "-");
result.put("feeForService", "-");
- result.put("remunerasiOperasional", "-");
result.put("kelebihanJamKerja", "-");
result.put("remunerasiManajerial", "-");
result.put("remunerasiTambahanDiklitjar", "-");
@@ -3238,7 +3237,6 @@ public class ReportServiceImpl extends BaseVoServiceImpl implements ReportServic
result.put("simpananWajibKoperasiGaji", "-");
result.put("pinjamanKoperasiGaji", "-");
result.put("potonganPphRemunerasi", "-");
- result.put("potonganPphRemunerasiOperasional", "-");
result.put("potonganObat", "-");
result.put("potonganRawatInap", "-");
result.put("potonganRawatJalan", "-");
@@ -3301,8 +3299,6 @@ public class ReportServiceImpl extends BaseVoServiceImpl implements ReportServic
result.put("remunerasiKinerja", nf.format(k.getNominal()));
} else if (Master.KomponenGaji.FEE_FOR_SERVICE.equals(k.getIdKomponen())) {
result.put("feeForService", nf.format(k.getNominal()));
- } else if (Master.KomponenGaji.REMUNERASI_OPERASIONAL.equals(k.getIdKomponen())) {
- result.put("remunerasiOperasional", nf.format(k.getNominal()));
} else if (Master.KomponenGaji.KELEBIHAN_JAM_KERJA.equals(k.getIdKomponen())) {
result.put("kelebihanJamKerja", nf.format(k.getNominal()));
} else if (Master.KomponenGaji.REMUNERASI_MANAJERIAL.equals(k.getIdKomponen())) {
@@ -3335,8 +3331,6 @@ public class ReportServiceImpl extends BaseVoServiceImpl implements ReportServic
result.put("pinjamanKoperasiGaji", nf.format(k.getNominal()));
} else if (Master.KomponenGaji.POTONGAN_PPH_REMUNERASI.equals(k.getIdKomponen())) {
result.put("potonganPphRemunerasi", nf.format(k.getNominal()));
- } else if (Master.KomponenGaji.POTONGAN_PPH_REMUNERASI_OPERASIONAL.equals(k.getIdKomponen())) {
- result.put("potonganPphRemunerasiOperasional", nf.format(k.getNominal()));
} else if (Master.KomponenGaji.POTONGAN_OBAT.equals(k.getIdKomponen())) {
result.put("potonganObat", nf.format(k.getNominal()));
} else if (Master.KomponenGaji.POTONGAN_RAWAT_INAP.equals(k.getIdKomponen())) {
@@ -3476,8 +3470,6 @@ public class ReportServiceImpl extends BaseVoServiceImpl implements ReportServic
penerimaanDtoBuilder.remunerasiKinerja(nf.format(k.getNominal()));
} else if (Master.KomponenGaji.FEE_FOR_SERVICE.equals(k.getIdKomponen())) {
penerimaanDtoBuilder.feeForService(nf.format(k.getNominal()));
- } else if (Master.KomponenGaji.REMUNERASI_OPERASIONAL.equals(k.getIdKomponen())) {
- penerimaanDtoBuilder.remunerasiOperasional(nf.format(k.getNominal()));
} else if (Master.KomponenGaji.KELEBIHAN_JAM_KERJA.equals(k.getIdKomponen())) {
penerimaanDtoBuilder.kelebihanJamKerja(nf.format(k.getNominal()));
} else if (Master.KomponenGaji.REMUNERASI_MANAJERIAL.equals(k.getIdKomponen())) {
@@ -3510,8 +3502,6 @@ public class ReportServiceImpl extends BaseVoServiceImpl implements ReportServic
potonganDtoBuilder.pinjamanKoperasiGaji(nf.format(k.getNominal()));
} else if (Master.KomponenGaji.POTONGAN_PPH_REMUNERASI.equals(k.getIdKomponen())) {
potonganDtoBuilder.potonganPphRemunerasi(nf.format(k.getNominal()));
- } else if (Master.KomponenGaji.POTONGAN_PPH_REMUNERASI_OPERASIONAL.equals(k.getIdKomponen())) {
- potonganDtoBuilder.potonganPphRemunerasiOperasional(nf.format(k.getNominal()));
} else if (Master.KomponenGaji.POTONGAN_OBAT.equals(k.getIdKomponen())) {
potonganDtoBuilder.potonganObat(nf.format(k.getNominal()));
} else if (Master.KomponenGaji.POTONGAN_RAWAT_INAP.equals(k.getIdKomponen())) {
@@ -3555,10 +3545,10 @@ public class ReportServiceImpl extends BaseVoServiceImpl implements ReportServic
jumlahPenerimaanBersih = jumlahGajiBersih.add(jumlahRemunerasiBersih).add(jumlahUangMakanBersih);
jumlahDtoBuilder.jumlahPenerimaanBersih(nf.format(jumlahPenerimaanBersih));
}
- resultBuilder.pegawaiDto(pegawaiDtoBuilder.build());
- resultBuilder.penerimaanDto(penerimaanDtoBuilder.build());
- resultBuilder.potonganDto(potonganDtoBuilder.build());
- resultBuilder.jumlahDto(jumlahDtoBuilder.build());
+ resultBuilder.pegawai(pegawaiDtoBuilder.build());
+ resultBuilder.penerimaan(penerimaanDtoBuilder.build());
+ resultBuilder.potongan(potonganDtoBuilder.build());
+ resultBuilder.jumlah(jumlahDtoBuilder.build());
}
SlipHeaderDto result = resultBuilder.build();
if (CommonUtil.isNullOrEmpty(result.getPegawai())) {
diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/dto/SlipHeaderDto.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/dto/SlipHeaderDto.java
index 44609b85..95e3638c 100644
--- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/dto/SlipHeaderDto.java
+++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/dto/SlipHeaderDto.java
@@ -4,11 +4,17 @@
package com.jasamedika.medifirst2000.dto;
import com.jasamedika.medifirst2000.helper.Caption;
+import lombok.*;
/**
* @author Salman
* @since May 16th, 2023
*/
+@Getter
+@Setter
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
public class SlipHeaderDto {
@Caption(value = "Pegawai")
private SlipPegawaiDto pegawai;
@@ -24,101 +30,4 @@ public class SlipHeaderDto {
@Caption(value = "Print")
private String print;
-
- public SlipHeaderDto() {
- }
-
- public SlipHeaderDto(SlipPegawaiDto pegawai, SlipPenerimaanDto penerimaan, SlipPotonganDto potongan,
- SlipJumlahDto jumlah, String print) {
- super();
- this.pegawai = pegawai;
- this.penerimaan = penerimaan;
- this.potongan = potongan;
- this.jumlah = jumlah;
- this.print = print;
- }
-
- public SlipPegawaiDto getPegawai() {
- return pegawai;
- }
-
- public void setPegawai(SlipPegawaiDto pegawai) {
- this.pegawai = pegawai;
- }
-
- public SlipPenerimaanDto getPenerimaan() {
- return penerimaan;
- }
-
- public void setPenerimaan(SlipPenerimaanDto penerimaan) {
- this.penerimaan = penerimaan;
- }
-
- public SlipPotonganDto getPotongan() {
- return potongan;
- }
-
- public void setPotongan(SlipPotonganDto potongan) {
- this.potongan = potongan;
- }
-
- public SlipJumlahDto getJumlah() {
- return jumlah;
- }
-
- public void setJumlah(SlipJumlahDto jumlah) {
- this.jumlah = jumlah;
- }
-
- public String getPrint() {
- return print;
- }
-
- public void setPrint(String print) {
- this.print = print;
- }
-
- public static SlipHeaderDtoBuilder builder() {
- return new SlipHeaderDtoBuilder();
- }
-
- public static class SlipHeaderDtoBuilder {
- private SlipPegawaiDto pegawai;
- private SlipPenerimaanDto penerimaan;
- private SlipPotonganDto potongan;
- private SlipJumlahDto jumlah;
- private String print;
-
- public SlipHeaderDtoBuilder() {
- }
-
- public SlipHeaderDtoBuilder pegawaiDto(final SlipPegawaiDto pegawai) {
- this.pegawai = pegawai;
- return this;
- }
-
- public SlipHeaderDtoBuilder penerimaanDto(final SlipPenerimaanDto penerimaan) {
- this.penerimaan = penerimaan;
- return this;
- }
-
- public SlipHeaderDtoBuilder potonganDto(final SlipPotonganDto potongan) {
- this.potongan = potongan;
- return this;
- }
-
- public SlipHeaderDtoBuilder jumlahDto(final SlipJumlahDto jumlah) {
- this.jumlah = jumlah;
- return this;
- }
-
- public SlipHeaderDtoBuilder print(final String print) {
- this.print = print;
- return this;
- }
-
- public SlipHeaderDto build() {
- return new SlipHeaderDto(this.pegawai, this.penerimaan, this.potongan, this.jumlah, this.print);
- }
- }
}
diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/dto/SlipPenerimaanDto.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/dto/SlipPenerimaanDto.java
index 8aa0f018..0113760c 100644
--- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/dto/SlipPenerimaanDto.java
+++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/dto/SlipPenerimaanDto.java
@@ -61,10 +61,6 @@ public class SlipPenerimaanDto {
@Builder.Default
private String feeForService = "-";
- @Caption(value = "Remunerasi Operasional")
- @Builder.Default
- private String remunerasiOperasional = "-";
-
@Caption(value = "Kelebihan Jam Kerja")
@Builder.Default
private String kelebihanJamKerja = "-";
diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/dto/SlipPotonganDto.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/dto/SlipPotonganDto.java
index 8dddb975..bfb15512 100644
--- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/dto/SlipPotonganDto.java
+++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/dto/SlipPotonganDto.java
@@ -57,10 +57,6 @@ public class SlipPotonganDto {
@Builder.Default
private String potonganPphRemunerasi = "-";
- @Caption(value = "Potongan PPH Remunerasi Operasional")
- @Builder.Default
- private String potonganPphRemunerasiOperasional = "-";
-
@Caption(value = "Potongan Obat")
@Builder.Default
private String potonganObat = "-";
diff --git a/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/slipGaji.jrxml b/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/slipGaji.jrxml
index 041e9962..21290ed7 100644
--- a/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/slipGaji.jrxml
+++ b/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/slipGaji.jrxml
@@ -18,7 +18,6 @@
-
@@ -30,7 +29,6 @@
-
@@ -65,7 +63,7 @@
-
+
@@ -966,52 +964,7 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
@@ -1021,7 +974,7 @@
-
+
@@ -1047,7 +1000,7 @@
-
+
@@ -1057,7 +1010,7 @@
-
+
@@ -1068,7 +1021,7 @@
-
+
@@ -1083,7 +1036,7 @@
-
+
@@ -1093,7 +1046,7 @@
-
+
@@ -1104,7 +1057,7 @@
-
+
@@ -1119,7 +1072,7 @@
-
+
@@ -1131,7 +1084,7 @@
-
+
@@ -1141,7 +1094,7 @@
-
+
@@ -1157,7 +1110,7 @@
-
+
@@ -1169,7 +1122,7 @@
-
+
@@ -1179,7 +1132,7 @@
-
+
@@ -1195,7 +1148,7 @@
-
+
@@ -1205,7 +1158,7 @@
-
+
@@ -1213,7 +1166,7 @@
-
+
@@ -1229,7 +1182,7 @@
-
+
@@ -1239,7 +1192,7 @@
-
+
@@ -1250,7 +1203,7 @@
-
+
@@ -1261,7 +1214,7 @@
-
+
@@ -1276,7 +1229,7 @@
-
+
@@ -1289,7 +1242,7 @@
-
+
@@ -1301,7 +1254,7 @@
-
+
@@ -1313,7 +1266,7 @@
-
+
@@ -1328,7 +1281,7 @@
-
+
@@ -1341,7 +1294,7 @@
-
+
@@ -1356,7 +1309,7 @@
-
+
@@ -1372,7 +1325,7 @@
-
+
@@ -1383,7 +1336,7 @@
-
+
@@ -1396,7 +1349,7 @@
-
+
@@ -1406,7 +1359,7 @@
-
+
@@ -1422,7 +1375,7 @@
-
+
@@ -1435,7 +1388,7 @@
-
+
@@ -1450,7 +1403,7 @@
-
+
@@ -1464,7 +1417,7 @@
-
+
@@ -1479,7 +1432,7 @@
-
+
@@ -1490,7 +1443,7 @@
-
+
@@ -1501,7 +1454,7 @@
-
+
@@ -1511,7 +1464,7 @@
-
+
@@ -1522,7 +1475,7 @@
-
+
@@ -1533,7 +1486,7 @@
-
+
@@ -1544,7 +1497,7 @@
-
+
@@ -1555,7 +1508,7 @@
-
+
@@ -1565,7 +1518,7 @@
-
+
@@ -1589,7 +1542,7 @@
-
+
@@ -1602,7 +1555,7 @@
-
+
@@ -1615,7 +1568,7 @@
-
+
@@ -1629,7 +1582,7 @@
-
+
@@ -1645,7 +1598,7 @@
-
+
@@ -1661,7 +1614,7 @@
-
+
@@ -1691,7 +1644,7 @@
-
+
@@ -1706,7 +1659,7 @@
-
+
@@ -1717,7 +1670,7 @@
-
+
@@ -1763,7 +1716,7 @@
-
+
@@ -1771,7 +1724,7 @@
-
+
@@ -1779,7 +1732,7 @@
-
+
@@ -1787,7 +1740,7 @@
-
+
@@ -1795,7 +1748,7 @@
-
+