salmanoe/SC-be-java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: salmanoe:master
Branches Tags
salmanoe:master
salmanoe:dev/technical-debt/clean-code
salmanoe:dev/integrasi/minio
salmanoe:prod/base
salmanoe:prod/no-cron
salmanoe:dev/no-cron
salmanoe:ade/add-master-shift/pagi-malem-2-1
salmanoe:dev/base
salmanoe:ade/logbook-tarif/non-kelas-eksekutif
salmanoe:ade/intervensi-cuti/bug-fixing-sisa-cuti
salmanoe:ade/absensi/remove-keterlambatan
salmanoe:ade/jadwal-dinas/juni2026
salmanoe:ade/reporting/modifikasi-printout-cuti
salmanoe:ade/bug-fixing/hapus-logbook
salmanoe:ade/monitoring-absensi/bug-fixing-absen-tunggal
salmanoe:ade/bug-remun/perbaikan-recursive-fixed-pay
salmanoe:ade/monitoring-absen/shift-pm3
salmanoe:ade/monitor-absen/shift-pm2
salmanoe:ade/monitor-absen/shift-pm
salmanoe:ade/monitoring/check-health4
salmanoe:ade/monitoring/check-health3
salmanoe:ade/monitoring/check-health2
salmanoe:ade/sdm-absensi/realisasi-absensi
salmanoe:ade/logbook-tarif/penyesuainruangan70persen
salmanoe:ade/logbook-tarif/ekslusi-dentalicious
salmanoe:ade/bug-fixing/master-shift-on-cuti
salmanoe:ade/bug-fixing/level-unitkerja-direktur
salmanoe:ade/mastershift-holidayservice-monitoringabsensi
salmanoe:ade/logbook/rekap-logbook-tarif
salmanoe:ade/bug-fixing/intervensi-cuti
salmanoe:dev-ade/sdm/intervensi-cuti
salmanoe:ade/bug-fixing/hak-akses-diskon-total
salmanoe:dev/billing/diskonpegawai
salmanoe:sdm/remunerasi/bug-fixing-pelayan-findPelayananBedah
salmanoe:dev/sdm/remunerasi
salmanoe:dev/remunerasi/bugfixingakumulasipersen
salmanoe:dev/pegawai/ws-example-ade-v2
..
compare: salmanoe:ade/jadwal-dinas/juni2026
Branches Tags
salmanoe:dev/technical-debt/clean-code
salmanoe:dev/integrasi/minio
salmanoe:master
salmanoe:prod/base
salmanoe:prod/no-cron
salmanoe:dev/no-cron
salmanoe:ade/add-master-shift/pagi-malem-2-1
salmanoe:dev/base
salmanoe:ade/logbook-tarif/non-kelas-eksekutif
salmanoe:ade/intervensi-cuti/bug-fixing-sisa-cuti
salmanoe:ade/absensi/remove-keterlambatan
salmanoe:ade/jadwal-dinas/juni2026
salmanoe:ade/reporting/modifikasi-printout-cuti
salmanoe:ade/bug-fixing/hapus-logbook
salmanoe:ade/monitoring-absensi/bug-fixing-absen-tunggal
salmanoe:ade/bug-remun/perbaikan-recursive-fixed-pay
salmanoe:ade/monitoring-absen/shift-pm3
salmanoe:ade/monitor-absen/shift-pm2
salmanoe:ade/monitor-absen/shift-pm
salmanoe:ade/monitoring/check-health4
salmanoe:ade/monitoring/check-health3
salmanoe:ade/monitoring/check-health2
salmanoe:ade/sdm-absensi/realisasi-absensi
salmanoe:ade/logbook-tarif/penyesuainruangan70persen
salmanoe:ade/logbook-tarif/ekslusi-dentalicious
salmanoe:ade/bug-fixing/master-shift-on-cuti
salmanoe:ade/bug-fixing/level-unitkerja-direktur
salmanoe:ade/mastershift-holidayservice-monitoringabsensi
salmanoe:ade/logbook/rekap-logbook-tarif
salmanoe:ade/bug-fixing/intervensi-cuti
salmanoe:dev-ade/sdm/intervensi-cuti
salmanoe:ade/bug-fixing/hak-akses-diskon-total
salmanoe:dev/billing/diskonpegawai
salmanoe:sdm/remunerasi/bug-fixing-pelayan-findPelayananBedah
salmanoe:dev/sdm/remunerasi
salmanoe:dev/remunerasi/bugfixingakumulasipersen
salmanoe:dev/pegawai/ws-example-ade-v2

No commits in common. "master" and "ade/jadwal-dinas/juni2026" have entirely different histories.
master ... ade/jadwal

7 changed files with 56 additions and 159 deletions
Show Stats Expand all files Collapse all files

2
jasamedika-bridging/src/main/webapp/WEB-INF/web.xml
View File

@ -15,7 +15,7 @@
</context-param>
<context-param>
<param-name>spring.profiles.default</param-name>
<param-value>bridging</param-value>
<param-value>localhost</param-value>
</context-param>
<listener>

4
jasamedika-business/src/main/java/com/jasamedika/medifirst2000/constants/Master.java
View File

@ -170,7 +170,6 @@ public final class Master {
public static final Integer KELAS_SATU = 3;
public static final Integer[] KELAS_SATU_VIP = { 3, 5, 8, 21 };
public static final Integer NON_KELAS = 6;
public static final Integer NON_KELAS_EKSEKUTIF = 22;
public static final Integer[] REF_KELAS_KAMAR = { 1, 2, 3, 5, 6, 8 };
}
@ -277,7 +276,6 @@ public final class Master {
public static final class MonitoringAbsensi {
public static final Integer BATAS_MULTI_FINGERPRINT = 10; // 10_Menit
public static final Long BATAS_TERLAMBAT = 15L; // 15_Menit
public static final Long BATAS_TERLAMBAT_01062026 = 0L; // 15_Menit
}
public static final class NilaiKelompokJabatan {
@ -393,7 +391,7 @@ public final class Master {
public static final String OPERATOR_FACTOR_RATE_NONSHIFT = "x";
public static final Integer[] PSM = { 31, 47, 106, 203, 204 }; // id shift kerja -> ada penambahan 203, 204
public static final Integer RESET = 0;
public static final Integer[] TUJUH_BELAS_JAM_SHIFT = { 22, 24, 31, 33, 46, 47, 50, 58, 64, 65, 66, 86, 91, 106, 114, 115, 203, 204, 216, 313, 314, 315, 316}; // id shift kerja -> ada penambahan 203, 204
public static final Integer[] TUJUH_BELAS_JAM_SHIFT = { 22, 24, 31, 33, 46, 47, 50, 58, 64, 65, 66, 86, 91, 106, 114, 115, 203, 204}; // id shift kerja -> ada penambahan 203, 204
}
public static final class StatusPegawai {

8
jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/PelayananPasienDao.java
View File

@ -197,7 +197,7 @@ public interface PelayananPasienDao extends JpaRepository<PelayananPasien, Strin
+ "when pd.kelompokPasienId = 5 then 6 " + "when pd.kelompokPasienId = 6 then 7 "
+ "when pd.kelompokPasienId = 3 then 8 " + "when pd.kelompokPasienId = 7 then 9 "
+ "else 10 end as sortIdKelompokPasien," + "kp.kelompokPasien as kelompokPasien," + "pp.kelasId as idKelas,"
+ "case when (pp.kelasId = 6 or pp.kelasId = 22) then 1 " + "when pp.kelasId = 1 then 2 " + "when pp.kelasId = 2 then 3 "
+ "case when pp.kelasId = 6 then 1 " + "when pp.kelasId = 1 then 2 " + "when pp.kelasId = 2 then 3 "
+ "when pp.kelasId = 3 then 4 " + "when pp.kelasId = 8 then 5 " + "when pp.kelasId = 5 then 6 "
+ "when pp.kelasId = 21 then 7 " + "else 8 end as sortIdKelas," + "kls.namaKelas as namaKelas,"
+ "ppp.noRec as idPelayananPasienPetugas," + "ppp.ObjectJenisPetugasPeId as idJenisPelaksana,"
@ -258,7 +258,7 @@ public interface PelayananPasienDao extends JpaRepository<PelayananPasien, Strin
+ "when pd.kelompokPasienId = 1 then 5 " + "when pd.kelompokPasienId = 5 then 6 "
+ "when pd.kelompokPasienId = 6 then 7 " + "when pd.kelompokPasienId = 3 then 8 "
+ "when pd.kelompokPasienId = 7 then 9 " + "else 10 end," + "kp.kelompokPasien," + "pp.kelasId,"
+ "case when (pp.kelasId = 6 or pp.kelasId = 22) then 1 " + "when pp.kelasId = 1 then 2 " + "when pp.kelasId = 2 then 3 "
+ "case when pp.kelasId = 6 then 1 " + "when pp.kelasId = 1 then 2 " + "when pp.kelasId = 2 then 3 "
+ "when pp.kelasId = 3 then 4 " + "when pp.kelasId = 8 then 5 " + "when pp.kelasId = 5 then 6 "
+ "when pp.kelasId = 21 then 7 " + "else 8 end," + "kls.namaKelas," + "ppp.noRec,"
+ "ppp.ObjectJenisPetugasPeId,ppp.ObjectPegawaiId,"
@ -273,7 +273,7 @@ public interface PelayananPasienDao extends JpaRepository<PelayananPasien, Strin
+ "when pd.kelompokPasienId = 9 then 4 " + "when pd.kelompokPasienId = 1 then 5 "
+ "when pd.kelompokPasienId = 5 then 6 " + "when pd.kelompokPasienId = 6 then 7 "
+ "when pd.kelompokPasienId = 3 then 8 " + "when pd.kelompokPasienId = 7 then 9 " + "else 10 end asc, "
+ "pp.tglPelayanan, " + "pp.hargaJual, " + "case when (pp.kelasId = 6 or pp.kelasId = 22) then 1 "
+ "pp.tglPelayanan, " + "pp.hargaJual, " + "case when pp.kelasId = 6 then 1 "
+ "when pp.kelasId = 1 then 2 " + "when pp.kelasId = 2 then 3 " + "when pp.kelasId = 3 then 4 "
+ "when pp.kelasId = 8 then 5 " + "when pp.kelasId = 5 then 6 " + "when pp.kelasId = 21 then 7 "
+ "else 8 end asc," + "pr.namaProduk";
@ -301,7 +301,7 @@ public interface PelayananPasienDao extends JpaRepository<PelayananPasien, Strin
+ "order by case when kp.id = 2 then 1 when kp.id = 4 then 2 when kp.id = 8 then 3 when kp.id = 9 then 4 "
+ "when kp.id = 1 then 5 when kp.id = 5 then 6 when kp.id = 6 then 7 when kp.id = 3 then 8 when kp.id = 7 then 9 else 10 end asc, "
+ "pp.tglPelayanan, " + "pp.hargaJual, "
+ "case when (kls.id = 6 or kls.id = 22) then 1 when kls.id = 1 then 2 when kls.id = 2 then 3 when kls.id =3 then 4 when kls.id = 8 then 5 when kls.id = 5 then 6 when kls.id = 21 then 7 else 8 end asc,"
+ "case when kls.id = 6 then 1 when kls.id = 1 then 2 when kls.id = 2 then 3 when kls.id =3 then 4 when kls.id = 8 then 5 when kls.id = 5 then 6 when kls.id = 21 then 7 else 8 end asc,"
+ "pr.namaProduk")
List<Map<String, Object>> findPelayananPasienByPetugasAndPelayananPasien(@Param("pegawaiId") Integer idPegawai,
@Param("norecs") List<String> norecs);

2
jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/JatahCutiDanIzinServiceImpl.java
View File

@ -320,7 +320,7 @@ public class JatahCutiDanIzinServiceImpl implements JatahCutiDanIzinService {
cutiTerpakaiB = cutiTerpakaiN;
} else {
sisaCutiB = 0 + getDataIntervensiCutiB;
sisaCutiB = 0;
cutiTerpakaiB = dataCutiB;
}
cutiIzinBuilder.sisaCutiB2(sisaCutiB2);

153
jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/MonitoringAbsenServiceImpl.java
View File

@ -512,15 +512,8 @@ public class MonitoringAbsenServiceImpl extends BaseVoServiceImpl implements Mon
if (((Integer) jamEfektif.get("hariKerja")) != 0) {
harikerja += (Integer) jamEfektif.get("hariKerja");
kehadiran.put("pulangAwal", reduceTime(jadwalPulang, absensiDate));
if((absensiMasuk.before(new Date(1780272000000L)) || absensiMasuk.equals(new Date(1780272000000L)))){
if (terlambat > Master.MonitoringAbsensi.BATAS_TERLAMBAT) {
kehadiran.put("terlambat", terlambat);
}
}else{
if (terlambat > Master.MonitoringAbsensi.BATAS_TERLAMBAT_01062026) {
kehadiran.put("terlambat", terlambat);
}
if (terlambat > 15) {
kehadiran.put("terlambat", terlambat);
}
}
}
@ -943,7 +936,8 @@ public class MonitoringAbsenServiceImpl extends BaseVoServiceImpl implements Mon
e.printStackTrace();
}
if (CommonUtil.isNotNullOrEmpty(data.get("namaShift")) && ((data.get("namaShift").equals("Pagi Malam")) || (data.get("namaShift").equals("Pagi Malam 2")) || (data.get("namaShift").equals("Non Shift MOD")))) {
if (CommonUtil.isNotNullOrEmpty(data.get("namaShift")) && ((data.get("namaShift").equals("Pagi Malam"))
|| (data.get("namaShift").equals("Non Shift MOD")))) {
try {
List<Map<String, Object>> listAbsensiPagi = new ArrayList<>();
List<Map<String, Object>> listAbsensiPM = new ArrayList<>();
@ -951,7 +945,7 @@ public class MonitoringAbsenServiceImpl extends BaseVoServiceImpl implements Mon
Map<String, Object> detailShiftPMPagi = new HashMap<>();
Map<String, Object> detailShiftPMMalam = new HashMap<>();
if ((data.get("namaShift").equals("Pagi Malam")) || (data.get("namaShift").equals("Pagi Malam 2"))) {
if ((data.get("namaShift").equals("Pagi Malam"))) {
detailShiftPMPagi = monitoringAbsenDao.findShiftPMDetail(
Integer.parseInt(data.get("idKelompokShiftKerja").toString()), "Pagi", "P");
detailShiftPMMalam = monitoringAbsenDao.findShiftPMDetail(
@ -1052,21 +1046,11 @@ public class MonitoringAbsenServiceImpl extends BaseVoServiceImpl implements Mon
dataPM.put("absensiMasuk", sdf.format(time));
terlambat = reduceTime(absensiDate, jadwalMasuk);
absensiMasuk = absensiDate;
if((absensiMasuk.before(new Date(1780272000000L)) || absensiMasuk.equals(new Date(1780272000000L)))){
if (terlambat > Master.MonitoringAbsensi.BATAS_TERLAMBAT) {
jumlahCountTerlambat += 1;
jumlahTerlambat += terlambat;
dataPM.put("terlambat", terlambat);
dataPM.put("telat", terlambat.toString());
}
}else{
if (terlambat > Master.MonitoringAbsensi.BATAS_TERLAMBAT_01062026) {
jumlahCountTerlambat += 1;
jumlahTerlambat += terlambat;
dataPM.put("terlambat", terlambat);
dataPM.put("telat", terlambat.toString());
}
if (terlambat > Master.MonitoringAbsensi.BATAS_TERLAMBAT) {
jumlahCountTerlambat += 1;
jumlahTerlambat += terlambat;
dataPM.put("terlambat", terlambat);
dataPM.put("telat", terlambat.toString());
}
} else if (count == index) {
dataPM.put("absensiPulang", sdf.format(time));
@ -1214,23 +1198,12 @@ public class MonitoringAbsenServiceImpl extends BaseVoServiceImpl implements Mon
data.put("absensiMasuk", sdf.format(time));
terlambat = reduceTime(absensiDate, jadwalMasuk);
absensiMasuk = absensiDate;
if((absensiMasuk.before(new Date(1780272000000L)) || absensiMasuk.equals(new Date(1780272000000L)))){
if (terlambat > Master.MonitoringAbsensi.BATAS_TERLAMBAT) {
jumlahCountTerlambat += 1;
jumlahTerlambat += terlambat;
data.put("terlambat", terlambat);
data.put("telat", terlambat.toString());
}
}else{
if (terlambat > Master.MonitoringAbsensi.BATAS_TERLAMBAT_01062026) {
jumlahCountTerlambat += 1;
jumlahTerlambat += terlambat;
data.put("terlambat", terlambat);
data.put("telat", terlambat.toString());
}
if (terlambat > Master.MonitoringAbsensi.BATAS_TERLAMBAT) {
jumlahCountTerlambat += 1;
jumlahTerlambat += terlambat;
data.put("terlambat", terlambat);
data.put("telat", terlambat.toString());
}
} else if (count == index) {
data.put("absensiPulang", sdf.format(time));
kelebihanJamKerja = reduceTime(absensiDate, jadwalPulang);
@ -1685,7 +1658,7 @@ public class MonitoringAbsenServiceImpl extends BaseVoServiceImpl implements Mon
e.printStackTrace();
}
if (CommonUtil.isNotNullOrEmpty(data.get("namaShift")) && ((data.get("namaShift").equals("Pagi Malam")) || (data.get("namaShift").equals("Pagi Malam 2")) || (data.get("namaShift").equals("Non Shift MOD")))) {
if (CommonUtil.isNotNullOrEmpty(data.get("namaShift")) && ((data.get("namaShift").equals("Pagi Malam")) || (data.get("namaShift").equals("Non Shift MOD")))) {
//if (CommonUtil.isNotNullOrEmpty(data.get("namaShift")) && (data.get("namaShift").equals("Non Shift MOD"))) {
try {
List<Map<String, Object>> listAbsensiPagi = new ArrayList<>();
@ -1694,7 +1667,7 @@ public class MonitoringAbsenServiceImpl extends BaseVoServiceImpl implements Mon
Map<String, Object> detailShiftPMPagi = new HashMap<>();
Map<String, Object> detailShiftPMMalam = new HashMap<>();
if ((data.get("namaShift").equals("Pagi Malam")) || (data.get("namaShift").equals("Pagi Malam 2"))) {
if ((data.get("namaShift").equals("Pagi Malam"))) {
detailShiftPMPagi = monitoringAbsenDao.findShiftPMDetail(
Integer.parseInt(data.get("idKelompokShiftKerja").toString()), "Pagi", "P");
detailShiftPMMalam = monitoringAbsenDao.findShiftPMDetail(
@ -1809,21 +1782,11 @@ public class MonitoringAbsenServiceImpl extends BaseVoServiceImpl implements Mon
}
terlambat = reduceTime(absensiDate, jadwalMasuk);
absensiMasuk = absensiDate;
if((absensiMasuk.before(new Date(1780272000000L)) || absensiMasuk.equals(new Date(1780272000000L)))){
if (terlambat > Master.MonitoringAbsensi.BATAS_TERLAMBAT) {
jumlahCountTerlambat += 1;
jumlahTerlambat += terlambat;
dataPM.put("terlambat", terlambat);
dataPM.put("telat", terlambat.toString());
}
}else{
if (terlambat > Master.MonitoringAbsensi.BATAS_TERLAMBAT_01062026) {
jumlahCountTerlambat += 1;
jumlahTerlambat += terlambat;
dataPM.put("terlambat", terlambat);
dataPM.put("telat", terlambat.toString());
}
if (terlambat > Master.MonitoringAbsensi.BATAS_TERLAMBAT) {
jumlahCountTerlambat += 1;
jumlahTerlambat += terlambat;
dataPM.put("terlambat", terlambat);
dataPM.put("telat", terlambat.toString());
}
} else if (count == index) {
listTrNo.add(Integer.parseInt(temp.get("tr_no").toString()));
@ -2128,23 +2091,12 @@ public class MonitoringAbsenServiceImpl extends BaseVoServiceImpl implements Mon
}
terlambat = reduceTime(absensiDate, jadwalMasuk);
absensiMasuk = absensiDate;
if((absensiMasuk.before(new Date(1780272000000L)) || absensiMasuk.equals(new Date(1780272000000L)))){
if (terlambat > Master.MonitoringAbsensi.BATAS_TERLAMBAT) {
jumlahCountTerlambat += 1;
jumlahTerlambat += terlambat;
data.put("terlambat", terlambat);
data.put("telat", terlambat.toString());
}
}else{
if (terlambat > Master.MonitoringAbsensi.BATAS_TERLAMBAT_01062026) {
jumlahCountTerlambat += 1;
jumlahTerlambat += terlambat;
data.put("terlambat", terlambat);
data.put("telat", terlambat.toString());
}
if (terlambat > Master.MonitoringAbsensi.BATAS_TERLAMBAT) {
jumlahCountTerlambat += 1;
jumlahTerlambat += terlambat;
data.put("terlambat", terlambat);
data.put("telat", terlambat.toString());
}
} else if (count == index) {
listTrNo.add(Integer.parseInt(temp.get("tr_no").toString()));
data.put("absensiPulang", sdf.format(time));
@ -3710,19 +3662,10 @@ public class MonitoringAbsenServiceImpl extends BaseVoServiceImpl implements Mon
kehadiran.put("pulangAwal", reduceTime(jadwalPulang, absensiDate));
kehadiran.put("pulangCepat", (reduceTime(jadwalPulang, absensiDate)).toString());
jumlahPulangAwal += reduceTime(jadwalPulang, absensiDate);
if((absensiMasuk.before(new Date(1780272000000L)) || absensiMasuk.equals(new Date(1780272000000L)))){
if (terlambat > Master.MonitoringAbsensi.BATAS_TERLAMBAT) {
jumlahTerlambat += terlambat;
kehadiran.put("terlambat", terlambat);
kehadiran.put("telat", terlambat.toString());
}
}else{
if (terlambat > Master.MonitoringAbsensi.BATAS_TERLAMBAT_01062026) {
jumlahTerlambat += terlambat;
kehadiran.put("terlambat", terlambat);
kehadiran.put("telat", terlambat.toString());
}
if (terlambat > 15) {
jumlahTerlambat += terlambat;
kehadiran.put("terlambat", terlambat);
kehadiran.put("telat", terlambat.toString());
}
if (CommonUtil.isNotNullOrEmpty(data.get("idKelompokShiftKerja"))) {
@ -4261,19 +4204,10 @@ public class MonitoringAbsenServiceImpl extends BaseVoServiceImpl implements Mon
kehadiran.put("pulangAwal", reduceTime(jadwalPulang, absensiDate));
kehadiran.put("pulangCepat", (reduceTime(jadwalPulang, absensiDate)).toString());
jumlahPulangAwal += reduceTime(jadwalPulang, absensiDate);
if((absensiMasuk.before(new Date(1780272000000L)) || absensiMasuk.equals(new Date(1780272000000L)))){
if (terlambat > Master.MonitoringAbsensi.BATAS_TERLAMBAT) {
jumlahTerlambat += terlambat;
kehadiran.put("terlambat", terlambat);
kehadiran.put("telat", terlambat.toString());
}
}else{
if (terlambat > Master.MonitoringAbsensi.BATAS_TERLAMBAT_01062026) {
jumlahTerlambat += terlambat;
kehadiran.put("terlambat", terlambat);
kehadiran.put("telat", terlambat.toString());
}
if (terlambat > 15) {
jumlahTerlambat += terlambat;
kehadiran.put("terlambat", terlambat);
kehadiran.put("telat", terlambat.toString());
}
if (CommonUtil.isNotNullOrEmpty(data.get("idKelompokShiftKerja"))) {
@ -4651,19 +4585,10 @@ public class MonitoringAbsenServiceImpl extends BaseVoServiceImpl implements Mon
data.put("pulangAwal", reduceTime(jadwalPulang, absensiDate));
data.put("pulangCepat", (reduceTime(jadwalPulang, absensiDate)).toString());
jumlahPulangAwal += reduceTime(jadwalPulang, absensiDate);
if((absensiMasuk.before(new Date(1780272000000L)) || absensiMasuk.equals(new Date(1780272000000L)))){
if (terlambat > Master.MonitoringAbsensi.BATAS_TERLAMBAT) {
jumlahTerlambat += terlambat;
data.put("terlambat", terlambat);
data.put("telat", terlambat.toString());
}
}else{
if (terlambat > Master.MonitoringAbsensi.BATAS_TERLAMBAT_01062026) {
jumlahTerlambat += terlambat;
data.put("terlambat", terlambat);
data.put("telat", terlambat.toString());
}
if (terlambat > 15) {
jumlahTerlambat += terlambat;
data.put("terlambat", terlambat);
data.put("telat", terlambat.toString());
}
if (CommonUtil.isNotNullOrEmpty(data.get("idKelompokShiftKerja"))) {

25
jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PelayananPasienServiceImpl.java
View File

@ -38,7 +38,6 @@ import static com.jasamedika.medifirst2000.constants.Master.JenisProduk.OBAT_ALK
import static com.jasamedika.medifirst2000.constants.Master.KONSUL_VISIT;
import static com.jasamedika.medifirst2000.constants.Master.KategoryPegawai.DOKTER_LUAR;
import static com.jasamedika.medifirst2000.constants.Master.Kelas.NON_KELAS;
import static com.jasamedika.medifirst2000.constants.Master.Kelas.NON_KELAS_EKSEKUTIF;
import static com.jasamedika.medifirst2000.constants.Master.KelompokPasien.KELOMPOK_BPJS;
import static com.jasamedika.medifirst2000.constants.Master.KelompokUser.TATA_REKENING;
import static com.jasamedika.medifirst2000.constants.Master.KomponenHarga.*;
@ -1996,10 +1995,8 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
.map(d -> d.get("paketId").toString() + d.get("idKelas").toString()).collect(Collectors.toList()));
allConcatProdukKelas.addAll(listData.stream().filter(d -> CommonUtil.isNotNullOrEmpty(d.get("idProduk")))
.map(d -> d.get("idProduk").toString() + d.get("idKelas").toString()).collect(Collectors.toList()));
List<HargaNettoProdukByKelasD> tarifDetailReguler = hargaNettoProdukByKelasDDao
.findByConcateProdukKelas(allConcatProdukKelas);
List<String> allConcatProdukNonkelas = listData.stream()
.filter(d -> CommonUtil.isNotNullOrEmpty(d.get("regRefId")))
.map(d -> d.get("regRefId").toString() + NON_KELAS).collect(Collectors.toList());
@ -2007,18 +2004,6 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
.map(d -> d.get("paketId").toString() + NON_KELAS).collect(Collectors.toList()));
allConcatProdukNonkelas.addAll(listData.stream().filter(d -> CommonUtil.isNotNullOrEmpty(d.get("idProduk")))
.map(d -> d.get("idProduk").toString() + NON_KELAS).collect(Collectors.toList()));
List<String> allConcatProdukNonkelasEksekutif = listData.stream()
.filter(d -> CommonUtil.isNotNullOrEmpty(d.get("regRefId")))
.map(d -> d.get("regRefId").toString() + NON_KELAS_EKSEKUTIF).collect(Collectors.toList());
allConcatProdukNonkelasEksekutif.addAll(listData.stream().filter(d -> CommonUtil.isNotNullOrEmpty(d.get("paketId")))
.map(d -> d.get("paketId").toString() + NON_KELAS_EKSEKUTIF).collect(Collectors.toList()));
allConcatProdukNonkelasEksekutif.addAll(listData.stream().filter(d -> CommonUtil.isNotNullOrEmpty(d.get("idProduk")))
.map(d -> d.get("idProduk").toString() + NON_KELAS_EKSEKUTIF).collect(Collectors.toList()));
allConcatProdukNonkelas.addAll(allConcatProdukNonkelasEksekutif);
List<HargaNettoProdukByKelasD> tarifDetailNonKelas = hargaNettoProdukByKelasDDao
.findByConcateProdukKelas(allConcatProdukNonkelas);
Set<Map<String, Object>> ibuPaketDiRanapByDokter = pelayananPasienDao.findPasienPaketDiRanapByDokter(drKsmObgyn,
@ -2068,7 +2053,7 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
} else {
Optional<HargaNettoProdukByKelasD> byDetailTarifNonKelas = tarifDetailNonKelas.stream()
.filter(dt -> dt.getProdukId().equals(d.get("paketId")))
.filter(dt -> dt.getKelasId().equals(NON_KELAS) || dt.getKelasId().equals(NON_KELAS_EKSEKUTIF))
.filter(dt -> dt.getKelasId().equals(NON_KELAS))
.filter(dt -> dt.getKomponenHargaId().equals(SPOG_OPERATOR)).findFirst();
byDetailTarifNonKelas.ifPresent(hargaNettoProdukByKelasD -> d.put("hargaJasa",
CommonUtil.isNotNullOrEmpty(byDetailTarifNonKelas.get().getHargaNetto1())
@ -2087,7 +2072,7 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
} else {
Optional<HargaNettoProdukByKelasD> byDetailTarifNonKelas = tarifDetailNonKelas.stream()
.filter(dt -> dt.getProdukId().equals(d.get("paketId")))
.filter(dt -> dt.getKelasId().equals(NON_KELAS) || dt.getKelasId().equals(NON_KELAS_EKSEKUTIF))
.filter(dt -> dt.getKelasId().equals(NON_KELAS))
.filter(dt -> dt.getKomponenHargaId().equals(SPOG_ASISTEN)).findFirst();
byDetailTarifNonKelas.ifPresent(hargaNettoProdukByKelasD -> d.put("hargaJasa",
CommonUtil.isNotNullOrEmpty(byDetailTarifNonKelas.get().getHargaNetto1())
@ -2105,7 +2090,7 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
} else {
Optional<HargaNettoProdukByKelasD> byDetailTarifNonKelas = tarifDetailNonKelas.stream()
.filter(dt -> dt.getProdukId().equals(d.get("idProduk")))
.filter(dt -> dt.getKelasId().equals(NON_KELAS) || dt.getKelasId().equals(NON_KELAS_EKSEKUTIF))
.filter(dt -> dt.getKelasId().equals(NON_KELAS))
.filter(dt -> dt.getKomponenHargaId().equals(JASA_DOKTER)).findFirst();
byDetailTarifNonKelas.ifPresent(hargaNettoProdukByKelasD -> d.put("hargaJasa",
CommonUtil.isNotNullOrEmpty(byDetailTarifNonKelas.get().getHargaNetto1())
@ -2123,7 +2108,7 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
} else {
Optional<HargaNettoProdukByKelasD> byDetailTarifNonKelas = tarifDetailNonKelas.stream()
.filter(dt -> dt.getProdukId().equals(d.get("idProduk")))
.filter(dt -> dt.getKelasId().equals(NON_KELAS) || dt.getKelasId().equals(NON_KELAS_EKSEKUTIF))
.filter(dt -> dt.getKelasId().equals(NON_KELAS))
.filter(dt -> dt.getKomponenHargaId().equals(JASA_ASISTEN_SPESIALIS)).findFirst();
byDetailTarifNonKelas.ifPresent(hargaNettoProdukByKelasD -> d.put("hargaJasa",
CommonUtil.isNotNullOrEmpty(byDetailTarifNonKelas.get().getHargaNetto1())
@ -2141,7 +2126,7 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
} else {
Optional<HargaNettoProdukByKelasD> byDetailTarifNonKelas = tarifDetailNonKelas.stream()
.filter(dt -> dt.getProdukId().equals(d.get("idProduk")))
.filter(dt -> dt.getKelasId().equals(NON_KELAS) || dt.getKelasId().equals(NON_KELAS_EKSEKUTIF))
.filter(dt -> dt.getKelasId().equals(NON_KELAS))
.filter(dt -> dt.getKomponenHargaId().equals(JASA_DOKTER_ANASTESI)).findFirst();
byDetailTarifNonKelas.ifPresent(hargaNettoProdukByKelasD -> d.put("hargaJasa",
CommonUtil.isNotNullOrEmpty(byDetailTarifNonKelas.get().getHargaNetto1())

21
jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/RemunerasiServiceImpl.java
View File

@ -33,7 +33,6 @@ import static com.jasamedika.medifirst2000.constants.Master.GolonganProduk.KONSU
import static com.jasamedika.medifirst2000.constants.Master.GolonganProduk.VISIT;
import static com.jasamedika.medifirst2000.constants.Master.JenisPetugasPelaksana.*;
import static com.jasamedika.medifirst2000.constants.Master.Kelas.NON_KELAS;
import static com.jasamedika.medifirst2000.constants.Master.Kelas.NON_KELAS_EKSEKUTIF;
import static com.jasamedika.medifirst2000.constants.Master.KelompokPasien.KELOMPOK_BPJS;
import static com.jasamedika.medifirst2000.constants.Master.KomponenHarga.*;
import static com.jasamedika.medifirst2000.constants.Master.Profesi.TERAPI;
@ -1896,18 +1895,8 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera
.map(d -> d.get("paketId").toString() + NON_KELAS).collect(Collectors.toList()));
allConcatProdukNonkelas.addAll(listData.stream().filter(d -> CommonUtil.isNotNullOrEmpty(d.get("idProduk")))
.map(d -> d.get("idProduk").toString() + NON_KELAS).collect(Collectors.toList()));
List<String> allConcatProdukNonkelasEksekutif = listData.stream()
.filter(d -> CommonUtil.isNotNullOrEmpty(d.get("regRefId")))
.map(d -> d.get("regRefId").toString() + NON_KELAS_EKSEKUTIF).collect(Collectors.toList());
allConcatProdukNonkelasEksekutif.addAll(listData.stream().filter(d -> CommonUtil.isNotNullOrEmpty(d.get("paketId")))
.map(d -> d.get("paketId").toString() + NON_KELAS_EKSEKUTIF).collect(Collectors.toList()));
allConcatProdukNonkelasEksekutif.addAll(listData.stream().filter(d -> CommonUtil.isNotNullOrEmpty(d.get("idProduk")))
.map(d -> d.get("idProduk").toString() + NON_KELAS_EKSEKUTIF).collect(Collectors.toList()));
//List<HargaNettoProdukByKelasD> tarifDetailNonKelas = hargaNettoProdukByKelasDDao.findByConcateProdukKelas(allConcatProdukNonkelas); // Ganti Versi batching
allConcatProdukNonkelas.addAll(allConcatProdukNonkelasEksekutif);
final int BATCH_SIZE_NB = Master.AppDefaultVariabel.RECURSIVE_BATCH;
int totalNB = allConcatProdukNonkelas.size();
List<HargaNettoProdukByKelasD> tarifDetailNonKelas = new ArrayList<>();
@ -1964,7 +1953,7 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera
} else {
Optional<HargaNettoProdukByKelasD> byDetailTarifNonKelas = tarifDetailNonKelas.stream()
.filter(dt -> dt.getProdukId().equals(d.get("paketId")))
.filter(dt -> dt.getKelasId().equals(NON_KELAS) || dt.getKelasId().equals(NON_KELAS_EKSEKUTIF))
.filter(dt -> dt.getKelasId().equals(NON_KELAS))
.filter(dt -> dt.getKomponenHargaId().equals(SPOG_OPERATOR)).findFirst();
byDetailTarifNonKelas.ifPresent(hargaNettoProdukByKelasD -> d.put("hargaJasa",
CommonUtil.isNotNullOrEmpty(byDetailTarifNonKelas.get().getHargaNetto1())
@ -1983,7 +1972,7 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera
} else {
Optional<HargaNettoProdukByKelasD> byDetailTarifNonKelas = tarifDetailNonKelas.stream()
.filter(dt -> dt.getProdukId().equals(d.get("paketId")))
.filter(dt -> dt.getKelasId().equals(NON_KELAS) || dt.getKelasId().equals(NON_KELAS_EKSEKUTIF))
.filter(dt -> dt.getKelasId().equals(NON_KELAS))
.filter(dt -> dt.getKomponenHargaId().equals(SPOG_ASISTEN)).findFirst();
byDetailTarifNonKelas.ifPresent(hargaNettoProdukByKelasD -> d.put("hargaJasa",
CommonUtil.isNotNullOrEmpty(byDetailTarifNonKelas.get().getHargaNetto1())
@ -2005,7 +1994,7 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera
} else {
Optional<HargaNettoProdukByKelasD> byDetailTarifNonKelas = tarifDetailNonKelas.stream()
.filter(dt -> dt.getProdukId().equals(d.get("idProduk")))
.filter(dt -> dt.getKelasId().equals(NON_KELAS) || dt.getKelasId().equals(NON_KELAS_EKSEKUTIF))
.filter(dt -> dt.getKelasId().equals(NON_KELAS))
.filter(dt -> dt.getKomponenHargaId().equals(JASA_DOKTER)).findFirst();
byDetailTarifNonKelas.ifPresent(hargaNettoProdukByKelasD -> d.put("hargaJasa",
CommonUtil.isNotNullOrEmpty(byDetailTarifNonKelas.get().getHargaNetto1())
@ -2027,7 +2016,7 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera
} else {
Optional<HargaNettoProdukByKelasD> byDetailTarifNonKelas = tarifDetailNonKelas.stream()
.filter(dt -> dt.getProdukId().equals(d.get("idProduk")))
.filter(dt -> dt.getKelasId().equals(NON_KELAS) || dt.getKelasId().equals(NON_KELAS_EKSEKUTIF))
.filter(dt -> dt.getKelasId().equals(NON_KELAS))
.filter(dt -> dt.getKomponenHargaId().equals(JASA_ASISTEN_SPESIALIS)).findFirst();
byDetailTarifNonKelas.ifPresent(hargaNettoProdukByKelasD -> d.put("hargaJasa",
CommonUtil.isNotNullOrEmpty(byDetailTarifNonKelas.get().getHargaNetto1())
@ -2049,7 +2038,7 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera
} else {
Optional<HargaNettoProdukByKelasD> byDetailTarifNonKelas = tarifDetailNonKelas.stream()
.filter(dt -> dt.getProdukId().equals(d.get("idProduk")))
.filter(dt -> dt.getKelasId().equals(NON_KELAS) || dt.getKelasId().equals(NON_KELAS_EKSEKUTIF))
.filter(dt -> dt.getKelasId().equals(NON_KELAS))
.filter(dt -> dt.getKomponenHargaId().equals(JASA_DOKTER_ANASTESI)).findFirst();
byDetailTarifNonKelas.ifPresent(hargaNettoProdukByKelasD -> d.put("hargaJasa",
CommonUtil.isNotNullOrEmpty(byDetailTarifNonKelas.get().getHargaNetto1())