diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/TargetSkorDokterDetailDao.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/TargetSkorDokterDetailDao.java index 80731ae0..f680abc7 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/TargetSkorDokterDetailDao.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/TargetSkorDokterDetailDao.java @@ -23,8 +23,9 @@ public interface TargetSkorDokterDetailDao extends PagingAndSortingRepository> findByHeadId(@Param("noRec") String noRec) throws JpaSystemException; @Query("select tsd.skor " + "from TargetSkorDokterDetail tsd " + "inner join tsd.targetSkor ts " - + "where tsd.pegawaiId = :pegawaiId " + "and to_char(ts.tmt,'yyyy-MM') < :bulan " + "order by ts.tmt desc") - public List findTargetByPegawai(@Param("pegawaiId") Integer idPegawai, @Param("bulan") String bulan) - throws JpaSystemException; + + "where tsd.pegawaiId = :pegawaiId " + "and to_char(ts.tmt,'yyyy-MM') <= :bulan " + + "and to_char(ts.tmt,'yyyy') = :tahun " + "order by ts.tmt desc") + public List findTargetByPegawai(@Param("pegawaiId") Integer idPegawai, @Param("bulan") String bulan, + @Param("tahun") String tahun) throws JpaSystemException; }