diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/MigrasiPasienDao.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/MigrasiPasienDao.java index cff00738..0c33a5df 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/MigrasiPasienDao.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/MigrasiPasienDao.java @@ -16,8 +16,8 @@ import java.util.List; */ public interface MigrasiPasienDao extends JpaRepository { @Query("select ps from MigrasiPasien mp " + "inner join mp.pasien ps " - + "where mp.statusMigrasi in (:listStatusMigrasi) " - + "and (ps.noIdentitas is not null or ps.noidentitas <> '')") + + "where mp.statusMigrasi in (:listStatusMigrasi) " + "and ps.noIdentitas is not null " + + "and ps.noIdentitas <> '' " + "and ps.noIdentitas <> '-'") List findPasienByStatusMigrasiIn(@Param("listStatusMigrasi") List statusMigrasiList); @Query(value = "select mp.* from migrasipasien_t mp " + "inner join pasien_m ps on mp.pasienfk = ps.id " diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/PasienDao.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/PasienDao.java index aae79884..ecaeb990 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/PasienDao.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/PasienDao.java @@ -127,7 +127,8 @@ public interface PasienDao extends JpaRepository { @Query(value = "select ps.* from pasien_m ps " + "where ps.statusenabled is true " + "and ps.nocm ~ '^[0-9\\.]+$' " + "and length(ps.nocm) = 8 " + "and cast(ps.nocm as integer) < 10000000 " - + "and ps.id not in (select mp.pasienfk from migrasipasien_t mp) " - + "order by cast(ps.nocm as integer) desc " + "limit 100", nativeQuery = true) + + "and ps.id not in (select mp.pasienfk from migrasipasien_t mp) " + "and ps.noidentitas is not null " + + "and ps.noidentitas <> '' " + "and ps.noidentitas <> '-' " + "order by cast(ps.nocm as integer) desc " + + "limit 100", nativeQuery = true) List find100LatestByNotMigrateYet(); }