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 6528d282..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 @@ -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" }; 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 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 "";