diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/LogbookKinerjaDao.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/LogbookKinerjaDao.java index 9dc2ea0e..0d17b3e0 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/LogbookKinerjaDao.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/LogbookKinerjaDao.java @@ -81,7 +81,7 @@ public interface LogbookKinerjaDao extends PagingAndSortingRepository> findKontrakKinerja(@Param("indikatorId") Integer idIndikator); - @Query("select new Map(lk.noRec as noRec," + "pg.id as idPegawai,pg.namaLengkap as namaPegawai," + @Query("select distinct new Map(lk.noRec as noRec," + "pg.id as idPegawai,pg.namaLengkap as namaPegawai," + "coalesce(mj.nilaiJabatan,0) as nilaiJabatan," + "jb.id as idJabatan,jb.namaJabatan as namaJabatan," + "jb.kelompokJabatanId as kelompokJabatanId," + "ik.jenisIndikator as idJenisIndikator," + "(case when ik.jenisIndikator = 1 then 'Kuantitas' " + "when ik.jenisIndikator = 2 then 'Kualitas' " diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/LogbookKinerjaServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/LogbookKinerjaServiceImpl.java index 49219347..287ee8e6 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/LogbookKinerjaServiceImpl.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/LogbookKinerjaServiceImpl.java @@ -3041,7 +3041,6 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb List idsRegDJPPenunjangPA = splitDataSettingDatafixed("penunjang_pa"); List idsRegDJPPenunjangPK = splitDataSettingDatafixed("penunjang_pk"); List idsRegDJPPenunjangRad = splitDataSettingDatafixed("penunjang_radiologi"); - List idsRegDJPPenunjangLab = splitDataSettingDatafixed("penunjang_laboratorium"); List laboranRadiologList = mapPegawaiLaboratRadiologiDao.findPegawaiLaboranRadiolog(); List drKsmUmumList = pegawaiDao.getDokterByKelompokKerja(Master.SubUnitKerja.KK_UMUM); @@ -3050,8 +3049,6 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb List drRadList = pegawaiDao.getDokterByKelompokKerja(Master.SubUnitKerja.KK_RADIOLOGI); List idsDokterUmumIGD = splitDataSettingDatafixed("pr_dokter_umum_igd"); - List idsKonsultasiDokterJaga = splitDataSettingDatafixed("pr_konsultasi_dokter_jaga"); - List idsPenunjangBukanAnestesi = splitDataSettingDatafixed("pr_penunjang_nonanestesi"); for (Integer idPegawai : listIdPegawai) { SkorDokterVO skorDokterVO = new SkorDokterVO();