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

Update service pelayanan pasien

Browse Source 
Penerapan filter status batal paket untuk logbook fixed-pay dokter
This commit is contained in:
Salman Manoe 2023-11-02 08:59:28 +07:00
parent 9fa265a89f
commit ed2ea02625
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -286,7 +286,7 @@ public interface PelayananPasienDao extends JpaRepository<PelayananPasien, Strin
List<PelayananPasien> findByPasienDaftarPasienDaftarNoRecIn(List<String> idDaftarList); List<PelayananPasien> findByPasienDaftarPasienDaftarNoRecIn(List<String> idDaftarList);
@Query("select distinct new Map(vp.pasienId as pasienId," + "vp.paketId as paketId," @Query("select distinct new Map(vp.pasienId as pasienId," + "vp.paketId as paketId," + "vp.isBatal as isBatal,"
+ "apd.tglKeluar as tglKeluar) " + "from PelayananPasienPetugas ppp, " + "Ruangan ru, " + "VoucherPaket vp " + "apd.tglKeluar as tglKeluar) " + "from PelayananPasienPetugas ppp, " + "Ruangan ru, " + "VoucherPaket vp "
+ "inner join ppp.pelayananPasien pp " + "inner join pp.pasienDaftar apd " + "inner join ppp.pelayananPasien pp " + "inner join pp.pasienDaftar apd "
+ "inner join apd.pasienDaftar pd " + "where apd.ruanganId = ru.id " + "and pd.pasienId = vp.pasienId " + "inner join apd.pasienDaftar pd " + "where apd.ruanganId = ru.id " + "and pd.pasienId = vp.pasienId "

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

@ -1652,8 +1652,13 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
d.put("tglPulangIbu", null); d.put("tglPulangIbu", null);
d.put("bulanPulangIbu", ""); d.put("bulanPulangIbu", "");
d.put("hargaJasa", 0.0); d.put("hargaJasa", 0.0);
first.ifPresent(stringObjectMap -> d.put("bulanPulangIbu", month.format(stringObjectMap.get("tglKeluar")))); d.put("isBatalPaket", false);
if (first.isPresent() && drKsmObgyn.contains(idPegawai) && !PERAWAT.name().equals(d.get("paketType"))) { first.ifPresent(f -> {
d.put("bulanPulangIbu", month.format(f.get("tglKeluar")));
d.put("isBatalPaket", f.get("isBatal"));
});
if (first.isPresent() && drKsmObgyn.contains(idPegawai) && !PERAWAT.name().equals(d.get("paketType"))
&& !Boolean.parseBoolean(d.get("isBatalPaket").toString())) {
d.put("tglPulangIbu", first.get().get("tglKeluar")); d.put("tglPulangIbu", first.get().get("tglKeluar"));
if ((tglAwal.equals(first.get().get("tglKeluar")) if ((tglAwal.equals(first.get().get("tglKeluar"))
|| ((Date) first.get().get("tglKeluar")).after(tglAwal)) || ((Date) first.get().get("tglKeluar")).after(tglAwal))
@ -1698,7 +1703,8 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
: byDetailTarifNonKelas.get().getHargaSatuan())); : byDetailTarifNonKelas.get().getHargaSatuan()));
} }
} }
} else if (!drKsmObgyn.contains(idPegawai) && !PERAWAT.name().equals(d.get("paketType"))) { } else if (!drKsmObgyn.contains(idPegawai) && !PERAWAT.name().equals(d.get("paketType"))
&& !Boolean.parseBoolean(d.get("isBatalPaket").toString())) {
if (DOKTER_PEMERIKSA.equals(d.get("idJenisPelaksana"))) { if (DOKTER_PEMERIKSA.equals(d.get("idJenisPelaksana"))) {
Optional<HargaNettoProdukByKelasD> byDetailTarif = tarifDetailReguler.stream() Optional<HargaNettoProdukByKelasD> byDetailTarif = tarifDetailReguler.stream()
.filter(dt -> dt.getProdukId().equals(d.get("idProduk"))) .filter(dt -> dt.getProdukId().equals(d.get("idProduk")))