diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/constants/Master.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/constants/Master.java index 96e49dae..102cb37b 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/constants/Master.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/constants/Master.java @@ -235,8 +235,8 @@ public class Master { /** * Komponen operator dari tarif konsultasi dokter spesialis */ - public static final Double KOMPONEN_DASAR = 120000.0; - + public static final Double KOMPONEN_DASAR = 120000.0; + public static final Double PERSENTASE_TINDAKAN_ASISTEN_SPESIALIS = 15.0; public static final Double PERSENTASE_TINDAKAN_DOKTER_PEMERIKSA = 30.0; public static final Double PERSENTASE_TINDAKAN_DOKTER_ANASTESI = 15.0; @@ -279,6 +279,7 @@ public class Master { public static final String DEFAULT_ACC_CODE = "x"; public static final String SMART_LOC_CODE = "99999"; public static final Integer SMART_REMOTE_NO = 99; + public static final String VPN = "103.144.126.78"; public static final String[] INET_PROVIDERS = { "103.116.203.91", "103.116.203.92", "103.116.203.93", "43.225.67.209" }; @@ -289,6 +290,7 @@ public class Master { public static final Integer[] DOKTER_UMUM_IGD = { 783, 401333, 402413, 402414, 402449, 402484 }; public static final Integer[] KONSULTASI_EKSEKUTIF = { 401092, 401093 }; + public static final Integer[] MONITORING_INTERVENSI = { 10666, 4037948 }; public static final Integer[] PENUNJANG_BUKAN_ANASTESI = { 13409, 15208, 19325, 19346, 19371, 19405, 19406, 19535, 19599, 402009, 10009835, 10012269, 1002117344, 1002117938, 1002117963, 1002117964, 1002117965, 1002117966 }; @@ -334,7 +336,7 @@ public class Master { public static final Integer[] PENUNJANG_MURNI = { 39, 276 }; public static final Integer[] PERISTI = { 45, 75, 76, 463, 464 }; public static final Integer[] TANJUNG = { 72, 551 }; - + public static final Integer ICU = 328; public static final int KLINIK_FALSE_EMERGENCY = 309; @@ -401,6 +403,7 @@ public class Master { public static final Integer KK_PATOLOGI_ANATOMI = 197; public static final Integer KK_PATOLOGI_KLINIK = 199; public static final Integer KK_PEDIATRIK_GD = 244; + public static final Integer KK_PERINATOLOGI = 217; public static final Integer KK_RADIOLOGI = 203; public static final Integer KK_UMUM = 222; public static final Integer SUBBAG_KESEJAHTERAAN = 26; diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/HabsenDao.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/HabsenDao.java index ad4db63a..06889941 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/HabsenDao.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/HabsenDao.java @@ -42,8 +42,8 @@ public interface HabsenDao extends PagingAndSortingRepository { + "where jk.pegawaiId = :idPegawai " + "and to_char(kd.tanggal, 'yyyy-MM-dd') = :tanggalJadwal") String getPegawaiJadwal(@Param("idPegawai") Integer idPegawai, @Param("tanggalJadwal") String tanggalJadwal); - @Query("select new Map(to_char(hb.tr_time, 'HH24:MI:SS') as tr_time," - + "hb.processtatus as processtatus,hb.ip_addr as ip_addr," + "hb.tag as tag," + @Query("select new Map(to_char(hb.tr_time, 'HH24:MI:SS') as tr_time," + "hb.processtatus as processtatus," + + "hb.ip_addr as ip_addr," + "hb.clientIPAddress as client_ip_addr," + "hb.tag as tag," + "(case when hb.tag = 1 then 'Presensi masuk' " + "when hb.tag = 0 then 'Presensi keluar/pulang' end) as tagDesc) " + "from Habsen hb, Pegawai pg " + "where hb.empl_code = pg.idFinger " + "and pg.id = :idPegawai " @@ -81,7 +81,7 @@ public interface HabsenDao extends PagingAndSortingRepository { String strQryHabsen = "select new Map(pg.id as id,pg.namaLengkap as namaLengkap," + "hb.tr_no as tr_no,to_char(hb.tr_date,'dd-MM-yyyy') as tr_date,to_char(hb.tr_time,'HH24:MI:ss') as tr_time," - + "hb.processtatus as processtatus,hb.ip_addr as ip_addr," + + "hb.processtatus as processtatus,hb.ip_addr as ip_addr,hb.clientIPAddress as client_ip_addr," + "hb.latitude as latitude,hb.longitude as longitude,hb.akurasi as akurasi,hb.lokasi as lokasi) " + "from Habsen hb, Pegawai pg " + "where hb.empl_code = pg.idFinger " + "and pg.statusEnabled is true"; diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/IndekKinerjaDao.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/IndekKinerjaDao.java index 77988942..b73052cb 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/IndekKinerjaDao.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/IndekKinerjaDao.java @@ -56,8 +56,8 @@ public interface IndekKinerjaDao extends PagingAndSortingRepository 'tarif_2022_Nov')) " - + "and harga.kelasId = 3) as hargaKelas1, " - + " dokter.id as idPegawai) " + " from PelayananPasienPetugas pelayananPasienPetugas" + + "and harga.kelasId = 3) as hargaKelas1, " + " dokter.id as idPegawai) " + + " from PelayananPasienPetugas pelayananPasienPetugas" + " left join pelayananPasienPetugas.kdpegawai dokter" + " left join pelayananPasienPetugas.pelayananPasien pelayananPasien" + " left join pelayananPasien.produk produk " + " left join pelayananPasien.kelas kelas " @@ -74,8 +74,8 @@ public interface IndekKinerjaDao extends PagingAndSortingRepository 'tarif_2022_Nov')) " - + "and harga.kelasId = 3) as hargaKelas1, " - + " dokter.id as idPegawai) " + " from PelayananPasienPetugas pelayananPasienPetugas" + + "and harga.kelasId = 3) as hargaKelas1, " + " dokter.id as idPegawai) " + + " from PelayananPasienPetugas pelayananPasienPetugas" + " left join pelayananPasienPetugas.kdpegawai dokter" + " left join pelayananPasienPetugas.pelayananPasien pelayananPasien" + " left join pelayananPasien.produk produk " + " left join pelayananPasien.kelas kelas " @@ -368,16 +368,16 @@ public interface IndekKinerjaDao extends PagingAndSortingRepository> findAbsensiAplikasiPegawai(@Param("idFinger") String idFinger, @Param("date") String date); @Query(" select new map (absen.tr_no as tr_no," + "absen.tr_date as date," + "absen.tr_time as time," - + "absen.empl_code as employee," + "absen.ip_addr as ip_addr," + "absen.processtatus as processtatus)" - + " from Habsen absen" + " where absen.empl_code = :idFinger" + + "absen.empl_code as employee," + "absen.ip_addr as ip_addr," + "absen.clientIPAddress as client_ip_addr," + + "absen.processtatus as processtatus)" + " from Habsen absen" + " where absen.empl_code = :idFinger" + " and to_char(absen.tr_date,'yyyy-MM-dd') = :date" + " and loc_code <> '99999'" + " and remoteno <> '99'" + " order by absen.tr_date, absen.tr_time asc") public List> findAbsensiPegawai(@Param("idFinger") String idFinger, @Param("date") String date); diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/MonitoringAbsenDao.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/MonitoringAbsenDao.java index 148a5479..5a0f7aee 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/MonitoringAbsenDao.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/MonitoringAbsenDao.java @@ -451,7 +451,7 @@ public interface MonitoringAbsenDao extends PagingAndSortingRepository getPegawaiHistoriRekapIndexByDate(@Param("idPegawai") Integer idPegawai, + public List> getPegawaiHistoriRekapIndexByDate(@Param("idPegawai") Integer idPegawai, @Param("listKomponenIndex") List listKomponenIndex, @Param("date") String date); @Query("select count(distinct rekInd.noRec) " + "from PegawaiHistoriRekapIndex rekInd, " diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/AbsensiPegawaiServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/AbsensiPegawaiServiceImpl.java index 0be1c1c4..191cb111 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/AbsensiPegawaiServiceImpl.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/AbsensiPegawaiServiceImpl.java @@ -156,7 +156,7 @@ public class AbsensiPegawaiServiceImpl extends BaseVoServiceImpl implements Abse uploadPhotoCapture(vo.getImageURLData(), idFinger, model.getTr_date(), model.getTr_time(), resultDomain.getTr_no()); } - + HabsenVO resultVO = new HabsenVO(); resultVO = presensiConverter.transferModelToVO(resultDomain, resultVO); resultVO.setPegawai(vo.getPegawai()); @@ -361,12 +361,21 @@ public class AbsensiPegawaiServiceImpl extends BaseVoServiceImpl implements Abse } else { map.put("processtatus", "WFO"); } - if (listIp.contains(map.get("ip_addr"))) { - map.put("ip_addr", "menggunakan jaringan internet RSAB"); - } else if (CommonUtil.isNullOrEmpty(map.get("ip_addr"))) { - map.put("ip_addr", "jaringan internet tidak terdeteksi"); + if (Master.PresensiPegawai.VPN.equals(map.get("ip_addr"))) { + if (map.get("client_ip_addr").toString().startsWith("172.16.198")) { + map.put("ip_addr", "bukan menggunakan jaringan internet RSAB"); + map.put("processtatus", "VPN"); + } else { + map.put("ip_addr", "menggunakan jaringan internet RSAB"); + } } else { - map.put("ip_addr", "bukan menggunakan jaringan internet RSAB"); + if (listIp.contains(map.get("ip_addr"))) { + map.put("ip_addr", "menggunakan jaringan internet RSAB"); + } else if (CommonUtil.isNullOrEmpty(map.get("ip_addr"))) { + map.put("ip_addr", "jaringan internet tidak terdeteksi"); + } else { + map.put("ip_addr", "bukan menggunakan jaringan internet RSAB"); + } } } } diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/IndekKinerjaServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/IndekKinerjaServiceImpl.java index 89fbdfbc..8b423667 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/IndekKinerjaServiceImpl.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/IndekKinerjaServiceImpl.java @@ -2706,6 +2706,7 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK List drAnastesiList = pegawaiDao.getDokterByKelompokKerja(Master.SubUnitKerja.KK_ANESTESI); List drKsmUmumList = pegawaiDao.getDokterByKelompokKerja(Master.SubUnitKerja.KK_UMUM); List drKkPediatrikGDList = pegawaiDao.getDokterByKelompokKerja(Master.SubUnitKerja.KK_PEDIATRIK_GD); + List drKkPerinatologiList = pegawaiDao.getDokterByKelompokKerja(Master.SubUnitKerja.KK_PERINATOLOGI); List laboranRadiologList = mapPegawaiLaboratRadiologiDao.findPegawaiLaboranRadiolog(); List idsRegDJPAdminNonPK = splitDataSettingDatafixed("admin_nonpk"); @@ -2734,6 +2735,7 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK List idsDokterUmumIGD = splitDataSettingDatafixed("pr_dokter_umum_igd"); List idsDokterPediatrikGD = splitDataSettingDatafixed("pr_dokter_pediatrik_gd"); + List idsDokterPerinatologi = splitDataSettingDatafixed("pr_dokter_perinatologi"); List idsPenunjangBukanAnestesi = splitDataSettingDatafixed("pr_penunjang_nonanestesi"); Double komponenDasar = Double.parseDouble(GetSettingDataFixed("ld_komponen_dasar")); Double persenOperator = Double.parseDouble(GetSettingDataFixed("ld_persen_operator")); @@ -2953,6 +2955,97 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK datePulang = datePulang.plusDays(1); } + if (Arrays.asList(Master.Departemen.GRUP_RAWAT_INAP) + .contains(Integer.parseInt(map.get("departemenId").toString())) + && ((dateTimePelayanan.isEqual(dateMasuk) || dateTimePelayanan.isAfter(dateMasuk)) + && dateTimePelayanan.isBefore(datePulang))) { + rawResult.add(map); + } else if (map.get("departemenId").equals(Master.Departemen.RAWAT_INAP) + && !Arrays.asList(Master.Ruangan.NONRANAP).contains(map.get("ruanganId")) + && Arrays.stream(Master.KONSUL_VISIT) + .anyMatch(map.get("namaProduk").toString().toLowerCase()::contains) + && (dateTimePelayanan.isBefore(dateMasuk) || dateTimePelayanan.isEqual(datePulang) + || dateTimePelayanan.isAfter(datePulang))) { + rawResult.add(map); + } else if (Arrays.asList(Master.Departemen.GRUP_RAWAT_INAP) + .contains(Integer.parseInt(map.get("departemenId").toString())) + && (dateTimePelayanan.isBefore(dateMasuk) || dateTimePelayanan.isEqual(datePulang) + || dateTimePelayanan.isAfter(datePulang)) + && Arrays.asList(Master.Kelas.KELAS_DUA_TIGA_NONKELAS) + .contains(Integer.parseInt(map.get("idKelas").toString()))) { + rawResult.add(map); + } else if (map.get("departemenId").equals(Master.Departemen.RAWAT_JALAN) + && map.get("namaShift").toString().equals("Non Shift") + && CommonUtil.isNotNullOrEmpty(jamPulangPSBB) + && (dateTimePelayanan.isEqual(PSBBDate) || dateTimePelayanan.isAfter(PSBBDate)) + && (dateTimePelayanan.isBefore(PSBBEnd) || dateTimePelayanan.isEqual(PSBBEnd))) { + if (((dateTimePelayanan.isEqual(dateMasuk) || dateTimePelayanan.isAfter(dateMasuk)) + && dateTimePelayanan.isBefore(datePulangPSBB))) { + rawResult.add(map); + } + } else if (Arrays.asList(Master.Departemen.GRUP_RAWAT_JALAN) + .contains(Integer.parseInt(map.get("departemenId").toString())) + && ((dateTimePelayanan.isEqual(dateMasuk) || dateTimePelayanan.isAfter(dateMasuk)) + && dateTimePelayanan.isBefore(datePulang))) { + rawResult.add(map); + } + } else if (CommonUtil.isNullOrEmpty(map.get("jamMasuk")) + && Arrays.asList(Master.Departemen.GRUP_RAWAT_INAP) + .contains(Integer.parseInt(map.get("departemenId").toString())) + && Arrays.asList(Master.Kelas.KELAS_DUA_TIGA_NONKELAS) + .contains(Integer.parseInt(map.get("idKelas").toString()))) { + rawResult.add(map); + } + + } else if (!listDetailJenisProduk.contains(Integer.parseInt(map.get("detailId").toString())) + && drKkPerinatologiList.contains(idPegawai) + && idsDokterPerinatologi.contains(Integer.parseInt(map.get("idProduk").toString()))) { + if (Master.KelompokPasien.BPJS.equals(Integer.parseInt(map.get("kelompokPasienId").toString())) + || Master.KelompokPasien.KEMENKES + .equals(Integer.parseInt(map.get("kelompokPasienId").toString())) + || Master.KelompokPasien.JAMKESDA + .equals(Integer.parseInt(map.get("kelompokPasienId").toString()))) { + rawResult.add(map); + } else if (CommonUtil.isNotNullOrEmpty(map.get("jamMasuk"))) { + Date tanggalPelayanan = (Date) map.get("tanggalPelayanan"); + String tglPelayanan = new SimpleDateFormat("yyyy-MM-dd").format(tanggalPelayanan); + String waktuPelayanan = new SimpleDateFormat("HH:mm:ss").format(tanggalPelayanan); + LocalDate datePelayanan = LocalDate.parse(tglPelayanan); + LocalTime timePelayanan = LocalTime.parse(waktuPelayanan); + LocalDateTime dateTimePelayanan = LocalDateTime.of(datePelayanan, timePelayanan); + + String jamMasuk = map.get("jamMasuk").toString().substring(0, 2) + ":" + + map.get("jamMasuk").toString().substring(3) + ":00"; + LocalTime timeMasuk = LocalTime.parse(jamMasuk); + LocalDateTime dateMasuk = LocalDateTime.of(datePelayanan, timeMasuk); + + String jamPulang = map.get("jamPulang").toString().substring(0, 2) + ":" + + map.get("jamPulang").toString().substring(3) + ":00"; + LocalTime timePulang = LocalTime.parse(jamPulang); + LocalDateTime datePulang = LocalDateTime.of(datePelayanan, timePulang); + + String jamPulangPSBB = ""; + LocalTime timePulangPSBB = LocalTime.now(); + LocalDateTime datePulangPSBB = LocalDateTime.now(); + if (getDayOfWeek((Date) map.get("tanggalPelayanan")) == 1 + || getDayOfWeek((Date) map.get("tanggalPelayanan")) == 2 + || getDayOfWeek((Date) map.get("tanggalPelayanan")) == 3 + || getDayOfWeek((Date) map.get("tanggalPelayanan")) == 4) { + jamPulangPSBB = "14:00:00"; + timePulangPSBB = LocalTime.parse(jamPulangPSBB); + datePulangPSBB = LocalDateTime.of(datePelayanan, timePulangPSBB); + } else if (getDayOfWeek((Date) map.get("tanggalPelayanan")) == 5) { + jamPulangPSBB = "14:30:00"; + timePulangPSBB = LocalTime.parse(jamPulangPSBB); + datePulangPSBB = LocalDateTime.of(datePelayanan, timePulangPSBB); + } else { + datePulangPSBB = LocalDateTime.of(datePelayanan, timePulang); + } + + if (map.get("namaShift").toString().contains("Malam")) { + datePulang = datePulang.plusDays(1); + } + if (Arrays.asList(Master.Departemen.GRUP_RAWAT_INAP) .contains(Integer.parseInt(map.get("departemenId").toString())) && ((dateTimePelayanan.isEqual(dateMasuk) || dateTimePelayanan.isAfter(dateMasuk)) @@ -3957,6 +4050,7 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK List drAnastesiList = pegawaiDao.getDokterByKelompokKerja(Master.SubUnitKerja.KK_ANESTESI); List drKsmUmumList = pegawaiDao.getDokterByKelompokKerja(Master.SubUnitKerja.KK_UMUM); List drKkPediatrikGDList = pegawaiDao.getDokterByKelompokKerja(Master.SubUnitKerja.KK_PEDIATRIK_GD); + List drKkPerinatologiList = pegawaiDao.getDokterByKelompokKerja(Master.SubUnitKerja.KK_PERINATOLOGI); List laboranRadiologList = mapPegawaiLaboratRadiologiDao.findPegawaiLaboranRadiolog(); List idsRegDJPAdminNonPK = splitDataSettingDatafixed("admin_nonpk"); @@ -3985,6 +4079,7 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK List idsDokterUmumIGD = splitDataSettingDatafixed("pr_dokter_umum_igd"); List idsDokterPediatrikGD = splitDataSettingDatafixed("pr_dokter_pediatrik_gd"); + List idsDokterPerinatologi = splitDataSettingDatafixed("pr_dokter_perinatologi"); List idsPenunjangBukanAnestesi = splitDataSettingDatafixed("pr_penunjang_nonanestesi"); Double komponenDasar = Double.parseDouble(GetSettingDataFixed("ld_komponen_dasar")); Double persenOperator = Double.parseDouble(GetSettingDataFixed("ld_persen_operator")); @@ -4205,6 +4300,96 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK datePulang = datePulang.plusDays(1); } + if (Arrays.asList(Master.Departemen.GRUP_RAWAT_INAP) + .contains(Integer.parseInt(map.get("departemenId").toString())) + && ((dateTimePelayanan.isEqual(dateMasuk) || dateTimePelayanan.isAfter(dateMasuk)) + && dateTimePelayanan.isBefore(datePulang))) { + rawResult.add(map); + } else if (map.get("departemenId").equals(Master.Departemen.RAWAT_INAP) + && !Arrays.asList(Master.Ruangan.NONRANAP).contains(map.get("ruanganId")) + && Arrays.stream(Master.KONSUL_VISIT) + .anyMatch(map.get("namaProduk").toString().toLowerCase()::contains) + && (dateTimePelayanan.isBefore(dateMasuk) || dateTimePelayanan.isEqual(datePulang) + || dateTimePelayanan.isAfter(datePulang))) { + rawResult.add(map); + } else if (Arrays.asList(Master.Departemen.GRUP_RAWAT_INAP) + .contains(Integer.parseInt(map.get("departemenId").toString())) + && (dateTimePelayanan.isBefore(dateMasuk) || dateTimePelayanan.isEqual(datePulang) + || dateTimePelayanan.isAfter(datePulang)) + && Arrays.asList(Master.Kelas.KELAS_DUA_TIGA_NONKELAS) + .contains(Integer.parseInt(map.get("idKelas").toString()))) { + rawResult.add(map); + } else if (map.get("departemenId").equals(Master.Departemen.RAWAT_JALAN) + && map.get("namaShift").toString().equals("Non Shift") + && CommonUtil.isNotNullOrEmpty(jamPulangPSBB) + && (dateTimePelayanan.isEqual(PSBBDate) || dateTimePelayanan.isAfter(PSBBDate)) + && (dateTimePelayanan.isBefore(PSBBEnd) || dateTimePelayanan.isEqual(PSBBEnd))) { + if (((dateTimePelayanan.isEqual(dateMasuk) || dateTimePelayanan.isAfter(dateMasuk)) + && dateTimePelayanan.isBefore(datePulangPSBB))) { + rawResult.add(map); + } + } else if (Arrays.asList(Master.Departemen.GRUP_RAWAT_JALAN) + .contains(Integer.parseInt(map.get("departemenId").toString())) + && ((dateTimePelayanan.isEqual(dateMasuk) || dateTimePelayanan.isAfter(dateMasuk)) + && dateTimePelayanan.isBefore(datePulang))) { + rawResult.add(map); + } + } else if (CommonUtil.isNullOrEmpty(map.get("jamMasuk")) + && Arrays.asList(Master.Departemen.GRUP_RAWAT_INAP) + .contains(Integer.parseInt(map.get("departemenId").toString())) + && Arrays.asList(Master.Kelas.KELAS_DUA_TIGA_NONKELAS) + .contains(Integer.parseInt(map.get("idKelas").toString()))) { + rawResult.add(map); + } + } else if (!listDetailJenisProduk.contains(Integer.parseInt(map.get("detailId").toString())) + && drKkPerinatologiList.contains(idPegawai) + && idsDokterPerinatologi.contains(Integer.parseInt(map.get("idProduk").toString()))) { + if (Master.KelompokPasien.BPJS.equals(Integer.parseInt(map.get("kelompokPasienId").toString())) + || Master.KelompokPasien.KEMENKES + .equals(Integer.parseInt(map.get("kelompokPasienId").toString())) + || Master.KelompokPasien.JAMKESDA + .equals(Integer.parseInt(map.get("kelompokPasienId").toString()))) { + rawResult.add(map); + } else if (CommonUtil.isNotNullOrEmpty(map.get("jamMasuk"))) { + Date tanggalPelayanan = (Date) map.get("tanggalPelayanan"); + String tglPelayanan = new SimpleDateFormat("yyyy-MM-dd").format(tanggalPelayanan); + String waktuPelayanan = new SimpleDateFormat("HH:mm:ss").format(tanggalPelayanan); + LocalDate datePelayanan = LocalDate.parse(tglPelayanan); + LocalTime timePelayanan = LocalTime.parse(waktuPelayanan); + LocalDateTime dateTimePelayanan = LocalDateTime.of(datePelayanan, timePelayanan); + + String jamMasuk = map.get("jamMasuk").toString().substring(0, 2) + ":" + + map.get("jamMasuk").toString().substring(3) + ":00"; + LocalTime timeMasuk = LocalTime.parse(jamMasuk); + LocalDateTime dateMasuk = LocalDateTime.of(datePelayanan, timeMasuk); + + String jamPulang = map.get("jamPulang").toString().substring(0, 2) + ":" + + map.get("jamPulang").toString().substring(3) + ":00"; + LocalTime timePulang = LocalTime.parse(jamPulang); + LocalDateTime datePulang = LocalDateTime.of(datePelayanan, timePulang); + + String jamPulangPSBB = ""; + LocalTime timePulangPSBB = LocalTime.now(); + LocalDateTime datePulangPSBB = LocalDateTime.now(); + if (getDayOfWeek((Date) map.get("tanggalPelayanan")) == 1 + || getDayOfWeek((Date) map.get("tanggalPelayanan")) == 2 + || getDayOfWeek((Date) map.get("tanggalPelayanan")) == 3 + || getDayOfWeek((Date) map.get("tanggalPelayanan")) == 4) { + jamPulangPSBB = "14:00:00"; + timePulangPSBB = LocalTime.parse(jamPulangPSBB); + datePulangPSBB = LocalDateTime.of(datePelayanan, timePulangPSBB); + } else if (getDayOfWeek((Date) map.get("tanggalPelayanan")) == 5) { + jamPulangPSBB = "14:30:00"; + timePulangPSBB = LocalTime.parse(jamPulangPSBB); + datePulangPSBB = LocalDateTime.of(datePelayanan, timePulangPSBB); + } else { + datePulangPSBB = LocalDateTime.of(datePelayanan, timePulang); + } + + if (map.get("namaShift").toString().contains("Malam")) { + datePulang = datePulang.plusDays(1); + } + if (Arrays.asList(Master.Departemen.GRUP_RAWAT_INAP) .contains(Integer.parseInt(map.get("departemenId").toString())) && ((dateTimePelayanan.isEqual(dateMasuk) || dateTimePelayanan.isAfter(dateMasuk)) @@ -5113,6 +5298,7 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK List laboranRadiologList = mapPegawaiLaboratRadiologiDao.findPegawaiLaboranRadiolog(); List drKsmUmumList = pegawaiDao.getDokterByKelompokKerja(Master.SubUnitKerja.KK_UMUM); List drKkPediatrikGDList = pegawaiDao.getDokterByKelompokKerja(Master.SubUnitKerja.KK_PEDIATRIK_GD); + List drKkPerinatologiList = pegawaiDao.getDokterByKelompokKerja(Master.SubUnitKerja.KK_PERINATOLOGI); List idsRegDJPAdminNonPK = splitDataSettingDatafixed("admin_nonpk"); List idsRegDJPMedisUtama = splitDataSettingDatafixed("medis_utama"); @@ -5145,6 +5331,7 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK List idsDokterUmumIGD = splitDataSettingDatafixed("pr_dokter_umum_igd"); List idsDokterPediatrikGD = splitDataSettingDatafixed("pr_dokter_pediatrik_gd"); + List idsDokterPerinatologi = splitDataSettingDatafixed("pr_dokter_perinatologi"); if (!ffs) { if (CommonUtil.isNotNullOrEmpty(listData)) { @@ -5598,6 +5785,203 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK } } } + } else if (!listDetailJenisProduk.contains(Integer.parseInt(map.get("detailId").toString())) + && drKkPerinatologiList.contains(idPegawai) + && idsDokterPerinatologi.contains(Integer.parseInt(map.get("idProduk").toString()))) { + if (Master.KelompokPasien.BPJS + .equals(Integer.parseInt(map.get("kelompokPasienId").toString())) + || Master.KelompokPasien.KEMENKES + .equals(Integer.parseInt(map.get("kelompokPasienId").toString())) + || Master.KelompokPasien.JAMKESDA + .equals(Integer.parseInt(map.get("kelompokPasienId").toString()))) { + if (diskon > 0 && (CommonUtil.isNullOrEmpty(statusDiskon) || statusDiskon.equals(0))) { + if (Double.valueOf(map.get("diskon").toString()) > 0 + && (CommonUtil.isNullOrEmpty(map.get("statusDiskon")) + || Integer.valueOf(map.get("statusDiskon").toString()).equals(0))) { + result.add(map); + } + } else { + if (Double.valueOf(map.get("diskon").toString()) == 0 + || (Double.valueOf(map.get("diskon").toString()) > 0 + && CommonUtil.isNotNullOrEmpty(map.get("statusDiskon")) && !Integer + .valueOf(map.get("statusDiskon").toString()).equals(0))) { + result.add(map); + } + } + } else if (CommonUtil.isNotNullOrEmpty(map.get("jamMasuk"))) { + Date tanggalPelayanan = (Date) map.get("tanggalPelayanan"); + String tglPelayanan = new SimpleDateFormat("yyyy-MM-dd").format(tanggalPelayanan); + String waktuPelayanan = new SimpleDateFormat("HH:mm:ss").format(tanggalPelayanan); + LocalDate datePelayanan = LocalDate.parse(tglPelayanan); + LocalTime timePelayanan = LocalTime.parse(waktuPelayanan); + LocalDateTime dateTimePelayanan = LocalDateTime.of(datePelayanan, timePelayanan); + + String jamMasuk = map.get("jamMasuk").toString().substring(0, 2) + ":" + + map.get("jamMasuk").toString().substring(3) + ":00"; + LocalTime timeMasuk = LocalTime.parse(jamMasuk); + LocalDateTime dateMasuk = LocalDateTime.of(datePelayanan, timeMasuk); + + String jamPulang = map.get("jamPulang").toString().substring(0, 2) + ":" + + map.get("jamPulang").toString().substring(3) + ":00"; + LocalTime timePulang = LocalTime.parse(jamPulang); + LocalDateTime datePulang = LocalDateTime.of(datePelayanan, timePulang); + + String jamPulangPSBB = ""; + LocalTime timePulangPSBB = LocalTime.now(); + LocalDateTime datePulangPSBB = LocalDateTime.now(); + if (getDayOfWeek((Date) map.get("tanggalPelayanan")) == 1 + || getDayOfWeek((Date) map.get("tanggalPelayanan")) == 2 + || getDayOfWeek((Date) map.get("tanggalPelayanan")) == 3 + || getDayOfWeek((Date) map.get("tanggalPelayanan")) == 4) { + jamPulangPSBB = "14:00:00"; + timePulangPSBB = LocalTime.parse(jamPulangPSBB); + datePulangPSBB = LocalDateTime.of(datePelayanan, timePulangPSBB); + } else if (getDayOfWeek((Date) map.get("tanggalPelayanan")) == 5) { + jamPulangPSBB = "14:30:00"; + timePulangPSBB = LocalTime.parse(jamPulangPSBB); + datePulangPSBB = LocalDateTime.of(datePelayanan, timePulangPSBB); + } else { + datePulangPSBB = LocalDateTime.of(datePelayanan, timePulang); + } + + if (map.get("namaShift").toString().contains("Malam")) { + datePulang = datePulang.plusDays(1); + } + + if (Arrays.asList(Master.Departemen.GRUP_RAWAT_INAP) + .contains(Integer.parseInt(map.get("departemenId").toString())) + && ((dateTimePelayanan.isEqual(dateMasuk) + || dateTimePelayanan.isAfter(dateMasuk)) + && dateTimePelayanan.isBefore(datePulang))) { + if (diskon > 0 + && (CommonUtil.isNullOrEmpty(statusDiskon) || statusDiskon.equals(0))) { + if (Double.valueOf(map.get("diskon").toString()) > 0 + && (CommonUtil.isNullOrEmpty(map.get("statusDiskon")) || Integer + .valueOf(map.get("statusDiskon").toString()).equals(0))) { + result.add(map); + } + } else { + if (Double.valueOf(map.get("diskon").toString()) == 0 + || (Double.valueOf(map.get("diskon").toString()) > 0 + && CommonUtil.isNotNullOrEmpty(map.get("statusDiskon")) + && !Integer.valueOf(map.get("statusDiskon").toString()) + .equals(0))) { + result.add(map); + } + } + } else if (map.get("departemenId").equals(Master.Departemen.RAWAT_INAP) + && !Arrays.asList(Master.Ruangan.NONRANAP).contains(map.get("ruanganId")) + && Arrays.stream(Master.KONSUL_VISIT) + .anyMatch(map.get("namaProduk").toString().toLowerCase()::contains) + && (dateTimePelayanan.isBefore(dateMasuk) + || dateTimePelayanan.isEqual(datePulang) + || dateTimePelayanan.isAfter(datePulang))) { + if (diskon > 0 + && (CommonUtil.isNullOrEmpty(statusDiskon) || statusDiskon.equals(0))) { + if (Double.valueOf(map.get("diskon").toString()) > 0 + && (CommonUtil.isNullOrEmpty(map.get("statusDiskon")) || Integer + .valueOf(map.get("statusDiskon").toString()).equals(0))) { + result.add(map); + } + } else { + if (Double.valueOf(map.get("diskon").toString()) == 0 + || (Double.valueOf(map.get("diskon").toString()) > 0 + && CommonUtil.isNotNullOrEmpty(map.get("statusDiskon")) + && !Integer.valueOf(map.get("statusDiskon").toString()) + .equals(0))) { + result.add(map); + } + } + } else if (Arrays.asList(Master.Departemen.GRUP_RAWAT_INAP) + .contains(Integer.parseInt(map.get("departemenId").toString())) + && (dateTimePelayanan.isBefore(dateMasuk) + || dateTimePelayanan.isEqual(datePulang) + || dateTimePelayanan.isAfter(datePulang)) + && Arrays.asList(Master.Kelas.KELAS_DUA_TIGA_NONKELAS) + .contains(Integer.parseInt(map.get("idKelas").toString()))) { + if (diskon > 0 + && (CommonUtil.isNullOrEmpty(statusDiskon) || statusDiskon.equals(0))) { + if (Double.valueOf(map.get("diskon").toString()) > 0 + && (CommonUtil.isNullOrEmpty(map.get("statusDiskon")) || Integer + .valueOf(map.get("statusDiskon").toString()).equals(0))) { + result.add(map); + } + } else { + if (Double.valueOf(map.get("diskon").toString()) == 0 + || (Double.valueOf(map.get("diskon").toString()) > 0 + && CommonUtil.isNotNullOrEmpty(map.get("statusDiskon")) + && !Integer.valueOf(map.get("statusDiskon").toString()) + .equals(0))) { + result.add(map); + } + } + } else if (map.get("departemenId").equals(Master.Departemen.RAWAT_JALAN) + && map.get("namaShift").toString().equals("Non Shift") + && CommonUtil.isNotNullOrEmpty(jamPulangPSBB) + && (dateTimePelayanan.isEqual(PSBBDate) || dateTimePelayanan.isAfter(PSBBDate)) + && (dateTimePelayanan.isBefore(PSBBEnd) + || dateTimePelayanan.isEqual(PSBBEnd))) { + if (((dateTimePelayanan.isEqual(dateMasuk) || dateTimePelayanan.isAfter(dateMasuk)) + && dateTimePelayanan.isBefore(datePulangPSBB))) { + if (diskon > 0 + && (CommonUtil.isNullOrEmpty(statusDiskon) || statusDiskon.equals(0))) { + if (Double.valueOf(map.get("diskon").toString()) > 0 + && (CommonUtil.isNullOrEmpty(map.get("statusDiskon")) || Integer + .valueOf(map.get("statusDiskon").toString()).equals(0))) { + result.add(map); + } + } else { + if (Double.valueOf(map.get("diskon").toString()) == 0 + || (Double.valueOf(map.get("diskon").toString()) > 0 + && CommonUtil.isNotNullOrEmpty(map.get("statusDiskon")) + && !Integer.valueOf(map.get("statusDiskon").toString()) + .equals(0))) { + result.add(map); + } + } + } + } else if (Arrays.asList(Master.Departemen.GRUP_RAWAT_JALAN) + .contains(Integer.parseInt(map.get("departemenId").toString())) + && ((dateTimePelayanan.isEqual(dateMasuk) + || dateTimePelayanan.isAfter(dateMasuk)) + && dateTimePelayanan.isBefore(datePulang))) { + if (diskon > 0 + && (CommonUtil.isNullOrEmpty(statusDiskon) || statusDiskon.equals(0))) { + if (Double.valueOf(map.get("diskon").toString()) > 0 + && (CommonUtil.isNullOrEmpty(map.get("statusDiskon")) || Integer + .valueOf(map.get("statusDiskon").toString()).equals(0))) { + result.add(map); + } + } else { + if (Double.valueOf(map.get("diskon").toString()) == 0 + || (Double.valueOf(map.get("diskon").toString()) > 0 + && CommonUtil.isNotNullOrEmpty(map.get("statusDiskon")) + && !Integer.valueOf(map.get("statusDiskon").toString()) + .equals(0))) { + result.add(map); + } + } + } + } else if (CommonUtil.isNullOrEmpty(map.get("jamMasuk")) + && Arrays.asList(Master.Departemen.GRUP_RAWAT_INAP) + .contains(Integer.parseInt(map.get("departemenId").toString())) + && Arrays.asList(Master.Kelas.KELAS_DUA_TIGA_NONKELAS) + .contains(Integer.parseInt(map.get("idKelas").toString()))) { + if (diskon > 0 && (CommonUtil.isNullOrEmpty(statusDiskon) || statusDiskon.equals(0))) { + if (Double.valueOf(map.get("diskon").toString()) > 0 + && (CommonUtil.isNullOrEmpty(map.get("statusDiskon")) + || Integer.valueOf(map.get("statusDiskon").toString()).equals(0))) { + result.add(map); + } + } else { + if (Double.valueOf(map.get("diskon").toString()) == 0 + || (Double.valueOf(map.get("diskon").toString()) > 0 + && CommonUtil.isNotNullOrEmpty(map.get("statusDiskon")) && !Integer + .valueOf(map.get("statusDiskon").toString()).equals(0))) { + result.add(map); + } + } + } } else if (CommonUtil.isNotNullOrEmpty(listDetailJenisProdukException) && listDetailJenisProdukException .contains(Integer.parseInt(map.get("detailId").toString()))) { diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/MonitoringAbsenServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/MonitoringAbsenServiceImpl.java index bba77de4..a874e51c 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/MonitoringAbsenServiceImpl.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/MonitoringAbsenServiceImpl.java @@ -1753,8 +1753,10 @@ public class MonitoringAbsenServiceImpl extends BaseVoServiceImpl implements Mon dataPM.put("absensiMasuk", sdf.format(time)); if (CommonUtil.isNotNullOrEmpty(temp.get("ip_addr")) && CommonUtil.isNotNullOrEmpty(temp.get("processtatus"))) { - dataPM.put("validMasuk", validate(temp.get("ip_addr").toString(), - Integer.valueOf(temp.get("processtatus").toString()))); + dataPM.put("validMasuk", + validate(temp.get("ip_addr").toString(), + temp.get("client_ip_addr").toString(), + Integer.valueOf(temp.get("processtatus").toString()))); } else { dataPM.put("validMasuk", "Y"); } @@ -1771,8 +1773,10 @@ public class MonitoringAbsenServiceImpl extends BaseVoServiceImpl implements Mon dataPM.put("absensiPulang", sdf.format(time)); if (CommonUtil.isNotNullOrEmpty(temp.get("ip_addr")) && CommonUtil.isNotNullOrEmpty(temp.get("processtatus"))) { - dataPM.put("validPulang", validate(temp.get("ip_addr").toString(), - Integer.valueOf(temp.get("processtatus").toString()))); + dataPM.put("validPulang", + validate(temp.get("ip_addr").toString(), + temp.get("client_ip_addr").toString(), + Integer.valueOf(temp.get("processtatus").toString()))); } else { dataPM.put("validPulang", "Y"); } @@ -1987,8 +1991,9 @@ public class MonitoringAbsenServiceImpl extends BaseVoServiceImpl implements Mon data.put("absensiMasuk", sdf.format(time)); if (CommonUtil.isNotNullOrEmpty(temp.get("ip_addr")) && CommonUtil.isNotNullOrEmpty(temp.get("processtatus"))) { - data.put("validMasuk", validate(temp.get("ip_addr").toString(), - Integer.valueOf(temp.get("processtatus").toString()))); + data.put("validMasuk", + validate(temp.get("ip_addr").toString(), temp.get("client_ip_addr").toString(), + Integer.valueOf(temp.get("processtatus").toString()))); } else { data.put("validMasuk", "Y"); } @@ -2005,8 +2010,9 @@ public class MonitoringAbsenServiceImpl extends BaseVoServiceImpl implements Mon data.put("absensiPulang", sdf.format(time)); if (CommonUtil.isNotNullOrEmpty(temp.get("ip_addr")) && CommonUtil.isNotNullOrEmpty(temp.get("processtatus"))) { - data.put("validPulang", validate(temp.get("ip_addr").toString(), - Integer.valueOf(temp.get("processtatus").toString()))); + data.put("validPulang", + validate(temp.get("ip_addr").toString(), temp.get("client_ip_addr").toString(), + Integer.valueOf(temp.get("processtatus").toString()))); } else { data.put("validPulang", "Y"); } @@ -2231,7 +2237,7 @@ public class MonitoringAbsenServiceImpl extends BaseVoServiceImpl implements Mon @Transactional(readOnly = true) public String cuti(Integer idPegawai, String tgl) { - Map alasanKetidakhadiran = pegawaiHistoriRekapIndexDao.getPegawaiHistoriRekapIndexByDate( + List> alasanKetidakhadiran = pegawaiHistoriRekapIndexDao.getPegawaiHistoriRekapIndexByDate( idPegawai, splitDataSettingDatafixed("komponenIndeksKetidakhadiran"), tgl); if (CommonUtil.isNullOrEmpty(alasanKetidakhadiran)) { alasanKetidakhadiran = pegawaiHistoriRekapIndexDao.getPegawaiHistoriRekapIndexByDate(idPegawai, @@ -2239,8 +2245,8 @@ public class MonitoringAbsenServiceImpl extends BaseVoServiceImpl implements Mon } String cuti = ""; if (CommonUtil.isNotNullOrEmpty(alasanKetidakhadiran)) { - if (CommonUtil.isNotNullOrEmpty(alasanKetidakhadiran.get("noRecHistory"))) { - cuti = alasanKetidakhadiran.get("alasan").toString(); + if (CommonUtil.isNotNullOrEmpty(alasanKetidakhadiran.get(0).get("noRecHistory"))) { + cuti = alasanKetidakhadiran.get(0).get("alasan").toString(); } } @@ -2267,7 +2273,7 @@ public class MonitoringAbsenServiceImpl extends BaseVoServiceImpl implements Mon } @Transactional(readOnly = true) - public String validate(String ipAddress, Integer processStatus) { + public String validate(String ipAddress, String clientIPAddress, Integer processStatus) { List listIp = stringSplitDataSettingDatafixed("ip_addr"); if (CommonUtil.isNotNullOrEmpty(listIp)) { if (processStatus.equals(1) && listIp.contains(ipAddress)) { @@ -2278,7 +2284,11 @@ public class MonitoringAbsenServiceImpl extends BaseVoServiceImpl implements Mon && !listIp.contains(ipAddress)) { return "T"; } else { - return "Y"; + if (ipAddress.equals(Master.PresensiPegawai.VPN) && clientIPAddress.startsWith("172.16.198")) { + return "T"; + } else { + return "Y"; + } } } else { return ""; diff --git a/jasamedika-config/src/main/resources/jdbc.development.properties b/jasamedika-config/src/main/resources/jdbc.development.properties index 1d9ca0b9..b51392ca 100644 --- a/jasamedika-config/src/main/resources/jdbc.development.properties +++ b/jasamedika-config/src/main/resources/jdbc.development.properties @@ -8,11 +8,11 @@ hibernate.show_sql = true hikari.config.maximum.pool.size = 5 # DB Development -jdbc.url = jdbc:postgresql://192.168.12.3:5432/production_backup_18_06_2022 +jdbc.url = jdbc:postgresql://192.168.12.3:5432/backup_20230104 jdbc.username = postgres jdbc.password = root jdbc.serverName = 192.168.12.3 -jdbc.databaseName = production_backup_18_06_2022 +jdbc.databaseName = backup_20230104 jdbc.portNumber = 5432 corePoolSizeAsyncConfigurer = 5 diff --git a/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/resep.jrxml b/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/resep.jrxml index 6a9559a2..138df36b 100644 --- a/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/resep.jrxml +++ b/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/resep.jrxml @@ -619,7 +619,7 @@ - + @@ -1616,7 +1616,7 @@ - + @@ -1629,7 +1629,7 @@ - + @@ -1641,7 +1641,7 @@ - + @@ -1651,7 +1651,7 @@ - + @@ -1662,7 +1662,7 @@ - + @@ -1672,7 +1672,7 @@ - + @@ -1682,7 +1682,7 @@ - + @@ -1692,7 +1692,7 @@ - + @@ -1705,7 +1705,7 @@ - + @@ -1717,10 +1717,10 @@ - + - + @@ -1732,7 +1732,7 @@ - + @@ -1748,9 +1748,8 @@ - + - @@ -1764,8 +1763,8 @@ - - + + @@ -1777,7 +1776,7 @@ - + @@ -1792,7 +1791,7 @@ - + @@ -1800,12 +1799,12 @@ - + - + @@ -1815,7 +1814,7 @@ - + @@ -1825,7 +1824,7 @@ - + @@ -1835,7 +1834,7 @@ - + @@ -1847,7 +1846,7 @@ - + @@ -1855,12 +1854,12 @@ - + - + @@ -1870,7 +1869,7 @@ - + @@ -1880,7 +1879,7 @@ - + @@ -1890,7 +1889,7 @@ - + @@ -1902,7 +1901,7 @@ - + @@ -1910,12 +1909,12 @@ - + - + @@ -1925,7 +1924,7 @@ - + @@ -1935,7 +1934,7 @@ - + @@ -1945,7 +1944,7 @@ - + diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RegistrasiPelayananController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RegistrasiPelayananController.java index f34e3a7c..db41b935 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RegistrasiPelayananController.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RegistrasiPelayananController.java @@ -47,6 +47,7 @@ import com.jasamedika.medifirst2000.dao.StrukOrderDao; import com.jasamedika.medifirst2000.dto.EtiketPersetujuanUmum; import com.jasamedika.medifirst2000.dto.HasilLaboratoriumDto; import com.jasamedika.medifirst2000.dto.Antrian; +import com.jasamedika.medifirst2000.dto.AntrianPasienDiperiksaDto; import com.jasamedika.medifirst2000.dto.OrderPelayananGiziDto; import com.jasamedika.medifirst2000.dto.SuratEligibilitasAsuransi; import com.jasamedika.medifirst2000.entities.Alamat; @@ -741,12 +742,11 @@ public class RegistrasiPelayananController extends LocaleController { @RequestMapping(value = "/get-antrian-pasien/", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity> getAntrianPasien( @RequestParam(value = "noRec", required = false) String noRec) { - AntrianPasienDiPeriksa resultPageMap = (AntrianPasienDiPeriksa) antrianPasienDiperiksaService.findAntrian(noRec) - .get(0); + AntrianPasienDiperiksaDto resultPageMap = antrianPasienDiperiksaService.findAntrian(noRec).get(0); try { - return RestUtil.getJsonResponse(resultPageMap.ToMap(), HttpStatus.OK, mapHeaderMessage); - } catch (IllegalArgumentException | IllegalAccessException e) { + return RestUtil.getJsonResponse(resultPageMap, HttpStatus.OK, mapHeaderMessage); + } catch (IllegalArgumentException e) { e.printStackTrace(); } return RestUtil.getJsonResponse(null, HttpStatus.NOT_FOUND, mapHeaderMessage);