From 5b926e6b810d6d1657de0afcc682aab5aabd7149 Mon Sep 17 00:00:00 2001 From: Salman Manoe Date: Wed, 13 Sep 2023 18:47:00 +0700 Subject: [PATCH 1/3] Update entity Perubahan data type persen untuk nilai desimal --- .../java/com/jasamedika/medifirst2000/entities/Sayatan.java | 2 +- .../main/java/com/jasamedika/medifirst2000/vo/SayatanVO.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/Sayatan.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/Sayatan.java index 9920f9c0..6c446078 100644 --- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/Sayatan.java +++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/Sayatan.java @@ -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") diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/SayatanVO.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/SayatanVO.java index 45ba3db7..fddb8f0b 100644 --- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/SayatanVO.java +++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/SayatanVO.java @@ -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; From b46df7387d14cde7f23868a601538f2842bdd8e4 Mon Sep 17 00:00:00 2001 From: Salman Manoe Date: Sat, 16 Sep 2023 18:26:11 +0700 Subject: [PATCH 2/3] Update service pelayanan pasien Perbaikan informasi keterangan sayatan logbook dokter --- .../medifirst2000/dao/PelayananPasienDao.java | 5 ++-- .../impl/PelayananPasienServiceImpl.java | 30 ++++++++++++++++--- 2 files changed, 29 insertions(+), 6 deletions(-) diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/PelayananPasienDao.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/PelayananPasienDao.java index a087143a..cf52896b 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/PelayananPasienDao.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/PelayananPasienDao.java @@ -197,8 +197,9 @@ public interface PelayananPasienDao extends JpaRepository Date: Sun, 17 Sep 2023 09:10:39 +0700 Subject: [PATCH 3/3] Update PelayananPasienServiceImpl.java Update aturan remunerasi dokter anestesi hanya untuk dokter pemeriksa --- .../impl/PelayananPasienServiceImpl.java | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PelayananPasienServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PelayananPasienServiceImpl.java index 9e2468c9..cc23f1bd 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PelayananPasienServiceImpl.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PelayananPasienServiceImpl.java @@ -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()); }