From b3e9e9e81aba8ef8d1fc8f250cfa08fa2ccb646c Mon Sep 17 00:00:00 2001 From: Salman Manoe Date: Tue, 30 May 2023 13:44:09 +0700 Subject: [PATCH] Update PelayananPasienServiceImpl.java Remove aturan lain-lain di remun logbook tarif untuk dokter --- .../impl/PelayananPasienServiceImpl.java | 77 ++----------------- 1 file changed, 6 insertions(+), 71 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 e707af59..34f842bb 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 @@ -993,17 +993,8 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel */ listPelayananRemun.add(next); capaianRemun += Double.valueOf(next.get("hargaJasa").toString()); - } else if (Arrays.asList(Master.Departemen.GRUP_RAWAT_INAP) - .contains(next.get("idDepartemen")) - || (Master.Departemen.RAWAT_INAP.equals(next.get("idDepartemen")) - && !Arrays.asList(Master.Ruangan.NONRANAP).contains(next.get("idRuangan")) - && (Master.GolonganProduk.VISIT.equals(next.get("idGolonganProduk")) - || Master.GolonganProduk.KONSULTASI - .equals(next.get("idGolonganProduk")))) - || Arrays.asList(Master.Departemen.GRUP_RAWAT_JALAN_UTAMA) - .contains(next.get("idDepartemen")) - || !Arrays.asList(Master.JenisProduk.NONTINDAKAN) - .contains(next.get("idJenisProduk"))) { + } else if (!Arrays.asList(Master.JenisProduk.NONTINDAKAN) + .contains(next.get("idJenisProduk"))) { listPelayananRemun.add(next); capaianRemun += Double.valueOf(next.get("hargaJasa").toString()); } @@ -1051,19 +1042,6 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel */ listPelayananRemun.add(next); capaianRemun += Double.valueOf(next.get("hargaJasa").toString()); - } else if (Arrays.asList(Master.Departemen.GRUP_RAWAT_INAP) - .contains(next.get("idDepartemen")) - || (Master.Departemen.RAWAT_INAP.equals(next.get("idDepartemen")) - && !Arrays.asList(Master.Ruangan.NONRANAP).contains(next.get("idRuangan")) - && (Master.GolonganProduk.VISIT.equals(next.get("idGolonganProduk")) - || Master.GolonganProduk.KONSULTASI - .equals(next.get("idGolonganProduk")))) - || Arrays.asList(Master.Departemen.GRUP_RAWAT_JALAN_UTAMA) - .contains(next.get("idDepartemen")) - || !Arrays.asList(Master.JenisProduk.NONTINDAKAN) - .contains(next.get("idJenisProduk"))) { - listPelayananRemun.add(next); - capaianRemun += Double.valueOf(next.get("hargaJasa").toString()); } } } @@ -1108,17 +1086,8 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel */ listPelayananRemun.add(next); capaianRemun += Double.valueOf(next.get("hargaJasa").toString()); - } else if (Arrays.asList(Master.Departemen.GRUP_RAWAT_INAP) - .contains(next.get("idDepartemen")) - || (Master.Departemen.RAWAT_INAP.equals(next.get("idDepartemen")) - && !Arrays.asList(Master.Ruangan.NONRANAP).contains(next.get("idRuangan")) - && (Master.GolonganProduk.VISIT.equals(next.get("idGolonganProduk")) - || Master.GolonganProduk.KONSULTASI - .equals(next.get("idGolonganProduk")))) - || Arrays.asList(Master.Departemen.GRUP_RAWAT_JALAN_UTAMA) - .contains(next.get("idDepartemen")) - || !Arrays.asList(Master.JenisProduk.NONTINDAKAN) - .contains(next.get("idJenisProduk"))) { + } else if (!Arrays.asList(Master.JenisProduk.NONTINDAKAN) + .contains(next.get("idJenisProduk"))) { listPelayananRemun.add(next); capaianRemun += Double.valueOf(next.get("hargaJasa").toString()); } @@ -1166,19 +1135,6 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel */ listPelayananRemun.add(next); capaianRemun += Double.valueOf(next.get("hargaJasa").toString()); - } else if (Arrays.asList(Master.Departemen.GRUP_RAWAT_INAP) - .contains(next.get("idDepartemen")) - || (Master.Departemen.RAWAT_INAP.equals(next.get("idDepartemen")) - && !Arrays.asList(Master.Ruangan.NONRANAP).contains(next.get("idRuangan")) - && (Master.GolonganProduk.VISIT.equals(next.get("idGolonganProduk")) - || Master.GolonganProduk.KONSULTASI - .equals(next.get("idGolonganProduk")))) - || Arrays.asList(Master.Departemen.GRUP_RAWAT_JALAN_UTAMA) - .contains(next.get("idDepartemen")) - || !Arrays.asList(Master.JenisProduk.NONTINDAKAN) - .contains(next.get("idJenisProduk"))) { - listPelayananRemun.add(next); - capaianRemun += Double.valueOf(next.get("hargaJasa").toString()); } } } @@ -1219,17 +1175,8 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel * bebas klaim */ listPelayananFfs.add(next); - } else if (Arrays.asList(Master.Departemen.GRUP_RAWAT_INAP) - .contains(next.get("idDepartemen")) - || (Master.Departemen.RAWAT_INAP.equals(next.get("idDepartemen")) - && !Arrays.asList(Master.Ruangan.NONRANAP).contains(next.get("idRuangan")) - && (Master.GolonganProduk.VISIT.equals(next.get("idGolonganProduk")) - || Master.GolonganProduk.KONSULTASI - .equals(next.get("idGolonganProduk")))) - || Arrays.asList(Master.Departemen.GRUP_RAWAT_JALAN_UTAMA) - .contains(next.get("idDepartemen")) - || !Arrays.asList(Master.JenisProduk.NONTINDAKAN) - .contains(next.get("idJenisProduk"))) { + } else if (!Arrays.asList(Master.JenisProduk.NONTINDAKAN) + .contains(next.get("idJenisProduk"))) { listPelayananFfs.add(next); } } else if (!listDetailJenisProduk.contains(next.get("idDetailJenisProduk")) @@ -1273,18 +1220,6 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel * bebas klaim */ listPelayananFfs.add(next); - } else if (Arrays.asList(Master.Departemen.GRUP_RAWAT_INAP) - .contains(next.get("idDepartemen")) - || (Master.Departemen.RAWAT_INAP.equals(next.get("idDepartemen")) - && !Arrays.asList(Master.Ruangan.NONRANAP).contains(next.get("idRuangan")) - && (Master.GolonganProduk.VISIT.equals(next.get("idGolonganProduk")) - || Master.GolonganProduk.KONSULTASI - .equals(next.get("idGolonganProduk")))) - || Arrays.asList(Master.Departemen.GRUP_RAWAT_JALAN_UTAMA) - .contains(next.get("idDepartemen")) - || !Arrays.asList(Master.JenisProduk.NONTINDAKAN) - .contains(next.get("idJenisProduk"))) { - listPelayananFfs.add(next); } } }