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

Merge branch 'master' into dev-1211

Browse Source
This commit is contained in:
Salman Manoe 2023-09-17 09:15:05 +07:00
commit c9e50941af
4 changed files with 40 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -197,8 +197,9 @@ public interface PelayananPasienDao extends JpaRepository<PelayananPasien, Strin
+ "else 8 end as sortIdKelas," + "kls.namaKelas as namaKelas," + "ppp.noRec as idPelayananPasienPetugas,"
+ "ppp.ObjectJenisPetugasPeId as idJenisPelaksana,ppp.ObjectPegawaiId as idPegawai,"
+ "pp.noRec as idPelayananPasien,coalesce(pp.hargaJual,0) as hargaJual,coalesce(pp.jumlah,0) as jumlah,"
+ "pp.sayatanId as idSayatan,coalesce(sy.persen,0) as persenSayatan,coalesce(sy.nama,'') as keterangan,"
+ "pp.tglPelayanan as tglPelayanan,to_char(pp.tglPelayanan,'yyyy-MM-dd') as tanggal,"
+ "pp.sayatanId as idSayatan,sy.urutan as urutanSayatan,"
+ "coalesce(sy.persen,0) as persenSayatan,coalesce(sy.nama,'') as keterangan,"
+ "apd.noRec as idAntrianPasienDiperiksa,apd.pegawaiId as idDPJP," + "apd.ruanganId as idRuangan,"
+ "case when lower(ru.namaRuangan) like '%eksekutif%' then 'Eksekutif' else 'Reguler' end as jenisRuangan,"
+ "ru.departemenId as idDepartemen," + "pd.noRec as idPasienDaftar,"
@ -221,7 +222,7 @@ public interface PelayananPasienDao extends JpaRepository<PelayananPasien, Strin
+ "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,"
+ "pp.noRec,coalesce(pp.hargaJual,0),coalesce(pp.jumlah,0),pp.sayatanId,"
+ "pp.noRec,coalesce(pp.hargaJual,0),coalesce(pp.jumlah,0),pp.sayatanId,sy.urutan,"
+ "coalesce(sy.persen,0),coalesce(sy.nama,'')," + "pp.tglPelayanan,to_char(pp.tglPelayanan,'yyyy-MM-dd'),"
+ "apd.noRec,apd.pegawaiId," + "apd.ruanganId,"
+ "case when lower(ru.namaRuangan) like '%eksekutif%' then 'Eksekutif' else 'Reguler' end,"

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

@ -1153,7 +1153,8 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
*/
listPelayananRemun.add(next);
capaianRemun += Double.parseDouble(next.get("hargaJasa").toString());
} else if (drAnastesiList.contains(idPegawai)) {
} else if (drAnastesiList.contains(idPegawai)
&& DOKTER_PEMERIKSA.equals(next.get("idJenisPelaksana"))) {
if (idsPenunjangBukanAnestesi.contains(Integer.parseInt(next.get("idProduk").toString()))) {
/*
* Aturan dokter kk anestesi dengan pembatasan
@ -1161,8 +1162,7 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
*/
listPelayananRemun.add(next);
capaianRemun += Double.parseDouble(next.get("hargaJasa").toString());
} else if (DOKTER_PEMERIKSA.equals(next.get("idJenisPelaksana"))
&& RADIOLOGI.equals(next.get("idDepartemen"))) {
} else if (RADIOLOGI.equals(next.get("idDepartemen"))) {
listPelayananRemun.add(next);
capaianRemun += Double.parseDouble(next.get("hargaJasa").toString());
}
@ -1270,7 +1270,8 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
*/
listPelayananRemun.add(next);
capaianRemun += Double.parseDouble(next.get("hargaJasa").toString());
} else if (drAnastesiList.contains(idPegawai)) {
} else if (drAnastesiList.contains(idPegawai)
&& DOKTER_PEMERIKSA.equals(next.get("idJenisPelaksana"))) {
if (idsPenunjangBukanAnestesi.contains(Integer.parseInt(next.get("idProduk").toString()))) {
/*
* Aturan dokter kk anestesi dengan pembatasan
@ -1278,8 +1279,7 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
*/
listPelayananRemun.add(next);
capaianRemun += Double.parseDouble(next.get("hargaJasa").toString());
} else if (DOKTER_PEMERIKSA.equals(next.get("idJenisPelaksana"))
&& RADIOLOGI.equals(next.get("idDepartemen"))) {
} else if (RADIOLOGI.equals(next.get("idDepartemen"))) {
listPelayananRemun.add(next);
capaianRemun += Double.parseDouble(next.get("hargaJasa").toString());
}
@ -1380,7 +1380,8 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
* tindakan tertentu
*/
listPelayananFfs.add(next);
} else if (drAnastesiList.contains(idPegawai)) {
} else if (drAnastesiList.contains(idPegawai)
&& DOKTER_PEMERIKSA.equals(next.get("idJenisPelaksana"))) {
if (idsPenunjangBukanAnestesi.contains(Integer.parseInt(next.get("idProduk").toString()))) {
/*
* Aturan dokter kk anestesi dengan pembatasan
@ -1388,8 +1389,7 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
*/
listPelayananRemun.add(next);
capaianRemun += Double.parseDouble(next.get("hargaJasa").toString());
} else if (DOKTER_PEMERIKSA.equals(next.get("idJenisPelaksana"))
&& RADIOLOGI.equals(next.get("idDepartemen"))) {
} else if (RADIOLOGI.equals(next.get("idDepartemen"))) {
listPelayananRemun.add(next);
capaianRemun += Double.parseDouble(next.get("hargaJasa").toString());
}
@ -1535,7 +1535,8 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
&& Arrays.asList(KELOMPOK_BPJS).contains(Integer.parseInt(d.get("idKelompokPasien").toString()))
&& DOKTER_PEMERIKSA.equals(d.get("idJenisPelaksana"))) {
double persenJasa = persenOperator / 100;
d.put("persenJasa", persenTarifJasaBedah + "% + " + persenOperator + "%");
d.put("persenJasa", persenOperator + "%");
d.put("keterangan", "Dari " + persenTarifJasaBedah + "% tarif");
if (Double.parseDouble(d.get("hargaJasa").toString()) != 0.0)
d.put("hargaJasa", persenJasa * persenTarifIBS * Double.parseDouble(d.get("hargaJual").toString()));
} else if (BEDAH_SENTRAL.equals(d.get("idDepartemen"))
@ -1543,7 +1544,8 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
&& Arrays.asList(KELOMPOK_BPJS).contains(Integer.parseInt(d.get("idKelompokPasien").toString()))
&& ASISTEN_SPESIALIS.equals(d.get("idJenisPelaksana"))) {
double persenJasa = persenAsistenIBS / 100;
d.put("persenJasa", persenTarifJasaBedah + "% + " + persenAsistenIBS + "%");
d.put("persenJasa", persenAsistenIBS + "%");
d.put("keterangan", "Dari " + persenTarifJasaBedah + "% tarif");
if (Double.parseDouble(d.get("hargaJasa").toString()) != 0.0)
d.put("hargaJasa", persenJasa * persenTarifIBS * Double.parseDouble(d.get("hargaJual").toString()));
} else if (BEDAH_SENTRAL.equals(d.get("idDepartemen"))
@ -1551,12 +1553,15 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
&& Arrays.asList(KELOMPOK_BPJS).contains(Integer.parseInt(d.get("idKelompokPasien").toString()))
&& DOKTER_ANASTESI.equals(d.get("idJenisPelaksana"))) {
double persenJasa = persenAnestesi / 100;
d.put("persenJasa", persenTarifJasaBedah + "% + " + persenAnestesi + "%");
d.put("persenJasa", persenAnestesi + "%");
d.put("keterangan", "Dari " + persenTarifJasaBedah + "% tarif");
if (Double.parseDouble(d.get("hargaJasa").toString()) != 0.0)
d.put("hargaJasa", persenJasa * persenTarifIBS * Double.parseDouble(d.get("hargaJual").toString()));
} else if (BEDAH_SENTRAL.equals(d.get("idDepartemen")) && DOKTER_PEMERIKSA.equals(d.get("idJenisPelaksana"))
&& CommonUtil.isNotNullOrEmpty(d.get("idSayatan"))) {
d.put("persenJasa", persenOperator + "%");
d.put("keterangan", "Dari " + (100.0 - Double.parseDouble(d.get("persenSayatan").toString()))
+ "% tarif, sayatan ke-" + d.get("urutanSayatan").toString());
if (Double.parseDouble(d.get("hargaJasa").toString()) != 0.0)
d.put("hargaJasa",
persenOperator / 100
@ -1567,6 +1572,8 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
&& ASISTEN_SPESIALIS.equals(d.get("idJenisPelaksana"))
&& CommonUtil.isNotNullOrEmpty(d.get("idSayatan"))) {
d.put("persenJasa", persenAsistenIBS + "%");
d.put("keterangan", "Dari " + (100.0 - Double.parseDouble(d.get("persenSayatan").toString()))
+ "% tarif, sayatan ke-" + d.get("urutanSayatan").toString());
if (Double.parseDouble(d.get("hargaJasa").toString()) != 0.0)
d.put("hargaJasa",
persenAsistenIBS / 100
@ -1576,6 +1583,8 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
} else if (BEDAH_SENTRAL.equals(d.get("idDepartemen")) && DOKTER_ANASTESI.equals(d.get("idJenisPelaksana"))
&& CommonUtil.isNotNullOrEmpty(d.get("idSayatan"))) {
d.put("persenJasa", persenAnestesi + "%");
d.put("keterangan", "Dari " + (100.0 - Double.parseDouble(d.get("persenSayatan").toString()))
+ "% tarif, sayatan ke-" + d.get("urutanSayatan").toString());
if (Double.parseDouble(d.get("hargaJasa").toString()) != 0.0)
d.put("hargaJasa",
persenAnestesi / 100
@ -1644,7 +1653,8 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
} else if (CommonUtil.isNotNullOrEmpty(d.get("idRuangan"))
&& Arrays.asList(ICU_NICU).contains(Integer.parseInt(d.get("idRuangan").toString()))) {
double persenJasa = persenTindakan / 100;
d.put("persenJasa", persenTarifJasaICU + "% + " + persenTindakan + "%");
d.put("persenJasa", persenTindakan + "%");
d.put("keterangan", "Dari " + persenTarifJasaICU + "% tarif");
if (Double.parseDouble(d.get("hargaJasa").toString()) != 0.0)
d.put("hargaJasa", persenJasa * persenTarifICU * Double.parseDouble(d.get("hargaJual").toString()));
} else {
@ -1876,6 +1886,8 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
} else if (BEDAH_SENTRAL.equals(d.get("idDepartemen")) && DOKTER_PEMERIKSA.equals(d.get("idJenisPelaksana"))
&& CommonUtil.isNotNullOrEmpty(d.get("idSayatan"))) {
d.put("persenJasa", persenOperator + "%");
d.put("keterangan", "Dari " + (100.0 - Double.parseDouble(d.get("persenSayatan").toString()))
+ "% tarif, sayatan ke-" + d.get("urutanSayatan").toString());
if (Double.parseDouble(d.get("hargaJasa").toString()) != 0.0)
d.put("hargaJasa",
persenOperator / 100
@ -1886,6 +1898,8 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
&& ASISTEN_SPESIALIS.equals(d.get("idJenisPelaksana"))
&& CommonUtil.isNotNullOrEmpty(d.get("idSayatan"))) {
d.put("persenJasa", persenAsistenIBS + "%");
d.put("keterangan", "Dari " + (100.0 - Double.parseDouble(d.get("persenSayatan").toString()))
+ "% tarif, sayatan ke-" + d.get("urutanSayatan").toString());
if (Double.parseDouble(d.get("hargaJasa").toString()) != 0.0)
d.put("hargaJasa",
persenAsistenIBS / 100
@ -1895,6 +1909,8 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
} else if (BEDAH_SENTRAL.equals(d.get("idDepartemen")) && DOKTER_ANASTESI.equals(d.get("idJenisPelaksana"))
&& CommonUtil.isNotNullOrEmpty(d.get("idSayatan"))) {
d.put("persenJasa", persenAnestesi + "%");
d.put("keterangan", "Dari " + (100.0 - Double.parseDouble(d.get("persenSayatan").toString()))
+ "% tarif, sayatan ke-" + d.get("urutanSayatan").toString());
if (Double.parseDouble(d.get("hargaJasa").toString()) != 0.0)
d.put("hargaJasa",
persenAnestesi / 100
@ -2192,6 +2208,8 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
} else if (BEDAH_SENTRAL.equals(d.get("idDepartemen")) && DOKTER_PEMERIKSA.equals(d.get("idJenisPelaksana"))
&& CommonUtil.isNotNullOrEmpty(d.get("idSayatan"))) {
d.put("persenJasa", persenOperatorIBS + "%");
d.put("keterangan", "Dari " + (100.0 - Double.parseDouble(d.get("persenSayatan").toString()))
+ "% tarif, sayatan ke-" + d.get("urutanSayatan").toString());
if (Double.parseDouble(d.get("hargaJasa").toString()) != 0.0)
d.put("hargaJasa",
persenOperatorIBS / 100
@ -2202,6 +2220,8 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
&& ASISTEN_SPESIALIS.equals(d.get("idJenisPelaksana"))
&& CommonUtil.isNotNullOrEmpty(d.get("idSayatan"))) {
d.put("persenJasa", persenAsistenIBS + "%");
d.put("keterangan", "Dari " + (100.0 - Double.parseDouble(d.get("persenSayatan").toString()))
+ "% tarif, sayatan ke-" + d.get("urutanSayatan").toString());
if (Double.parseDouble(d.get("hargaJasa").toString()) != 0.0)
d.put("hargaJasa",
persenAsistenIBS / 100
@ -2211,6 +2231,8 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
} else if (BEDAH_SENTRAL.equals(d.get("idDepartemen")) && DOKTER_ANASTESI.equals(d.get("idJenisPelaksana"))
&& CommonUtil.isNotNullOrEmpty(d.get("idSayatan"))) {
d.put("persenJasa", persenAnestesi + "%");
d.put("keterangan", "Dari " + (100.0 - Double.parseDouble(d.get("persenSayatan").toString()))
+ "% tarif, sayatan ke-" + d.get("urutanSayatan").toString());
if (Double.parseDouble(d.get("hargaJasa").toString()) != 0.0)
d.put("hargaJasa",
persenAnestesi / 100

2
jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/Sayatan.java
View File

@ -40,7 +40,7 @@ public class Sayatan extends BaseMaster implements Serializable {
@Column(name = "jumlah_persen")
@Caption(value = "Jumlah Persen")
private Integer persen;
private Double persen;
@ManyToOne(fetch = LAZY)
@JoinColumn(name = "objectpegawaifk")

2
jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/SayatanVO.java
View File

@ -23,7 +23,7 @@ public class SayatanVO extends BaseMasterVO {
private Integer urutan;
@Caption(value = "Jumlah Persen")
private Integer persen;
private Double persen;
@Caption(value = "Pegawai")
private PegawaiVO pegawai;