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

Merge branch 'dev/remun/logbook-tarif' into dev/no-cron

Browse Source
This commit is contained in:
Salman Manoe 2025-02-14 09:04:19 +07:00
commit 5f01d45298
3 changed files with 45 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jasamedika-bridging/src/main/java/com/jasamedika/medifirst2000/controller/base/LocaleController.java
View File

@ -214,7 +214,7 @@ public abstract class LocaleController<V extends BaseModelVO> {
// protected EntityManager em; // protected EntityManager em;
public String GetSettingDataFixed(String prefix) { public String GetSettingDataFixed(String prefix) {
return agamaService.GetSettingDataFixed(prefix); return agamaService.getSettingDataFixed(prefix);
// StringBuffer buffer = new StringBuffer(); // StringBuffer buffer = new StringBuffer();
// buffer.append("select model.nilaiField from SettingDataFixed ") // buffer.append("select model.nilaiField from SettingDataFixed ")
// .append(" model where model.namaField ='" + prefix + "' "); // .append(" model where model.namaField ='" + prefix + "' ");

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

@ -140,7 +140,7 @@ public final class Master {
public static final class JenisProduk { public static final class JenisProduk {
public static final Integer LAB_KLINIK = 36; // laboratorium_klinik public static final Integer LAB_KLINIK = 36; // laboratorium_klinik
public static final Integer[] NONKONSULTASI = { 116, 277 }; // reagensia,barang_umum public static final Integer[] NONKONSULTASI = { 116, 277 }; // reagensia,barang_umum
public static final Integer[] NONLOGBOOK = { 97, 277, 283 }; // barang_farmasi,barang_umum,vaksin public static final Integer[] NONLOGBOOK = { 97, 99, 277, 283 }; // barang_farmasi,barang_umum,vaksin
public static final Integer[] NONTINDAKAN = { 97, 283 }; // barang_farmasi,vaksin public static final Integer[] NONTINDAKAN = { 97, 283 }; // barang_farmasi,vaksin
public static final Integer OBAT_ALKES = 97; // barang_farmasi public static final Integer OBAT_ALKES = 97; // barang_farmasi
} }

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

@ -30,7 +30,6 @@ import static com.jasamedika.medifirst2000.constants.Master.Departemen.*;
import static com.jasamedika.medifirst2000.constants.Master.GolonganProduk.KONSULTASI; import static com.jasamedika.medifirst2000.constants.Master.GolonganProduk.KONSULTASI;
import static com.jasamedika.medifirst2000.constants.Master.GolonganProduk.VISIT; import static com.jasamedika.medifirst2000.constants.Master.GolonganProduk.VISIT;
import static com.jasamedika.medifirst2000.constants.Master.JenisPetugasPelaksana.*; import static com.jasamedika.medifirst2000.constants.Master.JenisPetugasPelaksana.*;
import static com.jasamedika.medifirst2000.constants.Master.JenisProduk.NONLOGBOOK;
import static com.jasamedika.medifirst2000.constants.Master.KategoryPegawai.DOKTER_LUAR; 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;
import static com.jasamedika.medifirst2000.constants.Master.KelompokPasien.KELOMPOK_BPJS; import static com.jasamedika.medifirst2000.constants.Master.KelompokPasien.KELOMPOK_BPJS;
@ -330,6 +329,7 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera
List<Integer> drKkRadiologi = pegawaiDao.getDokterByKelompokKerja(KK_RADIOLOGI); List<Integer> drKkRadiologi = pegawaiDao.getDokterByKelompokKerja(KK_RADIOLOGI);
List<Integer> laboranRadiologList = mapPegawaiLaboratRadiologiDao.findPegawaiLaboranRadiolog(); List<Integer> laboranRadiologList = mapPegawaiLaboratRadiologiDao.findPegawaiLaboranRadiolog();
List<Integer> terapisRehabMedik = mapJabatanProfesiDao.findIdPegawaiByProfesiIn(Arrays.asList(TERAPI)); List<Integer> terapisRehabMedik = mapJabatanProfesiDao.findIdPegawaiByProfesiIn(Arrays.asList(TERAPI));
List<Integer> idsJenisProdukNonLogbook = getNilaiDataFixByTMT("listJenisProdukNonLogbook", tglAwal);
List<Integer> idsRegDJPAdminNonPK = getNilaiDataFixByTMT("admin_nonpk", tglAwal); List<Integer> idsRegDJPAdminNonPK = getNilaiDataFixByTMT("admin_nonpk", tglAwal);
List<Integer> idsRegDJPMedisUtama = getNilaiDataFixByTMT("medis_utama", tglAwal); List<Integer> idsRegDJPMedisUtama = getNilaiDataFixByTMT("medis_utama", tglAwal);
List<Integer> idsRegDJPPenunjangPA = getNilaiDataFixByTMT("penunjang_pa", tglAwal); List<Integer> idsRegDJPPenunjangPA = getNilaiDataFixByTMT("penunjang_pa", tglAwal);
@ -970,7 +970,7 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera
listPelayananNonJknLuarJamKerja.add(next); listPelayananNonJknLuarJamKerja.add(next);
} }
} else if (CommonUtil.isNullOrEmpty(next.get("idJenisProduk")) } else if (CommonUtil.isNullOrEmpty(next.get("idJenisProduk"))
|| (CommonUtil.isNotNullOrEmpty(next.get("idJenisProduk")) && !Arrays.asList(NONLOGBOOK) || (CommonUtil.isNotNullOrEmpty(next.get("idJenisProduk")) && !idsJenisProdukNonLogbook
.contains(Integer.parseInt(next.get("idJenisProduk").toString())))) { .contains(Integer.parseInt(next.get("idJenisProduk").toString())))) {
if (Boolean.parseBoolean(next.get("isJamKerja").toString())) { if (Boolean.parseBoolean(next.get("isJamKerja").toString())) {
listPelayananFfs.add(next); listPelayananFfs.add(next);
@ -987,11 +987,16 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera
*/ */
if (drKkPediatrikGDList.contains(idPegawai)) { if (drKkPediatrikGDList.contains(idPegawai)) {
if (CommonUtil.isNotNullOrEmpty(next.get("kptl"))) { if (CommonUtil.isNotNullOrEmpty(next.get("kptl"))) {
/* if (CommonUtil.isNullOrEmpty(next.get("idJenisProduk"))
* Tarif baru dengan KPTL || (CommonUtil.isNotNullOrEmpty(next.get("idJenisProduk"))
*/ && !idsJenisProdukNonLogbook.contains(
listPelayananRemun.add(next); Integer.parseInt(next.get("idJenisProduk").toString())))) {
capaianRemun += Double.parseDouble(next.get("hargaJasa").toString()); /*
* Tarif baru dengan KPTL
*/
listPelayananRemun.add(next);
capaianRemun += Double.parseDouble(next.get("hargaJasa").toString());
}
} else { } else {
/* /*
* Bpjs untuk dokter-dokter kk pediatrik gawat * Bpjs untuk dokter-dokter kk pediatrik gawat
@ -1009,7 +1014,7 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera
|| VISIT.equals(next.get("idGolonganProduk"))) || VISIT.equals(next.get("idGolonganProduk")))
&& (CommonUtil.isNullOrEmpty(next.get("idJenisProduk")) && (CommonUtil.isNullOrEmpty(next.get("idJenisProduk"))
|| (CommonUtil.isNotNullOrEmpty(next.get("idJenisProduk")) || (CommonUtil.isNotNullOrEmpty(next.get("idJenisProduk"))
&& !Arrays.asList(NONLOGBOOK).contains( && !idsJenisProdukNonLogbook.contains(
Integer.parseInt(next.get("idJenisProduk").toString()))))) { Integer.parseInt(next.get("idJenisProduk").toString()))))) {
/* /*
* Dibatasi hanya di rawat jalan atau visite * Dibatasi hanya di rawat jalan atau visite
@ -1047,7 +1052,7 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera
capaianRemun += Double.parseDouble(next.get("hargaJasa").toString()); capaianRemun += Double.parseDouble(next.get("hargaJasa").toString());
} else if (CommonUtil.isNullOrEmpty(next.get("idJenisProduk")) } else if (CommonUtil.isNullOrEmpty(next.get("idJenisProduk"))
|| (CommonUtil.isNotNullOrEmpty(next.get("idJenisProduk")) || (CommonUtil.isNotNullOrEmpty(next.get("idJenisProduk"))
&& !Arrays.asList(NONLOGBOOK).contains( && !idsJenisProdukNonLogbook.contains(
Integer.parseInt(next.get("idJenisProduk").toString())))) { Integer.parseInt(next.get("idJenisProduk").toString())))) {
listPelayananRemun.add(next); listPelayananRemun.add(next);
capaianRemun += Double.parseDouble(next.get("hargaJasa").toString()); capaianRemun += Double.parseDouble(next.get("hargaJasa").toString());
@ -1112,7 +1117,7 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera
capaianRemun += Double.parseDouble(next.get("hargaJasa").toString()); capaianRemun += Double.parseDouble(next.get("hargaJasa").toString());
} else if (CommonUtil.isNullOrEmpty(next.get("idJenisProduk")) } else if (CommonUtil.isNullOrEmpty(next.get("idJenisProduk"))
|| (CommonUtil.isNotNullOrEmpty(next.get("idJenisProduk")) || (CommonUtil.isNotNullOrEmpty(next.get("idJenisProduk"))
&& !Arrays.asList(NONLOGBOOK).contains( && !idsJenisProdukNonLogbook.contains(
Integer.parseInt(next.get("idJenisProduk").toString())))) { Integer.parseInt(next.get("idJenisProduk").toString())))) {
listPelayananRemun.add(next); listPelayananRemun.add(next);
capaianRemun += Double.parseDouble(next.get("hargaJasa").toString()); capaianRemun += Double.parseDouble(next.get("hargaJasa").toString());
@ -1127,11 +1132,16 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera
*/ */
if (drKkPediatrikGDList.contains(idPegawai)) { if (drKkPediatrikGDList.contains(idPegawai)) {
if (CommonUtil.isNotNullOrEmpty(next.get("kptl"))) { if (CommonUtil.isNotNullOrEmpty(next.get("kptl"))) {
/* if (CommonUtil.isNullOrEmpty(next.get("idJenisProduk"))
* Tarif baru dengan KPTL || (CommonUtil.isNotNullOrEmpty(next.get("idJenisProduk"))
*/ && !idsJenisProdukNonLogbook.contains(
listPelayananRemun.add(next); Integer.parseInt(next.get("idJenisProduk").toString())))) {
capaianRemun += Double.parseDouble(next.get("hargaJasa").toString()); /*
* Tarif baru dengan KPTL
*/
listPelayananRemun.add(next);
capaianRemun += Double.parseDouble(next.get("hargaJasa").toString());
}
} else { } else {
/* /*
* Bpjs untuk dokter-dokter kk pediatrik gawat * Bpjs untuk dokter-dokter kk pediatrik gawat
@ -1149,7 +1159,7 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera
|| VISIT.equals(next.get("idGolonganProduk")) && (CommonUtil || VISIT.equals(next.get("idGolonganProduk")) && (CommonUtil
.isNullOrEmpty(next.get("idJenisProduk")) .isNullOrEmpty(next.get("idJenisProduk"))
|| (CommonUtil.isNotNullOrEmpty(next.get("idJenisProduk")) || (CommonUtil.isNotNullOrEmpty(next.get("idJenisProduk"))
&& !Arrays.asList(NONLOGBOOK).contains( && !idsJenisProdukNonLogbook.contains(
Integer.parseInt(next.get("idJenisProduk").toString()))))) { Integer.parseInt(next.get("idJenisProduk").toString()))))) {
/* /*
* Dibatasi hanya di rawat jalan atau visite * Dibatasi hanya di rawat jalan atau visite
@ -1187,7 +1197,7 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera
capaianRemun += Double.parseDouble(next.get("hargaJasa").toString()); capaianRemun += Double.parseDouble(next.get("hargaJasa").toString());
} else if (CommonUtil.isNullOrEmpty(next.get("idJenisProduk")) } else if (CommonUtil.isNullOrEmpty(next.get("idJenisProduk"))
|| (CommonUtil.isNotNullOrEmpty(next.get("idJenisProduk")) || (CommonUtil.isNotNullOrEmpty(next.get("idJenisProduk"))
&& !Arrays.asList(NONLOGBOOK).contains( && !idsJenisProdukNonLogbook.contains(
Integer.parseInt(next.get("idJenisProduk").toString())))) { Integer.parseInt(next.get("idJenisProduk").toString())))) {
listPelayananRemun.add(next); listPelayananRemun.add(next);
capaianRemun += Double.parseDouble(next.get("hargaJasa").toString()); capaianRemun += Double.parseDouble(next.get("hargaJasa").toString());
@ -1252,7 +1262,7 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera
capaianRemun += Double.parseDouble(next.get("hargaJasa").toString()); capaianRemun += Double.parseDouble(next.get("hargaJasa").toString());
} else if (CommonUtil.isNullOrEmpty(next.get("idJenisProduk")) } else if (CommonUtil.isNullOrEmpty(next.get("idJenisProduk"))
|| (CommonUtil.isNotNullOrEmpty(next.get("idJenisProduk")) || (CommonUtil.isNotNullOrEmpty(next.get("idJenisProduk"))
&& !Arrays.asList(NONLOGBOOK).contains( && !idsJenisProdukNonLogbook.contains(
Integer.parseInt(next.get("idJenisProduk").toString())))) { Integer.parseInt(next.get("idJenisProduk").toString())))) {
listPelayananRemun.add(next); listPelayananRemun.add(next);
capaianRemun += Double.parseDouble(next.get("hargaJasa").toString()); capaianRemun += Double.parseDouble(next.get("hargaJasa").toString());
@ -1266,13 +1276,18 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera
*/ */
if (drKkPediatrikGDList.contains(idPegawai)) { if (drKkPediatrikGDList.contains(idPegawai)) {
if (CommonUtil.isNotNullOrEmpty(next.get("kptl"))) { if (CommonUtil.isNotNullOrEmpty(next.get("kptl"))) {
/* if (CommonUtil.isNullOrEmpty(next.get("idJenisProduk"))
* Tarif baru dengan KPTL || (CommonUtil.isNotNullOrEmpty(next.get("idJenisProduk"))
*/ && !idsJenisProdukNonLogbook.contains(
if (Boolean.parseBoolean(next.get("isJamKerja").toString())) { Integer.parseInt(next.get("idJenisProduk").toString())))) {
listPelayananFfs.add(next); /*
} else { * Tarif baru dengan KPTL
listPelayananNonJknLuarJamKerja.add(next); */
if (Boolean.parseBoolean(next.get("isJamKerja").toString())) {
listPelayananFfs.add(next);
} else {
listPelayananNonJknLuarJamKerja.add(next);
}
} }
} else { } else {
/* /*
@ -1294,7 +1309,7 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera
|| VISIT.equals(next.get("idGolonganProduk")) && (CommonUtil || VISIT.equals(next.get("idGolonganProduk")) && (CommonUtil
.isNullOrEmpty(next.get("idJenisProduk")) .isNullOrEmpty(next.get("idJenisProduk"))
|| (CommonUtil.isNotNullOrEmpty(next.get("idJenisProduk")) || (CommonUtil.isNotNullOrEmpty(next.get("idJenisProduk"))
&& !Arrays.asList(NONLOGBOOK).contains( && !idsJenisProdukNonLogbook.contains(
Integer.parseInt(next.get("idJenisProduk").toString()))))) { Integer.parseInt(next.get("idJenisProduk").toString()))))) {
/* /*
* Dibatasi hanya di rawat jalan atau visite * Dibatasi hanya di rawat jalan atau visite
@ -1341,7 +1356,7 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera
} }
} else if (CommonUtil.isNullOrEmpty(next.get("idJenisProduk")) } else if (CommonUtil.isNullOrEmpty(next.get("idJenisProduk"))
|| (CommonUtil.isNotNullOrEmpty(next.get("idJenisProduk")) || (CommonUtil.isNotNullOrEmpty(next.get("idJenisProduk"))
&& !Arrays.asList(NONLOGBOOK).contains( && !idsJenisProdukNonLogbook.contains(
Integer.parseInt(next.get("idJenisProduk").toString())))) { Integer.parseInt(next.get("idJenisProduk").toString())))) {
if (Boolean.parseBoolean(next.get("isJamKerja").toString())) { if (Boolean.parseBoolean(next.get("isJamKerja").toString())) {
listPelayananFfs.add(next); listPelayananFfs.add(next);
@ -1424,7 +1439,7 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera
} }
} else if (CommonUtil.isNullOrEmpty(next.get("idJenisProduk")) } else if (CommonUtil.isNullOrEmpty(next.get("idJenisProduk"))
|| (CommonUtil.isNotNullOrEmpty(next.get("idJenisProduk")) || (CommonUtil.isNotNullOrEmpty(next.get("idJenisProduk"))
&& !Arrays.asList(NONLOGBOOK).contains( && !idsJenisProdukNonLogbook.contains(
Integer.parseInt(next.get("idJenisProduk").toString())))) { Integer.parseInt(next.get("idJenisProduk").toString())))) {
if (Boolean.parseBoolean(next.get("isJamKerja").toString())) { if (Boolean.parseBoolean(next.get("isJamKerja").toString())) {
listPelayananFfs.add(next); listPelayananFfs.add(next);