From 25025d7063bc407d96fdcff5256b7d382025c0b2 Mon Sep 17 00:00:00 2001 From: adesyawal <52590145+adesyawal@users.noreply.github.com> Date: Fri, 21 Mar 2025 10:33:29 +0700 Subject: [PATCH 1/2] Add Example Push Ade --- .../medifirst2000/controller/SdmController.java | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/jasamedika-sdm/src/main/java/com/jasamedika/medifirst2000/controller/SdmController.java b/jasamedika-sdm/src/main/java/com/jasamedika/medifirst2000/controller/SdmController.java index d789bbb3..e0b1f3b8 100644 --- a/jasamedika-sdm/src/main/java/com/jasamedika/medifirst2000/controller/SdmController.java +++ b/jasamedika-sdm/src/main/java/com/jasamedika/medifirst2000/controller/SdmController.java @@ -5903,4 +5903,19 @@ public class SdmController extends LocaleController { } } + @RequestMapping(value = "example/ade/test/{idPegawai}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + public ResponseEntity> getDataPegawaiTesterAde(@PathVariable("idPegawai") Integer idPegawai, + HttpServletRequest request) { + try { + Map 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); + } + } + } From d5a561f79f535d694dea2feaf3223c06559699a3 Mon Sep 17 00:00:00 2001 From: adesyawal <52590145+adesyawal@users.noreply.github.com> Date: Wed, 9 Apr 2025 11:17:04 +0700 Subject: [PATCH 2/2] Remuenrasi Special One Vinchia --- .../service/impl/RemunerasiServiceImpl.java | 25 ++++++++++--------- 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/RemunerasiServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/RemunerasiServiceImpl.java index c5cda564..a5b17676 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/RemunerasiServiceImpl.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/RemunerasiServiceImpl.java @@ -1076,7 +1076,7 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera || CATHLAB.equals(next.get("idRuangan")))) { listPelayananRemun.add(next); capaianRemun += Double.parseDouble(next.get("hargaJasa").toString()); - } else if (KK_UMUM.equals(idKKDokter) + } else if ( (KK_UMUM.equals(idKKDokter) || idPegawai.equals(1249) ) && idsDokterUmumIGD.contains(Integer.parseInt(next.get("idProduk").toString())) && (tglAwal.equals(tmtTarif2024) || tglAwal.after(tmtTarif2024))) { /* @@ -1117,7 +1117,7 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera if (CommonUtil.isNotNullOrEmpty(next.get("idDetailJenisProduk")) && listDetailJenisProduk .contains(Integer.parseInt(next.get("idDetailJenisProduk").toString()))) { if (!idsPerawat.contains(Integer.parseInt(next.get("idProduk").toString())) - || (KK_UMUM.equals(idKKDokter) + || ( (KK_UMUM.equals(idKKDokter) || idPegawai.equals(1249)) && !idsDokterUmumExclude .contains(Integer.parseInt(next.get("idProduk").toString())) && tglAwal.before(tmtTarif2024))) { @@ -1147,7 +1147,7 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera || (CommonUtil.isNotNullOrEmpty(next.get("idDetailJenisProduk")) && !listDetailJenisProduk.contains( Integer.parseInt(next.get("idDetailJenisProduk").toString())))) - && IGD.equals(next.get("idDepartemen")) && KK_UMUM.equals(idKKDokter) + && IGD.equals(next.get("idDepartemen")) && (KK_UMUM.equals(idKKDokter) || idPegawai.equals(1249)) && idsDokterUmumIGD.contains(Integer.parseInt(next.get("idProduk").toString())) && tglAwal.before(tmtTarif2024)) { /* @@ -1190,7 +1190,7 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera * Diluar pembatasan jenis produk */ if (!idsPerawat.contains(Integer.parseInt(next.get("idProduk").toString())) - || (KK_UMUM.equals(idKKDokter) + || ( (KK_UMUM.equals(idKKDokter) || idPegawai.equals(1249)) && !idsDokterUmumExclude .contains(Integer.parseInt(next.get("idProduk").toString())) && tglAwal.before(tmtTarif2024))) { @@ -1271,7 +1271,7 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera || CATHLAB.equals(next.get("idRuangan")))) { listPelayananRemun.add(next); capaianRemun += Double.parseDouble(next.get("hargaJasa").toString()); - } else if (KK_UMUM.equals(idKKDokter) + } else if ( (KK_UMUM.equals(idKKDokter) || idPegawai.equals(1249)) && idsDokterUmumIGD.contains(Integer.parseInt(next.get("idProduk").toString())) && (tglAwal.equals(tmtTarif2024) || tglAwal.after(tmtTarif2024))) { /* @@ -1312,7 +1312,7 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera if (CommonUtil.isNotNullOrEmpty(next.get("idDetailJenisProduk")) && listDetailJenisProduk .contains(Integer.parseInt(next.get("idDetailJenisProduk").toString()))) { if (!idsPerawat.contains(Integer.parseInt(next.get("idProduk").toString())) - || (KK_UMUM.equals(idKKDokter) + || ( (KK_UMUM.equals(idKKDokter) || idPegawai.equals(1249)) && !idsDokterUmumExclude .contains(Integer.parseInt(next.get("idProduk").toString())) && tglAwal.before(tmtTarif2024))) { @@ -1342,7 +1342,7 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera || (CommonUtil.isNotNullOrEmpty(next.get("idDetailJenisProduk")) && !listDetailJenisProduk.contains( Integer.parseInt(next.get("idDetailJenisProduk").toString())))) - && IGD.equals(next.get("idDepartemen")) && KK_UMUM.equals(idKKDokter) + && IGD.equals(next.get("idDepartemen")) && (KK_UMUM.equals(idKKDokter) || idPegawai.equals(1249)) && idsDokterUmumIGD.contains(Integer.parseInt(next.get("idProduk").toString())) && tglAwal.before(tmtTarif2024)) { /* @@ -1385,7 +1385,7 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera * Diluar pembatasan jenis produk */ if (!idsPerawat.contains(Integer.parseInt(next.get("idProduk").toString())) - || (KK_UMUM.equals(idKKDokter) + || ( (KK_UMUM.equals(idKKDokter) || idPegawai.equals(1249)) && !idsDokterUmumExclude .contains(Integer.parseInt(next.get("idProduk").toString())) && tglAwal.before(tmtTarif2024))) { @@ -1480,7 +1480,7 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera } else { listPelayananNonJknLuarJamKerja.add(next); } - } else if (KK_UMUM.equals(idKKDokter) + } else if ( (KK_UMUM.equals(idKKDokter) || idPegawai.equals(1249)) && idsDokterUmumIGD.contains(Integer.parseInt(next.get("idProduk").toString())) && (tglAwal.equals(tmtTarif2024) || tglAwal.after(tmtTarif2024))) { /* @@ -1532,7 +1532,7 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera if (CommonUtil.isNotNullOrEmpty(next.get("idDetailJenisProduk")) && listDetailJenisProduk .contains(Integer.parseInt(next.get("idDetailJenisProduk").toString()))) { if (!idsPerawat.contains(Integer.parseInt(next.get("idProduk").toString())) - || (KK_UMUM.equals(idKKDokter) + || ( (KK_UMUM.equals(idKKDokter) || idPegawai.equals(1249)) && !idsDokterUmumExclude .contains(Integer.parseInt(next.get("idProduk").toString())) && tglAwal.before(tmtTarif2024))) { @@ -1568,7 +1568,7 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera || (CommonUtil.isNotNullOrEmpty(next.get("idDetailJenisProduk")) && !listDetailJenisProduk.contains( Integer.parseInt(next.get("idDetailJenisProduk").toString())))) - && IGD.equals(next.get("idDepartemen")) && KK_UMUM.equals(idKKDokter) + && IGD.equals(next.get("idDepartemen")) && (KK_UMUM.equals(idKKDokter) || idPegawai.equals(1249)) && idsDokterUmumIGD.contains(Integer.parseInt(next.get("idProduk").toString())) && tglAwal.before(tmtTarif2024)) { /* @@ -1623,7 +1623,7 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera * Diluar pembatasan jenis produk */ if (!idsPerawat.contains(Integer.parseInt(next.get("idProduk").toString())) - || (KK_UMUM.equals(idKKDokter) + || ( (KK_UMUM.equals(idKKDokter) || idPegawai.equals(1249)) && !idsDokterUmumExclude .contains(Integer.parseInt(next.get("idProduk").toString())) && tglAwal.before(tmtTarif2024))) { @@ -2273,6 +2273,7 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera /* * Filtering tools: pelayanan bedah */ + List dokterAndAsisten = Arrays.asList(DOKTER_PEMERIKSA_AND_ASISTEN); List listKsm = Arrays.asList(KSM); List idPelayananByDokter = pelayananPasienDao.findIdPelayananByDokter(idPegawai, tglAwal, tglAkhir,