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

Compare commits

base: salmanoe:1edf19a2382ff6cbe5326fb8d2a8511ee8bd6412
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/absensi/remove-keterlambatan
salmanoe:dev/base
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:8b0aac3ec765c4d0848706ef891540675a3f5610
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/absensi/remove-keterlambatan
salmanoe:dev/base
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. "1edf19a2382ff6cbe5326fb8d2a8511ee8bd6412" and "8b0aac3ec765c4d0848706ef891540675a3f5610" have entirely different histories.
1edf19a238 ... 8b0aac3ec7

2 changed files with 12 additions and 28 deletions
Show Stats Expand all files Collapse all files

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

@ -1076,7 +1076,7 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera
|| CATHLAB.equals(next.get("idRuangan")))) { || CATHLAB.equals(next.get("idRuangan")))) {
listPelayananRemun.add(next); listPelayananRemun.add(next);
capaianRemun += Double.parseDouble(next.get("hargaJasa").toString()); capaianRemun += Double.parseDouble(next.get("hargaJasa").toString());
} else if ( (KK_UMUM.equals(idKKDokter) || idPegawai.equals(1249) ) } else if (KK_UMUM.equals(idKKDokter)
&& idsDokterUmumIGD.contains(Integer.parseInt(next.get("idProduk").toString())) && idsDokterUmumIGD.contains(Integer.parseInt(next.get("idProduk").toString()))
&& (tglAwal.equals(tmtTarif2024) || tglAwal.after(tmtTarif2024))) { && (tglAwal.equals(tmtTarif2024) || tglAwal.after(tmtTarif2024))) {
/* /*
@ -1117,7 +1117,7 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera
if (CommonUtil.isNotNullOrEmpty(next.get("idDetailJenisProduk")) && listDetailJenisProduk if (CommonUtil.isNotNullOrEmpty(next.get("idDetailJenisProduk")) && listDetailJenisProduk
.contains(Integer.parseInt(next.get("idDetailJenisProduk").toString()))) { .contains(Integer.parseInt(next.get("idDetailJenisProduk").toString()))) {
if (!idsPerawat.contains(Integer.parseInt(next.get("idProduk").toString())) if (!idsPerawat.contains(Integer.parseInt(next.get("idProduk").toString()))
|| ( (KK_UMUM.equals(idKKDokter) || idPegawai.equals(1249)) || (KK_UMUM.equals(idKKDokter)
&& !idsDokterUmumExclude && !idsDokterUmumExclude
.contains(Integer.parseInt(next.get("idProduk").toString())) .contains(Integer.parseInt(next.get("idProduk").toString()))
&& tglAwal.before(tmtTarif2024))) { && tglAwal.before(tmtTarif2024))) {
@ -1147,7 +1147,7 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera
|| (CommonUtil.isNotNullOrEmpty(next.get("idDetailJenisProduk")) || (CommonUtil.isNotNullOrEmpty(next.get("idDetailJenisProduk"))
&& !listDetailJenisProduk.contains( && !listDetailJenisProduk.contains(
Integer.parseInt(next.get("idDetailJenisProduk").toString())))) Integer.parseInt(next.get("idDetailJenisProduk").toString()))))
&& IGD.equals(next.get("idDepartemen")) && (KK_UMUM.equals(idKKDokter) || idPegawai.equals(1249)) && IGD.equals(next.get("idDepartemen")) && KK_UMUM.equals(idKKDokter)
&& idsDokterUmumIGD.contains(Integer.parseInt(next.get("idProduk").toString())) && idsDokterUmumIGD.contains(Integer.parseInt(next.get("idProduk").toString()))
&& tglAwal.before(tmtTarif2024)) { && tglAwal.before(tmtTarif2024)) {
/* /*
@ -1190,7 +1190,7 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera
* Diluar pembatasan jenis produk * Diluar pembatasan jenis produk
*/ */
if (!idsPerawat.contains(Integer.parseInt(next.get("idProduk").toString())) if (!idsPerawat.contains(Integer.parseInt(next.get("idProduk").toString()))
|| ( (KK_UMUM.equals(idKKDokter) || idPegawai.equals(1249)) || (KK_UMUM.equals(idKKDokter)
&& !idsDokterUmumExclude && !idsDokterUmumExclude
.contains(Integer.parseInt(next.get("idProduk").toString())) .contains(Integer.parseInt(next.get("idProduk").toString()))
&& tglAwal.before(tmtTarif2024))) { && tglAwal.before(tmtTarif2024))) {
@ -1271,7 +1271,7 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera
|| CATHLAB.equals(next.get("idRuangan")))) { || CATHLAB.equals(next.get("idRuangan")))) {
listPelayananRemun.add(next); listPelayananRemun.add(next);
capaianRemun += Double.parseDouble(next.get("hargaJasa").toString()); capaianRemun += Double.parseDouble(next.get("hargaJasa").toString());
} else if ( (KK_UMUM.equals(idKKDokter) || idPegawai.equals(1249)) } else if (KK_UMUM.equals(idKKDokter)
&& idsDokterUmumIGD.contains(Integer.parseInt(next.get("idProduk").toString())) && idsDokterUmumIGD.contains(Integer.parseInt(next.get("idProduk").toString()))
&& (tglAwal.equals(tmtTarif2024) || tglAwal.after(tmtTarif2024))) { && (tglAwal.equals(tmtTarif2024) || tglAwal.after(tmtTarif2024))) {
/* /*
@ -1312,7 +1312,7 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera
if (CommonUtil.isNotNullOrEmpty(next.get("idDetailJenisProduk")) && listDetailJenisProduk if (CommonUtil.isNotNullOrEmpty(next.get("idDetailJenisProduk")) && listDetailJenisProduk
.contains(Integer.parseInt(next.get("idDetailJenisProduk").toString()))) { .contains(Integer.parseInt(next.get("idDetailJenisProduk").toString()))) {
if (!idsPerawat.contains(Integer.parseInt(next.get("idProduk").toString())) if (!idsPerawat.contains(Integer.parseInt(next.get("idProduk").toString()))
|| ( (KK_UMUM.equals(idKKDokter) || idPegawai.equals(1249)) || (KK_UMUM.equals(idKKDokter)
&& !idsDokterUmumExclude && !idsDokterUmumExclude
.contains(Integer.parseInt(next.get("idProduk").toString())) .contains(Integer.parseInt(next.get("idProduk").toString()))
&& tglAwal.before(tmtTarif2024))) { && tglAwal.before(tmtTarif2024))) {
@ -1342,7 +1342,7 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera
|| (CommonUtil.isNotNullOrEmpty(next.get("idDetailJenisProduk")) || (CommonUtil.isNotNullOrEmpty(next.get("idDetailJenisProduk"))
&& !listDetailJenisProduk.contains( && !listDetailJenisProduk.contains(
Integer.parseInt(next.get("idDetailJenisProduk").toString())))) Integer.parseInt(next.get("idDetailJenisProduk").toString()))))
&& IGD.equals(next.get("idDepartemen")) && (KK_UMUM.equals(idKKDokter) || idPegawai.equals(1249)) && IGD.equals(next.get("idDepartemen")) && KK_UMUM.equals(idKKDokter)
&& idsDokterUmumIGD.contains(Integer.parseInt(next.get("idProduk").toString())) && idsDokterUmumIGD.contains(Integer.parseInt(next.get("idProduk").toString()))
&& tglAwal.before(tmtTarif2024)) { && tglAwal.before(tmtTarif2024)) {
/* /*
@ -1385,7 +1385,7 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera
* Diluar pembatasan jenis produk * Diluar pembatasan jenis produk
*/ */
if (!idsPerawat.contains(Integer.parseInt(next.get("idProduk").toString())) if (!idsPerawat.contains(Integer.parseInt(next.get("idProduk").toString()))
|| ( (KK_UMUM.equals(idKKDokter) || idPegawai.equals(1249)) || (KK_UMUM.equals(idKKDokter)
&& !idsDokterUmumExclude && !idsDokterUmumExclude
.contains(Integer.parseInt(next.get("idProduk").toString())) .contains(Integer.parseInt(next.get("idProduk").toString()))
&& tglAwal.before(tmtTarif2024))) { && tglAwal.before(tmtTarif2024))) {
@ -1480,7 +1480,7 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera
} else { } else {
listPelayananNonJknLuarJamKerja.add(next); listPelayananNonJknLuarJamKerja.add(next);
} }
} else if ( (KK_UMUM.equals(idKKDokter) || idPegawai.equals(1249)) } else if (KK_UMUM.equals(idKKDokter)
&& idsDokterUmumIGD.contains(Integer.parseInt(next.get("idProduk").toString())) && idsDokterUmumIGD.contains(Integer.parseInt(next.get("idProduk").toString()))
&& (tglAwal.equals(tmtTarif2024) || tglAwal.after(tmtTarif2024))) { && (tglAwal.equals(tmtTarif2024) || tglAwal.after(tmtTarif2024))) {
/* /*
@ -1532,7 +1532,7 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera
if (CommonUtil.isNotNullOrEmpty(next.get("idDetailJenisProduk")) && listDetailJenisProduk if (CommonUtil.isNotNullOrEmpty(next.get("idDetailJenisProduk")) && listDetailJenisProduk
.contains(Integer.parseInt(next.get("idDetailJenisProduk").toString()))) { .contains(Integer.parseInt(next.get("idDetailJenisProduk").toString()))) {
if (!idsPerawat.contains(Integer.parseInt(next.get("idProduk").toString())) if (!idsPerawat.contains(Integer.parseInt(next.get("idProduk").toString()))
|| ( (KK_UMUM.equals(idKKDokter) || idPegawai.equals(1249)) || (KK_UMUM.equals(idKKDokter)
&& !idsDokterUmumExclude && !idsDokterUmumExclude
.contains(Integer.parseInt(next.get("idProduk").toString())) .contains(Integer.parseInt(next.get("idProduk").toString()))
&& tglAwal.before(tmtTarif2024))) { && tglAwal.before(tmtTarif2024))) {
@ -1568,7 +1568,7 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera
|| (CommonUtil.isNotNullOrEmpty(next.get("idDetailJenisProduk")) || (CommonUtil.isNotNullOrEmpty(next.get("idDetailJenisProduk"))
&& !listDetailJenisProduk.contains( && !listDetailJenisProduk.contains(
Integer.parseInt(next.get("idDetailJenisProduk").toString())))) Integer.parseInt(next.get("idDetailJenisProduk").toString()))))
&& IGD.equals(next.get("idDepartemen")) && (KK_UMUM.equals(idKKDokter) || idPegawai.equals(1249)) && IGD.equals(next.get("idDepartemen")) && KK_UMUM.equals(idKKDokter)
&& idsDokterUmumIGD.contains(Integer.parseInt(next.get("idProduk").toString())) && idsDokterUmumIGD.contains(Integer.parseInt(next.get("idProduk").toString()))
&& tglAwal.before(tmtTarif2024)) { && tglAwal.before(tmtTarif2024)) {
/* /*
@ -1623,7 +1623,7 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera
* Diluar pembatasan jenis produk * Diluar pembatasan jenis produk
*/ */
if (!idsPerawat.contains(Integer.parseInt(next.get("idProduk").toString())) if (!idsPerawat.contains(Integer.parseInt(next.get("idProduk").toString()))
|| ( (KK_UMUM.equals(idKKDokter) || idPegawai.equals(1249)) || (KK_UMUM.equals(idKKDokter)
&& !idsDokterUmumExclude && !idsDokterUmumExclude
.contains(Integer.parseInt(next.get("idProduk").toString())) .contains(Integer.parseInt(next.get("idProduk").toString()))
&& tglAwal.before(tmtTarif2024))) { && tglAwal.before(tmtTarif2024))) {
@ -2273,7 +2273,6 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera
/* /*
* Filtering tools: pelayanan bedah * Filtering tools: pelayanan bedah
*/ */
List<Integer> dokterAndAsisten = Arrays.asList(DOKTER_PEMERIKSA_AND_ASISTEN); List<Integer> dokterAndAsisten = Arrays.asList(DOKTER_PEMERIKSA_AND_ASISTEN);
List<Integer> listKsm = Arrays.asList(KSM); List<Integer> listKsm = Arrays.asList(KSM);
List<String> idPelayananByDokter = pelayananPasienDao.findIdPelayananByDokter(idPegawai, tglAwal, tglAkhir, List<String> idPelayananByDokter = pelayananPasienDao.findIdPelayananByDokter(idPegawai, tglAwal, tglAkhir,

15
jasamedika-sdm/src/main/java/com/jasamedika/medifirst2000/controller/SdmController.java
View File

@ -5528,19 +5528,4 @@ public class SdmController extends LocaleController<AkunVO> {
} }
} }
@RequestMapping(value = "example/ade/test/{idPegawai}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
public ResponseEntity<Map<String, Object>> getDataPegawaiTesterAde(@PathVariable("idPegawai") Integer idPegawai,
HttpServletRequest request) {
try {
Map<String, Object> result = new HashMap<>();
result.put("param_tester", "Ade Syawal Saputra");
mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS,
getMessage(MessageResource.LABEL_SUCCESS, request));
return RestUtil.getJsonResponse(result, HttpStatus.OK);
} catch (Exception e) {
return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR);
}
}
} }