From a7a7326e14980a89809cff3ecf63199c86dc6bc4 Mon Sep 17 00:00:00 2001 From: Salman Manoe Date: Tue, 29 Aug 2023 11:38:25 +0700 Subject: [PATCH] Clean code Persiapan perbaikan tertanda direktur sdm, pendidikan, dan penelitian pada cetakan surat tugas --- .../medifirst2000/dao/PegawaiDao.java | 200 +- .../service/impl/PegawaiServiceImpl.java | 285 +-- .../controller/ReportingController.java | 2050 +++++++---------- 3 files changed, 1039 insertions(+), 1496 deletions(-) diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/PegawaiDao.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/PegawaiDao.java index adca5a04..40c0599a 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/PegawaiDao.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/PegawaiDao.java @@ -1,18 +1,17 @@ package com.jasamedika.medifirst2000.dao; -import java.util.Date; -import java.util.List; -import java.util.Map; - +import com.jasamedika.medifirst2000.entities.Jabatan; +import com.jasamedika.medifirst2000.entities.Pegawai; +import com.jasamedika.medifirst2000.vo.PegawaiVO; import org.springframework.data.jpa.repository.JpaSpecificationExecutor; import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.PagingAndSortingRepository; import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; -import com.jasamedika.medifirst2000.entities.Jabatan; -import com.jasamedika.medifirst2000.entities.Pegawai; -import com.jasamedika.medifirst2000.vo.PegawaiVO; +import java.util.Date; +import java.util.List; +import java.util.Map; /** * Repository class for Pegawai @@ -24,19 +23,19 @@ public interface PegawaiDao extends PagingAndSortingRepository @Query("select new map (pegawai.id as id, pegawai.namaLengkap as namaLengkap) " + "from Pegawai pegawai where pegawai.id = :pegawaiId and pegawai.statusEnabled is true") - public Map getPegawaiByPegawaiId(@Param("pegawaiId") Integer pegawaiId); + Map getPegawaiByPegawaiId(@Param("pegawaiId") Integer pegawaiId); @Query("select new Map (p.namaLengkap as namaLengkap,p.nip as nip) from Pegawai p where p.id=:id") - public Map dataPegawaiByNoRec(@Param("id") Integer id); + Map dataPegawaiByNoRec(@Param("id") Integer id); @Query("select new Map(model.id as id,model.namaLengkap as namaLengkap,model.ruanganId as ruanganId) " + "from Pegawai model where model.id=:id and model.statusEnabled is true") - public Map getPegawaiByIdCustom(@Param("id") Integer id); + Map getPegawaiByIdCustom(@Param("id") Integer id); @Query("select new Map(pg.namaLengkap as namaLengkap," + "pg.idFinger as idFinger," + "pg.jenisPegawaiId as jenisPegawaiId," + "pg.shiftKerjaId as shiftKerjaId) " + "from Pegawai pg " + "where pg.id = :pegawaiId") - public Map getPegawaiCapaianKuantitas(@Param("pegawaiId") Integer idPegawai); + Map getPegawaiCapaianKuantitas(@Param("pegawaiId") Integer idPegawai); @Query("select new map (coalesce(pegawai.nipPns,'') as nip, " + "coalesce(pegawai.namaLengkap,'') as namaLengkap, " + "coalesce(agama.agama,'') as agama, " + "coalesce(subUnitKerja.name,'') as subUnitKerja, " @@ -65,7 +64,7 @@ public interface PegawaiDao extends PagingAndSortingRepository + "left join pegawai.titlePasien titlePasien " + "left join pegawai.typePegawai typePegawai " + "where mapPegawai.isPrimary is true " + "and mapPegawai.statusEnabled is true " + "and kategoriPegawai.id = :kategoryPegawaiId " + "order by pegawai.nama") - public List> generatePegawaiByKategory(@Param("kategoryPegawaiId") Integer kategoryPegawaiId); + List> generatePegawaiByKategory(@Param("kategoryPegawaiId") Integer kategoryPegawaiId); @Query("select coalesce(p.nip,p.nipPns) as nip, " + "p.namaLengkap as namaLengkap, " + "a.agama as agama, " + "suk.namaExternal as subUnitKerja, " + "uk.namaExternal as UnitKerja, " @@ -75,40 +74,40 @@ public interface PegawaiDao extends PagingAndSortingRepository + "left join mapPegawai.subUnitKerjaPegawai suk " + "left join mapPegawai.unitKerjaPegawai uk " + "left join mapPegawai.jabatan ji " + "left join p.kedudukan k " + "where mapPegawai.isPrimary is true " + "and mapPegawai.statusEnabled is true " + "and p.statusEnabled is true " + "order by p.nama") - public List generatePegawai(); + List generatePegawai(); @Query("select NEW com.jasamedika.medifirst2000.entities.Pegawai(p.namaLengkap, p.namaPanggilan, p.nikIntern, p.nipPns, p.noIdentitas,p.npwp,p.id) " + "from SettingDataFixed s,JenisPegawai j,Pegawai p where p.statusEnabled is true and j.kdJenisPegawai=s.nilaiField and j.id=p.jenisPegawaiId " + "and j.id= (Select cast(s.nilaiField as int) from SettingDataFixed s where s.namaField='KdJenisPegawaiDokter') and p.statusPegawai.kdStatusPegawai=2 " + "group by p.id") - public List getAllDokter(); + List getAllDokter(); @Query("select NEW com.jasamedika.medifirst2000.entities.Pegawai(p.namaLengkap, p.namaPanggilan, p.nikIntern, p.nipPns, p.noIdentitas,p.npwp,p.id) " + "from SettingDataFixed s,JenisPegawai j,Pegawai p where p.namaLengkap like %:nama% and j.kdJenisPegawai=s.nilaiField and j.id=p.jenisPegawaiId " + "and j.id= (Select cast(s.nilaiField as int) from SettingDataFixed s where s.namaField='KdJenisPegawaiDokter') group by p.id") - public List getAllDokter(@Param("nama") String nama); + List getAllDokter(@Param("nama") String nama); @Query("select p from SettingDataFixed s,JenisPegawai j,Pegawai p where j.kdJenisPegawai=s.nilaiField and j.id=p.jenisPegawaiId and j.id= " + "(Select cast(s.nilaiField as int) from SettingDataFixed s where s.namaField='KdJenisPegawaiDokter' and :kodeRuangan=:kodeRuangan and :tanggal=:tanggal) " + "and p.statusPegawai.kdStatusPegawai=2 group by p.id") - public List getAllDokterByRuanganAndTanggal(@Param("kodeRuangan") String kodeRuangan, + List getAllDokterByRuanganAndTanggal(@Param("kodeRuangan") String kodeRuangan, @Param("tanggal") Date tanggal); @Query("select model from Pegawai model where model.namaLengkap=:nama") - public List findPasienByNama(@Param("nama") String nama); + List findPasienByNama(@Param("nama") String nama); @Query("select model from Pegawai model where model.statusEnabled is true and model.id=:nik") - public List findPasienByNik(@Param("nik") String nik); + List findPasienByNik(@Param("nik") String nik); @Query("select model from Pegawai model where model.statusEnabled is true and model.id=:key") - public Pegawai findById(@Param("key") Integer key); + Pegawai findById(@Param("key") Integer key); @Query("select model from Pegawai model where model.id=:id") - public Pegawai getPegawaiById(@Param("id") Integer id); + Pegawai getPegawaiById(@Param("id") Integer id); @Query("select count(model.id) " + "from LoginUser loginUser " + "inner join loginUser.pegawai model " + "where model.id = :id " + "and loginUser.statusEnabled is true " + "and model.statusEnabled is true") - public Integer countPegawaiWithUsername(@Param("id") Integer id); + Integer countPegawaiWithUsername(@Param("id") Integer id); @Query("select NEW Map(model.GolonganId as golonganId, " + "model.agamaId as agamaId, " + "model.alamat as alamat, " + "model.bankRekeningAtasNama as bankRekeningAtasNama, " + "model.bankRekeningNama as bankRekeningNama, " @@ -158,7 +157,7 @@ public interface PegawaiDao extends PagingAndSortingRepository + "and loginUser.statusEnabled is true " + "and mapPeg.isPrimary is true " + "and mapPeg.statusEnabled is true " + "and model.statusEnabled is true " + "and loginUser.namaUser = lower(regexp_replace(model.nama, ' ', '.'))") - public Map getPegawaiWithNamaUserById(@Param("id") Integer id); + Map getPegawaiWithNamaUserById(@Param("id") Integer id); @Query("select NEW Map(model.GolonganId as golonganId, " + "model.agamaId as agamaId, " + "model.alamat as alamat, " + "model.bankRekeningAtasNama as bankRekeningAtasNama, " + "model.bankRekeningNama as bankRekeningNama, " @@ -207,50 +206,50 @@ public interface PegawaiDao extends PagingAndSortingRepository + "inner join loginUser.pegawai model " + "where mapPegawai.pegawaiId = model.id " + "and mapPegawai.isPrimary is true " + "and mapPegawai.statusEnabled is true " + "and loginUser.statusEnabled is true " + "and model.statusEnabled is true " + "and model.id = :id") - public Map getPegawaiWithNamaUserByIdCustom(@Param("id") Integer id); + Map getPegawaiWithNamaUserByIdCustom(@Param("id") Integer id); @Query("select model from Pegawai model where model.statusEnabled is true and model.statusPegawai.kdStatusPegawai=2") - public List findAllPegawai(); + List findAllPegawai(); @Query("select NEW com.jasamedika.medifirst2000.entities.Pegawai(p.namaLengkap, p.namaPanggilan, p.nikIntern, p.nipPns, p.noIdentitas,p.npwp,p.id) " + "from SettingDataFixed s,JenisPegawai j,Pegawai p where j.kdJenisPegawai=s.nilaiField and j.id=p.jenisPegawaiId and j.id= (Select cast(s.nilaiField as int) " + "from SettingDataFixed s where s.namaField='KdJenisPegawaiDokter') and p.qPegawai=:kdPegawai group by p.id") - public Pegawai findByKdPegawaiDokter(@Param("kdPegawai") short kdPegawai); + Pegawai findByKdPegawaiDokter(@Param("kdPegawai") short kdPegawai); @Query("select NEW com.jasamedika.medifirst2000.entities.Pegawai(p.namaLengkap, p.namaPanggilan, p.nikIntern, p.nipPns, p.noIdentitas,p.npwp,p.id,p.qPegawai) " + "from SettingDataFixed s,JenisPegawai j,Pegawai p where j.kdJenisPegawai=s.nilaiField and j.id=p.jenisPegawaiId and j.id= (Select cast(s.nilaiField as int) " + "from SettingDataFixed s where s.namaField='KdJenisPegawaiDokter') and p.statusEnabled is true and p.statusPegawai.kdStatusPegawai=2 group by p.id " + "order by p.namaLengkap") - public List getDokters(); + List getDokters(); @Query("select p from Pegawai p where p.statusEnabled is true and p.jabatanFungsionalId=:jabatanFungsionalId") - public List findByJabatanFungsional(@Param("jabatanFungsionalId") Integer jabatanFungsionalId); + List findByJabatanFungsional(@Param("jabatanFungsionalId") Integer jabatanFungsionalId); @Query("select p from Pegawai p join fetch p.jenisPegawai where p.statusEnabled is true and p.jenisPegawai.id=:getSettingDataFixed and p.namaLengkap like :key") - public List findByJenisPetugas(@Param("getSettingDataFixed") Integer getSettingDataFixed, + List findByJenisPetugas(@Param("getSettingDataFixed") Integer getSettingDataFixed, @Param("key") String key); @Query("select p from Pegawai p where p.statusEnabled is true and p.satuanKerjaId=:satuanKerjaId") - public List findBySatuanKerja(@Param("satuanKerjaId") Integer satuanKerjaId); + List findBySatuanKerja(@Param("satuanKerjaId") Integer satuanKerjaId); @Query("select NEW com.jasamedika.medifirst2000.entities.Pegawai(p.id, p.namaLengkap) from Pegawai p where p.statusEnabled is true and p.satuanKerjaId=:satuanKerjaId") - public List findBySatuanKerja2(@Param("satuanKerjaId") Integer satuanKerjaId); + List findBySatuanKerja2(@Param("satuanKerjaId") Integer satuanKerjaId); // supir ambulance - sarpras @Query("select NEW Map(p.id as idPegawai,p.namaLengkap as namaPegawai) from Pegawai p,Jabatan jb " + "where p.statusEnabled is true and jb.id=p.jabatanFungsionalId and jb.namaJabatan like '%Pengemudi%'") - public List getSupirAmbulance(); + List getSupirAmbulance(); // supir kendaraan dinas - sarpras @Query("select NEW Map(p.id as idPegawai,p.namaLengkap as namaPegawai) from Pegawai p,Jabatan jb " + "where p.statusEnabled is true and jb.id=p.jabatanFungsionalId and jb.namaJabatan like '%Pengemudi%'") - public List getSupirKendaraanDinas(); + List getSupirKendaraanDinas(); @Query("select NEW Map(p.id as idPegawai,p.namaLengkap as namaPegawai,mapPegawai.jabatan.id as idJabatanInternal, mapPegawai.jabatan.namaJabatan as namaJabatan) " + "from MapPegawaiJabatanToUnitKerja mapPegawai " + "left join mapPegawai.pegawai p " + "where mapPegawai.isPrimary is true " + "and mapPegawai.statusEnabled is true " + "and p.statusEnabled is true " + "and p.ruangan.id=:ruangan") - public List> findByRuanganKerja(@Param("ruangan") Integer ruangan); + List> findByRuanganKerja(@Param("ruangan") Integer ruangan); @Query("select NEW Map(p.id as idPegawai," + "p.namaLengkap as namaPegawai," + "jabatanInternal.id as idJabatanInternal," + "jabatanInternal.namaJabatan as namaJabatan) " @@ -258,13 +257,13 @@ public interface PegawaiDao extends PagingAndSortingRepository + "left join mappeg.jabatan jabatanInternal " + "left join mappeg.subUnitKerjaPegawai subUnitKerja " + "where p.statusEnabled is true " + "and mappeg.isPrimary is true " + "and mappeg.statusEnabled is true " + "and subUnitKerja.id = :subUnitKerja " + "order by p.nama asc") - public List> findByUnitKerja(@Param("subUnitKerja") Integer subUnitKerja); + List> findByUnitKerja(@Param("subUnitKerja") Integer subUnitKerja); @Query("select distinct NEW Map(p.id as idPegawai," + "p.namaLengkap as namaPegawai) " + "from MapPegawaiJabatanToUnitKerja mappeg " + "left join mappeg.pegawai p " + "left join mappeg.subUnitKerjaPegawai subUnitKerja " + "where p.statusEnabled is true " + "and mappeg.statusEnabled is true " + "and subUnitKerja.id = :subUnitKerja " + "order by namaPegawai asc") - public List> findSimpleByUnitKerja(@Param("subUnitKerja") Integer subUnitKerja); + List> findSimpleByUnitKerja(@Param("subUnitKerja") Integer subUnitKerja); @Query("select NEW Map(p.id as idPegawai," + "p.namaLengkap as namaPegawai," + "jabatanInternal.id as idJabatanInternal," + "jabatanInternal.namaJabatan as namaJabatan) " @@ -272,44 +271,44 @@ public interface PegawaiDao extends PagingAndSortingRepository + "left join mappeg.jabatan jabatanInternal " + "left join mappeg.subUnitKerjaPegawai subUnitKerja " + "where p.statusEnabled is true " + "and mappeg.isPrimary is true " + "and mappeg.statusEnabled is true " + "and subUnitKerja.id = :subUnitKerja " + "and p.id = :idPegawai") - public List> findByUnitKerja(@Param("subUnitKerja") Integer subUnitKerja, + List> findByUnitKerja(@Param("subUnitKerja") Integer subUnitKerja, @Param("idPegawai") Integer idPegawai); @Query("select p.jabatanStruktural from Pegawai p where p.id=:id") - public Jabatan findJabatanByIdPegawai(@Param("id") Integer id); + Jabatan findJabatanByIdPegawai(@Param("id") Integer id); @Query("select peg from MapPegawaiJabatanToUnitKerja mappeg left join mappeg.pegawai peg where mappeg.pegawaiId=:idPegawai " + "and mappeg.jabatanId=:idJabatan and mappeg.statusEnabled is true") - public Pegawai findPegawaiByIdJabatanInternal(@Param("idPegawai") Integer idPegawai, + Pegawai findPegawaiByIdJabatanInternal(@Param("idPegawai") Integer idPegawai, @Param("idJabatan") Integer idJabatan); @Query("select mapPegawai.jabatan from MapPegawaiJabatanToUnitKerja mapPegawai left join mapPegawai.pegawai p " + "where mapPegawai.isPrimary is true and mapPegawai.statusEnabled is true and p.id=:id") - public Jabatan findJabatanInternalByIdPegawai(@Param("id") Integer id); + Jabatan findJabatanInternalByIdPegawai(@Param("id") Integer id); @Query("select j " + "from MapPegawaiJabatanToUnitKerja mapPegawai " + "left join mapPegawai.pegawai p " + "left join mapPegawai.jabatan j " + "where mapPegawai.statusEnabled is true " + "and p.statusEnabled is true " + "and j.statusEnabled is true " + "and p.id=:id " + "and j.id=:idJabatan") - public Jabatan findJabatanInternalByIdPegawai(@Param("id") Integer id, @Param("idJabatan") Integer idJabatan); + Jabatan findJabatanInternalByIdPegawai(@Param("id") Integer id, @Param("idJabatan") Integer idJabatan); @Query("select p from Pegawai p where p.statusEnabled is true ") - public List find(); + List find(); @Query("select p.idFinger from Pegawai p where p.id = :idPegawai") - public String getidFinger(@Param("idPegawai") Integer idPegawai); + String getidFinger(@Param("idPegawai") Integer idPegawai); - public Pegawai findByIdFinger(String idFinger); + Pegawai findByIdFinger(String idFinger); @Query("select new Map ( pegawai.namaLengkap as nama, pegawai.id as idPegawai,jabatan.id as idJabatanInternal) " + "from MapPegawaiJabatanToUnitKerja mapPegawai left join mapPegawai.pegawai pegawai left join mapPegawai.jabatan jabatan " + "where mapPegawai.isPrimary is true and mapPegawai.statusEnabled is true and pegawai.statusEnabled is true") - public List> dataAllPegawai(); + List> dataAllPegawai(); @Query("select new Map (" + "a.id as id, " + "a.namaLengkap as namaLengkap, " + "b.jenisPegawai as jenisPegawai) " + "from Pegawai a " + "left join a.jenisPegawai b " + "where b.id in (select d.id " + "from MapJenisPetugasPToJenisPegawai c " + "left join c.jenisPegawai d " + "left join c.jenisPetugasPe e " + "where a.statusEnabled is true and e.id=:id)") - public List> getPegawaiByPelaksana(@Param("id") Integer id); + List> getPegawaiByPelaksana(@Param("id") Integer id); @Query("select new map (pegawai.id as idPegawai, " + "pegawai.nama as nama, " + "pegawai.namaLengkap as namaLengkap, " + " pegawai.tglLahir as tglLahir, " @@ -359,7 +358,7 @@ public interface PegawaiDao extends PagingAndSortingRepository + "left join pegawai.titlePasien titlePasien " + "left join pegawai.typePegawai typePegawai " + "where pegawai.statusEnabled is true " + "and pegawai.kategoryPegawaiId in :listKategoryPegawaiId " + "and kedudukan.id not in :listKedudukan " + "order by pegawai.nama") - public List> findAllPegawaiNoPaging( + List> findAllPegawaiNoPaging( @Param("listKategoryPegawaiId") List listKategoryPegawaiId, @Param("listKedudukan") List listKedudukan); @@ -422,7 +421,7 @@ public interface PegawaiDao extends PagingAndSortingRepository + "left join pegawai.typePegawai typePegawai " + "where pegawai.statusEnabled is true " + "and pegawai.kategoryPegawaiId = :idKategoryPegawai " + // PNS "and kedudukan.id not in :listKedudukan " + "order by pegawai.nama") - public List> findAllPegawaiByKategory(@Param("listKedudukan") List listKedudukan, + List> findAllPegawaiByKategory(@Param("listKedudukan") List listKedudukan, @Param("idKategoryPegawai") Integer idKategoryPegawai); @Query("select new map (jabatanInternal.namaJabatan as jabatanInternal, " @@ -439,12 +438,12 @@ public interface PegawaiDao extends PagingAndSortingRepository + "left join mapPegawai.pejabatPenilai pejabatPenilai " + "where mapPegawai.isPrimary is true " + "and mapPegawai.statusEnabled is true " + "and pegawai.statusEnabled is true " + "and pegawai.id = :idPegawai") - public Map getMapJabatanUnitSubAllPegawai(@Param("idPegawai") Integer idPegawai); + Map getMapJabatanUnitSubAllPegawai(@Param("idPegawai") Integer idPegawai); @Query("select new Map(pegawai.id as idPegawai, " + "loginuser.namaUser as namaUser) " + "from LoginUser loginuser " + "left join loginuser.pegawai pegawai " + "where loginuser.statusEnabled is true " + "and pegawai.statusEnabled is true " + "and pegawai.id = :idPegawai " + "order by pegawai.id") - public List> getUsernameByIdPegawai(@Param("idPegawai") Integer idPegawai); + List> getUsernameByIdPegawai(@Param("idPegawai") Integer idPegawai); @Query("select new map (pegawai.id as idPegawai, " + "pegawai.nama as nama, " + "pegawai.namaLengkap as namaLengkap, " + " pegawai.tglLahir as tglLahir, " @@ -498,7 +497,7 @@ public interface PegawaiDao extends PagingAndSortingRepository + "where mapPegawai.isPrimary is true " + "and mapPegawai.statusEnabled is true " + "and pegawai.statusEnabled is true " + "and pegawai.kategoryPegawaiId not in :listKategoryPegawaiId " + "and kedudukan.id not in :listKedudukan " + "order by pegawai.nama") - public List> findAllPegawaiLainLain( + List> findAllPegawaiLainLain( @Param("listKategoryPegawaiId") List listKategoryPegawaiId, @Param("listKedudukan") List listKedudukan); @@ -516,24 +515,24 @@ public interface PegawaiDao extends PagingAndSortingRepository + "left join p.jabatanFungsional jf " + "where mapPegawai.isPrimary is true " + "and mapPegawai.statusEnabled is true " + "and p.statusEnabled is true " + "and p.namaLengkap like :namaPegawai " + "order by p.namaLengkap") - public List> findAllPegawaiNoPagingSearch(@Param("namaPegawai") String namaPegawai); + List> findAllPegawaiNoPagingSearch(@Param("namaPegawai") String namaPegawai); @Query("select p.id from Pegawai p where p.statusEnabled is true") - public List findAllIdPegawai(); + List findAllIdPegawai(); @Query("select p.id from Pegawai p " + "left join p.statusPegawai statusPegawai " + "left join p.kategoryPegawai kategori " + "where p.statusEnabled is true and statusPegawai.id = 2 " + "and kategori.id != 11 ") - public List findPegawaiStatusAktifAndKaryawan(); + List findPegawaiStatusAktifAndKaryawan(); @Query("select kategori.id " + "from Pegawai p " + "left join p.statusPegawai statusPegawai " + "left join p.kategoryPegawai kategori " + "where p.statusEnabled is true " + "and p.id = :idPegawai") - public Integer getStatusKategoryPegawai(@Param("idPegawai") Integer idPegawai); + Integer getStatusKategoryPegawai(@Param("idPegawai") Integer idPegawai); @Query("select p from Pegawai p " + "left join p.statusPegawai statusPegawai " + "left join p.shiftKerja shiftKerja " + "where p.statusEnabled is true " + "and to_char(p.tglMasuk,'yyyy-MM-dd') <= :tahun " + "and shiftKerja.id= :idKelompokShift ") - public List findPegawaiStatusAktif(@Param("idKelompokShift") Integer idKelompokShift, + List findPegawaiStatusAktif(@Param("idKelompokShift") Integer idKelompokShift, @Param("tahun") String tahun); String strQryJabatanCetak = "select new map (pegawai.id as idPegawai, " + "pegawai.namaLengkap as nama, " @@ -588,38 +587,37 @@ public interface PegawaiDao extends PagingAndSortingRepository String cdtJabatanUtamaCetak = "and mappegawai.isPrimary is true and pegawai.id =:pegawaiId"; @Query(strQryJabatanCetak + cdtJabatanUtamaCetak) - public Map findPegawaiById(@Param("pegawaiId") Integer idPegawai); + Map findPegawaiById(@Param("pegawaiId") Integer idPegawai); @Query(strQryJabatanCetak + cdtJabatanCetak) - public Map findPegawaiById(@Param("pegawaiId") Integer idPegawai, - @Param("jabatanId") Integer idJabatan); + Map findPegawaiById(@Param("pegawaiId") Integer idPegawai, @Param("jabatanId") Integer idJabatan); // GET ALL DOKTER BY RUANGAN KERJA @Query("select NEW Map(p.id as idPegawai,p.namaLengkap as namaPegawai,m.jabatan.id as idJabatanInternal, m.jabatan.namaJabatan as namaJabatan) " + "from MapPegawaiJabatanToUnitKerja m " + "left join m.pegawai p " + "where p.statusEnabled is true " + "and m.isPrimary is true " + "and m.statusEnabled is true " + "and p.jenisPegawai.id=1 " + "and p.ruangan.id=:ruangan") - public List> findDokterByRuanganKerja(@Param("ruangan") Integer ruangan); + List> findDokterByRuanganKerja(@Param("ruangan") Integer ruangan); // GET ALL PEGAWAI BY RUANGAN KERJA EXCEPT DOKTER @Query("select NEW Map(p.id as idPegawai,p.namaLengkap as namaPegawai,mapPegawai.jabatan.id as idJabatanInternal, mapPegawai.jabatan.namaJabatan as namaJabatan) " + "from MapPegawaiJabatanToUnitKerja mapPegawai " + "left join mapPegawai.pegawai p " + "where mapPegawai.isPrimary is true " + "and mapPegawai.statusEnabled is true " + "and p.statusEnabled is true " + "and p.ruangan.id=:ruangan " + "and p.jenisPegawai.id not in(1)") - public List> findPegawaiExceptDokterByRuanganKerja(@Param("ruangan") Integer ruangan); + List> findPegawaiExceptDokterByRuanganKerja(@Param("ruangan") Integer ruangan); @Query("select new com.jasamedika.medifirst2000.entities.Pegawai(p.id, p.namaLengkap, p.nipPns) from Pegawai p where p.nipPns=:nipPns") - public Pegawai findOneByNipPns(@Param("nipPns") String nipPns); + Pegawai findOneByNipPns(@Param("nipPns") String nipPns); @Query("select NEW Map(p.id as pegawaiId," + "p.namaLengkap as namaPegawai," + "p.nipPns as nipPegawai," + "p.tglLahir as tglLahir" + ") " + "from Pegawai p " + "left join p.statusPegawai statuspegawai " + "where p.statusEnabled is true and statuspegawai.id=2") - public List> findAllPegawais(); + List> findAllPegawais(); // GET HARI LIBUR @Query("select new map(model2.tanggal as tanggal, model1.namaExternal as namaHariLibur,model2.namaHari as namaHari) from MapKalenderToHariLibur model1 " + "right join model1.tanggal model2 where model2.tahunKalender = :tahun and model2.bulanKeDlmTahun= :bulan") - public List> findHariLiburPegawaiNonShift(@Param("tahun") Integer tahun, + List> findHariLiburPegawaiNonShift(@Param("tahun") Integer tahun, @Param("bulan") Integer bulan); @Query("select NEW com.jasamedika.medifirst2000.entities.Pegawai (model.id, model.namaLengkap) " @@ -627,7 +625,7 @@ public interface PegawaiDao extends PagingAndSortingRepository + "where mapPegawai.isPrimary is true " + "and mapPegawai.statusEnabled is true " + "and model.statusEnabled is true " + "and model.statusPegawai.kdStatusPegawai=2 " + "and mapPegawai.unitKerjaPegawaiId= :idRuangan") - public List findAllPegawaiAktifByRuangan(@Param("idRuangan") Integer idRuangan); + List findAllPegawaiAktifByRuangan(@Param("idRuangan") Integer idRuangan); @Query("select new map (pegawai.id as idPegawai, " + "pegawai.namaLengkap as nama, " + "golongan.golonganPegawai as namaGolongan, " + "agama.agama as agama, " @@ -669,7 +667,7 @@ public interface PegawaiDao extends PagingAndSortingRepository + "left join pegawai.titlePasien titlePasien " + "left join pegawai.typePegawai typePegawai " + "where mapPegawai.isPrimary is true " + "and mapPegawai.statusEnabled is true " + "and jabatanFungsional.id =:idJabatan") - public Map findPegawaiByIdabatan(@Param("idJabatan") Integer idJabatan); + Map findPegawaiByIdabatan(@Param("idJabatan") Integer idJabatan); @Query("select NEW Pegawai(p.id, p.namaLengkap) from Pegawai p where p.id = :idPegawai") Pegawai findPegawaiHukorById(@Param("idPegawai") Integer idPegawai); @@ -824,50 +822,50 @@ public interface PegawaiDao extends PagingAndSortingRepository @Query(queryListPegawai + "where kedudukan.id in (:listKedudukan) and kategoriPegawai.id not in (:listNonSdm) order by pegawai.nama ") - public List> findPegawaiMeninggalPindahPensiunNoPaging( + List> findPegawaiMeninggalPindahPensiunNoPaging( @Param("listKedudukan") List listKedudukan, @Param("listNonSdm") List listNonSdm); @Query(queryListPegawai + "where kedudukan.id in (:listKedudukan) and kategoriPegawai.id in (:listNonSdm) order by pegawai.nama ") - public List> findPegawaiMeninggalPindahPensiunNonSdm( + List> findPegawaiMeninggalPindahPensiunNonSdm( @Param("listKedudukan") List listKedudukan, @Param("listNonSdm") List listNonSdm); @Query(queryListPegawai + "where kategoriPegawai.id in (:listStatus) and pegawai.statusEnabled is true order by pegawai.nama ") - public List> findPegawaiOutSourcingNoPaging(@Param("listStatus") List listKedudukan); + List> findPegawaiOutSourcingNoPaging(@Param("listStatus") List listKedudukan); @Query("select new map (pegawai.id as idPegawai, pegawai.namaLengkap as namaLengkap, " + "pegawai.nama as nama) " + "from Pegawai pegawai " + "left join pegawai.kedudukan kedudukan " + "where (pegawai.statusEnabled is false and kedudukan.id in (:listKedudukan) and (pegawai.tanggalMeninggal >=:date or pegawai.tglPensiun >=:date " + "or pegawai.tglkeluar >=:date )) " + "or pegawai.statusEnabled is true " + "order by pegawai.nama ") - public List> findAllPegawaiIncludeMeninggalPindahPensiunNoPaging( + List> findAllPegawaiIncludeMeninggalPindahPensiunNoPaging( @Param("listKedudukan") List listKedudukan, @Param("date") Date date); @Query("select new map(peg.id as id, peg.namaLengkap as nama) " + "from MapPegawaiJabatanToUnitKerja mappeg " + "left join mappeg.pegawai peg " + "left join mappeg.jabatan jab " + "where jab.namaJabatan like 'Kepala Ruang%' " + "and mappeg.isPrimary is true " + "and mappeg.statusEnabled is true") - public List> findAllPegawaiKepalaRuangan(); + List> findAllPegawaiKepalaRuangan(); @Query("select new Map(pegawai.id as idPegawai, " + "pegawai.namaLengkap as namaPegawai, " + "pegawai.nipPns as nipPegawai, " + "jabatan.namaJabatan as namaJabatan) " + "from MapPegawaiJabatanToUnitKerja mapPegawai " + "inner join mapPegawai.pegawai pegawai " + "inner join mapPegawai.jabatan jabatan " + "where mapPegawai.jabatan.namaJabatan like %:namaJabatan%") - public Map getKepalaPegawai(@Param("namaJabatan") String namaJabatan); + Map getKepalaPegawai(@Param("namaJabatan") String namaJabatan); @Query("select pg.id from MapPegawaiJabatanToUnitKerja mj " + "inner join mj.pegawai pg " + "inner join mj.jabatan jb " + "where mj.unitKerjaPegawaiId = jb.unitKerjaId " + "and mj.statusEnabled is true and pg.statusEnabled is true and jb.statusEnabled is true " + "and mj.unitKerjaPegawaiId = :idUnitKerja " + "and (jb.levelJabatan in (3,4) " + "or (mj.subUnitKerjaPegawaiId = :idSubUnitKerja and jb.levelJabatan = 5))") - public List getPegawaiSDMforCred(@Param("idUnitKerja") Integer idUnitKerja, + List getPegawaiSDMforCred(@Param("idUnitKerja") Integer idUnitKerja, @Param("idSubUnitKerja") Integer idSubUnitKerja); @Query("select pegawai.id " + "from MapPegawaiJabatanToUnitKerja mapPegawai " + "inner join mapPegawai.pegawai pegawai " + "where mapPegawai.isPrimary is true " + "and mapPegawai.statusEnabled is true " + "and pegawai.statusEnabled is true " + "and mapPegawai.unitKerjaPegawaiId = 24") - public List getPegawaiSDM(); + List getPegawaiSDM(); @Query("select new map(pegawai.nipPns as nip, " + "pegawai.namaLengkap as nama, " + "jabatanInternal.namaJabatan as jabatanInternal, " + "ruangan.namaRuangan as namaRuangan, " @@ -878,7 +876,7 @@ public interface PegawaiDao extends PagingAndSortingRepository + "where pegawai.id = mapPegawai.pegawaiId " + "and mapPegawai.isPrimary is true " + "and mapPegawai.statusEnabled is true " + "and pegawai.idFinger = :idFinger " + "and pegawai.statusEnabled is true " + "order by pegawai.nama asc") - public Map getPegawaiToMonitoringAbsen(@Param("idFinger") String idFinger); + Map getPegawaiToMonitoringAbsen(@Param("idFinger") String idFinger); @Query("select new map(pegawai.nipPns as nip, " + "pegawai.namaLengkap as nama, " + "jabatanInternal.namaJabatan as jabatanInternal, " + "ruangan.namaRuangan as namaRuangan, " @@ -889,56 +887,55 @@ public interface PegawaiDao extends PagingAndSortingRepository + "where pegawai.id = mapPegawai.pegawaiId " + "and mapPegawai.statusEnabled is true " + "and pegawai.statusEnabled is true " + "and mapPegawai.isPrimary is true " + "and pegawai.id = :idPegawai " + "order by pegawai.nama asc") - public Map getPegawaiToMonitoringAbsen(@Param("idPegawai") Integer idPegawai); + Map getPegawaiToMonitoringAbsen(@Param("idPegawai") Integer idPegawai); @Query("select p.id " + "from MapPegawaiJabatanToUnitKerja mappeg " + "inner join mappeg.pegawai p " + "inner join mappeg.subUnitKerjaPegawai subUnitKerja " + "where mappeg.statusEnabled is true " + "and p.statusEnabled is true " + "and mappeg.isPrimary is true " + "and mappeg.statusEnabled is true " + "and p.shiftKerjaId in (1,2) " + "and subUnitKerja.id = :subUnitKerja " + "order by p.id asc") - public List getPegawaiNonshiftBySubunitKerja(@Param("subUnitKerja") Integer subUnitKerja); + List getPegawaiNonshiftBySubunitKerja(@Param("subUnitKerja") Integer subUnitKerja); @Query("select p.id " + "from MapPegawaiJabatanToUnitKerja mappeg " + "inner join mappeg.pegawai p " + "inner join mappeg.subUnitKerjaPegawai subUnitKerja " + "where mappeg.statusEnabled is true " + "and p.statusEnabled is true " + "and mappeg.isPrimary is true " + "and mappeg.statusEnabled is true " + "and p.shiftKerjaId in (1,2) " + "order by p.id asc") - public List getPegawaiNonshift(); + List getPegawaiNonshift(); @Query("select peg.id from Pegawai peg where peg.statusEnabled is true and peg.jenisPegawaiId=1 and peg.ruanganId=:idRuangan") - public int[] getDokterByRuanganId(@Param("idRuangan") int idRuangan); + int[] getDokterByRuanganId(@Param("idRuangan") int idRuangan); @Query("select distinct pgw.id " + "from MapPegawaiJabatanToUnitKerja mpj " + "inner join mpj.pegawai pgw " + "where mpj.statusEnabled is true " + "and pgw.statusEnabled is true " + "and pgw.jenisPegawaiId = 1 " + "and mpj.subUnitKerjaPegawaiId = :subunitKerjaId") - public List getDokterByKelompokKerja(@Param("subunitKerjaId") Integer idSubunitKerja); + List getDokterByKelompokKerja(@Param("subunitKerjaId") Integer idSubunitKerja); @Query("select peg.id from Pegawai peg where peg.statusEnabled is true and peg.kategoryPegawaiId in (:listKategoryPegawaiId)") - public List getPegawaiByKategoryPegawai( - @Param("listKategoryPegawaiId") List listKategoryPegawaiId); + List getPegawaiByKategoryPegawai(@Param("listKategoryPegawaiId") List listKategoryPegawaiId); @Query("select mapp.pegawaiId from MapPegawaiJabatanToUnitKerja mapp " + "where mapp.statusEnabled is true and mapp.unitKerjaPegawaiId = :idUnitKerja " + "and mapp.pegawaiId is not null") - public List getPegawaiByIdUnitKerja(@Param("idUnitKerja") Integer idUnitKerja); + List getPegawaiByIdUnitKerja(@Param("idUnitKerja") Integer idUnitKerja); @Query("select pg.shiftKerjaId from Pegawai pg where pg.statusEnabled is true and pg.id = :idPegawai") - public Integer getKelompokShiftByIdPegawai(@Param("idPegawai") Integer idPegawai); + Integer getKelompokShiftByIdPegawai(@Param("idPegawai") Integer idPegawai); @Query("select new Map(jab.id as id, jab.namaJabatan as namaJabatan) " + "from Pegawai peg left join peg.jabatanFungsional jab " + "where peg.statusEnabled is true " + "and jab.statusEnabled is true " + "and peg.id = :idPegawai") - public Map getJabatanFungsionalByPegawai(@Param("idPegawai") Integer idPegawai); + Map getJabatanFungsionalByPegawai(@Param("idPegawai") Integer idPegawai); @Query("select new Map (ese.id as idEselon,ese.eselon as eselon) " + "from MapPegawaiJabatanToUnitKerja mapp " + "left join mapp.jabatan jab " + "left join jab.eselon ese " + "where mapp.statusEnabled is true and jab.statusEnabled is true and ese.statusEnabled is true " + "and jab.jenisJabatanId = 5 and lower(jab.namaJabatan) not like lower('Plh%') and mapp.pegawaiId = :idPegawai") - public Map getEselonStruktural(@Param("idPegawai") Integer idPegawai); + Map getEselonStruktural(@Param("idPegawai") Integer idPegawai); @Query("select p.id " + "from Pegawai p," + "JenisPegawai j," + "SettingDataFixed s " + "where p.statusEnabled is true " + "and p.jenisPegawaiId = j.id " + "and p.jenisPegawaiId = cast(s.nilaiField as int) " + "and j.id = cast(s.nilaiField as int) " + "and s.namaField='KdJenisPegawaiDokter' " + "and p.statusPegawai.id = 2") - public List getPegawaiKedokteran(); + List getPegawaiKedokteran(); @Query("select new Map(pegawai.alamat as alamat, " + "pegawai.agamaId as agamaId, " + "pegawai.bankRekeningAtasNama as bankRekeningAtasNama, " @@ -967,7 +964,7 @@ public interface PegawaiDao extends PagingAndSortingRepository + "pegawai.tglPensiun as tglPensiun, " + "pegawai.tglTerbitSip as tglTerbitSip, " + "pegawai.tglTerbitStr as tglTerbitStr, " + "pegawai.typePegawaiId as typePegawaiId) " + "from Pegawai pegawai where pegawai.id = :idPegawai") - public Map getPegawaiDetailById(@Param("idPegawai") Integer idPegawai); + Map getPegawaiDetailById(@Param("idPegawai") Integer idPegawai); @Query("select new Map(pegawai.alamat as alamat, " + "pegawai.agamaId as agamaId, " + "pegawai.email as email, " + "pegawai.emailAlternatif as emailAlternatif, " + "pegawai.gelarBelakang as gelarBelakang, " @@ -987,7 +984,7 @@ public interface PegawaiDao extends PagingAndSortingRepository + "pegawai.tglLahir as tglLahir, " + "pegawai.tglMasuk as tglMasuk, " + "pegawai.tglkeluar as tglkeluar, " + "pegawai.tglTerbitSip as tglTerbitSip, " + "pegawai.tglTerbitStr as tglTerbitStr)" + "from Pegawai pegawai where pegawai.id = :idPegawai") - public Map getPesertaDidikDetailById(@Param("idPegawai") Integer idPegawai); + Map getPesertaDidikDetailById(@Param("idPegawai") Integer idPegawai); @Query("select new Map(dokter.id as id, dokter.namaLengkap as namaLengkap) " + "from PelayananPasienPetugas pelayananPasienPetugas " @@ -1002,7 +999,7 @@ public interface PegawaiDao extends PagingAndSortingRepository + "and ruangan.statusEnabled is true " + "and departemen.statusEnabled is true " + "and departemen.id = :idDepartemen " + "and jenisPetugas.id <> :idPetugasPelaksana " + "and to_char(pelayananPasien.tglPelayanan,'yyyy-MM') = :month " + "order by dokter.namaLengkap") - public List> getListPegawaiPendapatanDepartemen(@Param("idDepartemen") Integer idDepartemen, + List> getListPegawaiPendapatanDepartemen(@Param("idDepartemen") Integer idDepartemen, @Param("idPetugasPelaksana") int idPetugasPelaksana, @Param("month") String month); @Query("select new Map(dokter.id as id, dokter.namaLengkap as namaLengkap) " @@ -1019,7 +1016,7 @@ public interface PegawaiDao extends PagingAndSortingRepository + "and departemen.id = :idDepartemen " + "and ruangan.id = :idRuangan " + "and jenisPetugas.id <> :idPetugasPelaksana " + "and to_char(pelayananPasien.tglPelayanan,'yyyy-MM') = :month " + "order by dokter.namaLengkap") - public List> getListPegawaiPendapatanRuangan(@Param("idDepartemen") Integer idDepartemen, + List> getListPegawaiPendapatanRuangan(@Param("idDepartemen") Integer idDepartemen, @Param("idRuangan") Integer idRuangan, @Param("idPetugasPelaksana") int idPetugasPelaksana, @Param("month") String month); @@ -1037,54 +1034,53 @@ public interface PegawaiDao extends PagingAndSortingRepository + "and pelayananPasienPetugas.ObjectPegawaiId in (:listIdPegawai) " + "and jenisPetugas.id <> :idPetugasPelaksana " + "and to_char(pelayananPasien.tglPelayanan,'yyyy-MM') = :month " + "order by dokter.namaLengkap") - public List> getListPegawaiPendapatanUnitKerja( - @Param("listIdPegawai") List listIdPegawai, @Param("idPetugasPelaksana") int idPetugasPelaksana, - @Param("month") String month); + List> getListPegawaiPendapatanUnitKerja(@Param("listIdPegawai") List listIdPegawai, + @Param("idPetugasPelaksana") int idPetugasPelaksana, @Param("month") String month); @Query("select new Map(peg.id as idPegawai, peg.kategoryPegawaiId as idKategoryPegawai) " + "from Pegawai peg " + "where peg.statusEnabled is true " + "and to_char(peg.tglkeluar, 'yyyy-MM-dd') <= :currentDate " + "and peg.id = :idPegawai") - public Map getPegawaiKeluarHariIni(@Param("currentDate") String currentDate, + Map getPegawaiKeluarHariIni(@Param("currentDate") String currentDate, @Param("idPegawai") Integer idPegawai); @Query("select distinct peg.id " + "from MapPegawaiJabatanToUnitKerja mapp left join mapp.pegawai peg " + "where mapp.statusEnabled is true and peg.statusEnabled is true " + "and mapp.unitKerjaPegawaiId in (:listIdKsm)") - public List getListPegawaiByGrupUnitKerja(@Param("listIdKsm") List listIdKsm); + List getListPegawaiByGrupUnitKerja(@Param("listIdKsm") List listIdKsm); @Query("select new Map(pg.id as id,pg.shiftKerjaId as shiftKerjaId) from Pegawai pg where pg.statusEnabled is true and pg.id in (:listIdPegawai)") - public List> getListKelompokShiftKerja(@Param("listIdPegawai") List listIdPegawai); + List> getListKelompokShiftKerja(@Param("listIdPegawai") List listIdPegawai); @Query("select distinct new Map (pg.id as id,pg.namaLengkap as namaLengkap," + "pg.tglMasuk as tglMasuk," + "pg.jenisPegawaiId as jenisPegawaiId) " + "from Pegawai pg " + "where pg.statusEnabled is true " + "and pg.kategoryPegawaiId in (:listKategoryPegawaiId) " + "order by pg.namaLengkap") - public List> findPegawaiByListKategori( + List> findPegawaiByListKategori( @Param("listKategoryPegawaiId") List listIdKategoriPegawai); @Query("select new Map(pg.id as pegawaiId,pg.namaLengkap as namaLengkap) " + "from Pegawai pg where pg.statusEnabled is true and pg.id in (:listPegawaiId) " + "order by pg.namaLengkap") - public List> findPegawaiByListId(@Param("listPegawaiId") List listIdPegawai); + List> findPegawaiByListId(@Param("listPegawaiId") List listIdPegawai); @Query("select new Map(pg.id as id,pg.namaLengkap as namaLengkap) " + "from Pegawai pg " + "where pg.statusEnabled is true " + "and pg.idFinger = :fingerId " + "and pg.idFinger <> ''") - public List> checkExistingFingerId(@Param("fingerId") String idFinger); + List> checkExistingFingerId(@Param("fingerId") String idFinger); @Query("select new Map(pg.id as id,pg.namaLengkap as namaLengkap) " + "from Pegawai pg " + "where pg.statusEnabled is true " + "and trim(pg.idFinger) = :fingerId " + "and trim(pg.idFinger) <> '' " + "and pg.id <> :pegawaiId") - public List> checkExistingFingerId(@Param("fingerId") String idFinger, + List> checkExistingFingerId(@Param("fingerId") String idFinger, @Param("pegawaiId") Integer idPegawai); @Query("select new Map(pg.id as id,pg.namaLengkap as namaLengkap,pg.jenisKelaminId as jenisKelaminId) " + "from Pegawai pg " + "where pg.statusEnabled is true " + "and to_char(pg.tglLahir,'MM-dd') = :tglLahir " + "and pg.kedudukanId not in (3,4,5,6,24,25,26,28,29) " + "order by pg.namaLengkap") - public List> findByBirthDate(@Param("tglLahir") String tglLahir); + List> findByBirthDate(@Param("tglLahir") String tglLahir); @Query("select new Map(pg.id as id, pg.namaLengkap as namaLengkap) " + "from Pegawai pg " + "where pg.statusEnabled is true " + "and pg.jenisPegawaiId = 1 " + "and pg.namaLengkap like '%dr%' " + "order by pg.namaLengkap") - public List> findAllDokter(); + List> findAllDokter(); @Query("select peg.tglLahir from Pegawai peg where peg.id = :idPegawai") Date findTglLahirById(@Param("idPegawai") Integer idPegawai); diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PegawaiServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PegawaiServiceImpl.java index 9823c5fd..277bbd98 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PegawaiServiceImpl.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PegawaiServiceImpl.java @@ -1,18 +1,22 @@ package com.jasamedika.medifirst2000.service.impl; -import java.io.File; -import java.text.DateFormat; -import java.text.ParseException; -import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Calendar; -import java.util.Comparator; -import java.util.Date; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - +import com.jasamedika.medifirst2000.constants.Master; +import com.jasamedika.medifirst2000.converter.PegawaiConverter; +import com.jasamedika.medifirst2000.dao.*; +import com.jasamedika.medifirst2000.dao.custom.PegawaiDaoCustom; +import com.jasamedika.medifirst2000.dto.PegawaiDto; +import com.jasamedika.medifirst2000.entities.*; +import com.jasamedika.medifirst2000.paging.Comparison; +import com.jasamedika.medifirst2000.paging.Condition; +import com.jasamedika.medifirst2000.paging.Filter; +import com.jasamedika.medifirst2000.service.PegawaiService; +import com.jasamedika.medifirst2000.util.CommonUtil; +import com.jasamedika.medifirst2000.util.DateUtil; +import com.jasamedika.medifirst2000.util.ImageUtil; +import com.jasamedika.medifirst2000.util.JsonUtil; +import com.jasamedika.medifirst2000.vo.PegawaiVO; +import com.jasamedika.medifirst2000.vo.RegistrasiPegawaiMobileVO; +import com.jasamedika.medifirst2000.vo.RekamDataPegawaiVO; import org.joda.time.Chronology; import org.joda.time.LocalDate; import org.joda.time.chrono.ISOChronology; @@ -28,58 +32,11 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; -import com.jasamedika.medifirst2000.constants.Master; -import com.jasamedika.medifirst2000.converter.PegawaiConverter; -import com.jasamedika.medifirst2000.dao.AgamaDao; -import com.jasamedika.medifirst2000.dao.EselonDao; -import com.jasamedika.medifirst2000.dao.GolonganDarahDao; -import com.jasamedika.medifirst2000.dao.GolonganPegawaiDao; -import com.jasamedika.medifirst2000.dao.JabatanDao; -import com.jasamedika.medifirst2000.dao.JadwalDokterDao; -import com.jasamedika.medifirst2000.dao.JenisKelaminDao; -import com.jasamedika.medifirst2000.dao.JenisPegawaiDao; -import com.jasamedika.medifirst2000.dao.JenisPendidikanDao; -import com.jasamedika.medifirst2000.dao.KategoryPegawaiDao; -import com.jasamedika.medifirst2000.dao.KedudukanDao; -import com.jasamedika.medifirst2000.dao.KelompokShiftDao; -import com.jasamedika.medifirst2000.dao.KualifikasiJurusanDao; -import com.jasamedika.medifirst2000.dao.LoginUserDao; -import com.jasamedika.medifirst2000.dao.MapPegawaiJabatanToUnitKerjaDao; -import com.jasamedika.medifirst2000.dao.NegaraDao; -import com.jasamedika.medifirst2000.dao.NilaiKelompokJabatanDao; -import com.jasamedika.medifirst2000.dao.PangkatDao; -import com.jasamedika.medifirst2000.dao.PegawaiDao; -import com.jasamedika.medifirst2000.dao.PendidikanDao; -import com.jasamedika.medifirst2000.dao.RekananDao; -import com.jasamedika.medifirst2000.dao.RuanganDao; -import com.jasamedika.medifirst2000.dao.ShiftKerjaDao; -import com.jasamedika.medifirst2000.dao.StatusPerkawinanDao; -import com.jasamedika.medifirst2000.dao.SukuDao; -import com.jasamedika.medifirst2000.dao.TypePegawaiDao; -import com.jasamedika.medifirst2000.dao.custom.PegawaiDaoCustom; -import com.jasamedika.medifirst2000.dto.PegawaiDto; -import com.jasamedika.medifirst2000.entities.Jabatan; -import com.jasamedika.medifirst2000.entities.JadwalDokter; -import com.jasamedika.medifirst2000.entities.JadwalPraktek; -import com.jasamedika.medifirst2000.entities.Kalender; -import com.jasamedika.medifirst2000.entities.Kedudukan; -import com.jasamedika.medifirst2000.entities.KelompokUser; -import com.jasamedika.medifirst2000.entities.LoginUser; -import com.jasamedika.medifirst2000.entities.Negara; -import com.jasamedika.medifirst2000.entities.Pegawai; -import com.jasamedika.medifirst2000.entities.PegawaiJadwalKerja; -import com.jasamedika.medifirst2000.entities.ShiftKerja; -import com.jasamedika.medifirst2000.paging.Comparison; -import com.jasamedika.medifirst2000.paging.Condition; -import com.jasamedika.medifirst2000.paging.Filter; -import com.jasamedika.medifirst2000.service.PegawaiService; -import com.jasamedika.medifirst2000.util.CommonUtil; -import com.jasamedika.medifirst2000.util.DateUtil; -import com.jasamedika.medifirst2000.util.ImageUtil; -import com.jasamedika.medifirst2000.util.JsonUtil; -import com.jasamedika.medifirst2000.vo.PegawaiVO; -import com.jasamedika.medifirst2000.vo.RegistrasiPegawaiMobileVO; -import com.jasamedika.medifirst2000.vo.RekamDataPegawaiVO; +import java.io.File; +import java.text.DateFormat; +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.*; /** * Implement class for PasienService @@ -182,7 +139,7 @@ public class PegawaiServiceImpl extends BaseVoServiceImpl implements PegawaiServ } @Override - @Transactional(readOnly = false) + @Transactional public PegawaiVO add(PegawaiVO vo) { Pegawai pegawai = pegawaiConverter.transferVOToModel(vo, new Pegawai()); Pegawai resultModel = pegawaiDao.save(pegawai); @@ -192,7 +149,7 @@ public class PegawaiServiceImpl extends BaseVoServiceImpl implements PegawaiServ } @Override - @Transactional(readOnly = false) + @Transactional public PegawaiVO update(PegawaiVO vo) { Pegawai pegawaiLama = pegawaiDao.findOne(vo.getId()); Pegawai pegawaiBaru = pegawaiConverter.transferVOToModel(vo, pegawaiLama); @@ -224,7 +181,7 @@ public class PegawaiServiceImpl extends BaseVoServiceImpl implements PegawaiServ @Override public List findByNik(String nik) { List modelList = pegawaiDao.findPasienByNik(nik); - List modelVOList = new ArrayList(); + List modelVOList = new ArrayList<>(); for (Pegawai model : modelList) { PegawaiVO vo = new PegawaiVO(); String[] fieldsToInclude = { "namaLengkap", "nikIntern" }; @@ -236,7 +193,7 @@ public class PegawaiServiceImpl extends BaseVoServiceImpl implements PegawaiServ @Override public List getAllDokter() { - List vos = new ArrayList(); + List vos = new ArrayList<>(); List models = pegawaiDao.getAllDokter(); pegawaiConverter.transferListOfModelToListOfVO(models, vos); return vos; @@ -244,8 +201,7 @@ public class PegawaiServiceImpl extends BaseVoServiceImpl implements PegawaiServ @Override public List> getDokterBpjs() { - List> result = pegawaiDao.findAllDokter(); - return result; + return pegawaiDao.findAllDokter(); } @SuppressWarnings("unchecked") @@ -269,9 +225,7 @@ public class PegawaiServiceImpl extends BaseVoServiceImpl implements PegawaiServ try { return constructMapReturn(JsonUtil.ToMaps(pegawaiList), resultPage.getTotalElements(), resultPage.getTotalPages()); - } catch (IllegalArgumentException e) { - e.printStackTrace(); - } catch (IllegalAccessException e) { + } catch (IllegalArgumentException | IllegalAccessException e) { e.printStackTrace(); } return null; @@ -279,7 +233,7 @@ public class PegawaiServiceImpl extends BaseVoServiceImpl implements PegawaiServ @Override public List getAllDokter(String name) { - List vos = new ArrayList(); + List vos = new ArrayList<>(); List models = pegawaiDao.getAllDokter(name); pegawaiConverter.transferListOfModelToListOfVO(models, vos); return vos; @@ -287,7 +241,7 @@ public class PegawaiServiceImpl extends BaseVoServiceImpl implements PegawaiServ @Override public List getAllDokterByRuanganAndTanggal(String kodeRuangan, Date tanggal) { - List vos = new ArrayList(); + List vos = new ArrayList<>(); List models = pegawaiDao.getAllDokterByRuanganAndTanggal(kodeRuangan, tanggal); pegawaiConverter.transferListOfModelToListOfVO(models, vos); return vos; @@ -295,7 +249,7 @@ public class PegawaiServiceImpl extends BaseVoServiceImpl implements PegawaiServ @Override public Map addPegawai(PegawaiVO vo) { - Map result = new HashMap(); + Map result = new HashMap<>(); Pegawai model = pegawaiConverter.transferVOToModel(vo, new Pegawai()); Pegawai resultModel = pegawaiDao.save(model); if (CommonUtil.isNotNullOrEmpty(resultModel)) { @@ -306,7 +260,7 @@ public class PegawaiServiceImpl extends BaseVoServiceImpl implements PegawaiServ @Override public Map findAllPegawai() { - Map result = new HashMap(); + Map result = new HashMap<>(); List resultModel = pegawaiDao.findAllPegawai(); if (CommonUtil.isNotNullOrEmpty(resultModel)) { result.put("pegawai", resultModel); @@ -319,7 +273,7 @@ public class PegawaiServiceImpl extends BaseVoServiceImpl implements PegawaiServ @Override public List> getAllByJenisPegawai(String getSettingDataFixed, String key) { - Map result = new HashMap(); + Map result = new HashMap<>(); List resultModel = pegawaiDao.findByJenisPetugas(Integer.parseInt(getSettingDataFixed), "%" + key + "%"); if (CommonUtil.isNotNullOrEmpty(resultModel)) { @@ -329,7 +283,7 @@ public class PegawaiServiceImpl extends BaseVoServiceImpl implements PegawaiServ result.put("dataFound", false); } try { - return JsonUtil.ToMaps(resultModel, (Integer) 1); + return JsonUtil.ToMaps(resultModel, 1); } catch (IllegalArgumentException | IllegalAccessException e) { e.printStackTrace(); } @@ -338,7 +292,7 @@ public class PegawaiServiceImpl extends BaseVoServiceImpl implements PegawaiServ @Override public List> getAllBySatuanKerja(Integer satuanKerjaId) { - Map result = new HashMap(); + Map result = new HashMap<>(); List resultModel = pegawaiDao.findBySatuanKerja(satuanKerjaId); if (CommonUtil.isNotNullOrEmpty(resultModel)) { result.put("pegawai", resultModel); @@ -347,7 +301,7 @@ public class PegawaiServiceImpl extends BaseVoServiceImpl implements PegawaiServ result.put("dataFound", false); } try { - return JsonUtil.ToMaps(resultModel, (Integer) 1); + return JsonUtil.ToMaps(resultModel, 1); } catch (IllegalArgumentException | IllegalAccessException e) { e.printStackTrace(); } @@ -356,9 +310,8 @@ public class PegawaiServiceImpl extends BaseVoServiceImpl implements PegawaiServ @Override public Map findPegawaiById(Integer id) { - Map result = new HashMap(); - Pegawai pegawai = new Pegawai(); - pegawai = pegawaiDao.findOne(id); + Map result = new HashMap<>(); + Pegawai pegawai = pegawaiDao.findOne(id); if (CommonUtil.isNotNullOrEmpty(pegawai)) { result.put("data", pegawai); result.put("dataFound", true); @@ -371,7 +324,7 @@ public class PegawaiServiceImpl extends BaseVoServiceImpl implements PegawaiServ @SuppressWarnings("unchecked") @Override public Map findPegawaiByRuangan(Integer unitKerja, Integer tahun, Integer bulan) { - Map result = new HashMap(); + Map result = new HashMap<>(); List> list = new ArrayList<>(); List> listPegawai = pegawaiDao.findByUnitKerja(unitKerja); for (Map map : listPegawai) { @@ -407,7 +360,7 @@ public class PegawaiServiceImpl extends BaseVoServiceImpl implements PegawaiServ @SuppressWarnings("unchecked") @Override public Map findPegawaiByRuangan(Integer ruangan, Integer tahun, Integer bulan, Integer pegawai) { - Map result = new HashMap(); + Map result = new HashMap<>(); List> list = new ArrayList<>(); List> listPegawai = new ArrayList<>(); Pegawai dokter = pegawaiDao.findOne(pegawai); @@ -461,7 +414,7 @@ public class PegawaiServiceImpl extends BaseVoServiceImpl implements PegawaiServ @Override public Map findPegawaiByRuanganAndPegawaiId(Integer ruangan, Integer tahun, Integer bulan, Integer id) { - Map result = new HashMap(); + Map result = new HashMap<>(); List> list = new ArrayList<>(); List> listPegawai = new ArrayList<>(); Pegawai dokter = pegawaiDao.findOne(id); @@ -503,7 +456,7 @@ public class PegawaiServiceImpl extends BaseVoServiceImpl implements PegawaiServ @Override public Map dataAllPegawai() { - Map result = new HashMap(); + Map result = new HashMap<>(); List> listPegawai = pegawaiDao.dataAllPegawai(); result.put("pegawai", listPegawai); return result; @@ -521,14 +474,14 @@ public class PegawaiServiceImpl extends BaseVoServiceImpl implements PegawaiServ @Override public Map findAllPegawaiNoPaging() { - Map result = new HashMap(); + Map result = new HashMap<>(); List> resultModelWithUsername = new ArrayList<>(); List> resultModel = pegawaiDao.findAllPegawaiNoPaging( splitDataSettingDatafixed("statusDataPegawaiException"), splitDataSettingDatafixed("listDataKedudukanException")); for (Map map : resultModel) { - Map usernames = new HashMap(); + Map usernames = new HashMap<>(); Integer idPegawai = Integer.parseInt(map.get("idPegawai").toString()); List> listUsername = pegawaiDao.getUsernameByIdPegawai(idPegawai); Map mapJabatanUnitSub = pegawaiDao.getMapJabatanUnitSubAllPegawai(idPegawai); @@ -563,13 +516,13 @@ public class PegawaiServiceImpl extends BaseVoServiceImpl implements PegawaiServ @Override public Map findAllPegawaiPNS() { - Map result = new HashMap(); + Map result = new HashMap<>(); List> resultModelWithUsername = new ArrayList<>(); List> resultModel = pegawaiDao .findAllPegawaiByKategory(Arrays.asList(Master.KedudukanPegawai.NONSDM), Master.KategoryPegawai.PNS); for (Map map : resultModel) { - Map usernames = new HashMap(); + Map usernames = new HashMap<>(); Integer idPegawai = Integer.parseInt(map.get("idPegawai").toString()); List> listUsername = pegawaiDao.getUsernameByIdPegawai(idPegawai); Map mapJabatanUnitSub = pegawaiDao.getMapJabatanUnitSubAllPegawai(idPegawai); @@ -614,13 +567,13 @@ public class PegawaiServiceImpl extends BaseVoServiceImpl implements PegawaiServ @Override public Map findAllPegawaiMitra() { - Map result = new HashMap(); + Map result = new HashMap<>(); List> resultModelWithUsername = new ArrayList<>(); List> resultModel = pegawaiDao .findAllPegawaiByKategory(Arrays.asList(Master.KedudukanPegawai.NONSDM), Master.KategoryPegawai.MITRA); for (Map map : resultModel) { - Map usernames = new HashMap(); + Map usernames = new HashMap<>(); Integer idPegawai = Integer.parseInt(map.get("idPegawai").toString()); List> listUsername = pegawaiDao.getUsernameByIdPegawai(idPegawai); Map mapJabatanUnitSub = pegawaiDao.getMapJabatanUnitSubAllPegawai(idPegawai); @@ -665,13 +618,13 @@ public class PegawaiServiceImpl extends BaseVoServiceImpl implements PegawaiServ @Override public Map findAllPegawaiPesertaDidik() { - Map result = new HashMap(); + Map result = new HashMap<>(); List> resultModelWithUsername = new ArrayList<>(); List> resultModel = pegawaiDao.findAllPegawaiByKategory( Arrays.asList(Master.KedudukanPegawai.NONSDM), Master.KategoryPegawai.PESERTA_DIDIK); for (Map map : resultModel) { - Map usernames = new HashMap(); + Map usernames = new HashMap<>(); Integer idPegawai = Integer.parseInt(map.get("idPegawai").toString()); List> listUsername = pegawaiDao.getUsernameByIdPegawai(idPegawai); Map mapJabatanUnitSub = pegawaiDao.getMapJabatanUnitSubAllPegawai(idPegawai); @@ -716,13 +669,13 @@ public class PegawaiServiceImpl extends BaseVoServiceImpl implements PegawaiServ @Override public Map findAllPegawaiDokterTamu() { - Map result = new HashMap(); + Map result = new HashMap<>(); List> resultModelWithUsername = new ArrayList<>(); List> resultModel = pegawaiDao.findAllPegawaiByKategory( Arrays.asList(Master.KedudukanPegawai.NONSDM), Master.KategoryPegawai.DOKTER_TAMU); for (Map map : resultModel) { - Map usernames = new HashMap(); + Map usernames = new HashMap<>(); Integer idPegawai = Integer.parseInt(map.get("idPegawai").toString()); List> listUsername = pegawaiDao.getUsernameByIdPegawai(idPegawai); Map mapJabatanUnitSub = pegawaiDao.getMapJabatanUnitSubAllPegawai(idPegawai); @@ -768,13 +721,13 @@ public class PegawaiServiceImpl extends BaseVoServiceImpl implements PegawaiServ @Override public Map searchPegawaiCustom(String nama, Integer idUnitKerja, Integer idKedudukan, List listStatusPegawaiId, String periode) { - Map result = new HashMap(); + Map result = new HashMap<>(); List> resultModelWithUsername = new ArrayList<>(); List> resultModel = pegawaiDaoCustom.findPegawaiCustom(nama, idUnitKerja, idKedudukan, listStatusPegawaiId, periode, splitDataSettingDatafixed("listDataKedudukanException")); for (Map map : resultModel) { - Map usernames = new HashMap(); + Map usernames = new HashMap<>(); Integer idPegawai = Integer.parseInt(map.get("idPegawai").toString()); List> listUsername = pegawaiDao.getUsernameByIdPegawai(idPegawai); Map mapJabatanUnitSub = pegawaiDao.getMapJabatanUnitSubAllPegawai(idPegawai); @@ -820,14 +773,14 @@ public class PegawaiServiceImpl extends BaseVoServiceImpl implements PegawaiServ @Override public Map searchMitraCustom(String nama, Integer idUnitKerja, Integer idKedudukan, String periode) { - Map result = new HashMap(); + Map result = new HashMap<>(); List> resultModelWithUsername = new ArrayList<>(); List> resultModel = pegawaiDaoCustom.findPegawaiCustomByKategori(nama, idUnitKerja, idKedudukan, periode, splitDataSettingDatafixed("listDataKedudukanException"), Master.KategoryPegawai.MITRA); for (Map map : resultModel) { - Map usernames = new HashMap(); + Map usernames = new HashMap<>(); Integer idPegawai = Integer.parseInt(map.get("idPegawai").toString()); List> listUsername = pegawaiDao.getUsernameByIdPegawai(idPegawai); Map mapJabatanUnitSub = pegawaiDao.getMapJabatanUnitSubAllPegawai(idPegawai); @@ -873,14 +826,14 @@ public class PegawaiServiceImpl extends BaseVoServiceImpl implements PegawaiServ @Override public Map searchDokterTamuCustom(String nama, Integer idUnitKerja, Integer idKedudukan, String periode) { - Map result = new HashMap(); + Map result = new HashMap<>(); List> resultModelWithUsername = new ArrayList<>(); List> resultModel = pegawaiDaoCustom.findPegawaiCustomByKategori(nama, idUnitKerja, idKedudukan, periode, splitDataSettingDatafixed("listDataKedudukanException"), Master.KategoryPegawai.DOKTER_TAMU); for (Map map : resultModel) { - Map usernames = new HashMap(); + Map usernames = new HashMap<>(); Integer idPegawai = Integer.parseInt(map.get("idPegawai").toString()); List> listUsername = pegawaiDao.getUsernameByIdPegawai(idPegawai); Map mapJabatanUnitSub = pegawaiDao.getMapJabatanUnitSubAllPegawai(idPegawai); @@ -926,14 +879,14 @@ public class PegawaiServiceImpl extends BaseVoServiceImpl implements PegawaiServ @Override public Map searchPesertaDidikCustom(String nama, Integer idUnitKerja, Integer idKedudukan, String periode) { - Map result = new HashMap(); + Map result = new HashMap<>(); List> resultModelWithUsername = new ArrayList<>(); List> resultModel = pegawaiDaoCustom.findPegawaiCustomByKategori(nama, idUnitKerja, idKedudukan, periode, splitDataSettingDatafixed("listDataKedudukanException"), Master.KategoryPegawai.PESERTA_DIDIK); for (Map map : resultModel) { - Map usernames = new HashMap(); + Map usernames = new HashMap<>(); Integer idPegawai = Integer.parseInt(map.get("idPegawai").toString()); List> listUsername = pegawaiDao.getUsernameByIdPegawai(idPegawai); Map mapJabatanUnitSub = pegawaiDao.getMapJabatanUnitSubAllPegawai(idPegawai); @@ -979,14 +932,14 @@ public class PegawaiServiceImpl extends BaseVoServiceImpl implements PegawaiServ @Override public Map searchPegawaiCustom(String nama, Integer idUnitKerja, Integer idKedudukan, Integer idStatusPegawai, List listIdStatusPegawai, String periode) { - Map result = new HashMap(); + Map result = new HashMap<>(); List> resultModelWithUsername = new ArrayList<>(); List> resultModel = pegawaiDaoCustom.findPegawaiCustom(nama, idUnitKerja, idKedudukan, listIdStatusPegawai, idStatusPegawai, periode, splitDataSettingDatafixed("statusDataPegawaiException"), splitDataSettingDatafixed("listDataKedudukanException")); for (Map map : resultModel) { - Map usernames = new HashMap(); + Map usernames = new HashMap<>(); Integer idPegawai = Integer.parseInt(map.get("idPegawai").toString()); List> listUsername = pegawaiDao.getUsernameByIdPegawai(idPegawai); Map mapJabatanUnitSub = pegawaiDao.getMapJabatanUnitSubAllPegawai(idPegawai); @@ -1020,7 +973,7 @@ public class PegawaiServiceImpl extends BaseVoServiceImpl implements PegawaiServ @Override public Map findAllPegawaiLainLain() { - Map result = new HashMap(); + Map result = new HashMap<>(); List> resultModel = pegawaiDao.findAllPegawaiLainLain( splitDataSettingDatafixed("statusDataPegawaiException"), splitDataSettingDatafixed("listDataKedudukanException")); @@ -1036,7 +989,7 @@ public class PegawaiServiceImpl extends BaseVoServiceImpl implements PegawaiServ @Override public Map findAllPegawaiNoPagingSearch(String namaPegawai, String idJabatan, Integer idSubUnitKerja) { - Map result = new HashMap(); + Map result = new HashMap<>(); List> resultModel = pegawaiDaoCustom.findPegawaiByName(namaPegawai, idJabatan, idSubUnitKerja); if (CommonUtil.isNotNullOrEmpty(resultModel)) { @@ -1050,8 +1003,7 @@ public class PegawaiServiceImpl extends BaseVoServiceImpl implements PegawaiServ @Override public Map findPegawaiByIdCustom(Integer idPegawai) { - Map pegawai = pegawaiDao.findPegawaiById(idPegawai); - return pegawai; + return pegawaiDao.findPegawaiById(idPegawai); } @Override @@ -1073,7 +1025,7 @@ public class PegawaiServiceImpl extends BaseVoServiceImpl implements PegawaiServ @Override public Map findPegawaiByRuangan(Integer ruangan) { - Map result = new HashMap(); + Map result = new HashMap<>(); List> listPegawai = pegawaiDao.findByRuanganKerja(ruangan); result.put("data", listPegawai); return result; @@ -1099,7 +1051,7 @@ public class PegawaiServiceImpl extends BaseVoServiceImpl implements PegawaiServ @SuppressWarnings("unchecked") @Override public Map findPegawaiByRuanganRev(Integer ruangan, Integer tahun, Integer bulan) { - Map result = new HashMap(); + Map result = new HashMap<>(); List> list = new ArrayList<>(); List> listPegawai = pegawaiDao.findByRuanganKerja(ruangan); List> listidJabatanPegawaiDokter = jabatanDao.findIdJabatanInternalDokterOnly(); @@ -1228,10 +1180,8 @@ public class PegawaiServiceImpl extends BaseVoServiceImpl implements PegawaiServ @SuppressWarnings("unchecked") @Override public Map findPegawaiByRuanganRev2(Integer subUnitKerja, Integer tahun, Integer bulan) { - Map result = new HashMap(); + Map result = new HashMap<>(); List> list = new ArrayList<>(); - // List> listPegawai = - // pegawaiDao.findByUnitKerja(subUnitKerja); List> listPegawai = pegawaiDao.findSimpleByUnitKerja(subUnitKerja); List> mapListHariLibur = pegawaiDaoCustom.findHariLiburPegawaiNonShift(tahun, bulan); @@ -1246,15 +1196,14 @@ public class PegawaiServiceImpl extends BaseVoServiceImpl implements PegawaiServ // Setting Bulan Ramadhan Chronology iso = ISOChronology.getInstance(); Chronology hijri = IslamicChronology.getInstance(); - Integer bulanHijri; + int bulanHijri; for (Map map : listPegawai) { List> items = new ArrayList<>(); try { Map pegawaiMap = pegawaiDao.findById(Integer.parseInt(map.get("idPegawai").toString())) .ToMap(); - Map shiftKerja = new HashMap(); - shiftKerja = (Map) pegawaiMap.get("shiftKerja"); + Map shiftKerja = (Map) pegawaiMap.get("shiftKerja"); Integer idShift = 0; if (CommonUtil.isNotNullOrEmpty(shiftKerja)) { if (CommonUtil.isNotNullOrEmpty(shiftKerja.get("id"))) { @@ -1370,7 +1319,7 @@ public class PegawaiServiceImpl extends BaseVoServiceImpl implements PegawaiServ @Override public Map findPegawaiByRuanganRev2(Integer subUnitKerja, Integer tahun, Integer bulan, Integer idPegawai) { - Map result = new HashMap(); + Map result = new HashMap<>(); List> list = new ArrayList<>(); List> listPegawai = pegawaiDao.findByUnitKerja(subUnitKerja, idPegawai); List> mapListHariLibur = pegawaiDaoCustom.findHariLiburPegawaiNonShift(tahun, bulan); @@ -1386,7 +1335,7 @@ public class PegawaiServiceImpl extends BaseVoServiceImpl implements PegawaiServ // Setting Bulan Ramadhan Chronology iso = ISOChronology.getInstance(); Chronology hijri = IslamicChronology.getInstance(); - Integer bulanHijri; + int bulanHijri; for (Map map : listPegawai) { List> items = new ArrayList<>(); @@ -1504,7 +1453,7 @@ public class PegawaiServiceImpl extends BaseVoServiceImpl implements PegawaiServ @Override public List findAllPegawaiAktifByRuangan(Integer idRuangan) { - List vos = new ArrayList(); + List vos = new ArrayList<>(); List models = pegawaiDao.findAllPegawaiAktifByRuangan(idRuangan); pegawaiConverter.transferListOfModelToListOfVO(models, vos); return vos; @@ -1518,7 +1467,7 @@ public class PegawaiServiceImpl extends BaseVoServiceImpl implements PegawaiServ @Override public Map getPegawaiWithNamaUserById(Integer id) { Integer qPegawai = pegawaiDao.countPegawaiWithUsername(id); - Map pegawaiWithUsername = new HashMap(); + Map pegawaiWithUsername = new HashMap<>(); if (CommonUtil.isNotNullOrEmpty(qPegawai)) { if (qPegawai > 1) { pegawaiWithUsername = pegawaiDao.getPegawaiWithNamaUserById(id); @@ -1534,7 +1483,7 @@ public class PegawaiServiceImpl extends BaseVoServiceImpl implements PegawaiServ @Override public String SaveRegistrasiPegawaiMobile(RegistrasiPegawaiMobileVO vo) { - Map result = new HashMap(); + Map result = new HashMap<>(); Pegawai model = new Pegawai(); Negara negara = new Negara(); @@ -1564,9 +1513,9 @@ public class PegawaiServiceImpl extends BaseVoServiceImpl implements PegawaiServ @Override public Map getTglpensiun(String tglLahir, Integer jabatanFungsional) { - Date tglPensiun = null; + Date tglPensiun; Integer usiaPensiun = 0; - Map result = new HashMap(); + Map result = new HashMap<>(); Calendar calendar = Calendar.getInstance(); DateFormat df = new SimpleDateFormat("yyyy-MM-dd"); Date tanggalLahir; @@ -1597,7 +1546,7 @@ public class PegawaiServiceImpl extends BaseVoServiceImpl implements PegawaiServ @Override public Map nonAktifPegawai(Integer idPegawai) { - Map result = new HashMap(); + Map result = new HashMap<>(); if (CommonUtil.isNotNullOrEmpty(idPegawai)) { Pegawai pegawai = pegawaiDao.findById(idPegawai); pegawai.setStatusEnabled(false); @@ -1611,26 +1560,22 @@ public class PegawaiServiceImpl extends BaseVoServiceImpl implements PegawaiServ @Override public List> getPegawaiYgAkanPensiun(String startPeriode, String endPeriode) { - List> result = pegawaiDao.findPegawaiPensiun(startPeriode, endPeriode); - return result; + return pegawaiDao.findPegawaiPensiun(startPeriode, endPeriode); } @Override public List> getpegawaiByUnitkerja(Integer idSubUnitkerja) { - List> result = pegawaiDao.findByUnitKerja(idSubUnitkerja); - return result; + return pegawaiDao.findByUnitKerja(idSubUnitkerja); } @Override public List> getpegawaiStrExpired() { - List> result = pegawaiDao.findStrExpired(getNextSixMonth()); - return result; + return pegawaiDao.findStrExpired(getNextSixMonth()); } @Override public List> getpegawaiSipExpired() { - List> result = pegawaiDao.findSipExpired(getNextSixMonth()); - return result; + return pegawaiDao.findSipExpired(getNextSixMonth()); } public Date getNextSixMonth() { @@ -1642,31 +1587,27 @@ public class PegawaiServiceImpl extends BaseVoServiceImpl implements PegawaiServ @Override public List> getpegawaiByUnitKerja() { - List> result = pegawaiDao.countByUnitKerja(); - return result; + return pegawaiDao.countByUnitKerja(); } @Override public List> getpegawaiByKelompokJabatan() { - List> result = pegawaiDao.countByKelompokJabatan(); - return result; + return pegawaiDao.countByKelompokJabatan(); } @Override public List> getpegawaiByStatusPegawai() { - List> result = pegawaiDao.countByStatusPegawai(); - return result; + return pegawaiDao.countByStatusPegawai(); } @Override public List> getpegawaiByJenisKelamin() { - List> result = pegawaiDao.countByJenisKelamin(); - return result; + return pegawaiDao.countByJenisKelamin(); } @Override public Map findPegawaiMeninggalPindahPensiunNoPaging() { - Map result = new HashMap(); + Map result = new HashMap<>(); List> resultModelFeatured = new ArrayList<>(); List> resultModel = pegawaiDao.findPegawaiMeninggalPindahPensiunNoPaging( @@ -1703,7 +1644,7 @@ public class PegawaiServiceImpl extends BaseVoServiceImpl implements PegawaiServ @Override public Map findPegawaiMeninggalPindahPensiunNonSdm() { - Map result = new HashMap(); + Map result = new HashMap<>(); List> resultModelFeatured = new ArrayList<>(); List> resultModel = pegawaiDao.findPegawaiMeninggalPindahPensiunNonSdm( @@ -1740,7 +1681,7 @@ public class PegawaiServiceImpl extends BaseVoServiceImpl implements PegawaiServ @Override public Map findPegawaiOutSourcingNoPaging() { - Map result = new HashMap(); + Map result = new HashMap<>(); List> resultModelFeatured = new ArrayList<>(); List> resultModel = pegawaiDao @@ -1782,65 +1723,55 @@ public class PegawaiServiceImpl extends BaseVoServiceImpl implements PegawaiServ maxDay = maxDay - Calendar.DATE; cal.add(Calendar.DATE, -maxDay); cal.add(Calendar.MONTH, 1); - List> result = pegawaiDao.findAllPegawaiIncludeMeninggalPindahPensiunNoPaging( + return pegawaiDao.findAllPegawaiIncludeMeninggalPindahPensiunNoPaging( splitDataSettingDatafixed("idMeninggalKeluarPindah"), cal.getTime()); - return result; } @Override public List> getAllKepalaRuangan() { - List> result = pegawaiDao.findAllPegawaiKepalaRuangan(); - return result; + return pegawaiDao.findAllPegawaiKepalaRuangan(); } @Override public Map findKepalaPegawai(String namaJabatan) { - Map result = pegawaiDao.getKepalaPegawai(namaJabatan); - return result; + return pegawaiDao.getKepalaPegawai(namaJabatan); } @Override public List> findAllJabatan() { - List> result = jabatanDao.findAllJabatan(); - return result; + return jabatanDao.findAllJabatan(); } @Override public List findPegawaiSDMforCred() { - List result = pegawaiDao.getPegawaiSDMforCred(Master.UnitKerja.BAG_SDM, - Master.SubUnitKerja.SUBBAG_KESEJAHTERAAN); - return result; + return pegawaiDao.getPegawaiSDMforCred(Master.UnitKerja.BAG_SDM, Master.SubUnitKerja.SUBBAG_KESEJAHTERAAN); } @Override public List> findJabatanByPegawai(Integer idPegawai) { - List> result = mapPegawaiJabatanToUnitKerjaDao - .getJabatanInternalStrukturalByPegawai(idPegawai); - - return result; + return mapPegawaiJabatanToUnitKerjaDao.getJabatanInternalStrukturalByPegawai(idPegawai); } @Override public List> findAllPangkatGolongan() { - List> result = pangkatDao.getPangkatGolongan(); - return result; + return pangkatDao.getPangkatGolongan(); } - private String getDirPathFotoProfil(String dirname) { + private String getDirPathFotoProfil() { String osName = System.getProperty("os.name").toLowerCase(); - String path = systemDirectory + dirname + "/"; + String path = systemDirectory + "foto-profil" + "/"; if (osName.contains("win")) - path = systemDirectory.replace("/", "\\") + dirname + "\\"; + path = systemDirectory.replace("/", "\\") + "foto-profil" + "\\"; return path; } @Override public Map findPegawaiDetailById(Integer idPegawai) { Map result = pegawaiDao.getPegawaiDetailById(idPegawai); - Map dataEvaluasiJabatan = (Map) this.getEvaluasiJabatanByPegawai(idPegawai); + Map dataEvaluasiJabatan = this.getEvaluasiJabatanByPegawai(idPegawai); String imageURLData = ""; - File file = new File(getDirPathFotoProfil("foto-profil") + idPegawai + ".jpg"); + File file = new File(getDirPathFotoProfil() + idPegawai + ".jpg"); String encodeRs = ImageUtil.encodeFileToBase64Binary(file); if (CommonUtil.isNotNullOrEmpty(encodeRs)) { imageURLData = "data:image/jpg;base64," + encodeRs; @@ -2307,7 +2238,7 @@ public class PegawaiServiceImpl extends BaseVoServiceImpl implements PegawaiServ @Override public void resetLoginUser(Integer idPegawai) { - List allLoginUserDetail = new ArrayList(); + List allLoginUserDetail = new ArrayList<>(); List allLoginUser = loginUserDao.findAllLoginUserByIdPegawai(idPegawai); for (LoginUser loginUser : allLoginUser) { allLoginUserDetail.add(loginUserDao.findOne(loginUser.getId())); @@ -2348,8 +2279,8 @@ public class PegawaiServiceImpl extends BaseVoServiceImpl implements PegawaiServ @Override public String hitungMasaKerja(Date tglMasuk) { - int years = 0; - int months = 0; + int years; + int months; Calendar birthDay = Calendar.getInstance(); birthDay.setTimeInMillis(tglMasuk.getTime()); @@ -2405,14 +2336,12 @@ public class PegawaiServiceImpl extends BaseVoServiceImpl implements PegawaiServ @Override public List> findExistingFingerId(String idFinger, Integer idPegawai) { - List> result = new ArrayList<>(); - + List> result; if (CommonUtil.isNotNullOrEmpty(idPegawai)) { result = pegawaiDao.checkExistingFingerId(idFinger.trim(), idPegawai); } else { result = pegawaiDao.checkExistingFingerId(idFinger.trim()); } - return result; } @@ -2423,7 +2352,7 @@ public class PegawaiServiceImpl extends BaseVoServiceImpl implements PegawaiServ List> result = pegawaiDao.findByBirthDate(df.format(new Date())); for (Map map : result) { String imageURLData = ""; - File file = new File(getDirPathFotoProfil("foto-profil") + map.get("id").toString() + ".jpg"); + File file = new File(getDirPathFotoProfil() + map.get("id").toString() + ".jpg"); String encodeRs = ImageUtil.encodeFileToBase64Binary(file); if (CommonUtil.isNotNullOrEmpty(encodeRs)) { imageURLData = "data:image/jpg;base64," + encodeRs; @@ -2437,7 +2366,7 @@ public class PegawaiServiceImpl extends BaseVoServiceImpl implements PegawaiServ @Override public String findAvatar(Integer idPegawai) { String result = ""; - File file = new File(getDirPathFotoProfil("foto-profil") + idPegawai.toString() + ".jpg"); + File file = new File(getDirPathFotoProfil() + idPegawai.toString() + ".jpg"); String encodeRs = ImageUtil.encodeFileToBase64Binary(file); if (CommonUtil.isNotNullOrEmpty(encodeRs)) { result = "data:image/jpg;base64," + encodeRs; diff --git a/jasamedika-reporting/src/main/java/com/jasamedika/medifirst2000/controller/ReportingController.java b/jasamedika-reporting/src/main/java/com/jasamedika/medifirst2000/controller/ReportingController.java index bb0e5b2b..a01f451f 100644 --- a/jasamedika-reporting/src/main/java/com/jasamedika/medifirst2000/controller/ReportingController.java +++ b/jasamedika-reporting/src/main/java/com/jasamedika/medifirst2000/controller/ReportingController.java @@ -1,22 +1,22 @@ package com.jasamedika.medifirst2000.controller; -import java.math.BigDecimal; -import java.text.DateFormat; -import java.text.DecimalFormat; -import java.text.DecimalFormatSymbols; -import java.text.ParseException; -import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collection; -import java.util.Date; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; - -import javax.servlet.http.HttpServletRequest; - +import com.jasamedika.medifirst2000.constants.Constants; +import com.jasamedika.medifirst2000.constants.Master; +import com.jasamedika.medifirst2000.constants.MessageResource; +import com.jasamedika.medifirst2000.controller.base.IBaseRestController; +import com.jasamedika.medifirst2000.controller.base.LocaleController; +import com.jasamedika.medifirst2000.core.web.WebConstants; +import com.jasamedika.medifirst2000.dao.*; +import com.jasamedika.medifirst2000.dto.*; +import com.jasamedika.medifirst2000.entities.Jabatan; +import com.jasamedika.medifirst2000.entities.LoginUser; +import com.jasamedika.medifirst2000.entities.Pasien; +import com.jasamedika.medifirst2000.entities.Pegawai; +import com.jasamedika.medifirst2000.exception.ServiceVOException; +import com.jasamedika.medifirst2000.service.*; +import com.jasamedika.medifirst2000.util.*; +import com.jasamedika.medifirst2000.util.rest.RestUtil; +import com.jasamedika.medifirst2000.vo.RegistrasiPelayananVO; import org.apache.commons.lang.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -25,126 +25,14 @@ import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; import org.springframework.orm.jpa.JpaSystemException; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import org.springframework.web.servlet.ModelAndView; -import com.jasamedika.medifirst2000.constants.Constants; -import com.jasamedika.medifirst2000.constants.Master; -import com.jasamedika.medifirst2000.constants.MessageResource; -import com.jasamedika.medifirst2000.controller.base.IBaseRestController; -import com.jasamedika.medifirst2000.controller.base.LocaleController; -import com.jasamedika.medifirst2000.core.web.WebConstants; -import com.jasamedika.medifirst2000.dao.AsesmenGiziAwalDao; -import com.jasamedika.medifirst2000.dao.CheckListProsedurKeselamatanPasienDao; -import com.jasamedika.medifirst2000.dao.DiagnosaPasienDao; -import com.jasamedika.medifirst2000.dao.IndekKinerjaDao; -import com.jasamedika.medifirst2000.dao.JabatanDao; -import com.jasamedika.medifirst2000.dao.KebutuhanDasarDao; -import com.jasamedika.medifirst2000.dao.KelasDao; -import com.jasamedika.medifirst2000.dao.LaboratoriumDao; -import com.jasamedika.medifirst2000.dao.MasalahKeperawatanDetailDao; -import com.jasamedika.medifirst2000.dao.MonitoringAbsenDao; -import com.jasamedika.medifirst2000.dao.ObatGenerikDao; -import com.jasamedika.medifirst2000.dao.PapAlergiDao; -import com.jasamedika.medifirst2000.dao.PapKebutuhanEdukasiDao; -import com.jasamedika.medifirst2000.dao.PapKeluhanUtamaDao; -import com.jasamedika.medifirst2000.dao.PapRiwayatImunisasiDao; -import com.jasamedika.medifirst2000.dao.PapRiwayatKelahiranDao; -import com.jasamedika.medifirst2000.dao.PapSkriningGiziDao; -import com.jasamedika.medifirst2000.dao.PasienDao; -import com.jasamedika.medifirst2000.dao.PegawaiDao; -import com.jasamedika.medifirst2000.dao.PelayananPasienDao; -import com.jasamedika.medifirst2000.dao.PengkajianAwalNeonatusDao; -import com.jasamedika.medifirst2000.dao.PengkajianAwalPasienRawatJalanDewasaDao; -import com.jasamedika.medifirst2000.dao.ReportingDao; -import com.jasamedika.medifirst2000.dao.RuanganDao; -import com.jasamedika.medifirst2000.dto.BankDarahDto; -import com.jasamedika.medifirst2000.dto.BarcodelabDto; -import com.jasamedika.medifirst2000.dto.BuktiPenerimaanBarangDto; -import com.jasamedika.medifirst2000.dto.BukuRegisterMasukDto; -import com.jasamedika.medifirst2000.dto.BukuRegisterPelayananDto; -import com.jasamedika.medifirst2000.dto.CheckListProsedurKeselamatanPasienDto; -import com.jasamedika.medifirst2000.dto.CpptDto; -import com.jasamedika.medifirst2000.dto.DetailDto; -import com.jasamedika.medifirst2000.dto.HPSDto; -import com.jasamedika.medifirst2000.dto.HasilLabDto; -import com.jasamedika.medifirst2000.dto.HeadDto; -import com.jasamedika.medifirst2000.dto.HeadKasirDto; -import com.jasamedika.medifirst2000.dto.IndexPenyakitRawatInapDto; -import com.jasamedika.medifirst2000.dto.InstalasiRawatInapDto; -import com.jasamedika.medifirst2000.dto.KartuPengendaliDto; -import com.jasamedika.medifirst2000.dto.KartuPengendaliPasienPulangDto; -import com.jasamedika.medifirst2000.dto.KartuPulangPasienDto; -import com.jasamedika.medifirst2000.dto.KasirDto; -import com.jasamedika.medifirst2000.dto.KlinikMataDto; -import com.jasamedika.medifirst2000.dto.KunjunganPasienJenisDiagnosaDto; -import com.jasamedika.medifirst2000.dto.KunjunganPasienStatusDanJenisPasienDto; -import com.jasamedika.medifirst2000.dto.KunjunganPasienStatusDanJenisPasienDto2; -import com.jasamedika.medifirst2000.dto.KunjunganWilayahDto; -import com.jasamedika.medifirst2000.dto.LaboratoriumDto; -import com.jasamedika.medifirst2000.dto.LampiranSPPHDto; -import com.jasamedika.medifirst2000.dto.MorbiditasMortalitasDto; -import com.jasamedika.medifirst2000.dto.ObatGenerikDto; -import com.jasamedika.medifirst2000.dto.PayRollReportUangMakanDto; -import com.jasamedika.medifirst2000.dto.PengkajianAwalNeonatusDto; -import com.jasamedika.medifirst2000.dto.PengkajianAwalPasienRawatJalanAnakDto; -import com.jasamedika.medifirst2000.dto.PerjanjianPasienDto; -import com.jasamedika.medifirst2000.dto.ReportingPegawaiDto; -import com.jasamedika.medifirst2000.dto.SensusHarianDto; -import com.jasamedika.medifirst2000.dto.SlipHeaderDto; -import com.jasamedika.medifirst2000.dto.SuratPesananSementaraDto; -import com.jasamedika.medifirst2000.entities.Jabatan; -import com.jasamedika.medifirst2000.entities.LoginUser; -import com.jasamedika.medifirst2000.entities.Pasien; -import com.jasamedika.medifirst2000.entities.Pegawai; -import com.jasamedika.medifirst2000.exception.ServiceVOException; -import com.jasamedika.medifirst2000.service.CatatanPerkembanganPasienTerintegrasiService; -import com.jasamedika.medifirst2000.service.CssdSterilisasiService; -import com.jasamedika.medifirst2000.service.HasilPemeriksaanSwaPantauLimbahCairService; -import com.jasamedika.medifirst2000.service.IndekKinerjaService; -import com.jasamedika.medifirst2000.service.ItJadwalPerawatanService; -import com.jasamedika.medifirst2000.service.ItPerbaikanService; -import com.jasamedika.medifirst2000.service.KetersediaanTempatTidurService; -import com.jasamedika.medifirst2000.service.LaundryService; -import com.jasamedika.medifirst2000.service.LoginUserService; -import com.jasamedika.medifirst2000.service.MapPegawaiJabatanToUnitKerjaService; -import com.jasamedika.medifirst2000.service.MappingPegawaiToAtasanService; -import com.jasamedika.medifirst2000.service.MonitoringAbsenService; -import com.jasamedika.medifirst2000.service.NeracaLimbahService; -import com.jasamedika.medifirst2000.service.ObatGenerikService; -import com.jasamedika.medifirst2000.service.PasienDaftarService; -import com.jasamedika.medifirst2000.service.PasienService; -import com.jasamedika.medifirst2000.service.PayRollReportingService; -import com.jasamedika.medifirst2000.service.PegawaiService; -import com.jasamedika.medifirst2000.service.PelayananObatService; -import com.jasamedika.medifirst2000.service.PelayananPasienService; -import com.jasamedika.medifirst2000.service.PemusnahanBarangService; -import com.jasamedika.medifirst2000.service.PenanggungJawabPasienService; -import com.jasamedika.medifirst2000.service.PendapatanService; -import com.jasamedika.medifirst2000.service.ProdukService; -import com.jasamedika.medifirst2000.service.RegistrasiPelayananService; -import com.jasamedika.medifirst2000.service.RekrutmenService; -import com.jasamedika.medifirst2000.service.ReportService; -import com.jasamedika.medifirst2000.service.ReportingPegawaiService; -import com.jasamedika.medifirst2000.service.ReportingPelayananRekamMedisService; -import com.jasamedika.medifirst2000.service.ResepDokterService; -import com.jasamedika.medifirst2000.service.ReturRuanganService; -import com.jasamedika.medifirst2000.service.RuanganService; -import com.jasamedika.medifirst2000.service.StokProdukGlobalService; -import com.jasamedika.medifirst2000.service.StrukPelayananService; -import com.jasamedika.medifirst2000.service.TagihanRekananService; -import com.jasamedika.medifirst2000.util.Age; -import com.jasamedika.medifirst2000.util.AgeCalculator; -import com.jasamedika.medifirst2000.util.CommonUtil; -import com.jasamedika.medifirst2000.util.CurrencyUtil; -import com.jasamedika.medifirst2000.util.DateUtil; -import com.jasamedika.medifirst2000.util.IndonesianNumberToWords; -import com.jasamedika.medifirst2000.util.rest.RestUtil; -import com.jasamedika.medifirst2000.vo.RegistrasiPelayananVO; +import javax.servlet.http.HttpServletRequest; +import java.math.BigDecimal; +import java.text.*; +import java.util.*; +import java.util.Map.Entry; /** * Controller class for printing service @@ -346,15 +234,12 @@ public class ReportingController extends LocaleController @RequestMapping("/instalasiRawatInap") public ModelAndView generateInstalasiRawatInap(ModelAndView m, @RequestParam(value = "format", required = false) String format, - @RequestParam(value = "bulan", required = true) Integer bulan, - @RequestParam(value = "tahun", required = true) Integer tahun, - @RequestParam(value = "ruangan", required = true) Integer ruangan, - @RequestParam(value = "kelas", required = true) Integer kelas) { - // Map map = new HashMap(); + @RequestParam(value = "bulan") Integer bulan, @RequestParam(value = "tahun") Integer tahun, + @RequestParam(value = "ruangan") Integer ruangan, @RequestParam(value = "kelas") Integer kelas) { String month = (formatBulan(Integer.valueOf(new SimpleDateFormat("MM").format(new Date())))); - String monthFirstCaplock = Character.toString(month.charAt(0)).toUpperCase() + month.substring(1); - String monthAllCaplock = formatBulan(bulan).toUpperCase(); - List listRawatInapDto = new ArrayList(); + String monthFirstCapslock = Character.toString(month.charAt(0)).toUpperCase() + month.substring(1); + String monthAllCapslock = formatBulan(bulan).toUpperCase(); + List listRawatInapDto = new ArrayList<>(); List list = reportingPelayananRekamMedisService.findAntrianPasienDiPeriksaByRuanganKelas(ruangan, kelas, bulan, tahun); InstalasiRawatInapDto dtoBayiBaru = new InstalasiRawatInapDto(); @@ -390,33 +275,32 @@ public class ReportingController extends LocaleController String bayiAnakIbu = ((String) data[2]); String lamaBaru = ((String) data[3]); Long jumlah = ((Long) data[0]); - Long tempJumlah = jumlah; String[] elements = { "01", "02", "03", "04", "05", "06", "07", "08", "09", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31" }; if (bayiAnakIbu.equalsIgnoreCase("bayi") && lamaBaru.equalsIgnoreCase("baru")) { populateTgl(data, dtoBayiBaru, jumlah, elements); - jmlhCountLevel1BayiBaru = jmlhCountLevel1BayiBaru + tempJumlah; + jmlhCountLevel1BayiBaru = jmlhCountLevel1BayiBaru + jumlah; dtoBayiBaru.setJmlhLevel1(jmlhCountLevel1BayiBaru); } else if (bayiAnakIbu.equalsIgnoreCase("bayi") && lamaBaru.equalsIgnoreCase("lama")) { populateTgl(data, dtoBayiLama, jumlah, elements); - jmlhCountLevel1BayiLama = jmlhCountLevel1BayiLama + tempJumlah; + jmlhCountLevel1BayiLama = jmlhCountLevel1BayiLama + jumlah; dtoBayiLama.setJmlhLevel1(jmlhCountLevel1BayiLama); } else if (bayiAnakIbu.equalsIgnoreCase("anak") && lamaBaru.equalsIgnoreCase("baru")) { populateTgl(data, dtoAnakBaru, jumlah, elements); - jmlhCountLevel1AnakBaru = jmlhCountLevel1AnakBaru + tempJumlah; + jmlhCountLevel1AnakBaru = jmlhCountLevel1AnakBaru + jumlah; dtoAnakBaru.setJmlhLevel1(jmlhCountLevel1AnakBaru); } else if (bayiAnakIbu.equalsIgnoreCase("anak") && lamaBaru.equalsIgnoreCase("lama")) { populateTgl(data, dtoAnakLama, jumlah, elements); - jmlhCountLevel1AnakLama = jmlhCountLevel1AnakLama + tempJumlah; + jmlhCountLevel1AnakLama = jmlhCountLevel1AnakLama + jumlah; dtoAnakLama.setJmlhLevel1(jmlhCountLevel1AnakLama); } else if (bayiAnakIbu.equalsIgnoreCase("ibu") && lamaBaru.equalsIgnoreCase("baru")) { populateTgl(data, dtoIbuBaru, jumlah, elements); - jmlhCountLevel1IbuBaru = jmlhCountLevel1IbuBaru + tempJumlah; + jmlhCountLevel1IbuBaru = jmlhCountLevel1IbuBaru + jumlah; dtoIbuBaru.setJmlhLevel1(jmlhCountLevel1IbuBaru); } else if (bayiAnakIbu.equalsIgnoreCase("ibu") && lamaBaru.equalsIgnoreCase("lama")) { populateTgl(data, dtoIbuLama, jumlah, elements); - jmlhCountLevel1IbuLama = jmlhCountLevel1IbuLama + tempJumlah; + jmlhCountLevel1IbuLama = jmlhCountLevel1IbuLama + jumlah; dtoIbuLama.setJmlhLevel1(jmlhCountLevel1IbuLama); } } @@ -447,26 +331,24 @@ public class ReportingController extends LocaleController dtoIbu.setLevel1("Ibu"); Long jmlhCountLevel1Ibu = 0L; Long jmlhCountLevel1Anak = 0L; - Long jmlhCountLevel1Bayi = 0L; + long jmlhCountLevel1Bayi = 0L; for (Object[] data : list2) { - // String tanggal = ((String) data[1]).split("-")[2]; String bayiAnakIbu = ((String) data[2]); Long jumlah = ((Long) data[0]); - Long tempJumlah = jumlah; String[] elements = { "01", "02", "03", "04", "05", "06", "07", "08", "09", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31" }; if (bayiAnakIbu.equalsIgnoreCase("bayi")) { populateTgl(data, dtoBayi, jumlah, elements); - jmlhCountLevel1Bayi = jmlhCountLevel1Bayi + tempJumlah; + jmlhCountLevel1Bayi = jmlhCountLevel1Bayi + jumlah; dtoBayi.setJmlhLevel1(jmlhCountLevel1IbuLama); } else if (bayiAnakIbu.equalsIgnoreCase("anak")) { populateTgl(data, dtoAnak, jumlah, elements); - jmlhCountLevel1Anak = jmlhCountLevel1Anak + tempJumlah; + jmlhCountLevel1Anak = jmlhCountLevel1Anak + jumlah; dtoAnak.setJmlhLevel1(jmlhCountLevel1Anak); } else if (bayiAnakIbu.equalsIgnoreCase("ibu")) { populateTgl(data, dtoIbu, jumlah, elements); - jmlhCountLevel1Ibu = jmlhCountLevel1Ibu + tempJumlah; + jmlhCountLevel1Ibu = jmlhCountLevel1Ibu + jumlah; dtoIbu.setJmlhLevel1(jmlhCountLevel1Ibu); } } @@ -476,10 +358,10 @@ public class ReportingController extends LocaleController listRawatInapDto.add(dtoIbu); m.addObject("dataSource", listRawatInapDto); - m.addObject("bulan", monthAllCaplock); + m.addObject("bulan", monthAllCapslock); m.addObject("tahun", String.valueOf(tahun)); - m.addObject("tanggalReport", (new SimpleDateFormat("dd").format(new Date())) + " " + monthFirstCaplock + " " - + (new SimpleDateFormat("YYYY").format(new Date()))); + m.addObject("tanggalReport", (new SimpleDateFormat("dd").format(new Date())) + " " + monthFirstCapslock + " " + + (new SimpleDateFormat("yyyy").format(new Date()))); m.addObject("ruangan", ruanganDao.findOne(ruangan).getNamaRuangan()); m.addObject("kelas", kelasDao.findOne(kelas).getNamaKelas()); m.addObject("nama", "Nama Lengkap"); @@ -498,7 +380,7 @@ public class ReportingController extends LocaleController public ModelAndView generatePegawaiByKategory(ModelAndView m, @RequestParam(value = "kategoryPegawaiId", required = false) Integer kategoryPegawaiId) { if (CommonUtil.isNullOrEmpty(kategoryPegawaiId)) { - List listReportingPegawaiDto = new ArrayList(); + List listReportingPegawaiDto = new ArrayList<>(); List list = reportingPegawaiService.generatePegawai(); for (Object[] data : list) { ReportingPegawaiDto dto = new ReportingPegawaiDto(); @@ -515,7 +397,7 @@ public class ReportingController extends LocaleController m.addObject("dataSource", listReportingPegawaiDto); m.addObject("format", "pdf"); } else if (CommonUtil.isNotNullOrEmpty(kategoryPegawaiId)) { - List listReportingPegawaiDto = new ArrayList(); + List listReportingPegawaiDto = new ArrayList<>(); List> list = reportingPegawaiService.generatePegawaiByKategory(kategoryPegawaiId); for (Map data : list) { ReportingPegawaiDto dto = new ReportingPegawaiDto(); @@ -539,18 +421,15 @@ public class ReportingController extends LocaleController @RequestMapping("/instalasiHarianRawatInap") public ModelAndView generateInstalasiHarianRawatInap(ModelAndView m, @RequestParam(value = "format", required = false) String format, - @RequestParam(value = "bulan", required = true) Integer bulan, - @RequestParam(value = "tahun", required = true) Integer tahun, - @RequestParam(value = "ruangan", required = true) Integer ruangan, - @RequestParam(value = "kelas", required = true) Integer kelas) { + @RequestParam(value = "bulan") Integer bulan, @RequestParam(value = "tahun") Integer tahun, + @RequestParam(value = "ruangan") Integer ruangan, @RequestParam(value = "kelas") Integer kelas) { String month = (formatBulan(Integer.valueOf(new SimpleDateFormat("MM").format(new Date())))); - String monthFirstCaplock = Character.toString(month.charAt(0)).toUpperCase() + month.substring(1); - String monthAllCaplock = formatBulan(bulan).toUpperCase(); - List listRawatInapDto = new ArrayList(); + String monthFirstCapslock = Character.toString(month.charAt(0)).toUpperCase() + month.substring(1); + String monthAllCapslock = formatBulan(bulan).toUpperCase(); + List listRawatInapDto = new ArrayList<>(); - Object[] object = new Object[] { new Long(0L), new String("2016-10-10"), new String("Dua"), - new String("Tiga") }; - List list = new ArrayList(); + Object[] object = new Object[] { 0L, "2016-10-10", "Dua", "Tiga" }; + List list = new ArrayList<>(); list.add(object); for (Object[] data : list) { InstalasiRawatInapDto dto = new InstalasiRawatInapDto(); @@ -564,10 +443,10 @@ public class ReportingController extends LocaleController } m.addObject("dataSource", listRawatInapDto); - m.addObject("bulan", monthAllCaplock); + m.addObject("bulan", monthAllCapslock); m.addObject("tahun", String.valueOf(tahun)); - m.addObject("tanggalReport", (new SimpleDateFormat("dd").format(new Date())) + " " + monthFirstCaplock + " " - + (new SimpleDateFormat("YYYY").format(new Date()))); + m.addObject("tanggalReport", (new SimpleDateFormat("dd").format(new Date())) + " " + monthFirstCapslock + " " + + (new SimpleDateFormat("yyyy").format(new Date()))); m.addObject("ruangan", ruanganDao.findOne(ruangan).getNamaRuangan()); m.addObject("kelas", kelasDao.findOne(kelas).getNamaKelas()); m.addObject("nama", "Nama Lengkap"); @@ -584,19 +463,15 @@ public class ReportingController extends LocaleController @RequestMapping("/pasienPerDiagnosa") public ModelAndView generatePasienPerDiagnosa(ModelAndView m, @RequestParam(value = "format", required = false) String format, - @RequestParam(value = "bulan", required = true) Integer bulan, - @RequestParam(value = "tahun", required = true) Integer tahun, - @RequestParam(value = "ruangan", required = true) Integer ruangan, - @RequestParam(value = "kelas", required = true) Integer kelas) { - // Map map = new HashMap(); + @RequestParam(value = "bulan") Integer bulan, @RequestParam(value = "tahun") Integer tahun, + @RequestParam(value = "ruangan") Integer ruangan, @RequestParam(value = "kelas") Integer kelas) { String month = (formatBulan(Integer.valueOf(new SimpleDateFormat("MM").format(new Date())))); - String monthFirstCaplock = Character.toString(month.charAt(0)).toUpperCase() + month.substring(1); - String monthAllCaplock = formatBulan(bulan).toUpperCase(); - List listRawatInapDto = new ArrayList(); + String monthFirstCapslock = Character.toString(month.charAt(0)).toUpperCase() + month.substring(1); + String monthAllCapslock = formatBulan(bulan).toUpperCase(); + List listRawatInapDto = new ArrayList<>(); - Object[] object = new Object[] { new Long(0L), new String("2016-10-10"), new String("Dua"), - new String("Tiga") }; - List list = new ArrayList(); + Object[] object = new Object[] { 0L, "2016-10-10", "Dua", "Tiga" }; + List list = new ArrayList<>(); list.add(object); for (Object[] data : list) { InstalasiRawatInapDto dto = new InstalasiRawatInapDto(); @@ -610,10 +485,10 @@ public class ReportingController extends LocaleController } m.addObject("dataSource", listRawatInapDto); - m.addObject("bulan", monthAllCaplock); + m.addObject("bulan", monthAllCapslock); m.addObject("tahun", String.valueOf(tahun)); - m.addObject("tanggalReport", (new SimpleDateFormat("dd").format(new Date())) + " " + monthFirstCaplock + " " - + (new SimpleDateFormat("YYYY").format(new Date()))); + m.addObject("tanggalReport", (new SimpleDateFormat("dd").format(new Date())) + " " + monthFirstCapslock + " " + + (new SimpleDateFormat("yyyy").format(new Date()))); m.addObject("ruangan", ruanganDao.findOne(ruangan).getNamaRuangan()); m.addObject("kelas", kelasDao.findOne(kelas).getNamaKelas()); m.addObject("nama", "Nama Lengkap"); @@ -630,19 +505,16 @@ public class ReportingController extends LocaleController @RequestMapping("/pasienPerDokter") public ModelAndView generatePasienPerDokter(ModelAndView m, @RequestParam(value = "format", required = false) String format, - @RequestParam(value = "bulan", required = true) Integer bulan, - @RequestParam(value = "tahun", required = true) Integer tahun, - @RequestParam(value = "ruangan", required = true) Integer ruangan, - @RequestParam(value = "kelas", required = true) Integer kelas) { + @RequestParam(value = "bulan") Integer bulan, @RequestParam(value = "tahun") Integer tahun, + @RequestParam(value = "ruangan") Integer ruangan, @RequestParam(value = "kelas") Integer kelas) { // Map map = new HashMap(); String month = (formatBulan(Integer.valueOf(new SimpleDateFormat("MM").format(new Date())))); - String monthFirstCaplock = Character.toString(month.charAt(0)).toUpperCase() + month.substring(1); - String monthAllCaplock = month.toUpperCase(); - List listRawatInapDto = new ArrayList(); + String monthFirstCapslock = Character.toString(month.charAt(0)).toUpperCase() + month.substring(1); + String monthAllCapslock = month.toUpperCase(); + List listRawatInapDto = new ArrayList<>(); - Object[] object = new Object[] { new Long(0L), new String("2016-10-10"), new String("Dua"), - new String("Tiga") }; - List list = new ArrayList(); + Object[] object = new Object[] { 0L, "2016-10-10", "Dua", "Tiga" }; + List list = new ArrayList<>(); list.add(object); for (Object[] data : list) { InstalasiRawatInapDto dto = new InstalasiRawatInapDto(); @@ -656,10 +528,10 @@ public class ReportingController extends LocaleController } m.addObject("dataSource", listRawatInapDto); - m.addObject("bulan", monthAllCaplock); + m.addObject("bulan", monthAllCapslock); m.addObject("tahun", String.valueOf(tahun)); - m.addObject("tanggalReport", (new SimpleDateFormat("dd").format(new Date())) + " " + monthFirstCaplock + " " - + (new SimpleDateFormat("YYYY").format(new Date()))); + m.addObject("tanggalReport", (new SimpleDateFormat("dd").format(new Date())) + " " + monthFirstCapslock + " " + + (new SimpleDateFormat("yyyy").format(new Date()))); m.addObject("ruangan", ruanganDao.findOne(ruangan).getNamaRuangan()); m.addObject("kelas", kelasDao.findOne(kelas).getNamaKelas()); m.addObject("nama", "Nama Lengkap"); @@ -677,45 +549,25 @@ public class ReportingController extends LocaleController @RequestMapping("/morbiditasMortalitasPasien") public ModelAndView generateMorbiditasMortalitasPasien(ModelAndView m, @RequestParam(value = "format", required = false) String format, - @RequestParam(value = "startDate", required = true) String startDate, - @RequestParam(value = "endDate", required = true) String endDate, - @RequestParam(value = "rawat", required = true) Integer rawat) { + @RequestParam(value = "startDate") String startDate, @RequestParam(value = "endDate") String endDate, + @RequestParam(value = "rawat") Integer rawat) { // Map map = new HashMap(); String month = (formatBulan(Integer.valueOf(new SimpleDateFormat("MM").format(new Date())))); - String monthFirstCaplock = Character.toString(month.charAt(0)).toUpperCase() + month.substring(1); - String monthAllCaplock = month.toUpperCase(); - List listDto = new ArrayList(); + String monthFirstCapslock = Character.toString(month.charAt(0)).toUpperCase() + month.substring(1); + String monthAllCapslock = month.toUpperCase(); + List listDto = new ArrayList<>(); List list = reportingPelayananRekamMedisService .findAntrianPasienDiPeriksaByPeriodeAndDepartemen(startDate, endDate, rawat); for (Object[] data : list) { - String penyakit = ((String) data[1]); - String umur = ((String) data[2]); - String jenisKelamin = ((String) data[3]); - // String statusKeluar = ((String) data[2]); - Long count = ((Long) data[0]); - MorbiditasMortalitasDto dto = new MorbiditasMortalitasDto(); - dto.setNoDaftarTerperinci("1"); - dto.setGolongan(penyakit); - dto.setHr0_28(umur.equals("hr0_28") ? count : 0L); - dto.setBln1_11(umur.equals("bln1_11") ? count : 0L); - dto.setThn1_4(umur.equals("thn1_4") ? count : 0L); - dto.setThn5_14(umur.equals("thn5_14") ? count : 0L); - dto.setThn15_24(umur.equals("thn15_24") ? count : 0L); - dto.setThn25_44(umur.equals("thn25_44") ? count : 0L); - dto.setThn45_64(umur.equals("thn45_64") ? count : 0L); - dto.setThn65(umur.equals("thn65") ? count : 0L); - dto.setLakiLaki(jenisKelamin.equals("Laki-Laki") ? count : 0L); - dto.setPerempuan(jenisKelamin.equals("Perempuan") ? count : 0L); - dto.setJumlahPasienMeninggal(jenisKelamin.equals("Meninggal") ? count : 0L); - dto.setJumlahPasienKeluar(!jenisKelamin.equals("Meninggal") ? count : 0L); + MorbiditasMortalitasDto dto = getMorbiditasMortalitasDto(data); listDto.add(dto); } m.addObject("dataSource", listDto); - m.addObject("bulan", monthAllCaplock); - m.addObject("tanggalReport", (new SimpleDateFormat("dd").format(new Date())) + " " + monthFirstCaplock + " " - + (new SimpleDateFormat("YYYY").format(new Date()))); + m.addObject("bulan", monthAllCapslock); + m.addObject("tanggalReport", (new SimpleDateFormat("dd").format(new Date())) + " " + monthFirstCapslock + " " + + (new SimpleDateFormat("yyyy").format(new Date()))); m.addObject("format", "pdf"); if (format != null && !format.isEmpty()) { @@ -725,17 +577,40 @@ public class ReportingController extends LocaleController return m; } + private static MorbiditasMortalitasDto getMorbiditasMortalitasDto(Object[] data) { + String penyakit = ((String) data[1]); + String umur = ((String) data[2]); + String jenisKelamin = ((String) data[3]); + // String statusKeluar = ((String) data[2]); + Long count = ((Long) data[0]); + MorbiditasMortalitasDto dto = new MorbiditasMortalitasDto(); + dto.setNoDaftarTerperinci("1"); + dto.setGolongan(penyakit); + dto.setHr0_28(umur.equals("hr0_28") ? count : 0L); + dto.setBln1_11(umur.equals("bln1_11") ? count : 0L); + dto.setThn1_4(umur.equals("thn1_4") ? count : 0L); + dto.setThn5_14(umur.equals("thn5_14") ? count : 0L); + dto.setThn15_24(umur.equals("thn15_24") ? count : 0L); + dto.setThn25_44(umur.equals("thn25_44") ? count : 0L); + dto.setThn45_64(umur.equals("thn45_64") ? count : 0L); + dto.setThn65(umur.equals("thn65") ? count : 0L); + dto.setLakiLaki(jenisKelamin.equals("Laki-Laki") ? count : 0L); + dto.setPerempuan(jenisKelamin.equals("Perempuan") ? count : 0L); + dto.setJumlahPasienMeninggal(jenisKelamin.equals("Meninggal") ? count : 0L); + dto.setJumlahPasienKeluar(!jenisKelamin.equals("Meninggal") ? count : 0L); + return dto; + } + @SuppressWarnings("unchecked") @RequestMapping("/indexPenyakitRawatInap") public ModelAndView generateIndexPenyakitRawatInap(ModelAndView m, @RequestParam(value = "format", required = false) String format, - @RequestParam(value = "bulan", required = true) Integer bulan, - @RequestParam(value = "tahun", required = true) Integer tahun) { + @RequestParam(value = "bulan") Integer bulan, @RequestParam(value = "tahun") Integer tahun) { // Map map = new HashMap(); String month = (formatBulan(Integer.valueOf(new SimpleDateFormat("MM").format(new Date())))); - String monthFirstCaplock = Character.toString(month.charAt(0)).toUpperCase() + month.substring(1); - String monthAllCaplock = month.toUpperCase(); - List listRawatInapDto = new ArrayList(); + String monthFirstCapslock = Character.toString(month.charAt(0)).toUpperCase() + month.substring(1); + String monthAllCapslock = month.toUpperCase(); + List listRawatInapDto = new ArrayList<>(); List list = reportingPelayananRekamMedisService.findDiagnosaPasienRawatInapAll(); for (Object[] data : list) { @@ -774,10 +649,10 @@ public class ReportingController extends LocaleController } m.addObject("dataSource", listRawatInapDto); - m.addObject("bulan", monthAllCaplock); + m.addObject("bulan", monthAllCapslock); m.addObject("tahun", String.valueOf(tahun)); - m.addObject("tanggalReport", (new SimpleDateFormat("dd").format(new Date())) + " " + monthFirstCaplock + " " - + (new SimpleDateFormat("YYYY").format(new Date()))); + m.addObject("tanggalReport", (new SimpleDateFormat("dd").format(new Date())) + " " + monthFirstCapslock + " " + + (new SimpleDateFormat("yyyy").format(new Date()))); m.addObject("nama", "Nama Lengkap"); m.addObject("nip", "123456789"); m.addObject("format", "pdf"); @@ -793,13 +668,12 @@ public class ReportingController extends LocaleController @RequestMapping("/indexPenyakitRawatJalan") public ModelAndView generateIndexPenyakitRawatJalan(ModelAndView m, @RequestParam(value = "format", required = false) String format, - @RequestParam(value = "bulan", required = true) Integer bulan, - @RequestParam(value = "tahun", required = true) Integer tahun) { + @RequestParam(value = "bulan") Integer bulan, @RequestParam(value = "tahun") Integer tahun) { // Map map = new HashMap(); String month = (formatBulan(Integer.valueOf(new SimpleDateFormat("MM").format(new Date())))); - String monthFirstCaplock = Character.toString(month.charAt(0)).toUpperCase() + month.substring(1); - String monthAllCaplock = month.toUpperCase(); - List listRawatInapDto = new ArrayList(); + String monthFirstCapslock = Character.toString(month.charAt(0)).toUpperCase() + month.substring(1); + String monthAllCapslock = month.toUpperCase(); + List listRawatInapDto = new ArrayList<>(); List list = reportingPelayananRekamMedisService.findDiagnosaPasienRawatJalanAll(); for (Object[] data : list) { @@ -838,10 +712,10 @@ public class ReportingController extends LocaleController } m.addObject("dataSource", listRawatInapDto); - m.addObject("bulan", monthAllCaplock); + m.addObject("bulan", monthAllCapslock); m.addObject("tahun", String.valueOf(tahun)); - m.addObject("tanggalReport", (new SimpleDateFormat("dd").format(new Date())) + " " + monthFirstCaplock + " " - + (new SimpleDateFormat("YYYY").format(new Date()))); + m.addObject("tanggalReport", (new SimpleDateFormat("dd").format(new Date())) + " " + monthFirstCapslock + " " + + (new SimpleDateFormat("yyyy").format(new Date()))); m.addObject("nama", "Nama Lengkap"); m.addObject("nip", "123456789"); m.addObject("format", "pdf"); @@ -856,19 +730,16 @@ public class ReportingController extends LocaleController @RequestMapping("/icdPerPasien") public ModelAndView generateIcdPerPasien(ModelAndView m, @RequestParam(value = "format", required = false) String format, - @RequestParam(value = "bulan", required = true) Integer bulan, - @RequestParam(value = "tahun", required = true) Integer tahun, - @RequestParam(value = "ruangan", required = true) Integer ruangan, - @RequestParam(value = "kelas", required = true) Integer kelas) { + @RequestParam(value = "bulan") Integer bulan, @RequestParam(value = "tahun") Integer tahun, + @RequestParam(value = "ruangan") Integer ruangan, @RequestParam(value = "kelas") Integer kelas) { // Map map = new HashMap(); String month = (formatBulan(Integer.valueOf(new SimpleDateFormat("MM").format(new Date())))); - String monthFirstCaplock = Character.toString(month.charAt(0)).toUpperCase() + month.substring(1); - String monthAllCaplock = month.toUpperCase(); - List listRawatInapDto = new ArrayList(); + String monthFirstCapslock = Character.toString(month.charAt(0)).toUpperCase() + month.substring(1); + String monthAllCapslock = month.toUpperCase(); + List listRawatInapDto = new ArrayList<>(); - Object[] object = new Object[] { new Long(0L), new String("2016-10-10"), new String("Dua"), - new String("Tiga") }; - List list = new ArrayList(); + Object[] object = new Object[] { 0L, "2016-10-10", "Dua", "Tiga" }; + List list = new ArrayList<>(); list.add(object); for (Object[] data : list) { InstalasiRawatInapDto dto = new InstalasiRawatInapDto(); @@ -882,10 +753,10 @@ public class ReportingController extends LocaleController } m.addObject("dataSource", listRawatInapDto); - m.addObject("bulan", monthAllCaplock); + m.addObject("bulan", monthAllCapslock); m.addObject("tahun", String.valueOf(tahun)); - m.addObject("tanggalReport", (new SimpleDateFormat("dd").format(new Date())) + " " + monthFirstCaplock + " " - + (new SimpleDateFormat("YYYY").format(new Date()))); + m.addObject("tanggalReport", (new SimpleDateFormat("dd").format(new Date())) + " " + monthFirstCapslock + " " + + (new SimpleDateFormat("yyyy").format(new Date()))); m.addObject("ruangan", ruanganDao.findOne(ruangan).getNamaRuangan()); m.addObject("kelas", kelasDao.findOne(kelas).getNamaKelas()); m.addObject("nama", "Nama Lengkap"); @@ -902,19 +773,16 @@ public class ReportingController extends LocaleController @RequestMapping("/statistikRawatInapBulanan") public ModelAndView generateStatistikRawatInapBulanan(ModelAndView m, @RequestParam(value = "format", required = false) String format, - @RequestParam(value = "bulan", required = true) Integer bulan, - @RequestParam(value = "tahun", required = true) Integer tahun, - @RequestParam(value = "ruangan", required = true) Integer ruangan, - @RequestParam(value = "kelas", required = true) Integer kelas) { + @RequestParam(value = "bulan") Integer bulan, @RequestParam(value = "tahun") Integer tahun, + @RequestParam(value = "ruangan") Integer ruangan, @RequestParam(value = "kelas") Integer kelas) { // Map map = new HashMap(); String month = (formatBulan(Integer.valueOf(new SimpleDateFormat("MM").format(new Date())))); - String monthFirstCaplock = Character.toString(month.charAt(0)).toUpperCase() + month.substring(1); - String monthAllCaplock = month.toUpperCase(); - List listRawatInapDto = new ArrayList(); + String monthFirstCapslock = Character.toString(month.charAt(0)).toUpperCase() + month.substring(1); + String monthAllCapslock = month.toUpperCase(); + List listRawatInapDto = new ArrayList<>(); - Object[] object = new Object[] { new Long(0L), new String("2016-10-10"), new String("Dua"), - new String("Tiga") }; - List list = new ArrayList(); + Object[] object = new Object[] { 0L, "2016-10-10", "Dua", "Tiga" }; + List list = new ArrayList<>(); list.add(object); for (Object[] data : list) { InstalasiRawatInapDto dto = new InstalasiRawatInapDto(); @@ -928,10 +796,10 @@ public class ReportingController extends LocaleController } m.addObject("dataSource", listRawatInapDto); - m.addObject("bulan", monthAllCaplock); + m.addObject("bulan", monthAllCapslock); m.addObject("tahun", String.valueOf(tahun)); - m.addObject("tanggalReport", (new SimpleDateFormat("dd").format(new Date())) + " " + monthFirstCaplock + " " - + (new SimpleDateFormat("YYYY").format(new Date()))); + m.addObject("tanggalReport", (new SimpleDateFormat("dd").format(new Date())) + " " + monthFirstCapslock + " " + + (new SimpleDateFormat("yyyy").format(new Date()))); m.addObject("ruangan", ruanganDao.findOne(ruangan).getNamaRuangan()); m.addObject("kelas", kelasDao.findOne(kelas).getNamaKelas()); m.addObject("nama", "Nama Lengkap"); @@ -948,19 +816,16 @@ public class ReportingController extends LocaleController @RequestMapping("/statistikRawatInapTahunan") public ModelAndView generateStatistikRawatInapTahunan(ModelAndView m, @RequestParam(value = "format", required = false) String format, - @RequestParam(value = "bulan", required = true) Integer bulan, - @RequestParam(value = "tahun", required = true) Integer tahun, - @RequestParam(value = "ruangan", required = true) Integer ruangan, - @RequestParam(value = "kelas", required = true) Integer kelas) { + @RequestParam(value = "bulan") Integer bulan, @RequestParam(value = "tahun") Integer tahun, + @RequestParam(value = "ruangan") Integer ruangan, @RequestParam(value = "kelas") Integer kelas) { // Map map = new HashMap(); String month = (formatBulan(Integer.valueOf(new SimpleDateFormat("MM").format(new Date())))); - String monthFirstCaplock = Character.toString(month.charAt(0)).toUpperCase() + month.substring(1); - String monthAllCaplock = month.toUpperCase(); - List listRawatInapDto = new ArrayList(); + String monthFirstCapslock = Character.toString(month.charAt(0)).toUpperCase() + month.substring(1); + String monthAllCapslock = month.toUpperCase(); + List listRawatInapDto = new ArrayList<>(); - Object[] object = new Object[] { new Long(0L), new String("2016-10-10"), new String("Dua"), - new String("Tiga") }; - List list = new ArrayList(); + Object[] object = new Object[] { 0L, "2016-10-10", "Dua", "Tiga" }; + List list = new ArrayList<>(); list.add(object); for (Object[] data : list) { InstalasiRawatInapDto dto = new InstalasiRawatInapDto(); @@ -974,10 +839,10 @@ public class ReportingController extends LocaleController } m.addObject("dataSource", listRawatInapDto); - m.addObject("bulan", monthAllCaplock); + m.addObject("bulan", monthAllCapslock); m.addObject("tahun", String.valueOf(tahun)); - m.addObject("tanggalReport", (new SimpleDateFormat("dd").format(new Date())) + " " + monthFirstCaplock + " " - + (new SimpleDateFormat("YYYY").format(new Date()))); + m.addObject("tanggalReport", (new SimpleDateFormat("dd").format(new Date())) + " " + monthFirstCapslock + " " + + (new SimpleDateFormat("yyyy").format(new Date()))); m.addObject("ruangan", ruanganDao.findOne(ruangan).getNamaRuangan()); m.addObject("kelas", kelasDao.findOne(kelas).getNamaKelas()); m.addObject("nama", "Nama Lengkap"); @@ -1189,9 +1054,9 @@ public class ReportingController extends LocaleController @RequestParam(value = "ruangan", required = false) Integer ruangan) { // Map map = new HashMap(); String month = (formatBulan(Integer.valueOf(new SimpleDateFormat("MM").format(new Date())))); - String monthFirstCaplock = Character.toString(month.charAt(0)).toUpperCase() + month.substring(1); - // String monthAllCaplock = month.toUpperCase(); - List bukuRegisterMasukList = new ArrayList(); + String monthFirstCapslock = Character.toString(month.charAt(0)).toUpperCase() + month.substring(1); + // String monthAllCapslock = month.toUpperCase(); + List bukuRegisterMasukList = new ArrayList<>(); List list = reportingPelayananRekamMedisService.findAntrianPasienDiPeriksaByRuanganPeriode(ruangan, startDate, endDate); @@ -1239,8 +1104,8 @@ public class ReportingController extends LocaleController m.addObject("dataSource", bukuRegisterMasukList); m.addObject("startDate", startDate); m.addObject("endDate", endDate); - m.addObject("tanggalReport", (new SimpleDateFormat("dd").format(new Date())) + " " + monthFirstCaplock + " " - + (new SimpleDateFormat("YYYY").format(new Date()))); + m.addObject("tanggalReport", (new SimpleDateFormat("dd").format(new Date())) + " " + monthFirstCapslock + " " + + (new SimpleDateFormat("yyyy").format(new Date()))); if (CommonUtil.isNotNullOrEmpty(ruangan)) { m.addObject("ruangan", ruanganDao.findOne(ruangan).getNamaRuangan()); } @@ -1257,13 +1122,12 @@ public class ReportingController extends LocaleController @RequestMapping("/lapBukuRegisterPelayananRi") public ModelAndView generateLapBukuRegisterPelayananRi(ModelAndView m, @RequestParam(value = "format", required = false) String format, - @RequestParam(value = "startDate", required = true) String startDate, - @RequestParam(value = "endDate", required = true) String endDate) { + @RequestParam(value = "startDate") String startDate, @RequestParam(value = "endDate") String endDate) { // Map map = new HashMap(); String month = (formatBulan(Integer.valueOf(new SimpleDateFormat("MM").format(new Date())))); - String monthFirstCaplock = Character.toString(month.charAt(0)).toUpperCase() + month.substring(1); - // String monthAllCaplock = month.toUpperCase(); - List listBukuRegisterPelayananDto = new ArrayList(); + String monthFirstCapslock = Character.toString(month.charAt(0)).toUpperCase() + month.substring(1); + // String monthAllCapslock = month.toUpperCase(); + List listBukuRegisterPelayananDto = new ArrayList<>(); List list = reportingPelayananRekamMedisService.findPelayananPasienByRuanganPeriode(startDate, endDate); @@ -1326,8 +1190,8 @@ public class ReportingController extends LocaleController m.addObject("dataSource", listBukuRegisterPelayananDto); m.addObject("startDate", startDate); m.addObject("endDate", endDate); - m.addObject("tanggalReport", (new SimpleDateFormat("dd").format(new Date())) + " " + monthFirstCaplock + " " - + (new SimpleDateFormat("YYYY").format(new Date()))); + m.addObject("tanggalReport", (new SimpleDateFormat("dd").format(new Date())) + " " + monthFirstCapslock + " " + + (new SimpleDateFormat("yyyy").format(new Date()))); m.addObject("format", "pdf"); if (format != null && !format.isEmpty()) { @@ -1341,41 +1205,24 @@ public class ReportingController extends LocaleController @RequestMapping("/lapKunjunganBdsJenisDiagnosa") public ModelAndView generateLapKunjunganBdsJenisDiagnosa(ModelAndView m, @RequestParam(value = "format", required = false) String format, - @RequestParam(value = "startDate", required = true) String startDate, - @RequestParam(value = "endDate", required = true) String endDate) { + @RequestParam(value = "startDate") String startDate, @RequestParam(value = "endDate") String endDate) { // Map map = new HashMap(); String month = (formatBulan(Integer.valueOf(new SimpleDateFormat("MM").format(new Date())))); - String monthFirstCaplock = Character.toString(month.charAt(0)).toUpperCase() + month.substring(1); - // String monthAllCaplock = month.toUpperCase(); - List listKunjunganPasienStatusDto = new ArrayList(); + String monthFirstCapslock = Character.toString(month.charAt(0)).toUpperCase() + month.substring(1); + // String monthAllCapslock = month.toUpperCase(); + List listKunjunganPasienStatusDto = new ArrayList<>(); List listStatusPasien = reportingPelayananRekamMedisService.findJenisDiagnosaPasien(startDate, endDate); for (Object[] data : listStatusPasien) { - String tglRegistrasi = ((String) data[1]); - String ruangan = ((String) data[2]); - String detailJudul = ((String) data[3]); - String kdDiagnosa = ((String) data[4]); - String namaDiagnosa = ((String) data[5]); - String jenisKelamin = ((String) data[6]); - String judul = ((String) data[7]); - String noRegistrasi = ((String) data[0]); - KunjunganPasienJenisDiagnosaDto abc = new KunjunganPasienJenisDiagnosaDto(); - abc.setJudul(judul); - abc.setNoRegistrasi(noRegistrasi); - abc.setDetailJudul(detailJudul); - abc.setKodeDiagnosa(kdDiagnosa); - abc.setNamaDiagnosa(namaDiagnosa); - abc.setRuangan(ruangan); - abc.setTglRegistrasi(tglRegistrasi); - abc.setJenisKelamin(jenisKelamin); + KunjunganPasienJenisDiagnosaDto abc = getKunjunganPasienJenisDiagnosaDto(data); listKunjunganPasienStatusDto.add(abc); } m.addObject("dataSource", listKunjunganPasienStatusDto); m.addObject("startDate", startDate); m.addObject("endDate", endDate); - m.addObject("tanggalReport", (new SimpleDateFormat("dd").format(new Date())) + " " + monthFirstCaplock + " " - + (new SimpleDateFormat("YYYY").format(new Date()))); + m.addObject("tanggalReport", (new SimpleDateFormat("dd").format(new Date())) + " " + monthFirstCapslock + " " + + (new SimpleDateFormat("yyyy").format(new Date()))); m.addObject("format", "pdf"); if (format != null && !format.isEmpty()) { @@ -1385,41 +1232,49 @@ public class ReportingController extends LocaleController return m; } + private static KunjunganPasienJenisDiagnosaDto getKunjunganPasienJenisDiagnosaDto(Object[] data) { + String tglRegistrasi = ((String) data[1]); + String ruangan = ((String) data[2]); + String detailJudul = ((String) data[3]); + String kdDiagnosa = ((String) data[4]); + String namaDiagnosa = ((String) data[5]); + String jenisKelamin = ((String) data[6]); + String judul = ((String) data[7]); + String noRegistrasi = ((String) data[0]); + KunjunganPasienJenisDiagnosaDto abc = new KunjunganPasienJenisDiagnosaDto(); + abc.setJudul(judul); + abc.setNoRegistrasi(noRegistrasi); + abc.setDetailJudul(detailJudul); + abc.setKodeDiagnosa(kdDiagnosa); + abc.setNamaDiagnosa(namaDiagnosa); + abc.setRuangan(ruangan); + abc.setTglRegistrasi(tglRegistrasi); + abc.setJenisKelamin(jenisKelamin); + return abc; + } + @SuppressWarnings("unchecked") @RequestMapping("/lapKunjunganBdsStatusDanJenisOperasi") public ModelAndView generateLapKunjunganBdsStatusDanJenisOperasi(ModelAndView m, @RequestParam(value = "format", required = false) String format, - @RequestParam(value = "startDate", required = true) String startDate, - @RequestParam(value = "endDate", required = true) String endDate) { + @RequestParam(value = "startDate") String startDate, @RequestParam(value = "endDate") String endDate) { // Map map = new HashMap(); String month = (formatBulan(Integer.valueOf(new SimpleDateFormat("MM").format(new Date())))); - String monthFirstCaplock = Character.toString(month.charAt(0)).toUpperCase() + month.substring(1); - // String monthAllCaplock = month.toUpperCase(); - List listKunjunganPasienStatusDto = new ArrayList(); + String monthFirstCapslock = Character.toString(month.charAt(0)).toUpperCase() + month.substring(1); + // String monthAllCapslock = month.toUpperCase(); + List listKunjunganPasienStatusDto = new ArrayList<>(); List listStatusPasien = reportingPelayananRekamMedisService .findAntrianPasienDiperiksaStatusPasien(startDate, endDate); for (Object[] data : listStatusPasien) { - String tglRegistrasi = ((String) data[1]); - String ruangan = ((String) data[2]); - String statusPasien = ((String) data[3]); - String jenisKelamin = ((String) data[4]); - String judul = ((String) data[5]); - String noRegistrasi = ((String) data[0]); - KunjunganPasienStatusDanJenisPasienDto2 abc = new KunjunganPasienStatusDanJenisPasienDto2(); - abc.setJudul(judul); - abc.setDetailJudul(statusPasien); - abc.setNoRegistrasi(noRegistrasi); - abc.setRuangan(ruangan); - abc.setTglRegistrasi(tglRegistrasi); - abc.setJenisKelamin(jenisKelamin); + KunjunganPasienStatusDanJenisPasienDto2 abc = getKunjunganPasienStatusDanJenisPasienDto2(data); listKunjunganPasienStatusDto.add(abc); } m.addObject("dataSource", listKunjunganPasienStatusDto); m.addObject("startDate", startDate); m.addObject("endDate", endDate); - m.addObject("tanggalReport", (new SimpleDateFormat("dd").format(new Date())) + " " + monthFirstCaplock + " " - + (new SimpleDateFormat("YYYY").format(new Date()))); + m.addObject("tanggalReport", (new SimpleDateFormat("dd").format(new Date())) + " " + monthFirstCapslock + " " + + (new SimpleDateFormat("yyyy").format(new Date()))); m.addObject("format", "pdf"); if (format != null && !format.isEmpty()) { @@ -1429,61 +1284,53 @@ public class ReportingController extends LocaleController return m; } + private static KunjunganPasienStatusDanJenisPasienDto2 getKunjunganPasienStatusDanJenisPasienDto2(Object[] data) { + String tglRegistrasi = ((String) data[1]); + String ruangan = ((String) data[2]); + String statusPasien = ((String) data[3]); + String jenisKelamin = ((String) data[4]); + String judul = ((String) data[5]); + String noRegistrasi = ((String) data[0]); + KunjunganPasienStatusDanJenisPasienDto2 abc = new KunjunganPasienStatusDanJenisPasienDto2(); + abc.setJudul(judul); + abc.setDetailJudul(statusPasien); + abc.setNoRegistrasi(noRegistrasi); + abc.setRuangan(ruangan); + abc.setTglRegistrasi(tglRegistrasi); + abc.setJenisKelamin(jenisKelamin); + return abc; + } + @SuppressWarnings("unchecked") @RequestMapping("/lapKunjunganBdsStatusDanJenisPasien") public ModelAndView generateLapKunjunganBdsStatusDanJenisPasien(ModelAndView m, @RequestParam(value = "format", required = false) String format, - @RequestParam(value = "startDate", required = true) String startDate, - @RequestParam(value = "endDate", required = true) String endDate) { + @RequestParam(value = "startDate") String startDate, @RequestParam(value = "endDate") String endDate) { // Map map = new HashMap(); String month = (formatBulan(Integer.valueOf(new SimpleDateFormat("MM").format(new Date())))); - String monthFirstCaplock = Character.toString(month.charAt(0)).toUpperCase() + month.substring(1); - // String monthAllCaplock = month.toUpperCase(); - List listKunjunganPasienStatusDanJenisPasienDto = new ArrayList(); + String monthFirstCapslock = Character.toString(month.charAt(0)).toUpperCase() + month.substring(1); + // String monthAllCapslock = month.toUpperCase(); + List listKunjunganPasienStatusDanJenisPasienDto = new ArrayList<>(); List listStatusPasien = reportingPelayananRekamMedisService .findAntrianPasienDiperiksaStatusPasien(startDate, endDate); for (Object[] data : listStatusPasien) { - String tglRegistrasi = ((String) data[1]); - String ruangan = ((String) data[2]); - String statusPasien = ((String) data[3]); - String jenisKelamin = ((String) data[4]); - String judul = ((String) data[5]); - String noRegistrasi = ((String) data[0]); - KunjunganPasienStatusDanJenisPasienDto2 abc = new KunjunganPasienStatusDanJenisPasienDto2(); - abc.setJudul(judul); - abc.setDetailJudul(statusPasien); - abc.setNoRegistrasi(noRegistrasi); - abc.setRuangan(ruangan); - abc.setTglRegistrasi(tglRegistrasi); - abc.setJenisKelamin(jenisKelamin); + KunjunganPasienStatusDanJenisPasienDto2 abc = getKunjunganPasienStatusDanJenisPasienDto2(data); listKunjunganPasienStatusDanJenisPasienDto.add(abc); } List listKelompokPasien = reportingPelayananRekamMedisService .findAntrianPasienDiperiksaKelompokPasien(startDate, endDate); for (Object[] data : listKelompokPasien) { - String tglRegistrasi = ((String) data[1]); - String ruangan = ((String) data[2]); - String kelompokPasien = ((String) data[3]); - String jenisKelamin = ((String) data[4]); - String judul = ((String) data[5]); - String noRegistrasi = ((String) data[0]); - KunjunganPasienStatusDanJenisPasienDto2 abc = new KunjunganPasienStatusDanJenisPasienDto2(); - abc.setJudul(judul); - abc.setDetailJudul(kelompokPasien); - abc.setNoRegistrasi(noRegistrasi); - abc.setRuangan(ruangan); - abc.setTglRegistrasi(tglRegistrasi); - abc.setJenisKelamin(jenisKelamin); + KunjunganPasienStatusDanJenisPasienDto2 abc = getKunjunganPasienStatusDanJenisPasienDto2(data); listKunjunganPasienStatusDanJenisPasienDto.add(abc); } m.addObject("dataSource", listKunjunganPasienStatusDanJenisPasienDto); m.addObject("startDate", startDate); m.addObject("endDate", endDate); - m.addObject("tanggalReport", (new SimpleDateFormat("dd").format(new Date())) + " " + monthFirstCaplock + " " - + (new SimpleDateFormat("YYYY").format(new Date()))); + m.addObject("tanggalReport", (new SimpleDateFormat("dd").format(new Date())) + " " + monthFirstCapslock + " " + + (new SimpleDateFormat("yyyy").format(new Date()))); m.addObject("format", "pdf"); if (format != null && !format.isEmpty()) { @@ -1497,13 +1344,12 @@ public class ReportingController extends LocaleController @RequestMapping("/lapKunjunganBdsStatusDanJenisPasien2") public ModelAndView generateLapKunjunganBdsStatusDanJenisPasien2(ModelAndView m, @RequestParam(value = "format", required = false) String format, - @RequestParam(value = "startDate", required = true) String startDate, - @RequestParam(value = "endDate", required = true) String endDate) { + @RequestParam(value = "startDate") String startDate, @RequestParam(value = "endDate") String endDate) { // Map map = new HashMap(); String month = (formatBulan(Integer.valueOf(new SimpleDateFormat("MM").format(new Date())))); - String monthFirstCaplock = Character.toString(month.charAt(0)).toUpperCase() + month.substring(1); - // String monthAllCaplock = month.toUpperCase(); - List listKunjunganPasienStatusDanJenisPasienDto = new ArrayList(); + String monthFirstCapslock = Character.toString(month.charAt(0)).toUpperCase() + month.substring(1); + // String monthAllCapslock = month.toUpperCase(); + List listKunjunganPasienStatusDanJenisPasienDto = new ArrayList<>(); List list = reportingPelayananRekamMedisService.findAntrianPasienDiperiksaStatusJenisPasien(startDate, endDate); @@ -1548,7 +1394,7 @@ public class ReportingController extends LocaleController } else if (jenisKelamin.equalsIgnoreCase("laki-laki") && (kelompokPasien.equalsIgnoreCase("BPJS PBI ") || kelompokPasien.equalsIgnoreCase("BPJS Non PBI ")) - && statusPasien.equalsIgnoreCase("baru")) { + && statusPasien.equalsIgnoreCase("lama")) { bpjsLamaL.setPeriode(tglRegistrasi); bpjsLamaL.setRuangan(ruangan); bpjsLamaL.setCountUmumL(count); @@ -1593,8 +1439,8 @@ public class ReportingController extends LocaleController m.addObject("dataSource", listKunjunganPasienStatusDanJenisPasienDto); m.addObject("startDate", startDate); m.addObject("endDate", endDate); - m.addObject("tanggalReport", (new SimpleDateFormat("dd").format(new Date())) + " " + monthFirstCaplock + " " - + (new SimpleDateFormat("YYYY").format(new Date()))); + m.addObject("tanggalReport", (new SimpleDateFormat("dd").format(new Date())) + " " + monthFirstCapslock + " " + + (new SimpleDateFormat("yyyy").format(new Date()))); m.addObject("format", "pdf"); if (format != null && !format.isEmpty()) { @@ -1608,57 +1454,32 @@ public class ReportingController extends LocaleController @RequestMapping("/lapKunjunganBdsStatusDanKasusPenyakitPasien") public ModelAndView generateLapKunjunganBdsStatusDanKasusPenyakitPasien(ModelAndView m, @RequestParam(value = "format", required = false) String format, - @RequestParam(value = "startDate", required = true) String startDate, - @RequestParam(value = "endDate", required = true) String endDate) { + @RequestParam(value = "startDate") String startDate, @RequestParam(value = "endDate") String endDate) { // Map map = new HashMap(); String month = (formatBulan(Integer.valueOf(new SimpleDateFormat("MM").format(new Date())))); - String monthFirstCaplock = Character.toString(month.charAt(0)).toUpperCase() + month.substring(1); - // String monthAllCaplock = month.toUpperCase(); - List listKunjunganPasienStatusDanJenisPasienDto = new ArrayList(); + String monthFirstCapslock = Character.toString(month.charAt(0)).toUpperCase() + month.substring(1); + // String monthAllCapslock = month.toUpperCase(); + List listKunjunganPasienStatusDanJenisPasienDto = new ArrayList<>(); List listStatusPasien = reportingPelayananRekamMedisService .findAntrianPasienDiperiksaStatusPasien(startDate, endDate); for (Object[] data : listStatusPasien) { - String tglRegistrasi = ((String) data[1]); - String ruangan = ((String) data[2]); - String statusPasien = ((String) data[3]); - String jenisKelamin = ((String) data[4]); - String judul = ((String) data[5]); - String noRegistrasi = ((String) data[0]); - KunjunganPasienStatusDanJenisPasienDto2 abc = new KunjunganPasienStatusDanJenisPasienDto2(); - abc.setJudul(judul); - abc.setDetailJudul(statusPasien); - abc.setNoRegistrasi(noRegistrasi); - abc.setRuangan(ruangan); - abc.setTglRegistrasi(tglRegistrasi); - abc.setJenisKelamin(jenisKelamin); + KunjunganPasienStatusDanJenisPasienDto2 abc = getKunjunganPasienStatusDanJenisPasienDto2(data); listKunjunganPasienStatusDanJenisPasienDto.add(abc); } List listKasusPenyakit = reportingPelayananRekamMedisService .findAntrianPasienDiperiksaKasusPenyakit(startDate, endDate); for (Object[] data : listKasusPenyakit) { - String tglRegistrasi = ((String) data[1]); - String ruangan = ((String) data[2]); - String kelompokPasien = ((String) data[3]); - String jenisKelamin = ((String) data[4]); - String judul = ((String) data[5]); - String noRegistrasi = ((String) data[0]); - KunjunganPasienStatusDanJenisPasienDto2 abc = new KunjunganPasienStatusDanJenisPasienDto2(); - abc.setJudul(judul); - abc.setDetailJudul(kelompokPasien); - abc.setNoRegistrasi(noRegistrasi); - abc.setRuangan(ruangan); - abc.setTglRegistrasi(tglRegistrasi); - abc.setJenisKelamin(jenisKelamin); + KunjunganPasienStatusDanJenisPasienDto2 abc = getKunjunganPasienStatusDanJenisPasienDto2(data); listKunjunganPasienStatusDanJenisPasienDto.add(abc); } m.addObject("dataSource", listKunjunganPasienStatusDanJenisPasienDto); m.addObject("startDate", startDate); m.addObject("endDate", endDate); - m.addObject("tanggalReport", (new SimpleDateFormat("dd").format(new Date())) + " " + monthFirstCaplock + " " - + (new SimpleDateFormat("YYYY").format(new Date()))); + m.addObject("tanggalReport", (new SimpleDateFormat("dd").format(new Date())) + " " + monthFirstCapslock + " " + + (new SimpleDateFormat("yyyy").format(new Date()))); m.addObject("format", "pdf"); if (format != null && !format.isEmpty()) { @@ -1672,57 +1493,32 @@ public class ReportingController extends LocaleController @RequestMapping("/lapKunjunganBdsStatusDanKelas") public ModelAndView generateLapKunjunganBdsStatusDanKelas(ModelAndView m, @RequestParam(value = "format", required = false) String format, - @RequestParam(value = "startDate", required = true) String startDate, - @RequestParam(value = "endDate", required = true) String endDate) { + @RequestParam(value = "startDate") String startDate, @RequestParam(value = "endDate") String endDate) { // Map map = new HashMap(); String month = (formatBulan(Integer.valueOf(new SimpleDateFormat("MM").format(new Date())))); - String monthFirstCaplock = Character.toString(month.charAt(0)).toUpperCase() + month.substring(1); - // String monthAllCaplock = month.toUpperCase(); - List listKunjunganPasienStatusDanJenisPasienDto = new ArrayList(); + String monthFirstCapslock = Character.toString(month.charAt(0)).toUpperCase() + month.substring(1); + // String monthAllCapslock = month.toUpperCase(); + List listKunjunganPasienStatusDanJenisPasienDto = new ArrayList<>(); List listStatusPasien = reportingPelayananRekamMedisService .findAntrianPasienDiperiksaStatusPasien(startDate, endDate); for (Object[] data : listStatusPasien) { - String tglRegistrasi = ((String) data[1]); - String ruangan = ((String) data[2]); - String statusPasien = ((String) data[3]); - String jenisKelamin = ((String) data[4]); - String judul = ((String) data[5]); - String noRegistrasi = ((String) data[0]); - KunjunganPasienStatusDanJenisPasienDto2 abc = new KunjunganPasienStatusDanJenisPasienDto2(); - abc.setJudul(judul); - abc.setDetailJudul(statusPasien); - abc.setNoRegistrasi(noRegistrasi); - abc.setRuangan(ruangan); - abc.setTglRegistrasi(tglRegistrasi); - abc.setJenisKelamin(jenisKelamin); + KunjunganPasienStatusDanJenisPasienDto2 abc = getKunjunganPasienStatusDanJenisPasienDto2(data); listKunjunganPasienStatusDanJenisPasienDto.add(abc); } List listKelas = reportingPelayananRekamMedisService.findAntrianPasienDiperiksaKelas(startDate, endDate); for (Object[] data : listKelas) { - String tglRegistrasi = ((String) data[1]); - String ruangan = ((String) data[2]); - String kelompokPasien = ((String) data[3]); - String jenisKelamin = ((String) data[4]); - String judul = ((String) data[5]); - String noRegistrasi = ((String) data[0]); - KunjunganPasienStatusDanJenisPasienDto2 abc = new KunjunganPasienStatusDanJenisPasienDto2(); - abc.setJudul(judul); - abc.setDetailJudul(kelompokPasien); - abc.setNoRegistrasi(noRegistrasi); - abc.setRuangan(ruangan); - abc.setTglRegistrasi(tglRegistrasi); - abc.setJenisKelamin(jenisKelamin); + KunjunganPasienStatusDanJenisPasienDto2 abc = getKunjunganPasienStatusDanJenisPasienDto2(data); listKunjunganPasienStatusDanJenisPasienDto.add(abc); } m.addObject("dataSource", listKunjunganPasienStatusDanJenisPasienDto); m.addObject("startDate", startDate); m.addObject("endDate", endDate); - m.addObject("tanggalReport", (new SimpleDateFormat("dd").format(new Date())) + " " + monthFirstCaplock + " " - + (new SimpleDateFormat("YYYY").format(new Date()))); + m.addObject("tanggalReport", (new SimpleDateFormat("dd").format(new Date())) + " " + monthFirstCapslock + " " + + (new SimpleDateFormat("yyyy").format(new Date()))); m.addObject("format", "pdf"); if (format != null && !format.isEmpty()) { @@ -1736,57 +1532,32 @@ public class ReportingController extends LocaleController @RequestMapping("/lapKunjunganBdsStatusDanKondisiPulang") public ModelAndView generateLapKunjunganBdsStatusDanKondisiPulang(ModelAndView m, @RequestParam(value = "format", required = false) String format, - @RequestParam(value = "startDate", required = true) String startDate, - @RequestParam(value = "endDate", required = true) String endDate) { + @RequestParam(value = "startDate") String startDate, @RequestParam(value = "endDate") String endDate) { // Map map = new HashMap(); String month = (formatBulan(Integer.valueOf(new SimpleDateFormat("MM").format(new Date())))); - String monthFirstCaplock = Character.toString(month.charAt(0)).toUpperCase() + month.substring(1); - // String monthAllCaplock = month.toUpperCase(); - List listKunjunganPasienStatusDanJenisPasienDto = new ArrayList(); + String monthFirstCapslock = Character.toString(month.charAt(0)).toUpperCase() + month.substring(1); + // String monthAllCapslock = month.toUpperCase(); + List listKunjunganPasienStatusDanJenisPasienDto = new ArrayList<>(); List listStatusPasien = reportingPelayananRekamMedisService .findAntrianPasienDiperiksaStatusPasien(startDate, endDate); for (Object[] data : listStatusPasien) { - String tglRegistrasi = ((String) data[1]); - String ruangan = ((String) data[2]); - String statusPasien = ((String) data[3]); - String jenisKelamin = ((String) data[4]); - String judul = ((String) data[5]); - String noRegistrasi = ((String) data[0]); - KunjunganPasienStatusDanJenisPasienDto2 abc = new KunjunganPasienStatusDanJenisPasienDto2(); - abc.setJudul(judul); - abc.setDetailJudul(statusPasien); - abc.setNoRegistrasi(noRegistrasi); - abc.setRuangan(ruangan); - abc.setTglRegistrasi(tglRegistrasi); - abc.setJenisKelamin(jenisKelamin); + KunjunganPasienStatusDanJenisPasienDto2 abc = getKunjunganPasienStatusDanJenisPasienDto2(data); listKunjunganPasienStatusDanJenisPasienDto.add(abc); } List listKondisiPasien = reportingPelayananRekamMedisService .findAntrianPasienDiperiksaKondisiPasien(startDate, endDate); for (Object[] data : listKondisiPasien) { - String tglRegistrasi = ((String) data[1]); - String ruangan = ((String) data[2]); - String kelompokPasien = ((String) data[3]); - String jenisKelamin = ((String) data[4]); - String judul = ((String) data[5]); - String noRegistrasi = ((String) data[0]); - KunjunganPasienStatusDanJenisPasienDto2 abc = new KunjunganPasienStatusDanJenisPasienDto2(); - abc.setJudul(judul); - abc.setDetailJudul(kelompokPasien); - abc.setNoRegistrasi(noRegistrasi); - abc.setRuangan(ruangan); - abc.setTglRegistrasi(tglRegistrasi); - abc.setJenisKelamin(jenisKelamin); + KunjunganPasienStatusDanJenisPasienDto2 abc = getKunjunganPasienStatusDanJenisPasienDto2(data); listKunjunganPasienStatusDanJenisPasienDto.add(abc); } m.addObject("dataSource", listKunjunganPasienStatusDanJenisPasienDto); m.addObject("startDate", startDate); m.addObject("endDate", endDate); - m.addObject("tanggalReport", (new SimpleDateFormat("dd").format(new Date())) + " " + monthFirstCaplock + " " - + (new SimpleDateFormat("YYYY").format(new Date()))); + m.addObject("tanggalReport", (new SimpleDateFormat("dd").format(new Date())) + " " + monthFirstCapslock + " " + + (new SimpleDateFormat("yyyy").format(new Date()))); m.addObject("format", "pdf"); if (format != null && !format.isEmpty()) { @@ -1800,57 +1571,32 @@ public class ReportingController extends LocaleController @RequestMapping("/lapKunjunganBdsStatusDanRujukan") public ModelAndView generateLapKunjunganBdsStatusDanRujukan(ModelAndView m, @RequestParam(value = "format", required = false) String format, - @RequestParam(value = "startDate", required = true) String startDate, - @RequestParam(value = "endDate", required = true) String endDate) { + @RequestParam(value = "startDate") String startDate, @RequestParam(value = "endDate") String endDate) { // Map map = new HashMap(); String month = (formatBulan(Integer.valueOf(new SimpleDateFormat("MM").format(new Date())))); - String monthFirstCaplock = Character.toString(month.charAt(0)).toUpperCase() + month.substring(1); - // String monthAllCaplock = month.toUpperCase(); - List listKunjunganPasienStatusDanJenisPasienDto = new ArrayList(); + String monthFirstCapslock = Character.toString(month.charAt(0)).toUpperCase() + month.substring(1); + // String monthAllCapslock = month.toUpperCase(); + List listKunjunganPasienStatusDanJenisPasienDto = new ArrayList<>(); List listStatusPasien = reportingPelayananRekamMedisService .findAntrianPasienDiperiksaStatusPasien(startDate, endDate); for (Object[] data : listStatusPasien) { - String tglRegistrasi = ((String) data[1]); - String ruangan = ((String) data[2]); - String statusPasien = ((String) data[3]); - String jenisKelamin = ((String) data[4]); - String judul = ((String) data[5]); - String noRegistrasi = ((String) data[0]); - KunjunganPasienStatusDanJenisPasienDto2 abc = new KunjunganPasienStatusDanJenisPasienDto2(); - abc.setJudul(judul); - abc.setDetailJudul(statusPasien); - abc.setNoRegistrasi(noRegistrasi); - abc.setRuangan(ruangan); - abc.setTglRegistrasi(tglRegistrasi); - abc.setJenisKelamin(jenisKelamin); + KunjunganPasienStatusDanJenisPasienDto2 abc = getKunjunganPasienStatusDanJenisPasienDto2(data); listKunjunganPasienStatusDanJenisPasienDto.add(abc); } List listKondisiPasien = reportingPelayananRekamMedisService .findAntrianPasienDiperiksaAsalRujukan(startDate, endDate); for (Object[] data : listKondisiPasien) { - String tglRegistrasi = ((String) data[1]); - String ruangan = ((String) data[2]); - String kelompokPasien = ((String) data[3]); - String jenisKelamin = ((String) data[4]); - String judul = ((String) data[5]); - String noRegistrasi = ((String) data[0]); - KunjunganPasienStatusDanJenisPasienDto2 abc = new KunjunganPasienStatusDanJenisPasienDto2(); - abc.setJudul(judul); - abc.setDetailJudul(kelompokPasien); - abc.setNoRegistrasi(noRegistrasi); - abc.setRuangan(ruangan); - abc.setTglRegistrasi(tglRegistrasi); - abc.setJenisKelamin(jenisKelamin); + KunjunganPasienStatusDanJenisPasienDto2 abc = getKunjunganPasienStatusDanJenisPasienDto2(data); listKunjunganPasienStatusDanJenisPasienDto.add(abc); } m.addObject("dataSource", listKunjunganPasienStatusDanJenisPasienDto); m.addObject("startDate", startDate); m.addObject("endDate", endDate); - m.addObject("tanggalReport", (new SimpleDateFormat("dd").format(new Date())) + " " + monthFirstCaplock + " " - + (new SimpleDateFormat("YYYY").format(new Date()))); + m.addObject("tanggalReport", (new SimpleDateFormat("dd").format(new Date())) + " " + monthFirstCapslock + " " + + (new SimpleDateFormat("yyyy").format(new Date()))); m.addObject("format", "pdf"); if (format != null && !format.isEmpty()) { @@ -1864,39 +1610,26 @@ public class ReportingController extends LocaleController @RequestMapping("/lapKunjunganBdsWilayah") public ModelAndView generateLapKunjunganBdsWilayah(ModelAndView m, @RequestParam(value = "format", required = false) String format, - @RequestParam(value = "startDate", required = true) String startDate, - @RequestParam(value = "endDate", required = true) String endDate, - @RequestParam(value = "ruangan", required = true) Integer ruangan) { + @RequestParam(value = "startDate") String startDate, @RequestParam(value = "endDate") String endDate, + @RequestParam(value = "ruangan") Integer ruangan) { // Map map = new HashMap(); String month = (formatBulan(Integer.valueOf(new SimpleDateFormat("MM").format(new Date())))); - String monthFirstCaplock = Character.toString(month.charAt(0)).toUpperCase() + month.substring(1); - // String monthAllCaplock = month.toUpperCase(); + String monthFirstCapslock = Character.toString(month.charAt(0)).toUpperCase() + month.substring(1); + // String monthAllCapslock = month.toUpperCase(); - List listKunjunganWilayahDto = new ArrayList(); + List listKunjunganWilayahDto = new ArrayList<>(); List listStatusPasien = reportingPelayananRekamMedisService.findWilayah(ruangan, startDate, endDate); for (Object[] data : listStatusPasien) { - String tglRegistrasi = ((String) data[1]); - String wilayah = ((String) data[2]); - String statusPasien = ((String) data[3]); - String jenisKelamin = ((String) data[4]); - String judul = ((String) data[5]); - String noRegistrasi = ((String) data[0]); - KunjunganWilayahDto abc = new KunjunganWilayahDto(); - abc.setJudul(judul); - abc.setDetailJudul(statusPasien); - abc.setNoRegistrasi(noRegistrasi); - abc.setTglRegistrasi(tglRegistrasi); - abc.setJenisKelamin(jenisKelamin); - abc.setWilayah(wilayah); + KunjunganWilayahDto abc = getKunjunganWilayahDto(data); listKunjunganWilayahDto.add(abc); } m.addObject("dataSource", listKunjunganWilayahDto); m.addObject("startDate", startDate); m.addObject("endDate", endDate); - m.addObject("tanggalReport", (new SimpleDateFormat("dd").format(new Date())) + " " + monthFirstCaplock + " " - + (new SimpleDateFormat("YYYY").format(new Date()))); + m.addObject("tanggalReport", (new SimpleDateFormat("dd").format(new Date())) + " " + monthFirstCapslock + " " + + (new SimpleDateFormat("yyyy").format(new Date()))); m.addObject("ruangan", ruanganDao.findOne(ruangan).getNamaRuangan()); m.addObject("format", "pdf"); @@ -1907,6 +1640,23 @@ public class ReportingController extends LocaleController return m; } + private static KunjunganWilayahDto getKunjunganWilayahDto(Object[] data) { + String tglRegistrasi = ((String) data[1]); + String wilayah = ((String) data[2]); + String statusPasien = ((String) data[3]); + String jenisKelamin = ((String) data[4]); + String judul = ((String) data[5]); + String noRegistrasi = ((String) data[0]); + KunjunganWilayahDto abc = new KunjunganWilayahDto(); + abc.setJudul(judul); + abc.setDetailJudul(statusPasien); + abc.setNoRegistrasi(noRegistrasi); + abc.setTglRegistrasi(tglRegistrasi); + abc.setJenisKelamin(jenisKelamin); + abc.setWilayah(wilayah); + return abc; + } + @SuppressWarnings("unchecked") @RequestMapping("/lapSensusHarian") public ModelAndView generateLapSensusHarian(ModelAndView m, @@ -1916,9 +1666,9 @@ public class ReportingController extends LocaleController @RequestParam(value = "ruanganId", required = false) Integer ruanganId) { // Map map = new HashMap(); String month = (formatBulan(Integer.valueOf(new SimpleDateFormat("MM").format(new Date())))); - String monthFirstCaplock = Character.toString(month.charAt(0)).toUpperCase() + month.substring(1); - // String monthAllCaplock = month.toUpperCase(); - List listSensusHarianDto = new ArrayList(); + String monthFirstCapslock = Character.toString(month.charAt(0)).toUpperCase() + month.substring(1); + // String monthAllCapslock = month.toUpperCase(); + List listSensusHarianDto = new ArrayList<>(); List listPenderitaMasuk = reportingPelayananRekamMedisService.findPasienMasuk(startDate, endDate, ruanganId); @@ -1953,8 +1703,8 @@ public class ReportingController extends LocaleController m.addObject("dataSource", listSensusHarianDto); m.addObject("startDate", startDate); m.addObject("endDate", endDate); - m.addObject("tanggalReport", (new SimpleDateFormat("dd").format(new Date())) + " " + monthFirstCaplock + " " - + (new SimpleDateFormat("YYYY").format(new Date()))); + m.addObject("tanggalReport", (new SimpleDateFormat("dd").format(new Date())) + " " + monthFirstCapslock + " " + + (new SimpleDateFormat("yyyy").format(new Date()))); m.addObject("format", "pdf"); if (format != null && !format.isEmpty()) { @@ -1968,15 +1718,14 @@ public class ReportingController extends LocaleController @RequestMapping("/lapHasilLaboratorium") public ModelAndView generateDetailLaboratorium(ModelAndView m, @RequestParam(value = "format", required = false) String format, - @RequestParam(value = "startDate", required = true) String startDate, - @RequestParam(value = "endDate", required = true) String endDate, - @RequestParam(value = "hasilId", required = true) Integer hasilId, - @RequestParam(value = "departemenId", required = true) Integer departemenId) { + @RequestParam(value = "startDate") String startDate, @RequestParam(value = "endDate") String endDate, + @RequestParam(value = "hasilId") Integer hasilId, + @RequestParam(value = "departemenId") Integer departemenId) { // Map map = new HashMap(); String month = (formatBulan(Integer.valueOf(new SimpleDateFormat("MM").format(new Date())))); - String monthFirstCaplock = Character.toString(month.charAt(0)).toUpperCase() + month.substring(1); - // String monthAllCaplock = month.toUpperCase(); - List listSensusHarianDto = new ArrayList(); + String monthFirstCapslock = Character.toString(month.charAt(0)).toUpperCase() + month.substring(1); + // String monthAllCapslock = month.toUpperCase(); + List listSensusHarianDto = new ArrayList<>(); List listPenderitaMasuk = reportingPelayananRekamMedisService.findHasilLaboratorium(hasilId, departemenId, startDate, endDate); @@ -2002,8 +1751,8 @@ public class ReportingController extends LocaleController m.addObject("endDate", endDate); m.addObject("hasil", "Hasil"); m.addObject("departemen", "All"); - m.addObject("tanggalReport", (new SimpleDateFormat("dd").format(new Date())) + " " + monthFirstCaplock + " " - + (new SimpleDateFormat("YYYY").format(new Date()))); + m.addObject("tanggalReport", (new SimpleDateFormat("dd").format(new Date())) + " " + monthFirstCapslock + " " + + (new SimpleDateFormat("yyyy").format(new Date()))); m.addObject("format", "pdf"); if (format != null && !format.isEmpty()) { @@ -2017,10 +1766,9 @@ public class ReportingController extends LocaleController @RequestMapping("/lapObatGenerik") public ModelAndView generateLapObatGenerik(ModelAndView m, @RequestParam(value = "format", required = false) String format, - @RequestParam(value = "startDate", required = true) String startDate, - @RequestParam(value = "endDate", required = true) String endDate) { + @RequestParam(value = "startDate") String startDate, @RequestParam(value = "endDate") String endDate) { - List listObatGenerikDto = new ArrayList(); + List listObatGenerikDto = new ArrayList<>(); List listObatGenerik = obatGenerikService.findListObatGenerik(startDate, endDate); for (Object[] data : listObatGenerik) { @@ -2028,7 +1776,7 @@ public class ReportingController extends LocaleController String noResep = ((String) data[1]); Double jumlah = ((Double) data[2]); Double hargaSatuan = ((Double) data[3]); - Integer produkId = Integer.valueOf(((String) data[5])); + int produkId = Integer.parseInt(((String) data[5])); String noRegistrasi = ((String) data[5]); String noCm = ((String) data[6]); String namaPasien = ((String) data[7]); @@ -2037,13 +1785,13 @@ public class ReportingController extends LocaleController String namaRuangan = ((String) data[10]); Date tglRegistrasi = ((Date) data[11]); String namaGenerik = ((String) data[12]); - Double subHargaTotal = jumlah * hargaSatuan; + double subHargaTotal = jumlah * hargaSatuan; ObatGenerikDto dto = new ObatGenerikDto(); dto.setNoResep(noResep); dto.setJumlah(jumlah.toString()); dto.setHargaSatuan(hargaSatuan.toString()); - dto.setKodeProduk(produkId.toString()); + dto.setKodeProduk(Integer.toString(produkId)); dto.setNoRegistrasi(noRegistrasi); dto.setNamaPasien(namaPasien); dto.setJenisKelamin(jenisKelamin); @@ -2051,7 +1799,7 @@ public class ReportingController extends LocaleController dto.setNoCm(noCm); dto.setTglResep(tglResep); dto.setNamaGenerik(namaGenerik); - dto.setSubHargaTotal(subHargaTotal.toString()); + dto.setSubHargaTotal(Double.toString(subHargaTotal)); if (CommonUtil.isNotNullOrEmpty(tglLahir)) { Age age = AgeCalculator.calculateAge2(tglRegistrasi, tglLahir); if (CommonUtil.isNotNullOrEmpty(age)) { @@ -2070,10 +1818,9 @@ public class ReportingController extends LocaleController @RequestMapping("/lapObatPsikotropika") public ModelAndView generateLapObatPsikotropika(ModelAndView m, @RequestParam(value = "format", required = false) String format, - @RequestParam(value = "startDate", required = true) String startDate, - @RequestParam(value = "endDate", required = true) String endDate) { + @RequestParam(value = "startDate") String startDate, @RequestParam(value = "endDate") String endDate) { - List listObatPsikotropikaDto = new ArrayList(); + List listObatPsikotropikaDto = new ArrayList<>(); List listObatPsikotropika = obatGenerikDao.findListObatPsikotropika(startDate, endDate); for (Object[] data : listObatPsikotropika) { @@ -2082,7 +1829,7 @@ public class ReportingController extends LocaleController String namaRuangan = ((String) data[2]); Double jumlah = ((Double) data[3]); String namaGenerik = ((String) data[4]); - Integer produkId = Integer.valueOf(((String) data[5])); + int produkId = Integer.parseInt(((String) data[5])); String noRegistrasi = ((String) data[6]); Date tglRegistrasi = ((Date) data[7]); String namaPasien = ((String) data[8]); @@ -2094,7 +1841,7 @@ public class ReportingController extends LocaleController dto.setNoResep(noResep); dto.setJumlah(jumlah.toString()); - dto.setKodeProduk(produkId.toString()); + dto.setKodeProduk(Integer.toString(produkId)); dto.setNoRegistrasi(noRegistrasi); dto.setNamaPasien(namaPasien); dto.setJenisKelamin(jenisKelamin); @@ -2120,10 +1867,9 @@ public class ReportingController extends LocaleController @RequestMapping("/lapObatNarkotika") public ModelAndView generateLapObatNarkotika(ModelAndView m, @RequestParam(value = "format", required = false) String format, - @RequestParam(value = "startDate", required = true) String startDate, - @RequestParam(value = "endDate", required = true) String endDate) { + @RequestParam(value = "startDate") String startDate, @RequestParam(value = "endDate") String endDate) { - List listObatNarkotikaDto = new ArrayList(); + List listObatNarkotikaDto = new ArrayList<>(); List listObatNarkotika = obatGenerikDao.findListObatNarkotika(startDate, endDate); for (Object[] data : listObatNarkotika) { @@ -2170,10 +1916,9 @@ public class ReportingController extends LocaleController @RequestMapping("/lapObatAntibiotika") public ModelAndView generateLapObatAntibiotika(ModelAndView m, @RequestParam(value = "format", required = false) String format, - @RequestParam(value = "startDate", required = true) String startDate, - @RequestParam(value = "endDate", required = true) String endDate) { + @RequestParam(value = "startDate") String startDate, @RequestParam(value = "endDate") String endDate) { - List listObatAntibiotikaDto = new ArrayList(); + List listObatAntibiotikaDto = new ArrayList<>(); List listObatAntibiotika = obatGenerikDao.findListObatNarkotika(startDate, endDate); for (Object[] data : listObatAntibiotika) { @@ -2182,7 +1927,7 @@ public class ReportingController extends LocaleController String namaRuangan = ((String) data[2]); Double jumlah = ((Double) data[3]); String namaGenerik = ((String) data[4]); - Integer produkId = Integer.valueOf(((String) data[5])); + int produkId = Integer.parseInt(((String) data[5])); String noRegistrasi = ((String) data[6]); Date tglRegistrasi = ((Date) data[7]); String namaPasien = ((String) data[8]); @@ -2194,7 +1939,7 @@ public class ReportingController extends LocaleController dto.setNoResep(noResep); dto.setJumlah(jumlah.toString()); - dto.setKodeProduk(produkId.toString()); + dto.setKodeProduk(Integer.toString(produkId)); dto.setNoRegistrasi(noRegistrasi); dto.setNamaPasien(namaPasien); dto.setJenisKelamin(jenisKelamin); @@ -2219,11 +1964,10 @@ public class ReportingController extends LocaleController @RequestMapping("/lapPengkajianAwalRawatJalan") public ModelAndView generateLapPengkajian(ModelAndView m, - @RequestParam(value = "format", required = false) String format, - @RequestParam(value = "noCm", required = true) String noCm, - @RequestParam(value = "tglInput", required = true) String tglInput) { + @RequestParam(value = "format", required = false) String format, @RequestParam(value = "noCm") String noCm, + @RequestParam(value = "tglInput") String tglInput) { - List listPengkajianAwalPasienRawatJalanAnak = new ArrayList(); + List listPengkajianAwalPasienRawatJalanAnak = new ArrayList<>(); DetailDto detailDto1 = new DetailDto(); DetailDto detailDto2 = new DetailDto(); DetailDto detailDto3 = new DetailDto(); @@ -2245,7 +1989,7 @@ public class ReportingController extends LocaleController PengkajianAwalPasienRawatJalanAnakDto dto = new PengkajianAwalPasienRawatJalanAnakDto(); List> pasienList = reportingDao.findMapPasienByNoCm(noCm); - Map pasien = new HashMap(); + Map pasien = new HashMap<>(); int indek = 0; for (Map temp : pasienList) { indek++; @@ -2266,8 +2010,6 @@ public class ReportingController extends LocaleController List papRiwayatKesehatan = pengkajianAwalPasienRawatJalanDewasaDao.findRiwayatKesehatanByNoCm(noCm); List masalahkeperawatanDetail = masalahkeperawatanDetailDao.findByNocmAndTglInput(noCm, tglInput); List papSkriningGizi = papSkriningGiziDao.findByNoCmAndTglInput(noCm, tglInput); - // List papSkriningGiziDetail = - // papSkriningGiziDetailDao.findByNoCmAndTglInput(noCm, tglInput); List asesmenGiziAwal = asesmenGiziAwalDao.findByNoCm(noCm); List kebutuhanDasar = kebutuhanDasarDao.findByNoCm(noCm); List papCatatan = pengkajianAwalPasienRawatJalanDewasaDao.findCatatanByNoCm(noCm); @@ -2284,11 +2026,11 @@ public class ReportingController extends LocaleController namaRuangan = ((String) data[3]); } - String alergi = ""; - String reaksi = ""; + String alergi; + String reaksi; // int alergiId = 0; - String papalergi = ""; - String ket = ""; + StringBuilder papalergi = new StringBuilder(); + String ket; for (Object[] data : papAlergi) { if ((CommonUtil.isNotNullOrEmpty(data))) { if ((Integer) data[2] == 1) { @@ -2302,7 +2044,7 @@ public class ReportingController extends LocaleController } // alergiId = (Integer) data[2]; ket = ((String) data[3]); - papalergi = alergi + ", yaitu " + ket + " Reaksi " + reaksi; + papalergi = new StringBuilder(alergi + ", yaitu " + ket + " Reaksi " + reaksi); } else if ((Integer) data[2] == 2) { alergi = ((String) data[0]); if (CommonUtil.isNullOrEmpty(alergi)) { @@ -2314,41 +2056,24 @@ public class ReportingController extends LocaleController } // alergiId = (Integer) data[2]; ket = ((String) data[3]); - papalergi += "\n " + alergi + ", yaitu " + ket + " Reaksi " + reaksi; + papalergi.append("\n ").append(alergi).append(", yaitu ").append(ket).append(" Reaksi ") + .append(reaksi); } } else { - papalergi = "Tidak ada alergi"; + papalergi = new StringBuilder("Tidak ada alergi"); } } String riwayatKeluarga = ""; for (Object[] data : papRiwayatkeluarga) { - riwayatKeluarga = "Ibu : " + ((String) data[0]) + ", Umur : " + ((String) data[1]) + ", Bangsa : " - + ((String) data[2]) + ", Kesehatan : " + ((String) data[3]) + "\n Ayah : " + ((String) data[4]) - + ", Umur : " + ((String) data[5]) + ", Bangsa : " + ((String) data[6]) + ", Kesehatan : " - + ((String) data[7]) + "\n Anak anak lain : " + ((String) data[8]); + riwayatKeluarga = "Ibu : " + data[0] + ", Umur : " + data[1] + ", Bangsa : " + data[2] + ", Kesehatan : " + + data[3] + "\n Ayah : " + data[4] + ", Umur : " + data[5] + ", Bangsa : " + data[6] + + ", Kesehatan : " + data[7] + "\n Anak anak lain : " + data[8]; } - String riwayatKesehatan = ""; - for (Object[] data : papRiwayatKesehatan) { - String rawat = ""; - if (((Boolean) data[0])) { - rawat = "Ya"; - } - String alatImplan = ""; - if (((Boolean) data[1])) { - alatImplan = "Ya"; - } - String penyakitMayor = ""; - if (((Boolean) data[1])) { - penyakitMayor = "Ya"; - } - riwayatKesehatan = "Pernah dirawat : " + rawat + "\n Apakah terpasang alat implant : " + alatImplan - + "\n Apakah ada riwayat dalam keluarga yang memiliki penyakit mayor : " + penyakitMayor; - - } + String riwayatKesehatan = getString(papRiwayatKesehatan); String riwayatKelahiran = ""; for (Object[] data : papRiwayatKelahiran) { @@ -2383,24 +2108,24 @@ public class ReportingController extends LocaleController } } - String riwayatImunisasi = "Imunisasi yang diterima : "; - List listImunisasi = new ArrayList(); + StringBuilder riwayatImunisasi = new StringBuilder("Imunisasi yang diterima : "); + List listImunisasi = new ArrayList<>(); for (Object[] data : papRiwayatImunisasi) { if ((CommonUtil.isNotNullOrEmpty(data))) { String imunisasi = ((String) data[1]); if (!listImunisasi.contains(imunisasi)) { - riwayatImunisasi += imunisasi + " "; + riwayatImunisasi.append(imunisasi).append(" "); listImunisasi.add(imunisasi); } } else { - riwayatImunisasi = "Tidak Pernah"; + riwayatImunisasi = new StringBuilder("Tidak Pernah"); } } - String kebutuhanEdukasi = ""; - String hambatanPembelajaran = ""; - List listHambatan = new ArrayList(); - List listEdukasi = new ArrayList(); + StringBuilder kebutuhanEdukasi = new StringBuilder(); + StringBuilder hambatanPembelajaran = new StringBuilder(); + List listHambatan = new ArrayList<>(); + List listEdukasi = new ArrayList<>(); for (Object[] data : papKebutuhanEdukasi) { if ((CommonUtil.isNotNullOrEmpty(data))) { @@ -2408,18 +2133,18 @@ public class ReportingController extends LocaleController String hambatan = ((String) data[1]); listHambatan.add(hambatan); - hambatanPembelajaran += "- " + hambatan + "\n "; + hambatanPembelajaran.append("- ").append(hambatan).append("\n "); } else if (!listEdukasi.contains((String) data[0])) { String edukasi = ((String) data[0]); listEdukasi.add(edukasi); - kebutuhanEdukasi += "- " + edukasi + "\n "; + kebutuhanEdukasi.append("- ").append(edukasi).append("\n "); } } else { - kebutuhanEdukasi = "Tidak ada"; - hambatanPembelajaran = "Tidak ada"; + kebutuhanEdukasi = new StringBuilder("Tidak ada"); + hambatanPembelajaran = new StringBuilder("Tidak ada"); } } @@ -2427,28 +2152,28 @@ public class ReportingController extends LocaleController for (Object[] data : papTumbuhKembangAnak) { if ((CommonUtil.isNotNullOrEmpty(data))) { String tengkurap = ""; - if (CommonUtil.isNotNullOrEmpty(((Float) data[0]))) { - tengkurap = ((Float) data[0]).toString(); + if (CommonUtil.isNotNullOrEmpty(data[0])) { + tengkurap = data[0].toString(); } String tumbuhGigi = ""; - if (CommonUtil.isNotNullOrEmpty(((Float) data[1]))) { - tumbuhGigi = ((Float) data[1]).toString(); + if (CommonUtil.isNotNullOrEmpty(data[1])) { + tumbuhGigi = data[1].toString(); } String bicara = ""; - if (CommonUtil.isNotNullOrEmpty(((Float) data[2]))) { - bicara = ((Float) data[2]).toString(); + if (CommonUtil.isNotNullOrEmpty(data[2])) { + bicara = data[2].toString(); } String duduk = ""; - if (CommonUtil.isNotNullOrEmpty(((Float) data[3]))) { - duduk = ((Float) data[3]).toString(); + if (CommonUtil.isNotNullOrEmpty(data[3])) { + duduk = data[3].toString(); } String berdiri = ""; - if (CommonUtil.isNotNullOrEmpty(((Float) data[4]))) { - berdiri = ((Float) data[4]).toString(); + if (CommonUtil.isNotNullOrEmpty(data[4])) { + berdiri = data[4].toString(); } String berjalan = ""; - if (CommonUtil.isNotNullOrEmpty(((Float) data[5]))) { - berjalan = ((Float) data[5]).toString(); + if (CommonUtil.isNotNullOrEmpty(data[5])) { + berjalan = data[5].toString(); } tumbuhKembang = "- Tengkurap, usia : " + tengkurap + " tahun\n - Tumbuh Gigi, usia : " + tumbuhGigi @@ -2459,18 +2184,18 @@ public class ReportingController extends LocaleController } - String riwayatPsikososial = ""; + String riwayatPsikososial; String hubungan = ""; String tempatTinggal = ""; - String statusPsikology = ""; + StringBuilder statusPsikology = new StringBuilder(); String lain = ""; - List listStatusPsikososial = new ArrayList(); + List listStatusPsikososial = new ArrayList<>(); for (Object[] data : papRiwayatPsikososial) { if ((CommonUtil.isNotNullOrEmpty(data))) { Boolean nilai = ((Boolean) data[1]); if (nilai) { if (!listStatusPsikososial.contains((String) data[0])) { - statusPsikology += "- " + ((String) data[0]) + "\n "; + statusPsikology.append("- ").append(data[0]).append("\n "); listStatusPsikososial.add(((String) data[0])); if (CommonUtil.isNotNullOrEmpty(data[2])) { lain = ((String) data[2]); @@ -2486,9 +2211,9 @@ public class ReportingController extends LocaleController + "\n Status Sosial : \n a. Hubungan pasien dengan anggota keluarga : " + hubungan + "\n b. Tempat tinggal : " + tempatTinggal; - String masalahKeperawatan = ""; + StringBuilder masalahKeperawatan = new StringBuilder(); int num = 0; - List masalahKeperawatanList = new ArrayList(); + List masalahKeperawatanList = new ArrayList<>(); for (Object[] data : masalahkeperawatanDetail) { if ((CommonUtil.isNotNullOrEmpty(data))) { @@ -2506,8 +2231,9 @@ public class ReportingController extends LocaleController } if (!masalahKeperawatanList.contains(((String) data[1]))) { num++; - masalahKeperawatan += num + ". " + masalah + ", ditemukan pada tanggal : " + tglDitemukan - + " dan teratasi pada tanggal : " + tglteratasi + "\n "; + masalahKeperawatan.append(num).append(". ").append(masalah).append(", ditemukan pada tanggal : ") + .append(tglDitemukan).append(" dan teratasi pada tanggal : ").append(tglteratasi) + .append("\n "); masalahKeperawatanList.add(((String) data[1])); } } @@ -2515,10 +2241,10 @@ public class ReportingController extends LocaleController } String skriningGizi = ""; - String pertanyaanSkriningGizi = ""; + StringBuilder pertanyaanSkriningGizi = new StringBuilder(); String skor = ""; int no = 0; - List listPertanyaan = new ArrayList(); + List listPertanyaan = new ArrayList<>(); for (Object[] data : papSkriningGizi) { if ((CommonUtil.isNotNullOrEmpty(data))) { @@ -2533,15 +2259,15 @@ public class ReportingController extends LocaleController + " kg Lingkar Kepala : " + lingkarKepala; if (!listPertanyaan.contains(((String) data[4]))) { no++; - pertanyaanSkriningGizi += no + ". " + pertanyaan + "\n Jawaban : " + jawaban + ", Nilai : " - + nilai + "\n "; + pertanyaanSkriningGizi.append(no).append(". ").append(pertanyaan).append("\n Jawaban : ") + .append(jawaban).append(", Nilai : ").append(nilai).append("\n "); listPertanyaan.add(((String) data[4])); } skor = totalSkor.toString(); } } - String asesmenGizi = ""; + StringBuilder asesmenGizi = new StringBuilder(); for (Object[] data : asesmenGiziAwal) { if ((CommonUtil.isNotNullOrEmpty(data))) { String diet = ((String) data[0]); @@ -2556,7 +2282,8 @@ public class ReportingController extends LocaleController if (CommonUtil.isNullOrEmpty(resiko)) { resiko = ""; } - asesmenGizi += "Diet : " + diet + ", dengan resiko : " + resiko + ", dan nilai : " + nilai + "\n "; + asesmenGizi.append("Diet : ").append(diet).append(", dengan resiko : ").append(resiko) + .append(", dan nilai : ").append(nilai).append("\n "); } } @@ -2670,17 +2397,17 @@ public class ReportingController extends LocaleController + "\n 2. Risiko Jatuh : \n a. Apakah pernah jatuh dalam 3 bulan terakhir : " + pernahJatuh + "\n b. Apakah menggunakan alat bantu (tongkat, kursi roda, dll) : " + alatBantu; - String catatan = ""; + StringBuilder catatan = new StringBuilder(); String lainnya = ""; for (Object[] data : papCatatan) { if ((CommonUtil.isNotNullOrEmpty(data))) { if (((Boolean) data[1])) { - catatan += "- " + ((String) data[0]) + "\n "; + catatan.append("- ").append(data[0]).append("\n "); - if ((CommonUtil.isNullOrEmpty(((String) data[0])))) { - catatan = ""; + if ((CommonUtil.isNullOrEmpty(data[0]))) { + catatan = new StringBuilder(); } - lainnya = "Lainnya : " + ((String) data[2]); + lainnya = "Lainnya : " + data[2]; } } } @@ -2746,11 +2473,10 @@ public class ReportingController extends LocaleController @RequestMapping("/lapPengkajianAwalRawatJalanDewasa") public ModelAndView generateLapPengkajianDewasa(ModelAndView m, - @RequestParam(value = "format", required = false) String format, - @RequestParam(value = "noCm", required = true) String noCm, - @RequestParam(value = "tglInput", required = true) String tglInput) { + @RequestParam(value = "format", required = false) String format, @RequestParam(value = "noCm") String noCm, + @RequestParam(value = "tglInput") String tglInput) { - List listPengkajianAwalPasienRawatJalanDewasa = new ArrayList(); + List listPengkajianAwalPasienRawatJalanDewasa = new ArrayList<>(); PengkajianAwalPasienRawatJalanAnakDto dto = new PengkajianAwalPasienRawatJalanAnakDto(); DetailDto keluhanUtamaData = new DetailDto(); DetailDto alergiData = new DetailDto(); @@ -2773,8 +2499,6 @@ public class ReportingController extends LocaleController List papRiwayatKesehatan = pengkajianAwalPasienRawatJalanDewasaDao.findRiwayatKesehatanByNoCm(noCm); List masalahkeperawatanDetail = masalahkeperawatanDetailDao.findByNocmAndTglInput(noCm, tglInput); List papSkriningGizi = papSkriningGiziDao.findByNoCmAndTglInput(noCm, tglInput); - // List papSkriningGiziDetail = - // papSkriningGiziDetailDao.findByNoCmAndTglInput(noCm, tglInput); List kebutuhanDasar = kebutuhanDasarDao.findByNoCm(noCm); List papCatatan = pengkajianAwalPasienRawatJalanDewasaDao.findCatatanByNoCm(noCm); List papStatusFungsional = pengkajianAwalPasienRawatJalanDewasaDao.findStatusFungsionalByNoCm(noCm); @@ -2791,11 +2515,11 @@ public class ReportingController extends LocaleController namaRuangan = ((String) data[3]); } - String alergi = ""; - String reaksi = ""; + String alergi; + String reaksi; // int alergiId = 0; - String papalergi = ""; - String ket = ""; + StringBuilder papalergi = new StringBuilder(); + String ket; for (Object[] data : papAlergi) { if ((CommonUtil.isNotNullOrEmpty(data))) { if ((Integer) data[2] == 1) { @@ -2809,7 +2533,7 @@ public class ReportingController extends LocaleController } // alergiId = (Integer) data[2]; ket = ((String) data[3]); - papalergi = alergi + ", yaitu " + ket + " Reaksi " + reaksi; + papalergi = new StringBuilder(alergi + ", yaitu " + ket + " Reaksi " + reaksi); } else if ((Integer) data[2] == 2) { alergi = ((String) data[0]); if (CommonUtil.isNullOrEmpty(alergi)) { @@ -2821,35 +2545,19 @@ public class ReportingController extends LocaleController } // alergiId = (Integer) data[2]; ket = ((String) data[3]); - papalergi += "\n " + alergi + ", yaitu " + ket + " Reaksi " + reaksi; + papalergi.append("\n ").append(alergi).append(", yaitu ").append(ket).append(" Reaksi ") + .append(reaksi); } } else { - papalergi = "Tidak ada alergi"; + papalergi = new StringBuilder("Tidak ada alergi"); } } - String riwayatKesehatan = ""; - for (Object[] data : papRiwayatKesehatan) { - String rawat = ""; - if (((Boolean) data[0])) { - rawat = "Ya"; - } - String alatImplan = ""; - if (((Boolean) data[1])) { - alatImplan = "Ya"; - } - String penyakitMayor = ""; - if (((Boolean) data[1])) { - penyakitMayor = "Ya"; - } - riwayatKesehatan = "Pernah dirawat : " + rawat + "\n Apakah terpasang alat implant : " + alatImplan - + "\n Apakah ada riwayat dalam keluarga yang memiliki penyakit mayor : " + penyakitMayor; - - } - String kesehatanNifas = ""; + String riwayatKesehatan = getString(papRiwayatKesehatan); + StringBuilder kesehatanNifas = new StringBuilder(); int no = 0; for (Object[] data : papKesehatanNifas) { String tglPartus = ((String) data[0]); @@ -2861,18 +2569,20 @@ public class ReportingController extends LocaleController String beratBadanLahir = ((String) data[6]); String status = ((String) data[7]); no++; - kesehatanNifas += " RIWAYAT KESEHATAN NIFAS\n a.Riwayat kehamilan, persalinan dan nifas yang lalu : \n " - + no + ". Tanggal Partus : " + tglPartus + ", Tempat : " + tempatPartus + ", Umur hamil : " - + umurHamil + ", Jenis persalinan : " + jenisPersalinan + "\n Penolong persalinan : " - + penolongPersalinan + ", Penyulit : " + penyulit + ", BB lahir : " + beratBadanLahir + ", " - + status + "\n"; + kesehatanNifas + .append(" RIWAYAT KESEHATAN NIFAS\n a.Riwayat kehamilan, persalinan dan nifas yang lalu : \n ") + .append(no).append(". Tanggal Partus : ").append(tglPartus).append(", Tempat : ") + .append(tempatPartus).append(", Umur hamil : ").append(umurHamil).append(", Jenis persalinan : ") + .append(jenisPersalinan).append("\n Penolong persalinan : ").append(penolongPersalinan) + .append(", Penyulit : ").append(penyulit).append(", BB lahir : ").append(beratBadanLahir) + .append(", ").append(status).append("\n"); } - String kebutuhanEdukasi = ""; - String hambatanPembelajaran = ""; - List listHambatan = new ArrayList(); - List listEdukasi = new ArrayList(); + StringBuilder kebutuhanEdukasi = new StringBuilder(); + StringBuilder hambatanPembelajaran = new StringBuilder(); + List listHambatan = new ArrayList<>(); + List listEdukasi = new ArrayList<>(); for (Object[] data : papKebutuhanEdukasi) { if ((CommonUtil.isNotNullOrEmpty(data))) { @@ -2880,36 +2590,36 @@ public class ReportingController extends LocaleController String hambatan = ((String) data[1]); listHambatan.add(hambatan); - hambatanPembelajaran += "- " + hambatan + "\n "; + hambatanPembelajaran.append("- ").append(hambatan).append("\n "); } else if (!listEdukasi.contains((String) data[0])) { String edukasi = ((String) data[0]); listEdukasi.add(edukasi); - kebutuhanEdukasi += "- " + edukasi + "\n "; + kebutuhanEdukasi.append("- ").append(edukasi).append("\n "); } } else { - kebutuhanEdukasi = "Tidak ada"; - hambatanPembelajaran = "Tidak ada"; + kebutuhanEdukasi = new StringBuilder("Tidak ada"); + hambatanPembelajaran = new StringBuilder("Tidak ada"); } } - String riwayatPsikososial = ""; + String riwayatPsikososial; String hubungan = ""; String tempatTinggal = ""; - String statusPsikology = ""; - String statusMental = ""; + StringBuilder statusPsikology = new StringBuilder(); + StringBuilder statusMental = new StringBuilder(); String lain = ""; - List listStatusPsikososial = new ArrayList(); - List listStatusMental = new ArrayList(); + List listStatusPsikososial = new ArrayList<>(); + List listStatusMental = new ArrayList<>(); for (Object[] data : papRiwayatPsikososial) { if ((CommonUtil.isNotNullOrEmpty(data))) { Boolean nilai = ((Boolean) data[1]); Boolean nilaiMental = ((Boolean) data[6]); if (nilai) { if (!listStatusPsikososial.contains((String) data[0])) { - statusPsikology += "- " + ((String) data[0]) + "\n "; + statusPsikology.append("- ").append(data[0]).append("\n "); listStatusPsikososial.add(((String) data[0])); lain = ((String) data[2]); @@ -2919,8 +2629,8 @@ public class ReportingController extends LocaleController if (nilaiMental) { if (!listStatusMental.contains((String) data[5])) { - if (CommonUtil.isNotNullOrEmpty((String) data[5])) { - statusMental += "- " + ((String) data[5]) + "\n "; + if (CommonUtil.isNotNullOrEmpty(data[5])) { + statusMental.append("- ").append(data[5]).append("\n "); listStatusMental.add(((String) data[5])); } } @@ -2935,9 +2645,9 @@ public class ReportingController extends LocaleController + " Status Sosial : \n a. Hubungan pasien dengan anggota keluarga : " + hubungan + "\n b. Tempat tinggal : " + tempatTinggal; - String masalahKeperawatan = ""; + StringBuilder masalahKeperawatan = new StringBuilder(); int num = 0; - List masalahKeperawatanList = new ArrayList(); + List masalahKeperawatanList = new ArrayList<>(); for (Object[] data : masalahkeperawatanDetail) { if ((CommonUtil.isNotNullOrEmpty(data))) { @@ -2955,8 +2665,9 @@ public class ReportingController extends LocaleController } if (!masalahKeperawatanList.contains(((String) data[1]))) { num++; - masalahKeperawatan += num + ". " + masalah + ", ditemukan pada tanggal : " + tglDitemukan - + " dan teratasi pada tanggal : " + tglteratasi + "\n "; + masalahKeperawatan.append(num).append(". ").append(masalah).append(", ditemukan pada tanggal : ") + .append(tglDitemukan).append(" dan teratasi pada tanggal : ").append(tglteratasi) + .append("\n "); masalahKeperawatanList.add(((String) data[1])); } } @@ -2964,10 +2675,10 @@ public class ReportingController extends LocaleController } String skriningGizi = ""; - String pertanyaanSkriningGizi = ""; + StringBuilder pertanyaanSkriningGizi = new StringBuilder(); String skor = ""; int i = 0; - List listPertanyaan = new ArrayList(); + List listPertanyaan = new ArrayList<>(); for (Object[] data : papSkriningGizi) { if ((CommonUtil.isNotNullOrEmpty(data))) { @@ -2982,8 +2693,8 @@ public class ReportingController extends LocaleController + " kg Lingkar Kepala : " + lingkarKepala; if (!listPertanyaan.contains(((String) data[4]))) { i++; - pertanyaanSkriningGizi += i + ". " + pertanyaan + "\n Jawaban : " + jawaban + ", Nilai : " + nilai - + "\n "; + pertanyaanSkriningGizi.append(i).append(". ").append(pertanyaan).append("\n Jawaban : ") + .append(jawaban).append(", Nilai : ").append(nilai).append("\n "); listPertanyaan.add(((String) data[4])); } skor = totalSkor.toString(); @@ -3099,15 +2810,15 @@ public class ReportingController extends LocaleController + "\n 2. Risiko Jatuh : \n a. Apakah pernah jatuh dalam 3 bulan terakhir : " + pernahJatuh + "\n b. Apakah menggunakan alat bantu (tongkat, kursi roda, dll) : " + alatBantu; - String catatanPapDewasa = ""; + StringBuilder catatanPapDewasa = new StringBuilder(); // String lainnya = ""; for (Object[] data : papCatatan) { if ((CommonUtil.isNotNullOrEmpty(data))) { if (((Boolean) data[1])) { - catatanPapDewasa += "- " + ((String) data[0]) + "\n "; + catatanPapDewasa.append("- ").append(data[0]).append("\n "); - if ((CommonUtil.isNullOrEmpty(((String) data[0])))) { - catatanPapDewasa = ""; + if ((CommonUtil.isNullOrEmpty(data[0]))) { + catatanPapDewasa = new StringBuilder(); } // lainnya = "Lainnya : " + ((String) data[2]); } @@ -3158,23 +2869,41 @@ public class ReportingController extends LocaleController return m; } + private static String getString(List papRiwayatKesehatan) { + String riwayatKesehatan = ""; + for (Object[] data : papRiwayatKesehatan) { + String rawat = ""; + if (((Boolean) data[0])) { + rawat = "Ya"; + } + String alatImplan = ""; + if (((Boolean) data[1])) { + alatImplan = "Ya"; + } + String penyakitMayor = ""; + if (((Boolean) data[1])) { + penyakitMayor = "Ya"; + } + riwayatKesehatan = "Pernah dirawat : " + rawat + "\n Apakah terpasang alat implant : " + alatImplan + + "\n Apakah ada riwayat dalam keluarga yang memiliki penyakit mayor : " + penyakitMayor; + + } + return riwayatKesehatan; + } + @RequestMapping("/lapKlinikMata") public ModelAndView generateLapKlinikMata(ModelAndView m, @RequestParam(value = "format", required = false) String format, - - @RequestParam(value = "noCm", required = true) String noCm) { - - List klinikMataDtoList = new ArrayList(); - + @RequestParam(value = "noCm") String noCm) { + List klinikMataDtoList = new ArrayList<>(); KlinikMataDto klinikMataDto = new KlinikMataDto(); - Pasien pasien = pasienDao.findPasienByNoCm(noCm); - List klinikMata = new ArrayList(); - String visusMata = ""; - String KoreksiMata = ""; - String kacamataMata = ""; - String tonometriMata = ""; - String aplasnasiMata = ""; + List klinikMata = new ArrayList<>(); + StringBuilder visusMata = new StringBuilder(); + StringBuilder KoreksiMata = new StringBuilder(); + StringBuilder kacamataMata = new StringBuilder(); + StringBuilder tonometriMata = new StringBuilder(); + StringBuilder aplasnasiMata = new StringBuilder(); String streak = ""; String tglInput = ""; for (Object[] data : klinikMata) { @@ -3182,27 +2911,27 @@ public class ReportingController extends LocaleController String visus = ((String) data[0]); Boolean nilaiVisus = ((Boolean) data[1]); if (nilaiVisus) { - visusMata += " " + visus; + visusMata.append(" ").append(visus); } String koreksi = ((String) data[2]); Boolean nilaiKoreksi = ((Boolean) data[3]); if (nilaiKoreksi) { - KoreksiMata += " " + koreksi; + KoreksiMata.append(" ").append(koreksi); } String kacamata = ((String) data[4]); Boolean nilaiKacamata = ((Boolean) data[5]); if (nilaiKacamata) { - kacamataMata += " " + kacamata; + kacamataMata.append(" ").append(kacamata); } String tonometri = ((String) data[6]); Boolean nilaiTonometri = ((Boolean) data[7]); if (nilaiTonometri) { - tonometriMata += " " + tonometri; + tonometriMata.append(" ").append(tonometri); } String aplasnasi = ((String) data[8]); Boolean nilaiAplasnasi = ((Boolean) data[9]); if (nilaiAplasnasi) { - aplasnasiMata += " " + aplasnasi; + aplasnasiMata.append(" ").append(aplasnasi); } streak = ((String) data[10]); tglInput = ((String) data[11]); @@ -3210,11 +2939,11 @@ public class ReportingController extends LocaleController } } - klinikMataDto.setVisus(visusMata); - klinikMataDto.setKoreksi(KoreksiMata); - klinikMataDto.setTonometri(tonometriMata); - klinikMataDto.setAplasnasi(aplasnasiMata); - klinikMataDto.setKacamata(kacamataMata); + klinikMataDto.setVisus(visusMata.toString()); + klinikMataDto.setKoreksi(KoreksiMata.toString()); + klinikMataDto.setTonometri(tonometriMata.toString()); + klinikMataDto.setAplasnasi(aplasnasiMata.toString()); + klinikMataDto.setKacamata(kacamataMata.toString()); klinikMataDto.setNoCm(pasien.getNoCm()); klinikMataDto.setNamaPasien(pasien.getNamaPasien()); klinikMataDto.setTglLahir(pasien.getTglLahir().toString()); @@ -3234,11 +2963,10 @@ public class ReportingController extends LocaleController @RequestMapping("/lapPengkajianAwalNeonatus") public ModelAndView generateLapPengkajianNeonatus(ModelAndView m, - @RequestParam(value = "format", required = false) String format, - @RequestParam(value = "noCm", required = true) String noCm, - @RequestParam(value = "tglInput", required = true) String tglInput) { + @RequestParam(value = "format", required = false) String format, @RequestParam(value = "noCm") String noCm, + @RequestParam(value = "tglInput") String tglInput) { - List listDetailDto = new ArrayList(); + List listDetailDto = new ArrayList<>(); PengkajianAwalNeonatusDto dto = new PengkajianAwalNeonatusDto(); @@ -3294,15 +3022,13 @@ public class ReportingController extends LocaleController + nocmIbu + "\n Status Perkawinan : " + statusPerkawinan + "\n Ruang: " + namaRuangan + "\n Ditolong Oleh : " + ditolongOleh; } - } - } List papKelahiranTerdahulu = pengkajianAwalNeonatusDao.findByRiwayatKelahiranYangLalu(nocmIbu, tglInput); List alergiIbu = papAlergiDao.findPapAlergiByNoCm(nocmIbu); List riwayatKehamilanSekarang = pengkajianAwalNeonatusDao.findByRiwayatKehamilanYangSekarang(nocmIbu); - String kelahiranTerhadulu = ""; + StringBuilder kelahiranTerhadulu = new StringBuilder(); int number = 0; for (Object[] data : papKelahiranTerdahulu) { if ((CommonUtil.isNotNullOrEmpty(data))) { @@ -3315,20 +3041,17 @@ public class ReportingController extends LocaleController String penyakit = ((String) data[5]); String jenisPersalinan = ((String) data[6]); String keteranganLain = ((String) data[7]); - kelahiranTerhadulu += number + ". Tanggal kelahiran : " + tglTahunKelahiran + ", Jenis Kelamin : " - + jenisKelamin + ", Berat Badan Lahir : " + beratBadan + "\n Keadaan Bayi : " - + keadaanLahirBayi + ", Komplikasi Kehamilan/Kelahiran yang dialami : " + komplikasiKehamilan - + ",\n Penyakit Ketika Hamil : " + penyakit + ", Jenis Persalinan : " + jenisPersalinan - + "\n Keterangan : " + keteranganLain + "\n"; + kelahiranTerhadulu.append(number).append(". Tanggal kelahiran : ").append(tglTahunKelahiran) + .append(", Jenis Kelamin : ").append(jenisKelamin).append(", Berat Badan Lahir : ") + .append(beratBadan).append("\n Keadaan Bayi : ").append(keadaanLahirBayi) + .append(", Komplikasi Kehamilan/Kelahiran yang dialami : ").append(komplikasiKehamilan) + .append(",\n Penyakit Ketika Hamil : ").append(penyakit).append(", Jenis Persalinan : ") + .append(jenisPersalinan).append("\n Keterangan : ").append(keteranganLain).append("\n"); } - } - String alergi = ""; - String reaksi = ""; - // int alergiId = 0; - // String papalergi = ""; - // String ket = ""; + String alergi; + String reaksi; for (Object[] data : alergiIbu) { if ((CommonUtil.isNotNullOrEmpty(data))) { if ((Integer) data[2] == 1) { @@ -3340,10 +3063,6 @@ public class ReportingController extends LocaleController if (CommonUtil.isNullOrEmpty(reaksi)) { reaksi = ""; } - // alergiId = (Integer) data[2]; - // ket = ((String) data[3]); - // papalergi = alergi + ", yaitu " + ket + " Reaksi " + - // reaksi; } else if ((Integer) data[2] == 2) { alergi = ((String) data[0]); if (CommonUtil.isNullOrEmpty(alergi)) { @@ -3358,18 +3077,14 @@ public class ReportingController extends LocaleController // papalergi += "\n" + alergi + ", yaitu " + ket + " Reaksi // " + reaksi; } - - } - - else { - // papalergi = "Tidak ada alergi"; } + // papalergi = "Tidak ada alergi"; } - String kebutuhanEdukasi = ""; - String hambatanPembelajaran = ""; - List listHambatan = new ArrayList(); - List listEdukasi = new ArrayList(); + StringBuilder kebutuhanEdukasi = new StringBuilder(); + StringBuilder hambatanPembelajaran = new StringBuilder(); + List listHambatan = new ArrayList<>(); + List listEdukasi = new ArrayList<>(); for (Object[] data : papKebutuhanEdukasi) { if ((CommonUtil.isNotNullOrEmpty(data))) { @@ -3377,24 +3092,24 @@ public class ReportingController extends LocaleController String hambatan = ((String) data[1]); listHambatan.add(hambatan); - hambatanPembelajaran += "- " + hambatan + "\n "; + hambatanPembelajaran.append("- ").append(hambatan).append("\n "); } else if (!listEdukasi.contains((String) data[0])) { String edukasi = ((String) data[0]); listEdukasi.add(edukasi); - kebutuhanEdukasi += "- " + edukasi + "\n "; + kebutuhanEdukasi.append("- ").append(edukasi).append("\n "); } } else { - kebutuhanEdukasi = "Tidak ada"; - hambatanPembelajaran = "Tidak ada"; + kebutuhanEdukasi = new StringBuilder("Tidak ada"); + hambatanPembelajaran = new StringBuilder("Tidak ada"); } } - String masalahKeperawatan = ""; + StringBuilder masalahKeperawatan = new StringBuilder(); int num = 0; - List masalahKeperawatanList = new ArrayList(); + List masalahKeperawatanList = new ArrayList<>(); for (Object[] data : masalahkeperawatanDetail) { if ((CommonUtil.isNotNullOrEmpty(data))) { @@ -3412,8 +3127,9 @@ public class ReportingController extends LocaleController } if (!masalahKeperawatanList.contains(((String) data[1]))) { num++; - masalahKeperawatan += num + ". " + masalah + ", ditemukan pada tanggal : " + tglDitemukan - + " dan teratasi pada tanggal : " + tglteratasi + "\n "; + masalahKeperawatan.append(num).append(". ").append(masalah).append(", ditemukan pada tanggal : ") + .append(tglDitemukan).append(" dan teratasi pada tanggal : ").append(tglteratasi) + .append("\n "); masalahKeperawatanList.add(((String) data[1])); } } @@ -3501,22 +3217,20 @@ public class ReportingController extends LocaleController String keterangan = ((String) data[2]); pulang = "- " + penilaian + " : " + status + ", ket: " + keterangan + "\n"; } - String kelainan = ""; + StringBuilder kelainan = new StringBuilder(); String kehamilanyangSekarang = ""; - List kelainanList = new ArrayList(); + List kelainanList = new ArrayList<>(); for (Object[] data : riwayatKehamilanSekarang) { if (!kelainanList.contains(((String) data[3]))) { - kelainan += ((String) data[3]) + "\n"; + kelainan.append(data[3]).append("\n"); kelainanList.add(((String) data[3])); } - kehamilanyangSekarang = "GPA : " + ((String) data[0]) + "\nPemeriksaan Antenatal : " + ((String) data[1]) - + "\n" + ((String) data[2]) + "\nKelainan : " + kelainan + "\nFEOTAL DISTRESS : \n" + " FHR : " - + ((String) data[5]) + "\n FH : " + ((String) data[4]) + "\n FHR : " + ((String) data[6]) - + "\n Lilitan Tali Pusat : " + ((String) data[7]) + "\n Prolabs Umbicilus : " + ((String) data[8]) - + "\nPARTUS \n Tanggal : " + ((String) data[10]) + "\n Letak : " + ((String) data[11]) - + "\n Partus : " + ((String) data[9]) + "\nPLACENTA \n Berat : " + ((String) data[16]) - + "\n Keadaan : " + ((String) data[17]) + "\nTALI PUSAT \n Pembuluh Darah : " + ((String) data[13]) - + "\n Kelainan : " + ((String) data[18]); + kehamilanyangSekarang = "GPA : " + data[0] + "\nPemeriksaan Antenatal : " + data[1] + "\n" + data[2] + + "\nKelainan : " + kelainan + "\nFEOTAL DISTRESS : \n" + " FHR : " + data[5] + "\n FH : " + data[4] + + "\n FHR : " + data[6] + "\n Lilitan Tali Pusat : " + data[7] + "\n Prolabs Umbicilus : " + data[8] + + "\nPARTUS \n Tanggal : " + data[10] + "\n Letak : " + data[11] + "\n Partus : " + data[9] + + "\nPLACENTA \n Berat : " + data[16] + "\n Keadaan : " + data[17] + + "\nTALI PUSAT \n Pembuluh Darah : " + data[13] + "\n Kelainan : " + data[18]; } dataKebutuhanDasarSuster.setDetail("D. PEMERIKSAAN FISIK \n " + kebutuhanDasarPerawat); @@ -3556,13 +3270,12 @@ public class ReportingController extends LocaleController @RequestMapping("/lapLaboratorium") public ModelAndView generateLapLaboratorium(ModelAndView m, @RequestParam(value = "format", required = false) String format, - @RequestParam(value = "startDate", required = true) String startDate, - @RequestParam(value = "endDate", required = true) String endDate, + @RequestParam(value = "startDate") String startDate, @RequestParam(value = "endDate") String endDate, @RequestParam(value = "departemenId", required = false, defaultValue = "0") int departemenId, @RequestParam(value = "produkDetailId", required = false, defaultValue = "0") int produkDetailId) { - List listLabDto = new ArrayList(); - List listLaboratorium = new ArrayList(); + List listLabDto = new ArrayList<>(); + List listLaboratorium; if (departemenId == 0 && produkDetailId == 0) { listLaboratorium = laboratoriumDao.findListLaboratoriumAll(startDate, endDate); } else if (departemenId == 0) { @@ -3573,7 +3286,7 @@ public class ReportingController extends LocaleController listLaboratorium = laboratoriumDao.findListLaboratorium(startDate, endDate, departemenId, produkDetailId); } - List listLab = new ArrayList(); + List listLab = new ArrayList<>(); for (Object[] data : listLaboratorium) { String tglHasil = ((String) data[0]); String noLab = ((String) data[1]); @@ -3628,8 +3341,8 @@ public class ReportingController extends LocaleController @RequestMapping("/lapBilling") public ModelAndView generateLapBilling(ModelAndView m, @RequestParam(value = "format", required = false) String format, - @RequestParam(value = "noRegistrasi", required = true) String noRegistrasi, - @RequestParam(value = "X-AUTH-TOKEN", required = true) String token) { + @RequestParam(value = "noRegistrasi") String noRegistrasi, + @RequestParam(value = "X-AUTH-TOKEN") String token) { HeadKasirDto headKasirDto = reportService.generateBilling(noRegistrasi, token); m.addObject("noCm", headKasirDto.getNoCm()); @@ -3659,9 +3372,9 @@ public class ReportingController extends LocaleController @RequestMapping("/lapSPMRS") public ModelAndView generateLapSPMRS(ModelAndView m, @RequestParam(value = "format", required = false) String format, - @RequestParam(value = "noRegistrasi", required = true) String noRegistrasi) { + @RequestParam(value = "noRegistrasi") String noRegistrasi) { - List> listSpmrs = new ArrayList>(); + List> listSpmrs = new ArrayList<>(); Map spmrs = reportService.generateSPMRS(noRegistrasi); listSpmrs.add(spmrs); @@ -3674,9 +3387,9 @@ public class ReportingController extends LocaleController @RequestMapping("/lapCheckListProsedurKeselamatan") public ModelAndView generateLapCheckListProsedurKeselamatan(ModelAndView m, @RequestParam(value = "format", required = false) String format, - @RequestParam(value = "noRegistrasi", required = true) String noRegistrasi) { + @RequestParam(value = "noRegistrasi") String noRegistrasi) { - List listCheckList = new ArrayList(); + List listCheckList = new ArrayList<>(); List checkListProsedurKeselamatanPasien = checkListProsedurKeselamatanPasienDao .findCheckInByNoRegistrasi(noRegistrasi); List listPengobatanKhusus = checkListProsedurKeselamatanPasienDao @@ -3699,8 +3412,6 @@ public class ReportingController extends LocaleController .findListCheckOutKelengkapanByNoRegistrasi(noRegistrasi); List listCheckOutPemasangan = checkListProsedurKeselamatanPasienDao .findListCheckOutPemasanganByNoRegistrasi(noRegistrasi); - // List listDiagnosa = - // checkListProsedurKeselamatanPasienDao.findDiagnosaByNoRegistrasi(noRegistrasi); int beratBadan = 0; String namaPasien = ""; String noCm = ""; @@ -3715,12 +3426,12 @@ public class ReportingController extends LocaleController String td = ""; String n = ""; String rr = ""; - String pengobatanKhusus = ""; - String alatTerpasang = ""; + StringBuilder pengobatanKhusus = new StringBuilder(); + StringBuilder alatTerpasang = new StringBuilder(); for (Object[] data : checkListProsedurKeselamatanPasien) { if (CommonUtil.isNotNullOrEmpty(data)) { - if (CommonUtil.isNullOrEmpty((Integer) data[0])) { + if (CommonUtil.isNullOrEmpty(data[0])) { beratBadan = 0; } else { beratBadan = ((Integer) data[0]); @@ -3729,7 +3440,7 @@ public class ReportingController extends LocaleController noCm = ((String) data[2]); tglLahir = ((String) data[3]); namaRuangan = ((String) data[4]); - if (CommonUtil.isNullOrEmpty((Integer) data[5])) { + if (CommonUtil.isNullOrEmpty(data[5])) { tinggiBadan = 0; } else { tinggiBadan = ((Integer) data[5]); @@ -3737,7 +3448,7 @@ public class ReportingController extends LocaleController jenisKelamin = ((String) data[6]); puasa = ((String) data[7]); jenisOperasi = ((String) data[8]); - if (CommonUtil.isNullOrEmpty((Integer) data[9])) { + if (CommonUtil.isNullOrEmpty(data[9])) { minumTerakhir = 0; } else { minumTerakhir = ((Integer) data[9]); @@ -3752,8 +3463,8 @@ public class ReportingController extends LocaleController // Pengobatan Khusus for (Object[] data : listPengobatanKhusus) { if (CommonUtil.isNotNullOrEmpty(data)) { - if (((String) data[1]).equals("1")) { - pengobatanKhusus += "- " + ((String) data[0]) + "\n"; + if (data[1].equals("1")) { + pengobatanKhusus.append("- ").append(data[0]).append("\n"); } } } @@ -3761,7 +3472,7 @@ public class ReportingController extends LocaleController // Alat Terpasang for (Object[] data : listAlatTerpasang) { if (CommonUtil.isNotNullOrEmpty(data)) { - alatTerpasang += "-" + ((String) data[0]) + "\n"; + alatTerpasang.append("-").append(data[0]).append("\n"); } } @@ -3773,28 +3484,28 @@ public class ReportingController extends LocaleController + alatTerpasang; // Sign in - String pengobatanKhususSignIn = ""; - String konfirmasi = ""; + StringBuilder pengobatanKhususSignIn = new StringBuilder(); + StringBuilder konfirmasi = new StringBuilder(); for (Object[] data : listSignInPengobatanKhusus) { if (CommonUtil.isNotNullOrEmpty(data)) { String val = ((String) data[1]); if (val.equals("1")) { - pengobatanKhususSignIn += "- " + ((String) data[0]) + " : Ya\n"; + pengobatanKhususSignIn.append("- ").append(data[0]).append(" : Ya\n"); } } } for (Object[] data : listSignInKonfirmasi) { if (CommonUtil.isNotNullOrEmpty(data)) { - konfirmasi += "- " + ((String) data[0]) + "\n"; + konfirmasi.append("- ").append(data[0]).append("\n"); } } String signIn = "SIGN IN\n(Dilakukan sebelum induksi anestesi)\nKonfirmasi atau Verifikasi\n" + konfirmasi + pengobatanKhususSignIn; // Sign Out - String kelengkapanAlkes = ""; - String pemeriksaanJaringan = ""; + StringBuilder kelengkapanAlkes = new StringBuilder(); + StringBuilder pemeriksaanJaringan = new StringBuilder(); for (Object[] data : listSignOutPemeriksaanJaringan) { if (CommonUtil.isNotNullOrEmpty(data)) { Boolean status = ((Boolean) data[2]); @@ -3803,7 +3514,8 @@ public class ReportingController extends LocaleController if (status) { statusPemeriksaan = "Ya"; } - pemeriksaanJaringan += ((String) data[0]) + " : " + statusPemeriksaan + "\nKet : " + keterangan + "\n"; + pemeriksaanJaringan.append(data[0]).append(" : ").append(statusPemeriksaan).append("\nKet : ") + .append(keterangan).append("\n"); } } Boolean value = false; @@ -3812,7 +3524,8 @@ public class ReportingController extends LocaleController value = ((Boolean) data[0]); String keterangan = ((String) data[3]); String kelengkapan = ((String) data[2]); - kelengkapanAlkes += ((String) data[1]) + " : " + kelengkapan + "\nKet : " + keterangan + "\n"; + kelengkapanAlkes.append(data[1]).append(" : ").append(kelengkapan).append("\nKet : ").append(keterangan) + .append("\n"); } } String val = ""; @@ -3824,16 +3537,16 @@ public class ReportingController extends LocaleController + "Pemeriksaan jaringan atau cairan tubuh : \n" + pemeriksaanJaringan; // CheckOut - String kesadaranPasien = ""; - String kelengkapanPasien = ""; - String pemeriksaan = ""; - String pemasangan = ""; + StringBuilder kesadaranPasien = new StringBuilder(); + StringBuilder kelengkapanPasien = new StringBuilder(); + StringBuilder pemeriksaan = new StringBuilder(); + StringBuilder pemasangan = new StringBuilder(); String jam = ""; for (Object[] data : listCheckOutKesadaran) { if (CommonUtil.isNotNullOrEmpty(data)) { jam = ((String) data[0]); if (((Boolean) data[2])) { - kesadaranPasien += "\n" + ((String) data[1]); + kesadaranPasien.append("\n").append(data[1]); } } } @@ -3842,15 +3555,15 @@ public class ReportingController extends LocaleController if (CommonUtil.isNotNullOrEmpty(data)) { jam = ((String) data[0]); if (((Boolean) data[2])) { - kesadaranPasien += "\n" + ((String) data[1]); + kesadaranPasien.append("\n").append(data[1]); } } } for (Object[] data : listCheckOutKelengkapan) { if (CommonUtil.isNotNullOrEmpty(data)) { - if (((String) data[1]).equals("Ya")) { - kelengkapanPasien += "\n" + ((String) data[0]); + if (data[1].equals("Ya")) { + kelengkapanPasien.append("\n").append(data[0]); } } @@ -3858,8 +3571,8 @@ public class ReportingController extends LocaleController for (Object[] data : listCheckOutPemeriksaan) { if (CommonUtil.isNotNullOrEmpty(data)) { - if (((String) data[1]).equals("Ya")) { - pemeriksaan += "\n" + ((String) data[0]); + if (data[1].equals("Ya")) { + pemeriksaan.append("\n").append(data[0]); } } @@ -3867,8 +3580,8 @@ public class ReportingController extends LocaleController for (Object[] data : listCheckOutPemasangan) { if (CommonUtil.isNotNullOrEmpty(data)) { - if (((String) data[1]).equals("Ya")) { - pemasangan += "\n" + ((String) data[0]); + if (data[1].equals("Ya")) { + pemasangan.append("\n").append(data[0]); } } @@ -3938,12 +3651,12 @@ public class ReportingController extends LocaleController @RequestMapping("/lapKartuPemberitahuanPasienPulang") public ModelAndView generateKartuPemberitahuanPasienPulang(ModelAndView m, @RequestParam(value = "format", required = false) String format, - @RequestParam(value = "noRegistrasi", required = true) String noRegistrasi) { + @RequestParam(value = "noRegistrasi") String noRegistrasi) { KartuPengendaliPasienPulangDto dto = new KartuPengendaliPasienPulangDto(); - List dataSource = new ArrayList(); + List dataSource = new ArrayList<>(); List pasienPulang = diagnosaPasienDao.findDiagnosaPasien(noRegistrasi); - List listDiagnosa = new ArrayList(); + List listDiagnosa = new ArrayList<>(); String diagnosa = ""; for (Object[] data : pasienPulang) { String noReg = ((String) data[0]); @@ -3954,7 +3667,7 @@ public class ReportingController extends LocaleController String diagnosis = ((String) data[4]); if (listDiagnosa.size() > 0) { - diagnosis = ", " + ((String) data[4]); + diagnosis = ", " + data[4]; } diagnosa += diagnosis; listDiagnosa.add((String) data[4]); @@ -3981,15 +3694,12 @@ public class ReportingController extends LocaleController @RequestMapping("/lapBarcodeNoLab") public ModelAndView generateBarcodeNoLab(ModelAndView m, @RequestParam(value = "format", required = false) String format, - @RequestParam(value = "noLab", required = true) String noLab) { + @RequestParam(value = "noLab") String noLab) { - List dataSource = new ArrayList(); + List dataSource = new ArrayList<>(); BarcodelabDto dto = new BarcodelabDto(); String barcode1 = "000000019020"; String barcode2 = "000000019110"; - // List dataLab = laboratoriumDao.findListNoLab(noLab); - // List listData = new ArrayList(); - String keterangan = "L0000000190-20 Urin"; String detail = "00000320/Andri/2016-12-04/Laboratorium Patologi Klinik"; // String pemeriksaan = ""; @@ -4012,20 +3722,11 @@ public class ReportingController extends LocaleController @RequestMapping("/lapPerjanjianPasien") public ModelAndView generatePerjanjianPasien(ModelAndView m, - @RequestParam(value = "format", required = false) String format, - @RequestParam(value = "noCm", required = true) String noCm, - @RequestParam(value = "dokterId", required = true) Integer dokterId) { - - // List pasien = new ArrayList(); - + @RequestParam(value = "format", required = false) String format, @RequestParam(value = "noCm") String noCm, + @RequestParam(value = "dokterId") Integer dokterId) { PerjanjianPasienDto dto = new PerjanjianPasienDto(); - List listPerjanjianPasienDto = new ArrayList(); - // String nocm = ""; - // for (Object[] data : pasien) { - // nocm = ((String) data[0]); - // - // } - List papInstruksiPerjanjian = new ArrayList(); + List listPerjanjianPasienDto = new ArrayList<>(); + List papInstruksiPerjanjian = new ArrayList<>(); for (Object[] data : papInstruksiPerjanjian) { dto.setNamaPasien(((String) data[0])); dto.setNoCm(((String) data[1])); @@ -4046,14 +3747,14 @@ public class ReportingController extends LocaleController @RequestMapping("/lapBankDarah") public ModelAndView generateBankDarah(ModelAndView m, @RequestParam(value = "format", required = false) String format, - @RequestParam(value = "noOrder", required = true) String noOrder) { + @RequestParam(value = "noOrder") String noOrder) { List pasien = pelayananPasienDao.getByStrukOrderNoOrder(noOrder); BankDarahDto dto = new BankDarahDto(); - List listBankDarahDto = new ArrayList(); + List listBankDarahDto = new ArrayList<>(); for (Object[] data : pasien) { if (CommonUtil.isNotNullOrEmpty(data[0])) { - dto.setVolume(((Double) data[0]).toString()); + dto.setVolume(data[0].toString()); } dto.setNoKantung(((String) data[1])); dto.setNamaRuangan(((String) data[2])); @@ -4076,12 +3777,12 @@ public class ReportingController extends LocaleController @RequestMapping("/lapKartuPasienPulang") public ModelAndView generateKartuPasienPulang(ModelAndView m, @RequestParam(value = "format", required = false) String format, - @RequestParam(value = "noRegistrasi", required = true) String noRegistrasi, - @RequestParam(value = "X-AUTH-TOKEN", required = true) String token) { + @RequestParam(value = "noRegistrasi") String noRegistrasi, + @RequestParam(value = "X-AUTH-TOKEN") String token) { KartuPulangPasienDto kartuPulangPasienDto = reportService.generateKartuPasienPulang(noRegistrasi, token); - List listKartuPasien = new ArrayList(); + List listKartuPasien = new ArrayList<>(); listKartuPasien.add(kartuPulangPasienDto); Map resultPageMap = registrasiPelayananService.getDataPelayananDarah("0000001161"); @@ -4098,12 +3799,12 @@ public class ReportingController extends LocaleController @RequestMapping("/lapRekapPendapatanHarianPoliklinik") public ModelAndView generateRekapPendapatanHarianPoliklinik(ModelAndView m, @RequestParam(value = "format", required = false) String format, - @RequestParam(value = "noRegistrasi", required = true) String noRegistrasi, - @RequestParam(value = "X-AUTH-TOKEN", required = true) String token) { + @RequestParam(value = "noRegistrasi") String noRegistrasi, + @RequestParam(value = "X-AUTH-TOKEN") String token) { KartuPulangPasienDto kartuPulangPasienDto = reportService.generateKartuPasienPulang(noRegistrasi, token); - List listKartuPasien = new ArrayList(); + List listKartuPasien = new ArrayList<>(); listKartuPasien.add(kartuPulangPasienDto); m.addObject("dataSource", listKartuPasien); @@ -4115,9 +3816,9 @@ public class ReportingController extends LocaleController @RequestMapping("/lapHasilPemeriksaanLab") public ModelAndView generateHasilPemeriksaan(ModelAndView m, @RequestParam(value = "format", required = false) String format, - @RequestParam(value = "noLab", required = true) String noLab) { + @RequestParam(value = "noLab") String noLab) { - List dataSource = new ArrayList(); + List dataSource = new ArrayList<>(); // List listHasil = new ArrayList(); List dataLab = laboratoriumDao.findListNoLab(noLab); String noCm = ""; @@ -4161,7 +3862,7 @@ public class ReportingController extends LocaleController @RequestMapping("/lapKartuPengendali") public ModelAndView generateKartuPengendali(ModelAndView m, @RequestParam(value = "format", required = false) String format, - @RequestParam(value = "noRec", required = true) String noRec) { + @RequestParam(value = "noRec") String noRec) { KartuPengendaliDto kartuPengendaliDto = reportService.generateKartuPengendali(noRec); @@ -4199,10 +3900,10 @@ public class ReportingController extends LocaleController @RequestMapping("/lapHPS") public ModelAndView generateHps(ModelAndView m, @RequestParam(value = "format", required = false) String format, - @RequestParam(value = "noRec", required = true) String noRec) { + @RequestParam(value = "noRec") String noRec) { HPSDto hPSDto = reportService.generateHPS(noRec); - String tahun = new SimpleDateFormat("yyyy").format(hPSDto.getKartuPengendaliHeader().getTahun()).toString(); + String tahun = new SimpleDateFormat("yyyy").format(hPSDto.getKartuPengendaliHeader().getTahun()); m.addObject("dataSource", hPSDto.getKartuPengendaliDetail()); m.addObject("total", hPSDto.getKartuPengendaliHeader().getTotal() != null ? hPSDto.getKartuPengendaliHeader().getTotal().toString() : ""); @@ -4219,8 +3920,8 @@ public class ReportingController extends LocaleController @RequestMapping("/lapRincianBiayaSementara") public ModelAndView generateLapBiayaSementara(ModelAndView m, @RequestParam(value = "format", required = false) String format, - @RequestParam(value = "noRegistrasi", required = true) String noRegistrasi, - @RequestParam(value = "X-AUTH-TOKEN", required = true) String token) { + @RequestParam(value = "noRegistrasi") String noRegistrasi, + @RequestParam(value = "X-AUTH-TOKEN") String token) { HeadKasirDto headKasirDto = reportService.generateBilling(noRegistrasi, token); System.out.println(headKasirDto.getNoCm()); @@ -4250,10 +3951,9 @@ public class ReportingController extends LocaleController @RequestMapping("/lapCppt") public ModelAndView generateCppt(ModelAndView m, @RequestParam(value = "format", required = false) String format, - @RequestParam(value = "noCm", required = true) String noCm, - @RequestParam(value = "tglRegistrasi", required = true) String tglRegistrasi) { + @RequestParam(value = "noCm") String noCm, @RequestParam(value = "tglRegistrasi") String tglRegistrasi) { - List dataSource = new ArrayList(); + List dataSource = new ArrayList<>(); List dataSoap = reportingDao.findCppt(noCm, tglRegistrasi); @@ -4288,13 +3988,12 @@ public class ReportingController extends LocaleController @SuppressWarnings("unchecked") @RequestMapping("/lapResume") public ModelAndView generateResume(ModelAndView m, @RequestParam(value = "format", required = false) String format, - @RequestParam(value = "noCm", required = true) String noCm, - @RequestParam(value = "tglRegistrasi", required = true) String tglRegistrasi) { + @RequestParam(value = "noCm") String noCm, @RequestParam(value = "tglRegistrasi") String tglRegistrasi) { List> list = registrasiPelayananService.findPealyananRawatJalanByNoCmAndTglregistrasi(null, noCm, tglRegistrasi); List> pasienList = reportingDao.findMapPasienByNoCm(noCm); - Map pasien = new HashMap(); + Map pasien = new HashMap<>(); int indek = 0; for (Map temp : pasienList) { indek++; @@ -4332,8 +4031,8 @@ public class ReportingController extends LocaleController @RequestMapping("/lapSPS") public ModelAndView generateSPS(ModelAndView m, @RequestParam(value = "format", required = false) String format, - @RequestParam(value = "noRecKartuPengendaliId", required = true) String noRecKartuPengendaliId, - @RequestParam(value = "supplierId", required = true) Integer supplierId) { + @RequestParam(value = "noRecKartuPengendaliId") String noRecKartuPengendaliId, + @RequestParam(value = "supplierId") Integer supplierId) { SuratPesananSementaraDto sPSDto = reportService.generateSPS(noRecKartuPengendaliId, supplierId); m.addObject("dataSource", sPSDto.getDetailProduk()); @@ -4351,7 +4050,7 @@ public class ReportingController extends LocaleController @RequestMapping("/lapLampiranSPPH") public ModelAndView generateLampiranSPPH(ModelAndView m, @RequestParam(value = "format", required = false) String format, - @RequestParam(value = "noRec", required = true) String noRec) { + @RequestParam(value = "noRec") String noRec) { LampiranSPPHDto dto = reportService.generateLampiranSPPH(noRec); String noUsulan = dto.getKartuPengendaliHeader().getNoUsulan() != null @@ -4359,8 +4058,8 @@ public class ReportingController extends LocaleController String namaPengendali = dto.getKartuPengendaliHeader().getNamaPengendali() != null ? dto.getKartuPengendaliHeader().getNamaPengendali() : ""; Date tgl = dto.getKartuPengendaliHeader().getTanggalUsulan(); - String tahun = tgl != null ? new SimpleDateFormat("yyyy").format(tgl).toString() : ""; - String tanggal = tgl != null ? new SimpleDateFormat("dd-MM-yyyy").format(tgl).toString() : ""; + String tahun = tgl != null ? new SimpleDateFormat("yyyy").format(tgl) : ""; + String tanggal = tgl != null ? new SimpleDateFormat("dd-MM-yyyy").format(tgl) : ""; String pengadaan = dto.getPengadaan().getNamaPengadaan(); m.addObject("dataSource", dto.getKartuPengendaliDetail()); m.addObject("total", dto.getKartuPengendaliHeader().getTotal() != null @@ -4382,17 +4081,14 @@ public class ReportingController extends LocaleController @RequestMapping("/lapSPPHBarangUmum") public ModelAndView generateSPPHBarangUmum(ModelAndView m, @RequestParam(value = "format", required = false) String format, - @RequestParam(value = "noRec", required = true) String noRec) { + @RequestParam(value = "noRec") String noRec) { LampiranSPPHDto dto = reportService.generateLampiranSPPH(noRec); String noUsulan = dto.getKartuPengendaliHeader().getNoUsulan() != null ? dto.getKartuPengendaliHeader().getNoUsulan() : ""; - // String namaPengendali = - // dto.getKartuPengendaliHeader().getNamaPengendali() != null - // ? dto.getKartuPengendaliHeader().getNamaPengendali() : ""; Date tgl = dto.getKartuPengendaliHeader().getTanggalUsulan(); - String tahun = tgl != null ? new SimpleDateFormat("yyyy").format(tgl).toString() : ""; - String tanggal = tgl != null ? new SimpleDateFormat("dd-MM-yyyy").format(tgl).toString() : ""; + String tahun = tgl != null ? new SimpleDateFormat("yyyy").format(tgl) : ""; + String tanggal = tgl != null ? new SimpleDateFormat("dd-MM-yyyy").format(tgl) : ""; String pengadaan = dto.getPengadaan().getNamaPengadaan(); m.addObject("dataSource", dto.getKartuPengendaliDetail()); m.addObject("total", dto.getKartuPengendaliHeader().getTotal() != null @@ -4409,17 +4105,14 @@ public class ReportingController extends LocaleController @RequestMapping("/lapSPPHBarangMedis") public ModelAndView generateSPPHBarangMedis(ModelAndView m, @RequestParam(value = "format", required = false) String format, - @RequestParam(value = "noRec", required = true) String noRec) { + @RequestParam(value = "noRec") String noRec) { LampiranSPPHDto dto = reportService.generateLampiranSPPH(noRec); String noUsulan = dto.getKartuPengendaliHeader().getNoUsulan() != null ? dto.getKartuPengendaliHeader().getNoUsulan() : ""; - // String namaPengendali = - // dto.getKartuPengendaliHeader().getNamaPengendali() != null - // ? dto.getKartuPengendaliHeader().getNamaPengendali() : ""; Date tgl = dto.getKartuPengendaliHeader().getTanggalUsulan(); - String tahun = tgl != null ? new SimpleDateFormat("yyyy").format(tgl).toString() : ""; - String tanggal = tgl != null ? new SimpleDateFormat("dd-MM-yyyy").format(tgl).toString() : ""; + String tahun = tgl != null ? new SimpleDateFormat("yyyy").format(tgl) : ""; + String tanggal = tgl != null ? new SimpleDateFormat("dd-MM-yyyy").format(tgl) : ""; String pengadaan = dto.getPengadaan().getNamaPengadaan(); m.addObject("dataSource", dto.getKartuPengendaliDetail()); m.addObject("total", dto.getKartuPengendaliHeader().getTotal() != null @@ -4436,17 +4129,14 @@ public class ReportingController extends LocaleController @RequestMapping("/lapSPPHPekerjaan") public ModelAndView generateSPPHPekerjaan(ModelAndView m, @RequestParam(value = "format", required = false) String format, - @RequestParam(value = "noRec", required = true) String noRec) { + @RequestParam(value = "noRec") String noRec) { LampiranSPPHDto dto = reportService.generateLampiranSPPH(noRec); String noUsulan = dto.getKartuPengendaliHeader().getNoUsulan() != null ? dto.getKartuPengendaliHeader().getNoUsulan() : ""; - // String namaPengendali = - // dto.getKartuPengendaliHeader().getNamaPengendali() != null - // ? dto.getKartuPengendaliHeader().getNamaPengendali() : ""; Date tgl = dto.getKartuPengendaliHeader().getTanggalUsulan(); - String tahun = tgl != null ? new SimpleDateFormat("yyyy").format(tgl).toString() : ""; - String tanggal = tgl != null ? new SimpleDateFormat("dd-MM-yyyy").format(tgl).toString() : ""; + String tahun = tgl != null ? new SimpleDateFormat("yyyy").format(tgl) : ""; + String tanggal = tgl != null ? new SimpleDateFormat("dd-MM-yyyy").format(tgl) : ""; String pengadaan = dto.getPengadaan().getNamaPengadaan(); m.addObject("dataSource", dto.getKartuPengendaliDetail()); m.addObject("total", dto.getKartuPengendaliHeader().getTotal() != null @@ -4464,57 +4154,32 @@ public class ReportingController extends LocaleController @RequestMapping("/lapKunjunganBdsRuanganJenisPasienStatus") public ModelAndView generateLapKunjunganBdsRuanganStatusDanJenisPasien(ModelAndView m, @RequestParam(value = "format", required = false) String format, - @RequestParam(value = "startDate", required = true) String startDate, - @RequestParam(value = "endDate", required = true) String endDate) { + @RequestParam(value = "startDate") String startDate, @RequestParam(value = "endDate") String endDate) { // Map map = new HashMap(); String month = (formatBulan(Integer.valueOf(new SimpleDateFormat("MM").format(new Date())))); - String monthFirstCaplock = Character.toString(month.charAt(0)).toUpperCase() + month.substring(1); - // String monthAllCaplock = month.toUpperCase(); - List listKunjunganPasienStatusDanJenisPasienDto = new ArrayList(); + String monthFirstCapslock = Character.toString(month.charAt(0)).toUpperCase() + month.substring(1); + // String monthAllCapslock = month.toUpperCase(); + List listKunjunganPasienStatusDanJenisPasienDto = new ArrayList<>(); List listStatusPasien = reportingPelayananRekamMedisService .findAntrianPasienDiperiksaStatusPasien(startDate, endDate); for (Object[] data : listStatusPasien) { - String tglRegistrasi = ((String) data[1]); - String ruangan = ((String) data[2]); - String statusPasien = ((String) data[3]); - String jenisKelamin = ((String) data[4]); - String judul = ((String) data[5]); - String noRegistrasi = ((String) data[0]); - KunjunganPasienStatusDanJenisPasienDto2 abc = new KunjunganPasienStatusDanJenisPasienDto2(); - abc.setJudul(judul); - abc.setDetailJudul(statusPasien); - abc.setNoRegistrasi(noRegistrasi); - abc.setRuangan(ruangan); - abc.setTglRegistrasi(tglRegistrasi); - abc.setJenisKelamin(jenisKelamin); + KunjunganPasienStatusDanJenisPasienDto2 abc = getKunjunganPasienStatusDanJenisPasienDto2(data); listKunjunganPasienStatusDanJenisPasienDto.add(abc); } List listKelompokPasien = reportingPelayananRekamMedisService .findAntrianPasienDiperiksaKelompokPasien(startDate, endDate); for (Object[] data : listKelompokPasien) { - String tglRegistrasi = ((String) data[1]); - String ruangan = ((String) data[2]); - String kelompokPasien = ((String) data[3]); - String jenisKelamin = ((String) data[4]); - String judul = ((String) data[5]); - String noRegistrasi = ((String) data[0]); - KunjunganPasienStatusDanJenisPasienDto2 abc = new KunjunganPasienStatusDanJenisPasienDto2(); - abc.setJudul(judul); - abc.setDetailJudul(kelompokPasien); - abc.setNoRegistrasi(noRegistrasi); - abc.setRuangan(ruangan); - abc.setTglRegistrasi(tglRegistrasi); - abc.setJenisKelamin(jenisKelamin); + KunjunganPasienStatusDanJenisPasienDto2 abc = getKunjunganPasienStatusDanJenisPasienDto2(data); listKunjunganPasienStatusDanJenisPasienDto.add(abc); } m.addObject("dataSource", listKunjunganPasienStatusDanJenisPasienDto); m.addObject("startDate", startDate); m.addObject("endDate", endDate); - m.addObject("tanggalReport", (new SimpleDateFormat("dd").format(new Date())) + " " + monthFirstCaplock + " " - + (new SimpleDateFormat("YYYY").format(new Date()))); + m.addObject("tanggalReport", (new SimpleDateFormat("dd").format(new Date())) + " " + monthFirstCapslock + " " + + (new SimpleDateFormat("yyyy").format(new Date()))); m.addObject("format", "pdf"); if (format != null && !format.isEmpty()) { @@ -4667,8 +4332,8 @@ public class ReportingController extends LocaleController @RequestParam(value = "endDate", required = false) String endDate, @RequestParam(value = "unitKerja", required = false) Integer unitKerja, @RequestParam(value = "subUnitKerja", required = false) Integer subUnitKerja) { - List> listkehadiran = new ArrayList>(); - Map kehadiran = new HashMap(); + List> listkehadiran = new ArrayList<>(); + Map kehadiran = new HashMap<>(); if (CommonUtil.isNotNullOrEmpty(subUnitKerja) && CommonUtil.isNullOrEmpty(idPegawai)) { List listIdPegawaiFilter = new ArrayList<>(); @@ -4739,7 +4404,7 @@ public class ReportingController extends LocaleController @RequestParam(value = "idPegawai", required = false) Integer idPegawai, @RequestParam(value = "periode", required = false) String periode) { Map result = reportService.generateSlipPenghasilan(idPegawai, periode); - List> list = new ArrayList>(); + List> list = new ArrayList<>(); list.add(result); m.addObject("dataSource", list); m.addObject("format", "pdf"); @@ -4843,9 +4508,8 @@ public class ReportingController extends LocaleController jenisProdukId, produkId); Map header = (Map) result.get("header"); - String periode = ""; - periode = header.get("tanggalAwal") == null ? "" : (String) header.get("tanggalAwal"); - periode = periode + (header.get("tanggalAhir") == null ? "" : " s.d " + (String) header.get("tanggalAhir")); + String periode = header.get("tanggalAwal") == null ? "" : (String) header.get("tanggalAwal"); + periode = periode + (header.get("tanggalAhir") == null ? "" : " s.d " + header.get("tanggalAhir")); m.addObject("dataSource", result.get("data")); m.addObject("produk", header.get("produk")); m.addObject("kelompokProduk", header.get("kelompokProduk")); @@ -4876,7 +4540,7 @@ public class ReportingController extends LocaleController Map header = (Map) result.get("header"); String periode = header.get("tanggalAwal") == null ? "" : (String) header.get("tanggalAwal"); - periode = periode + (header.get("tanggalAhir") == null ? "" : " sd " + (String) header.get("tanggalAhir")); + periode = periode + (header.get("tanggalAhir") == null ? "" : " sd " + header.get("tanggalAhir")); m.addObject("dataSource", result.get("data")); m.addObject("produk", header.get("produk")); m.addObject("kelompokProduk", header.get("kelompokProduk")); @@ -4907,7 +4571,7 @@ public class ReportingController extends LocaleController Map header = (Map) result.get("header"); String periode = header.get("tanggalAwal") == null ? "" : (String) header.get("tanggalAwal"); - periode = periode + (header.get("tanggalAhir") == null ? "" : " sd " + (String) header.get("tanggalAhir")); + periode = periode + (header.get("tanggalAhir") == null ? "" : " sd " + header.get("tanggalAhir")); m.addObject("dataSource", result.get("data")); m.addObject("produk", header.get("produk")); m.addObject("kelompokProduk", header.get("kelompokProduk")); @@ -4939,7 +4603,7 @@ public class ReportingController extends LocaleController Map header = (Map) result.get("header"); String periode = header.get("tanggalAwal") == null ? "" : (String) header.get("tanggalAwal"); - periode = periode + (header.get("tanggalAhir") == null ? "" : " sd " + (String) header.get("tanggalAhir")); + periode = periode + (header.get("tanggalAhir") == null ? "" : " sd " + header.get("tanggalAhir")); m.addObject("dataSource", result.get("data")); m.addObject("produk", header.get("produk")); m.addObject("kelompokProduk", header.get("kelompokProduk")); @@ -5005,42 +4669,41 @@ public class ReportingController extends LocaleController @RequestMapping("/lapSuratPernyataan") public ModelAndView generateLapAgingSchedulePiutang(ModelAndView m, @RequestParam(value = "format", required = false) String format, - @RequestParam(value = "noRegistrasi", required = true) String noRegistrasi) { + @RequestParam(value = "noRegistrasi") String noRegistrasi) { Map result = penanggungJawabPasienService.ambilSuratPernyataanPerNoRegistrasi(noRegistrasi); - Map penanggungJawab = new HashMap(); + Map penanggungJawab = new HashMap<>(); String alamatPj = ""; String alamatRelasi = ""; - String alamatPasien = ""; - Map relasi = new HashMap(); + String alamatPasien; + Map relasi = new HashMap<>(); for (Map data : (List>) result.get("penanggungJawab")) { - String ttLahir = ""; + String ttLahir; if (CommonUtil.isNotNullOrEmpty(data.get("keterangan"))) { - ttLahir = data.get("tempatLahir") != null ? (String) data.get("tempatLahir") - : "" + data.get("tglLahir") != null ? ", " + (String) data.get("tglLahir") : ""; - if (((String) data.get("keterangan")).equals("Penanggungjawab")) { - alamatPj = (data.get("alamatLengkap") != null ? "Jln " + (String) data.get("alamatLengkap") : "") - + (data.get("desaKelurahan") != null ? ", Kelurahan " + (String) data.get("desaKelurahan") - : "") - + (data.get("rtrw") != null ? ", RT/RW " + (String) data.get("rtrw") : "") - + (data.get("kecamatan") != null ? ", Kecamatan " + (String) data.get("kecamatan") : "") - + (data.get("kotaKabupaten") != null ? ", Kota/Kab " + (String) data.get("kotaKabupaten") - : "") - + (data.get("propinsi") != null ? ", Provinsi " + (String) data.get("propinsi") : ""); + if (data.get("tempatLahir") != null) { + ttLahir = (String) data.get("tempatLahir"); + } else { + data.get("tglLahir"); + ttLahir = ", " + data.get("tglLahir"); + } + if (data.get("keterangan").equals("Penanggungjawab")) { + alamatPj = (data.get("alamatLengkap") != null ? "Jln " + data.get("alamatLengkap") : "") + + (data.get("desaKelurahan") != null ? ", Kelurahan " + data.get("desaKelurahan") : "") + + (data.get("rtrw") != null ? ", RT/RW " + data.get("rtrw") : "") + + (data.get("kecamatan") != null ? ", Kecamatan " + data.get("kecamatan") : "") + + (data.get("kotaKabupaten") != null ? ", Kota/Kab " + data.get("kotaKabupaten") : "") + + (data.get("propinsi") != null ? ", Provinsi " + data.get("propinsi") : ""); penanggungJawab = data; penanggungJawab.put("ttLahir", ttLahir); - } else if (((String) data.get("keterangan")).equals("Relasi")) { - alamatRelasi = (data.get("alamatLengkap") != null ? "Jln " + (String) data.get("alamatLengkap") - : "") - + (data.get("desaKelurahan") != null ? ", Kelurahan " + (String) data.get("desaKelurahan") - : "") - + (data.get("rtrw") != null ? ", RT/RW " + (String) data.get("rtrw") : "") - + (data.get("kecamatan") != null ? ", Kecamatan " + (String) data.get("kecamatan") : "") - + (data.get("kotaKabupaten") != null ? ", Kota/Kab " + (String) data.get("kotaKabupaten") - : "") - + (data.get("propinsi") != null ? ", Provinsi " + (String) data.get("propinsi") : ""); + } else if (data.get("keterangan").equals("Relasi")) { + alamatRelasi = (data.get("alamatLengkap") != null ? "Jln " + data.get("alamatLengkap") : "") + + (data.get("desaKelurahan") != null ? ", Kelurahan " + data.get("desaKelurahan") : "") + + (data.get("rtrw") != null ? ", RT/RW " + data.get("rtrw") : "") + + (data.get("kecamatan") != null ? ", Kecamatan " + data.get("kecamatan") : "") + + (data.get("kotaKabupaten") != null ? ", Kota/Kab " + data.get("kotaKabupaten") : "") + + (data.get("propinsi") != null ? ", Provinsi " + data.get("propinsi") : ""); relasi = data; relasi.put("ttLahir", ttLahir); } @@ -5049,21 +4712,24 @@ public class ReportingController extends LocaleController // pasien Map pasien = (Map) result.get("pasien"); - String ttLahirPasien = pasien.get("tempatLahir") != null ? (String) pasien.get("tempatLahir") - : "" + pasien.get("tglLahir") != null ? ", " + (String) pasien.get("tglLahir") : ""; + String ttLahirPasien; + if (pasien.get("tempatLahir") != null) { + ttLahirPasien = (String) pasien.get("tempatLahir"); + } else { + pasien.get("tglLahir"); + ttLahirPasien = ", " + pasien.get("tglLahir"); + } // alamatPasien Map mapAlamatPasien = (Map) result.get("alamatPasien"); - alamatPasien = (mapAlamatPasien.get("alamatLengkap") != null - ? "Jln " + (String) mapAlamatPasien.get("alamatLengkap") : "") - + (mapAlamatPasien.get("desaKelurahan") != null - ? ", Kelurahan " + (String) mapAlamatPasien.get("desaKelurahan") : "") - + (mapAlamatPasien.get("rtrw") != null ? ", RT/RW " + (String) mapAlamatPasien.get("rtrw") : "") - + (mapAlamatPasien.get("kecamatan") != null ? ", Kecamatan " + (String) mapAlamatPasien.get("kecamatan") + alamatPasien = (mapAlamatPasien.get("alamatLengkap") != null ? "Jln " + mapAlamatPasien.get("alamatLengkap") + : "") + + (mapAlamatPasien.get("desaKelurahan") != null ? ", Kelurahan " + mapAlamatPasien.get("desaKelurahan") : "") - + (mapAlamatPasien.get("kotaKabupaten") != null - ? ", Kota/Kab " + (String) mapAlamatPasien.get("kotaKabupaten") : "") - + (mapAlamatPasien.get("propinsi") != null ? ", Provinsi " + (String) mapAlamatPasien.get("propinsi") - : ""); + + (mapAlamatPasien.get("rtrw") != null ? ", RT/RW " + mapAlamatPasien.get("rtrw") : "") + + (mapAlamatPasien.get("kecamatan") != null ? ", Kecamatan " + mapAlamatPasien.get("kecamatan") : "") + + (mapAlamatPasien.get("kotaKabupaten") != null ? ", Kota/Kab " + mapAlamatPasien.get("kotaKabupaten") + : "") + + (mapAlamatPasien.get("propinsi") != null ? ", Provinsi " + mapAlamatPasien.get("propinsi") : ""); // Biaya Map biaya = (Map) result.get("strukPelayanan"); @@ -5116,22 +4782,20 @@ public class ReportingController extends LocaleController @RequestMapping("/lapResepApotek") public ModelAndView generateLapResepApotek(ModelAndView m, @RequestParam(value = "format", required = false) String format, - @RequestParam(value = "noOrder", required = true) String noOrder) { + @RequestParam(value = "noOrder") String noOrder) { Map result = pelayananObatService.getOrderPelayanan3(noOrder); List> orders = (List>) result.get("orders"); - List> dataSources = new ArrayList>(); - Map strukOrder = new HashMap(); + List> dataSources = new ArrayList<>(); + Map strukOrder; for (Map data : orders) { - Map order = new HashMap(); + Map order = new HashMap<>(); order.put("namaProduk", ((Map) data.get("produk")).get("namaProduk")); order.put("keteranganPakai", ((Map) data.get("keteranganPakai")).get("name")); if (CommonUtil.isNotNullOrEmpty(data.get("jumlah"))) { - order.put("jumlah", ((Double) data.get("jumlah")).toString()); + order.put("jumlah", data.get("jumlah").toString()); } strukOrder = (Map) data.get("strukOrder"); - // Map nocm = (Map) - // strukOrder.get("noCm"); order.put("namaPasien", ((Map) strukOrder.get("noCm")).get("namaPasien")); dataSources.add(order); } @@ -5150,18 +4814,18 @@ public class ReportingController extends LocaleController @RequestMapping("/lapKwitansiResep") public ModelAndView generateLapKwitansiResep(ModelAndView m, @RequestParam(value = "format", required = false) String format, - @RequestParam(value = "noOrder", required = true) String noOrder) { + @RequestParam(value = "noOrder") String noOrder) { Map result = pelayananObatService.getOrderPelayanan3(noOrder); List> orders = (List>) result.get("orders"); - List> dataSources = new ArrayList>(); - Map strukOrder = new HashMap(); - Map nocm = new HashMap(); - Double total = 0.0; + List> dataSources = new ArrayList<>(); + Map strukOrder = new HashMap<>(); + Map nocm = new HashMap<>(); + double total = 0.0; for (Map data : orders) { Double hargaJual = 0.0; Double jumlah = 0.0; - Map order = new HashMap(); + Map order = new HashMap<>(); if (CommonUtil.isNotNullOrEmpty(data.get("jumlah"))) { jumlah = (Double) data.get("jumlah"); } @@ -5171,13 +4835,13 @@ public class ReportingController extends LocaleController total += (jumlah * hargaJual); strukOrder = (Map) data.get("strukOrder"); String qty = jumlah.toString(); - order.put("jumlah", "" + qty.substring(0, qty.length() - 2)); + order.put("jumlah", qty.substring(0, qty.length() - 2)); order.put("namaProduk", ((Map) data.get("produk")).get("namaProduk")); dataSources.add(order); nocm = (Map) strukOrder.get("noCm"); } Map ruangan = (Map) strukOrder.get("ruangan"); - String terbilang = IndonesianNumberToWords.convert(total.longValue()); + String terbilang = IndonesianNumberToWords.convert((long) total); m.addObject("dataSource", dataSources); m.addObject("noKwitansi", noOrder); @@ -5198,14 +4862,13 @@ public class ReportingController extends LocaleController @RequestMapping("/lapDataUangMakanPegawai") public ModelAndView generateLapDataInventarisRuangan(ModelAndView m, @RequestParam(value = "format", required = false) String format, - @RequestParam(value = "detailPegawai", required = true) Integer detailPegawai, - @RequestParam(value = "periode", required = true) String periode) { + @RequestParam(value = "detailPegawai") Integer detailPegawai, + @RequestParam(value = "periode") String periode) { List result = payRollReportingService.reportUangMakan(detailPegawai, periode); - List> listPegawai = new ArrayList>(); + List> listPegawai = new ArrayList<>(); - for (int i = 0; i < result.size(); i++) { - PayRollReportUangMakanDto dto = result.get(i); + for (PayRollReportUangMakanDto dto : result) { listPegawai = dto.getListPegawai(); m.addObject("bulanHeader", dto.getBulanHeader()); m.addObject("aktifitasBulanHeader", dto.getAktifitasBulanHeader()); @@ -5230,11 +4893,11 @@ public class ReportingController extends LocaleController @RequestMapping("/lapKwitansiDeposit") public ModelAndView generateLapKwitansiDeposit(ModelAndView m, @RequestParam(value = "format", required = false) String format, - @RequestParam(value = "noSBM", required = true) String noSBM) { + @RequestParam(value = "noSBM") String noSBM) { Map result = reportingDao.findPembayaranDeposit(noSBM); - List> listResult = new ArrayList>(); + List> listResult = new ArrayList<>(); if (CommonUtil.isNotNullOrEmpty(result)) { if (CommonUtil.isNullOrEmpty(result.get("pembayar"))) { @@ -5265,26 +4928,26 @@ public class ReportingController extends LocaleController @RequestMapping("/lapKwitansiCicilan") public ModelAndView generateLapKwitansiCicilan(ModelAndView m, @RequestParam(value = "format", required = false) String format, - @RequestParam(value = "noSBM", required = true) String noSBM) { + @RequestParam(value = "noSBM") String noSBM) { Map result = reportingDao.findPembayaranCicilan(noSBM); - List> listResult = new ArrayList>(); + List> listResult = new ArrayList<>(); if (CommonUtil.isNotNullOrEmpty(result)) { if (CommonUtil.isNullOrEmpty(result.get("pembayar"))) { result.put("pembayar", result.get("namaPasien")); } if (CommonUtil.isNotNullOrEmpty(result.get("piutangAwal"))) { - Double piutangAwal = ((BigDecimal) result.get("piutangAwal")).doubleValue(); + double piutangAwal = ((BigDecimal) result.get("piutangAwal")).doubleValue(); result.put("piutangAwal", CurrencyUtil.getPriceInINA(piutangAwal)); } if (CommonUtil.isNotNullOrEmpty(result.get("totalCicilan"))) { - Double totalCicilan = ((BigDecimal) result.get("totalCicilan")).doubleValue(); + double totalCicilan = ((BigDecimal) result.get("totalCicilan")).doubleValue(); result.put("totalCicilan", CurrencyUtil.getPriceInINA(totalCicilan)); } if (CommonUtil.isNotNullOrEmpty(result.get("sisaPiutang"))) { - Double sisaPiutang = ((BigDecimal) result.get("sisaPiutang")).doubleValue(); + double sisaPiutang = ((BigDecimal) result.get("sisaPiutang")).doubleValue(); result.put("sisaPiutang", CurrencyUtil.getPriceInINA(sisaPiutang)); } Double total = 0.0; @@ -5313,8 +4976,8 @@ public class ReportingController extends LocaleController @RequestMapping("/lapBuktiKas") public ModelAndView generateBuktiKas(ModelAndView m, @RequestParam(value = "format", required = false) String format, - @RequestParam(value = "noStruk", required = true) String noStruk) { - List> listResult = new ArrayList>(); + @RequestParam(value = "noStruk") String noStruk) { + List> listResult = new ArrayList<>(); Map result = reportingPelayananRekamMedisService.reportBukuKas(noStruk); if (CommonUtil.isNotNullOrEmpty(result)) { listResult.add(result); @@ -5333,8 +4996,8 @@ public class ReportingController extends LocaleController @RequestMapping("/lapKwitansiUmum") public ModelAndView generateKwitansiUmum(ModelAndView m, @RequestParam(value = "format", required = false) String format, - @RequestParam(value = "noSbm", required = true) String noSbm) { - List> listResult = new ArrayList>(); + @RequestParam(value = "noSbm") String noSbm) { + List> listResult = new ArrayList<>(); Map result = reportingPelayananRekamMedisService.reportKwitansiUmum(noSbm); if (CommonUtil.isNotNullOrEmpty(result)) { listResult.add(result); @@ -5353,8 +5016,8 @@ public class ReportingController extends LocaleController @RequestMapping("/lapKwitansiPengeluaran") public ModelAndView generateKwitansiPengeluaran(ModelAndView m, @RequestParam(value = "format", required = false) String format, - @RequestParam(value = "noSbk", required = true) String noSbk) { - List> listResult = new ArrayList>(); + @RequestParam(value = "noSbk") String noSbk) { + List> listResult = new ArrayList<>(); Map result = reportingPelayananRekamMedisService.reportKwitansiPengeluaran(noSbk); if (CommonUtil.isNotNullOrEmpty(result)) { listResult.add(result); @@ -5372,9 +5035,7 @@ public class ReportingController extends LocaleController @RequestMapping("/lapStrukLaundry") public ModelAndView generateStrukLaundry(ModelAndView m, @RequestParam(value = "format", required = false) String format, - @RequestParam(value = "noRecStrukPelayanan", required = true) String noRecStrukPelayanan) { - // List> listResult = new ArrayList>(); + @RequestParam(value = "noRecStrukPelayanan") String noRecStrukPelayanan) { Map result = laundryService.getStrukOrderExternal(noRecStrukPelayanan); m.addObject("dataSource", result.get("produkLinens")); @@ -5404,7 +5065,7 @@ public class ReportingController extends LocaleController @RequestParam(value = "format", required = false) String format, @RequestParam(value = "kdPap", required = false) String kdPap, @RequestParam(value = "noRec", required = false) String noRec) { - List> listResult = new ArrayList>(); + List> listResult = new ArrayList<>(); Map pasien = reportingDao.findPasienByNoRegistrasi(noRec); Map result = reportService.pengkajianAwalNeonatusRawatJalan(kdPap, noRec); result.putAll(pasien); @@ -5425,7 +5086,7 @@ public class ReportingController extends LocaleController @RequestParam(value = "format", required = false) String format, @RequestParam(value = "kdPap", required = false) String kdPap, @RequestParam(value = "noRec", required = false) String noRec) { - List> listResult = new ArrayList>(); + List> listResult = new ArrayList<>(); Map pasien = reportingDao.findPasienByNoRegistrasi(noRec); Map result = reportService.pengkajianAwalNeonatusRawatInap(kdPap, noRec); result.putAll(pasien); @@ -5446,7 +5107,7 @@ public class ReportingController extends LocaleController @RequestParam(value = "format", required = false) String format, @RequestParam(value = "kdPap", required = false) String kdPap, @RequestParam(value = "noRec", required = false) String noRec) { - List> listResult = new ArrayList>(); + List> listResult = new ArrayList<>(); Map pasien = reportingDao.findPasienByNoRegistrasi(noRec); Map result = reportService.pengkajianAwalAnakRawatJalan(kdPap, noRec); result.putAll(pasien); @@ -5466,7 +5127,7 @@ public class ReportingController extends LocaleController @RequestParam(value = "format", required = false) String format, @RequestParam(value = "kdPap", required = false) String kdPap, @RequestParam(value = "noRec", required = false) String noRec) { - List> listResult = new ArrayList>(); + List> listResult = new ArrayList<>(); Map pasien = reportingDao.findPasienByNoRegistrasi(noRec); Map result = reportService.pengkajianAwalDewasaRawatJalan(kdPap, noRec); result.putAll(pasien); @@ -5487,7 +5148,7 @@ public class ReportingController extends LocaleController @RequestParam(value = "format", required = false) String format, @RequestParam(value = "kdPap", required = false) String kdPap, @RequestParam(value = "noRec", required = false) String noRec) { - List> listResult = new ArrayList>(); + List> listResult = new ArrayList<>(); Map pasien = reportingDao.findPasienByNoRegistrasi(noRec); Map result = reportService.pengkajianAwalAnakRawatInap(kdPap, noRec); result.putAll(pasien); @@ -5507,7 +5168,7 @@ public class ReportingController extends LocaleController public ModelAndView generatePengkajianAwalDewasaRawatJalan(ModelAndView m, @RequestParam(value = "format", required = false) String format, @RequestParam(value = "noRec", required = false) String noRec) { - List> listResult = new ArrayList>(); + List> listResult = new ArrayList<>(); Map pasien = reportingDao.findPasienByNoRegistrasi(noRec); String umur = AgeCalculator .calculateAge2((Date) pasien.get("tanggalRegistrasi"), (Date) pasien.get("tanggalLahir")).toString(); @@ -5530,8 +5191,8 @@ public class ReportingController extends LocaleController @RequestMapping("/lapDaftarHadir") public ModelAndView generateDaftarHadir(ModelAndView m, - @RequestParam(value = "noRecStrukPlanning", required = true) String noRecStrukPlanning, - @RequestParam(value = "jenisTestId", required = true) Integer jenisTestId, + @RequestParam(value = "noRecStrukPlanning") String noRecStrukPlanning, + @RequestParam(value = "jenisTestId") Integer jenisTestId, @RequestParam(value = "format", required = false) String format) { Map result = rekrutmenService.getDaftarHadirRekrutmen(noRecStrukPlanning, jenisTestId); @@ -5552,11 +5213,11 @@ public class ReportingController extends LocaleController @RequestMapping("/lapBuktiPelayanan") public ModelAndView generateLapBuktiPelayanan(ModelAndView m, @RequestParam(value = "format", required = false) String format, - @RequestParam(value = "noRegistrasi", required = true) String noRegistrasi, - @RequestParam(value = "X-AUTH-TOKEN", required = true) String token) { + @RequestParam(value = "noRegistrasi") String noRegistrasi, + @RequestParam(value = "X-AUTH-TOKEN") String token) { List list = reportingDao.findNoRecAntrian(noRegistrasi); - List listKasir = new ArrayList(); + List listKasir = new ArrayList<>(); if (CommonUtil.isNotNullOrEmpty(list)) { Map pasien = reportingDao.findPasienByNoRegistrasi(list.get(0)); List diagnosa = reportingDao.findDiagnosisUtama(list.get(0)); @@ -5606,10 +5267,10 @@ public class ReportingController extends LocaleController @RequestMapping("/lapTracer") public ModelAndView generateLapTracer(ModelAndView m, @RequestParam(value = "format", required = false) String format, - @RequestParam(value = "noRegistrasi", required = true) String noRegistrasi) { + @RequestParam(value = "noRegistrasi") String noRegistrasi) { Map result = reportService.tracer(noRegistrasi); - List> data = new ArrayList>(); + List> data = new ArrayList<>(); data.add(result); m.addObject("dataSource", data); m.addObject("format", "pdf"); @@ -5620,11 +5281,10 @@ public class ReportingController extends LocaleController @RequestMapping("/labelPasien") public ModelAndView generateLabelPasien(ModelAndView m, @RequestParam(value = "format", required = false) String format, - @RequestParam(value = "noCm", required = true) String noRegistrasi, - @RequestParam(value = "qty", required = true) Integer qty) { + @RequestParam(value = "noCm") String noRegistrasi, @RequestParam(value = "qty") Integer qty) { Map result = reportService.labelPasien(noRegistrasi); - List> data = new ArrayList>(); + List> data = new ArrayList<>(); for (int i = 0; i < qty; i++) { data.add(result); } @@ -5637,10 +5297,10 @@ public class ReportingController extends LocaleController @RequestMapping("/lapGeneralConsent") public ModelAndView generatelapGeneralConsent(ModelAndView m, @RequestParam(value = "format", required = false) String format, - @RequestParam(value = "noRegistrasi", required = true) String noRegistrasi) { + @RequestParam(value = "noRegistrasi") String noRegistrasi) { Map result = reportService.labelPasien(noRegistrasi); - List> data = new ArrayList>(); + List> data = new ArrayList<>(); data.add(result); m.addObject("dataSource", data); m.addObject("format", "pdf"); @@ -5651,10 +5311,10 @@ public class ReportingController extends LocaleController @RequestMapping("/lapRingkasanKeluarMasuk") public ModelAndView generateLapRingkasanKeluarMasuk(ModelAndView m, @RequestParam(value = "format", required = false) String format, - @RequestParam(value = "noRegistrasi", required = true) String noRegistrasi) { + @RequestParam(value = "noRegistrasi") String noRegistrasi) { Map result = reportService.ringkasanKeluarMasuk(noRegistrasi); - List> data = new ArrayList>(); + List> data = new ArrayList<>(); data.add(result); m.addObject("dataSource", data); @@ -5666,7 +5326,7 @@ public class ReportingController extends LocaleController @RequestMapping("/lapRekapIndeksKehadiran") public ModelAndView generateLapRekapitulasiKehadiran(ModelAndView m, @RequestParam(value = "format", required = false) String format, - @RequestParam(value = "periode", required = true) String periode) { + @RequestParam(value = "periode") String periode) { List> result = reportService.generateLapRekapitulasiIndexKehadiran(periode); String[] bulanArray = DateUtil.INDONESIAN_MONTH; @@ -5709,8 +5369,7 @@ public class ReportingController extends LocaleController @RequestMapping("/lapCapaianKinerja") public ModelAndView generateAllRlapCapaianKinerja(ModelAndView m, - @RequestParam(value = "format", required = false) String format, - @RequestParam(value = "date", required = true) String date, + @RequestParam(value = "format", required = false) String format, @RequestParam(value = "date") String date, @RequestParam(value = "idAtasan", required = false) Integer idAtasan) { List> result = indekKinerjaService.findUraianTugasByTanggal(date); @@ -5744,7 +5403,7 @@ public class ReportingController extends LocaleController @RequestMapping("/lapLogbookPegawai") public ModelAndView generateLapLogbookPegawai(ModelAndView m, @RequestParam(value = "format", required = false) String format, - @RequestParam(value = "periode", required = true) String periode, + @RequestParam(value = "periode") String periode, @RequestParam(value = "idPegawai", required = false) Integer idPegawai) { Date start = DateUtil.startMonth(periode); Date end = DateUtil.endMonth(periode); @@ -5787,7 +5446,7 @@ public class ReportingController extends LocaleController @RequestMapping("/lapLogbookPegawaiVer2") public ModelAndView generateLapLogbookPegawaiVer2(ModelAndView m, @RequestParam(value = "format", required = false) String format, - @RequestParam(value = "periode", required = true) String periode, + @RequestParam(value = "periode") String periode, @RequestParam(value = "idPegawai", required = false) Integer idPegawai, @RequestParam(value = "idJabatan", required = false) Integer idJabatan, @RequestParam(value = "idAtasan", required = false) Integer idAtasan, @@ -5801,7 +5460,7 @@ public class ReportingController extends LocaleController result = indekKinerjaService.reportrekapitulasi(idPegawai, periode, isFFS); } else if (pegawaiDao.getPegawaiByKategoryPegawai(Arrays.asList(Master.KategoryPegawai.DOKTER_LUAR)) .contains(idPegawai) && isFFS) { - result = indekKinerjaService.reportrekapitulasi(idPegawai, periode, isFFS); + result = indekKinerjaService.reportrekapitulasi(idPegawai, periode, true); } if (isFFS) { @@ -5823,11 +5482,11 @@ public class ReportingController extends LocaleController idJabatanAtasan); Jabatan jabatan = jabatanDao.findOne(idJabatan); - Long tms = 0L; + long tms = 0L; for (Map tmps : result) { - Long count = (new Double(Double.parseDouble(tmps.get("count").toString()))).longValue(); + long count = (new Double(Double.parseDouble(tmps.get("count").toString()))).longValue(); tmps.put("count", count); - tms += count.longValue(); + tms += count; } m.addObject("dataSource", result); @@ -5843,7 +5502,7 @@ public class ReportingController extends LocaleController if (CommonUtil.isNotNullOrEmpty(atasan)) { m.addObject("jabatanAtasan", atasan.get("jabatan")); } - m.addObject("total", (Long) tms); + m.addObject("total", tms); m.addObject("format", "pdf"); if (format != null && !format.isEmpty()) { @@ -5856,15 +5515,13 @@ public class ReportingController extends LocaleController @RequestMapping("/lapLogbookPegawaiRekap") public ModelAndView generateLapLogbookPegawaiRekap(ModelAndView m, @RequestParam(value = "format", required = false) String format, - @RequestParam(value = "periode", required = true) String periode, + @RequestParam(value = "periode") String periode, @RequestParam(value = "idPegawai", required = false) Integer idPegawai, @RequestParam(value = "idJabatan", required = false) Integer idJabatan, @RequestParam(value = "idAtasan", required = false) Integer idAtasan, @RequestParam(value = "idJabatanAtasan", required = false) Integer idJabatanAtasan) { Map pegawai = pegawaiDao.findPegawaiById(idPegawai); - // List> result = new ArrayList>(); String[] bulanArray = DateUtil.INDONESIAN_MONTH; String[] splitData = periode.split("-"); @@ -5900,9 +5557,9 @@ public class ReportingController extends LocaleController m.addObject("jabatanAtasan", atasan.get("jabatan")); } - m.addObject("total", (Long) tms); - m.addObject("totalr", (Long) trs); - m.addObject("totalf", (Long) tfs); + m.addObject("total", tms); + m.addObject("totalr", trs); + m.addObject("totalf", tfs); m.addObject("format", "pdf"); if (format != null && !format.isEmpty()) { @@ -5915,13 +5572,11 @@ public class ReportingController extends LocaleController @RequestMapping("/lapLogbookPegawaiRekapWithPasien") public ModelAndView generateLapLogbookPegawaiRekapWithPasien(ModelAndView m, @RequestParam(value = "format", required = false) String format, - @RequestParam(value = "periode", required = true) String periode, + @RequestParam(value = "periode") String periode, @RequestParam(value = "idPegawai", required = false) Integer idPegawai) { Pegawai pegawaiLoggedIn = indekKinerjaService.getPegawaiByUserLogin(); Map pegawai = pegawaiDao.findPegawaiById(pegawaiLoggedIn.getId()); - // List> result = new ArrayList>(); String[] bulanArray = DateUtil.INDONESIAN_MONTH; String[] splitData = periode.split("-"); @@ -5950,7 +5605,7 @@ public class ReportingController extends LocaleController m.addObject("atasan", atasan.get("nama")); m.addObject("nipAtasan", atasan.get("nipPns")); - m.addObject("total", (Long) tms); + m.addObject("total", tms); m.addObject("format", "pdf"); if (format != null && !format.isEmpty()) { @@ -5963,15 +5618,9 @@ public class ReportingController extends LocaleController @RequestMapping("/lapLogbookPegawaiRekapWithPasienV2") public ModelAndView generateLapLogbookPegawaiRekapWithPasienV2(ModelAndView m, @RequestParam(value = "format", required = false) String format, - @RequestParam(value = "periode", required = true) String periode, + @RequestParam(value = "periode") String periode, @RequestParam(value = "idPegawai", required = false) Integer idPegawai) { - - // Pegawai pegawaiLoggedIn = - // indekKinerjaService.getPegawaiByUserLogin(); Map pegawai = pegawaiDao.findPegawaiById(idPegawai); - // List> result = new ArrayList>(); - String[] bulanArray = DateUtil.INDONESIAN_MONTH; String[] splitData = periode.split("-"); String bulan = ""; @@ -6002,7 +5651,7 @@ public class ReportingController extends LocaleController m.addObject("atasan", atasan.get("namaAtasanLangsung")); m.addObject("nipAtasan", atasan.get("nipPnsAtasanLangsung")); - m.addObject("total", (Long) tms); + m.addObject("total", tms); m.addObject("format", "pdf"); if (format != null && !format.isEmpty()) { @@ -6015,9 +5664,8 @@ public class ReportingController extends LocaleController @RequestMapping("/neracaLimbahB3") public ModelAndView generateNeracaLimbahB3(ModelAndView m, @RequestParam(value = "format", required = false) String format, - @RequestParam(value = "noRec", required = true) String noRec, - @RequestParam(value = "startDate", required = true) String startDate, - @RequestParam(value = "endDate", required = true) String endDate) { + @RequestParam(value = "noRec") String noRec, @RequestParam(value = "startDate") String startDate, + @RequestParam(value = "endDate") String endDate) { DateFormat df = new SimpleDateFormat("yyyy/MM/dd"); @@ -6078,19 +5726,17 @@ public class ReportingController extends LocaleController @RequestMapping("/laporanPendapatanDokterGroup") public ModelAndView generateLaporanPendapatanDokterGroup(ModelAndView m, @RequestParam(value = "format", required = false) String format, - @RequestParam(value = "periode", required = true) String periode, - @RequestParam(value = "idPegawai", required = true) Integer idPegawai, + @RequestParam(value = "periode") String periode, @RequestParam(value = "idPegawai") Integer idPegawai, @RequestParam(value = "idDepartemen", required = false) Integer idDepartemen, @RequestParam(value = "idRuangan", required = false) Integer idRuangan, @RequestParam(value = "idUnitKerja", required = false) Integer idUnitKerja, - @RequestParam(value = "idJabatan", required = true) Integer idJabatan, - @RequestParam(value = "idAtasan", required = true) Integer idAtasan, - @RequestParam(value = "idJabatanAtasan", required = true) Integer idJabatanAtasan) { + @RequestParam(value = "idJabatan") Integer idJabatan, @RequestParam(value = "idAtasan") Integer idAtasan, + @RequestParam(value = "idJabatanAtasan") Integer idJabatanAtasan) { List> listResult = new ArrayList<>(); List> listDetail = new ArrayList<>(); - List> result = new ArrayList<>(); - List> allDetailTindakan = new ArrayList<>(); + List> result; + List> allDetailTindakan; List listIdPegawai = new ArrayList<>(); @@ -6108,7 +5754,7 @@ public class ReportingController extends LocaleController String[] bulanArray = DateUtil.INDONESIAN_MONTH; String[] splitData = periode.split("-"); - String bulan = ""; + String bulan; if (String.valueOf(splitData[1].charAt(0)).equals("0")) { bulan = bulanArray[Integer.parseInt(splitData[1].replace("0", "")) - 1]; } else { @@ -6139,8 +5785,8 @@ public class ReportingController extends LocaleController thj += Double.parseDouble(tmps.get("jasaMedis").toString()); tmps.put("total", tms); - tmps.put("totalTarif", kursINA.format(tt).toString()); - tmps.put("totalHargaJual", kursINA.format(thj).toString()); + tmps.put("totalTarif", kursINA.format(tt)); + tmps.put("totalHargaJual", kursINA.format(thj)); } listResult.addAll(result); @@ -6169,8 +5815,8 @@ public class ReportingController extends LocaleController thj += Double.parseDouble(tmps.get("jasaMedis").toString()); tmps.put("total", tms); - tmps.put("totalTarif", kursINA.format(tt).toString()); - tmps.put("totalHargaJual", kursINA.format(thj).toString()); + tmps.put("totalTarif", kursINA.format(tt)); + tmps.put("totalHargaJual", kursINA.format(thj)); } listResult.addAll(result); @@ -6187,9 +5833,9 @@ public class ReportingController extends LocaleController m.addObject("nip", pegawai.get("nipPns")); m.addObject("nama", pegawai.get("nama")); } - m.addObject("total", (Long) tms); - m.addObject("totalTarif", kursINA.format(tt).toString()); - m.addObject("totalHargaJual", kursINA.format(thj).toString()); + m.addObject("total", tms); + m.addObject("totalTarif", kursINA.format(tt)); + m.addObject("totalHargaJual", kursINA.format(thj)); m.addObject("format", "pdf"); if (CommonUtil.isNotNullOrEmpty(mapJabatan)) { m.addObject("unitKerja", mapJabatan.get("unitKerja")); @@ -6210,19 +5856,17 @@ public class ReportingController extends LocaleController @RequestMapping("/laporanRemunerasiDokterGroup") public ModelAndView generateLaporanRemunerasiDokterGroup(ModelAndView m, @RequestParam(value = "format", required = false) String format, - @RequestParam(value = "periode", required = true) String periode, - @RequestParam(value = "idPegawai", required = true) Integer idPegawai, + @RequestParam(value = "periode") String periode, @RequestParam(value = "idPegawai") Integer idPegawai, @RequestParam(value = "idDepartemen", required = false) Integer idDepartemen, @RequestParam(value = "idRuangan", required = false) Integer idRuangan, @RequestParam(value = "idUnitKerja", required = false) Integer idUnitKerja, - @RequestParam(value = "idJabatan", required = true) Integer idJabatan, - @RequestParam(value = "idAtasan", required = true) Integer idAtasan, - @RequestParam(value = "idJabatanAtasan", required = true) Integer idJabatanAtasan) { + @RequestParam(value = "idJabatan") Integer idJabatan, @RequestParam(value = "idAtasan") Integer idAtasan, + @RequestParam(value = "idJabatanAtasan") Integer idJabatanAtasan) { List> listResult = new ArrayList<>(); List> listDetail = new ArrayList<>(); - List> result = new ArrayList<>(); - List> allDetailTindakan = new ArrayList<>(); + List> result; + List> allDetailTindakan; List listIdPegawai = new ArrayList<>(); @@ -6240,7 +5884,7 @@ public class ReportingController extends LocaleController String[] bulanArray = DateUtil.INDONESIAN_MONTH; String[] splitData = periode.split("-"); - String bulan = ""; + String bulan; if (String.valueOf(splitData[1].charAt(0)).equals("0")) { bulan = bulanArray[Integer.parseInt(splitData[1].replace("0", "")) - 1]; } else { @@ -6272,8 +5916,8 @@ public class ReportingController extends LocaleController tt += Double.parseDouble(tmps.get("tarif").toString()); tmps.put("total", tms); - tmps.put("totalHargaJual", kursINA.format(thj).toString()); - tmps.put("totalTarif", kursINA.format(tt).toString()); + tmps.put("totalHargaJual", kursINA.format(thj)); + tmps.put("totalTarif", kursINA.format(tt)); } listResult.addAll(result); @@ -6304,8 +5948,8 @@ public class ReportingController extends LocaleController tt += Double.parseDouble(tmps.get("tarif").toString()); tmps.put("total", tms); - tmps.put("totalHargaJual", kursINA.format(thj).toString()); - tmps.put("totalTarif", kursINA.format(tt).toString()); + tmps.put("totalHargaJual", kursINA.format(thj)); + tmps.put("totalTarif", kursINA.format(tt)); } listResult.addAll(result); @@ -6323,9 +5967,9 @@ public class ReportingController extends LocaleController m.addObject("nip", pegawai.get("nipPns")); m.addObject("nama", pegawai.get("nama")); } - m.addObject("total", (Long) tms); - m.addObject("totalHargaJual", kursINA.format(thj).toString()); - m.addObject("totalTarif", kursINA.format(tt).toString()); + m.addObject("total", tms); + m.addObject("totalHargaJual", kursINA.format(thj)); + m.addObject("totalTarif", kursINA.format(tt)); m.addObject("format", "pdf"); if (CommonUtil.isNotNullOrEmpty(mapJabatan)) { m.addObject("unitKerja", mapJabatan.get("unitKerja")); @@ -6346,19 +5990,17 @@ public class ReportingController extends LocaleController @RequestMapping("/laporanFeeForServiceDokterGroup") public ModelAndView generateLaporanFeeForServiceDokterGroup(ModelAndView m, @RequestParam(value = "format", required = false) String format, - @RequestParam(value = "periode", required = true) String periode, - @RequestParam(value = "idPegawai", required = true) Integer idPegawai, + @RequestParam(value = "periode") String periode, @RequestParam(value = "idPegawai") Integer idPegawai, @RequestParam(value = "idDepartemen", required = false) Integer idDepartemen, @RequestParam(value = "idRuangan", required = false) Integer idRuangan, @RequestParam(value = "idUnitKerja", required = false) Integer idUnitKerja, - @RequestParam(value = "idJabatan", required = true) Integer idJabatan, - @RequestParam(value = "idAtasan", required = true) Integer idAtasan, - @RequestParam(value = "idJabatanAtasan", required = true) Integer idJabatanAtasan) { + @RequestParam(value = "idJabatan") Integer idJabatan, @RequestParam(value = "idAtasan") Integer idAtasan, + @RequestParam(value = "idJabatanAtasan") Integer idJabatanAtasan) { List> listResult = new ArrayList<>(); List> listDetail = new ArrayList<>(); - List> result = new ArrayList<>(); - List> allDetailTindakan = new ArrayList<>(); + List> result; + List> allDetailTindakan; List listIdPegawai = new ArrayList<>(); @@ -6376,7 +6018,7 @@ public class ReportingController extends LocaleController String[] bulanArray = DateUtil.INDONESIAN_MONTH; String[] splitData = periode.split("-"); - String bulan = ""; + String bulan; if (String.valueOf(splitData[1].charAt(0)).equals("0")) { bulan = bulanArray[Integer.parseInt(splitData[1].replace("0", "")) - 1]; } else { @@ -6407,8 +6049,8 @@ public class ReportingController extends LocaleController tt += Double.parseDouble(tmps.get("tarif").toString()); tmps.put("total", tms); - tmps.put("totalHargaJual", kursINA.format(thj).toString()); - tmps.put("totalTarif", kursINA.format(tt).toString()); + tmps.put("totalHargaJual", kursINA.format(thj)); + tmps.put("totalTarif", kursINA.format(tt)); } listResult.addAll(result); @@ -6437,8 +6079,8 @@ public class ReportingController extends LocaleController tt += Double.parseDouble(tmps.get("tarif").toString()); tmps.put("total", tms); - tmps.put("totalHargaJual", kursINA.format(thj).toString()); - tmps.put("totalTarif", kursINA.format(tt).toString()); + tmps.put("totalHargaJual", kursINA.format(thj)); + tmps.put("totalTarif", kursINA.format(tt)); } listResult.addAll(result); @@ -6455,9 +6097,9 @@ public class ReportingController extends LocaleController m.addObject("nip", pegawai.get("nipPns")); m.addObject("nama", pegawai.get("nama")); } - m.addObject("total", (Long) tms); - m.addObject("totalHargaJual", kursINA.format(thj).toString()); - m.addObject("totalTarif", kursINA.format(tt).toString()); + m.addObject("total", tms); + m.addObject("totalHargaJual", kursINA.format(thj)); + m.addObject("totalTarif", kursINA.format(tt)); m.addObject("format", "pdf"); if (CommonUtil.isNotNullOrEmpty(mapJabatan)) { m.addObject("unitKerja", mapJabatan.get("unitKerja")); @@ -6478,11 +6120,9 @@ public class ReportingController extends LocaleController @RequestMapping("/laporanFeeForServiceDokter") public ModelAndView generateLaporanFeeForServiceDokter(ModelAndView m, @RequestParam(value = "format", required = false) String format, - @RequestParam(value = "periode", required = true) String periode, - @RequestParam(value = "idPegawai", required = true) Integer idPegawai, - @RequestParam(value = "idJabatan", required = true) Integer idJabatan, - @RequestParam(value = "idAtasan", required = true) Integer idAtasan, - @RequestParam(value = "idJabatanAtasan", required = true) Integer idJabatanAtasan) { + @RequestParam(value = "periode") String periode, @RequestParam(value = "idPegawai") Integer idPegawai, + @RequestParam(value = "idJabatan") Integer idJabatan, @RequestParam(value = "idAtasan") Integer idAtasan, + @RequestParam(value = "idJabatanAtasan") Integer idJabatanAtasan) { DecimalFormatSymbols formatRp = new DecimalFormatSymbols(); formatRp.setCurrencySymbol("Rp"); @@ -6494,7 +6134,7 @@ public class ReportingController extends LocaleController String[] bulanArray = DateUtil.INDONESIAN_MONTH; String[] splitData = periode.split("-"); - String bulan = ""; + String bulan; if (String.valueOf(splitData[1].charAt(0)).equals("0")) { bulan = bulanArray[Integer.parseInt(splitData[1].replace("0", "")) - 1]; } else { @@ -6532,8 +6172,8 @@ public class ReportingController extends LocaleController m.addObject("periode", bulan + " " + splitData[0]); m.addObject("nip", pegawai.get("nipPns")); m.addObject("nama", pegawai.get("nama")); - m.addObject("total", (Long) tms); - m.addObject("totalHargaJual", kursINA.format(thj).toString()); + m.addObject("total", tms); + m.addObject("totalHargaJual", kursINA.format(thj)); m.addObject("format", "pdf"); if (CommonUtil.isNotNullOrEmpty(mapJabatan)) { m.addObject("unitKerja", mapJabatan.get("unitKerja")); @@ -6554,19 +6194,17 @@ public class ReportingController extends LocaleController @RequestMapping("/logbookTindakanDokterDetailPasien") public ModelAndView generateLogbookTindakanDokterDetailPasien(ModelAndView m, @RequestParam(value = "format", required = false) String format, - @RequestParam(value = "periode", required = true) String periode, - @RequestParam(value = "idPegawai", required = true) Integer idPegawai, - @RequestParam(value = "idJabatan", required = true) Integer idJabatan, - @RequestParam(value = "idAtasan", required = true) Integer idAtasan, - @RequestParam(value = "idJabatanAtasan", required = true) Integer idJabatanAtasan, - @RequestParam(value = "ffs", required = true) Boolean ffs) { + @RequestParam(value = "periode") String periode, @RequestParam(value = "idPegawai") Integer idPegawai, + @RequestParam(value = "idJabatan") Integer idJabatan, @RequestParam(value = "idAtasan") Integer idAtasan, + @RequestParam(value = "idJabatanAtasan") Integer idJabatanAtasan, + @RequestParam(value = "ffs") Boolean ffs) { - List> resultFFS = new ArrayList>(); - List> allDetailTindakan = new ArrayList<>(); + List> resultFFS; + List> allDetailTindakan; String[] bulanArray = DateUtil.INDONESIAN_MONTH; String[] splitData = periode.split("-"); - String bulan = ""; + String bulan; if (String.valueOf(splitData[1].charAt(0)).equals("0")) { bulan = bulanArray[Integer.parseInt(splitData[1].replace("0", "")) - 1]; } else { @@ -6581,15 +6219,12 @@ public class ReportingController extends LocaleController Map pegawai = pegawaiDao.findPegawaiById(idPegawai); if (ffs) { - /** - * @deprecated Unused services - */ + // @deprecated Unused services resultFFS = indekKinerjaService.getAllTindakanByDokterForfeeForServiceReview(periode, idPegawai); - allDetailTindakan = indekKinerjaService.findPatientDetailForEveryTindakanReview(idPegawai, periode, ffs); } else { resultFFS = indekKinerjaService.getAllTindakanByDokterReviewForReport(periode, idPegawai); - allDetailTindakan = indekKinerjaService.findPatientDetailForEveryTindakanReview(idPegawai, periode, ffs); } + allDetailTindakan = indekKinerjaService.findPatientDetailForEveryTindakanReview(idPegawai, periode, ffs); Long tms = 0L; for (Map tmps : resultFFS) { @@ -6610,7 +6245,7 @@ public class ReportingController extends LocaleController m.addObject("periode", bulan + " " + splitData[0]); m.addObject("nip", pegawai.get("nipPns")); m.addObject("nama", pegawai.get("nama")); - m.addObject("total", (Long) tms); + m.addObject("total", tms); m.addObject("format", "pdf"); if (CommonUtil.isNotNullOrEmpty(mapJabatan)) { m.addObject("unitKerja", mapJabatan.get("unitKerja")); @@ -6631,7 +6266,7 @@ public class ReportingController extends LocaleController @RequestMapping("/lapPermohonanCuti") public ModelAndView generateLapPermohonanCuti(ModelAndView m, @RequestParam(value = "format", required = false) String format, - @RequestParam(value = "noRecPlanning", required = true) String noRecPlanning, + @RequestParam(value = "noRecPlanning") String noRecPlanning, @RequestParam(value = "idJabatan", required = false, defaultValue = "0") Integer idJabatan, @RequestParam(value = "idUnitKerja", required = false, defaultValue = "0") Integer idUnitKerja, @RequestParam(value = "idAtasan1", required = false, defaultValue = "0") Integer idAtasan1, @@ -6641,7 +6276,7 @@ public class ReportingController extends LocaleController @RequestParam(value = "idJabatanAtasan2", required = false, defaultValue = "0") Integer idJabatanAtasan2, @RequestParam(value = "atasanDireksi", required = false) String atasanDireksi) { - List> result = new ArrayList>(); + List> result = new ArrayList<>(); Map data = reportService.generateLapPermohonanCuti(noRecPlanning, idJabatan, idUnitKerja, idAtasan1, idAtasan2, idKaRu, idJabatanAtasan1, idJabatanAtasan2, atasanDireksi); result.add(data); @@ -6657,7 +6292,7 @@ public class ReportingController extends LocaleController @RequestMapping("/lapPermohonanCutiPembina") public ModelAndView generateLapPermohonanCutiPembina(ModelAndView m, @RequestParam(value = "format", required = false) String format, - @RequestParam(value = "noRecPlanning", required = true) String noRecPlanning, + @RequestParam(value = "noRecPlanning") String noRecPlanning, @RequestParam(value = "idJabatan", required = false, defaultValue = "0") Integer idJabatan, @RequestParam(value = "idUnitKerja", required = false, defaultValue = "0") Integer idUnitKerja, @RequestParam(value = "idAtasan1", required = false, defaultValue = "0") Integer idAtasan1, @@ -6667,7 +6302,7 @@ public class ReportingController extends LocaleController @RequestParam(value = "idJabatanAtasan2", required = false, defaultValue = "0") Integer idJabatanAtasan2, @RequestParam(value = "atasanDireksi", required = false) String atasanDireksi) { - List> result = new ArrayList>(); + List> result = new ArrayList<>(); Map data = reportService.generateLapPermohonanCuti(noRecPlanning, idJabatan, idUnitKerja, idAtasan1, idAtasan2, idKaRu, idJabatanAtasan1, idJabatanAtasan2, atasanDireksi); result.add(data); @@ -6683,7 +6318,7 @@ public class ReportingController extends LocaleController @RequestMapping("/lapPermohonanCutiLuarNegeri") public ModelAndView generateCutiLuarNegeri(ModelAndView m, @RequestParam(value = "format", required = false) String format, - @RequestParam(value = "noRecPlanning", required = true) String noRecPlanning, + @RequestParam(value = "noRecPlanning") String noRecPlanning, @RequestParam(value = "idJabatan", required = false, defaultValue = "0") Integer idJabatan, @RequestParam(value = "idUnitKerja", required = false, defaultValue = "0") Integer idUnitKerja, @RequestParam(value = "idAtasan1", required = false, defaultValue = "0") Integer idAtasan1, @@ -6715,7 +6350,7 @@ public class ReportingController extends LocaleController @RequestMapping("/lapPermohonanCutiLuarNegeriPembina") public ModelAndView generateCutiLuarNegeriPembina(ModelAndView m, @RequestParam(value = "format", required = false) String format, - @RequestParam(value = "noRecPlanning", required = true) String noRecPlanning, + @RequestParam(value = "noRecPlanning") String noRecPlanning, @RequestParam(value = "idJabatan", required = false, defaultValue = "0") Integer idJabatan, @RequestParam(value = "idUnitKerja", required = false, defaultValue = "0") Integer idUnitKerja, @RequestParam(value = "idAtasan1", required = false, defaultValue = "0") Integer idAtasan1, @@ -6747,7 +6382,7 @@ public class ReportingController extends LocaleController @RequestMapping("/suratIzinSementara") public ModelAndView generateSuratIzinSementara(ModelAndView m, @RequestParam(value = "format", required = false) String format, - @RequestParam(value = "noRecPlanning", required = true) String noRecPlanning, + @RequestParam(value = "noRecPlanning") String noRecPlanning, @RequestParam(value = "idJabatan", required = false, defaultValue = "0") Integer idJabatan, @RequestParam(value = "idUnitKerja", required = false, defaultValue = "0") Integer idUnitKerja, @RequestParam(value = "idAtasan1", required = false, defaultValue = "0") Integer idAtasan1, @@ -6756,7 +6391,7 @@ public class ReportingController extends LocaleController @RequestParam(value = "idJabatanAtasan1", required = false, defaultValue = "0") Integer idJabatanAtasan1, @RequestParam(value = "idJabatanAtasan2", required = false, defaultValue = "0") Integer idJabatanAtasan2) { - List> result = new ArrayList>(); + List> result = new ArrayList<>(); Map data = reportService.generateSuratIzinSementara(noRecPlanning, idJabatan, idUnitKerja, idAtasan1, idAtasan2, idKaRu, idJabatanAtasan1, idJabatanAtasan2); result.add(data); @@ -6772,13 +6407,13 @@ public class ReportingController extends LocaleController @RequestMapping("/suratIzinSementaraCuti") public ModelAndView generateSuratIzinSementara(ModelAndView m, @RequestParam(value = "format", required = false) String format, - @RequestParam(value = "noRecPlanning", required = true) String noRecPlanning, + @RequestParam(value = "noRecPlanning") String noRecPlanning, @RequestParam(value = "idJabatan", required = false, defaultValue = "0") Integer idJabatan, @RequestParam(value = "idUnitKerja", required = false, defaultValue = "0") Integer idUnitKerja, @RequestParam(value = "idAtasan1", required = false, defaultValue = "0") Integer idAtasan1, @RequestParam(value = "idJabatanAtasan1", required = false, defaultValue = "0") Integer idJabatanAtasan1) { - List> result = new ArrayList>(); + List> result = new ArrayList<>(); Map data = reportService.generateSuratIzinSementara(noRecPlanning, idJabatan, idUnitKerja, idAtasan1, idJabatanAtasan1); result.add(data); @@ -6794,7 +6429,7 @@ public class ReportingController extends LocaleController @RequestMapping("/suratTugas") public ModelAndView generateSuratTugas(ModelAndView m, @RequestParam(value = "format", required = false) String format, - @RequestParam(value = "noRecPlanning", required = true) String noRecPlanning, + @RequestParam(value = "noRecPlanning") String noRecPlanning, @RequestParam(value = "idJabatan", required = false, defaultValue = "0") Integer idJabatan, @RequestParam(value = "idUnitKerja", required = false, defaultValue = "0") Integer idUnitKerja, @RequestParam(value = "idAtasan1", required = false, defaultValue = "0") Integer idAtasan1, @@ -6803,7 +6438,7 @@ public class ReportingController extends LocaleController @RequestParam(value = "idJabatanAtasan1", required = false, defaultValue = "0") Integer idJabatanAtasan1, @RequestParam(value = "idJabatanAtasan2", required = false, defaultValue = "0") Integer idJabatanAtasan2) { - List> result = new ArrayList>(); + List> result = new ArrayList<>(); Map data = reportService.generateSuratTugas(noRecPlanning, idJabatan, idUnitKerja, idAtasan1, idAtasan2, idKaRu, idJabatanAtasan1, idJabatanAtasan2); Map kepalaPegawai = pegawaiService @@ -6826,12 +6461,12 @@ public class ReportingController extends LocaleController @RequestMapping("/lapSuratIzinCuti") public ModelAndView generateSuratIzinCuti(ModelAndView m, @RequestParam(value = "format", required = false) String format, - @RequestParam(value = "noRecPlanning", required = true) String noRecPlanning, + @RequestParam(value = "noRecPlanning") String noRecPlanning, @RequestParam(value = "idJabatan", required = false) Integer idJabatan, @RequestParam(value = "idAtasan", required = false) Integer idAtasan, @RequestParam(value = "idJabatanAtasan", required = false) Integer idJabatanAtasan) { - List> result = new ArrayList>(); + List> result = new ArrayList<>(); Map data = reportService.generateLapSuratIzinCuti(noRecPlanning, idJabatan, idAtasan, idJabatanAtasan); result.add(data); @@ -6847,12 +6482,12 @@ public class ReportingController extends LocaleController @RequestMapping("/lapSuratIzin") public ModelAndView generateSuratIzin(ModelAndView m, @RequestParam(value = "format", required = false) String format, - @RequestParam(value = "noRecPlanning", required = true) String noRecPlanning, - @RequestParam(value = "idJabatan", required = true) Integer idJabatan, + @RequestParam(value = "noRecPlanning") String noRecPlanning, + @RequestParam(value = "idJabatan") Integer idJabatan, @RequestParam(value = "idAtasan", required = false) Integer idAtasan, @RequestParam(value = "idJabatanAtasan", required = false) Integer idJabatanAtasan) { - List> result = new ArrayList>(); + List> result = new ArrayList<>(); Map data = reportService.generateLapSuratIzinCuti(noRecPlanning, idJabatan, idAtasan, idJabatanAtasan); result.add(data); @@ -6869,14 +6504,13 @@ public class ReportingController extends LocaleController @RequestMapping("/lapPelayananPasien") public ModelAndView generateLapPelayananPasien(ModelAndView m, @RequestParam(value = "format", required = false) String format, - @RequestParam(value = "startDate", required = true) String startDate, - @RequestParam(value = "endDate", required = true) String endDate, + @RequestParam(value = "startDate") String startDate, @RequestParam(value = "endDate") String endDate, @RequestParam(value = "idRuangan", required = false) Integer idRuangan, @RequestParam(value = "idjenisPasien", required = false) Integer idjenisPasien) { // String id = reportingDao.findIdJenisProdukKarcis(); Map result = reportService.generateLapPelayanan(startDate, endDate, null, idRuangan, idjenisPasien); - List> datas = new ArrayList>(); + List> datas; datas = (List>) result.get("listData"); if (CommonUtil.isNullOrEmpty(datas)) { @@ -6898,16 +6532,15 @@ public class ReportingController extends LocaleController @RequestMapping("/lapPelayananPasienByDokter") public ModelAndView generateLapPelayananPasienKarcisDailyByDokter(ModelAndView m, @RequestParam(value = "format", required = false) String format, - @RequestParam(value = "startDate", required = true) String startDate, - @RequestParam(value = "endDate", required = true) String endDate, + @RequestParam(value = "startDate") String startDate, @RequestParam(value = "endDate") String endDate, @RequestParam(value = "idRuangan", required = false) Integer idRuangan, @RequestParam(value = "idjenisPasien", required = false) Integer idjenisPasien, - @RequestParam(value = "idDokter", required = true) Integer idDokter) { + @RequestParam(value = "idDokter") Integer idDokter) { String id = reportingDao.findIdJenisProdukKarcis(); Map result = reportService.generateLapPelayananByDokter(startDate, endDate, Integer.valueOf(id), idRuangan, idjenisPasien, idDokter); - List> datas = new ArrayList>(); + List> datas; datas = (List>) result.get("listData"); if (CommonUtil.isNullOrEmpty(datas)) { datas.add(result); @@ -6928,15 +6561,14 @@ public class ReportingController extends LocaleController @RequestMapping("/lapPelayananPasienKarcis") public ModelAndView generateLapPelayananPasienKarcisDaily(ModelAndView m, @RequestParam(value = "format", required = false) String format, - @RequestParam(value = "startDate", required = true) String startDate, - @RequestParam(value = "endDate", required = true) String endDate, + @RequestParam(value = "startDate") String startDate, @RequestParam(value = "endDate") String endDate, @RequestParam(value = "idRuangan", required = false) Integer idRuangan, @RequestParam(value = "idjenisPasien", required = false) Integer idjenisPasien) { String id = reportingDao.findIdJenisProdukKarcis(); Map result = reportService.generateLapPelayanan(startDate, endDate, Integer.valueOf(id), idRuangan, idjenisPasien); - List> datas = new ArrayList>(); + List> datas; datas = (List>) result.get("listData"); if (CommonUtil.isNullOrEmpty(datas)) { datas.add(result); @@ -6958,15 +6590,14 @@ public class ReportingController extends LocaleController @RequestMapping("/lapPelayananPasienByAllDokter") public ModelAndView generateLapPelayananPasienKarcisDailyByAllDokter(ModelAndView m, @RequestParam(value = "format", required = false) String format, - @RequestParam(value = "startDate", required = true) String startDate, - @RequestParam(value = "endDate", required = true) String endDate, + @RequestParam(value = "startDate") String startDate, @RequestParam(value = "endDate") String endDate, @RequestParam(value = "idRuangan", required = false) Integer idRuangan, @RequestParam(value = "idjenisPasien", required = false) Integer idjenisPasien) { String id = reportingDao.findIdJenisProdukKarcis(); Map result = reportService.generateLapPelayananByDokter(startDate, endDate, Integer.valueOf(id), idRuangan, idjenisPasien, null); - List> datas = new ArrayList>(); + List> datas; datas = (List>) result.get("listData"); if (CommonUtil.isNullOrEmpty(datas)) { datas.add(result); @@ -6987,15 +6618,14 @@ public class ReportingController extends LocaleController @RequestMapping("/test") public ModelAndView generateLapPrintingTest(ModelAndView m, @RequestParam(value = "format", required = false) String format, - @RequestParam(value = "startDate", required = true) String startDate, - @RequestParam(value = "endDate", required = true) String endDate, + @RequestParam(value = "startDate") String startDate, @RequestParam(value = "endDate") String endDate, @RequestParam(value = "idRuangan", required = false) Integer idRuangan, @RequestParam(value = "idjenisPasien", required = false) Integer idjenisPasien) { String id = reportingDao.findIdJenisProdukKarcis(); Map result = reportService.generateLapPelayanan(startDate, endDate, Integer.valueOf(id), idRuangan, idjenisPasien); - List> datas = new ArrayList>(); + List> datas; datas = (List>) result.get("listData"); if (CommonUtil.isNullOrEmpty(datas)) { datas.add(result); @@ -7014,13 +6644,12 @@ public class ReportingController extends LocaleController @RequestMapping("/jadwalPegawai") public ModelAndView generateJadwalPegawai(ModelAndView m, @RequestParam(value = "format", required = false) String format, - @RequestParam(value = "ruangan", required = true) Integer ruangan, - @RequestParam(value = "tahun", required = true) Integer tahun, + @RequestParam(value = "ruangan") Integer ruangan, @RequestParam(value = "tahun") Integer tahun, @RequestParam(value = "bulan", required = false) Integer bulan) { // String id = reportingDao.findIdJenisProdukKarcis(); Map result = reportService.generateJadwalPerUnitKerja(ruangan, tahun, bulan); - List> datas = new ArrayList>(); + List> datas; datas = (List>) result.get("datas"); if (CommonUtil.isNullOrEmpty(datas)) { datas.add(result); @@ -7052,7 +6681,7 @@ public class ReportingController extends LocaleController @RequestMapping("/lapLogbookKinerjaStaffMedis") public ModelAndView generatelapLogbookKinerjaStaffMedis(ModelAndView m, @RequestParam(value = "format", required = false) String format, - @RequestParam(value = "periode", required = true) String periode, + @RequestParam(value = "periode") String periode, @RequestParam(value = "idDokter", required = false) Integer idDokter, @RequestParam(value = "idAlternatif", required = false) Integer idAlternatif, @RequestParam(value = "idJabatan", required = false) Integer idJabatan) { @@ -7093,7 +6722,7 @@ public class ReportingController extends LocaleController m.addObject("format", format); } m.addObject("dataSource", datas); - m.addObject("periode", DateUtil.INDONESIAN_MONTH[Integer.valueOf(periode) - 1] + " " + splitData[0]); + m.addObject("periode", DateUtil.INDONESIAN_MONTH[Integer.parseInt(periode) - 1] + " " + splitData[0]); m.addObject("format", "pdf"); return m; @@ -7102,7 +6731,7 @@ public class ReportingController extends LocaleController @RequestMapping("/tindakanPasienMeninggal") public ModelAndView generateTindakanPasienMeninggal(ModelAndView m, @RequestParam(value = "format", required = false) String format, - @RequestParam(value = "noCm", required = true) Integer noCm) { + @RequestParam(value = "noCm") Integer noCm) { Map result = pelayananPasienService.findTindakanPasienMeninggal(noCm); @@ -7122,8 +6751,7 @@ public class ReportingController extends LocaleController @RequestMapping("/laporanLogbookLimbahB3") public ModelAndView generatelapLogbookLimbahB3(ModelAndView m, @RequestParam(value = "format", required = false) String format, - @RequestParam(value = "startDate", required = true) String startDate, - @RequestParam(value = "endDate", required = true) String endDate, + @RequestParam(value = "startDate") String startDate, @RequestParam(value = "endDate") String endDate, @RequestParam(value = "idPegawai", required = false, defaultValue = "1281") Integer idPegawai) { Map result = reportService.generatelapLogbookLimbahB3Report(startDate, endDate); Map pegawai = pegawaiDao.findPegawaiByIdabatan(idPegawai); @@ -7132,14 +6760,11 @@ public class ReportingController extends LocaleController m.addObject("tglCetak", result.get("tglCetak")); m.addObject("periodeMMYYYY", result.get("periode")); - if (CommonUtil.isNotNullOrEmpty(pegawai)) { - m.addObject("nama", pegawai.get("nama")); - m.addObject("nip", pegawai.get("nip") != null ? pegawai.get("nip") : pegawai.get("nipPns")); - } else { + if (!CommonUtil.isNotNullOrEmpty(pegawai)) { pegawai = pegawaiDao.findPegawaiById(122); - m.addObject("nama", pegawai.get("nama")); - m.addObject("nip", pegawai.get("nip") != null ? pegawai.get("nip") : pegawai.get("nipPns")); } + m.addObject("nama", pegawai.get("nama")); + m.addObject("nip", pegawai.get("nip") != null ? pegawai.get("nip") : pegawai.get("nipPns")); m.addObject("format", "pdf"); @@ -7153,7 +6778,7 @@ public class ReportingController extends LocaleController @RequestMapping("/formulirLaporanKecelakaanKerja") public ModelAndView generateFormulirLaporanKecelakaanKerja(ModelAndView m, @RequestParam(value = "format", required = false) String format, - @RequestParam(value = "noRec", required = true) String noRec) { + @RequestParam(value = "noRec") String noRec) { Map result = reportService.generateFormulirLaporanKecelakaanKerja(noRec); m.addObject("dataSource", result.get("data")); @@ -7194,8 +6819,7 @@ public class ReportingController extends LocaleController @RequestMapping("/LaporanPengirimanLinenPerLayanan") public ModelAndView generateLaporanPengirimanLinenPerLayanan(ModelAndView m, @RequestParam(value = "format", required = false) String format, - @RequestParam(value = "startDate", required = true) String startDate, - @RequestParam(value = "endDate", required = true) String endDate) { + @RequestParam(value = "startDate") String startDate, @RequestParam(value = "endDate") String endDate) { DateFormat df = new SimpleDateFormat("yyyy-MM-dd"); @@ -7227,8 +6851,7 @@ public class ReportingController extends LocaleController @RequestMapping("/rekapLayananLaundry") public ModelAndView generateRekapLayananLaundry(ModelAndView m, @RequestParam(value = "format", required = false) String format, - @RequestParam(value = "startDate", required = true) String startDate, - @RequestParam(value = "endDate", required = true) String endDate) { + @RequestParam(value = "startDate") String startDate, @RequestParam(value = "endDate") String endDate) { DateFormat df = new SimpleDateFormat("yyyy-MM-dd"); @@ -7264,8 +6887,7 @@ public class ReportingController extends LocaleController @RequestMapping("/rekapLayananSterilisasi") public ModelAndView generateRekapLayananSterilisasi(ModelAndView m, @RequestParam(value = "format", required = false) String format, - @RequestParam(value = "startDate", required = true) String startDate, - @RequestParam(value = "endDate", required = true) String endDate) { + @RequestParam(value = "startDate") String startDate, @RequestParam(value = "endDate") String endDate) { DateFormat df = new SimpleDateFormat("yyyy-MM-dd"); @@ -7308,8 +6930,7 @@ public class ReportingController extends LocaleController @RequestMapping("/rekapPengirimanSterilisasi") public ModelAndView generateRekapPengirimanSterilisasi(ModelAndView m, @RequestParam(value = "format", required = false) String format, - @RequestParam(value = "startDate", required = true) String startDate, - @RequestParam(value = "endDate", required = true) String endDate) { + @RequestParam(value = "startDate") String startDate, @RequestParam(value = "endDate") String endDate) { DateFormat df = new SimpleDateFormat("yyyy-MM-dd"); @@ -7346,9 +6967,8 @@ public class ReportingController extends LocaleController @RequestMapping("/rekapitulasiCorrectiveMaintenance") public ModelAndView generateRekapitulasiCorrectiveMaintenance(ModelAndView m, @RequestParam(value = "format", required = false) String format, - @RequestParam(value = "startDate", required = true) String startDate, - @RequestParam(value = "endDate", required = true) String endDate, - @RequestParam(value = "idJenisProduk", required = true) Integer idJenisProduk) { + @RequestParam(value = "startDate") String startDate, @RequestParam(value = "endDate") String endDate, + @RequestParam(value = "idJenisProduk") Integer idJenisProduk) { Map result = reportService.generateRekapitulasiCorrectiveMaintenance(startDate, endDate, idJenisProduk); @@ -7379,7 +6999,7 @@ public class ReportingController extends LocaleController Map header = (Map) result.get("header"); String periode = header.get("tanggalAwal") == null ? "" : (String) header.get("tanggalAwal"); - periode = periode + (header.get("tanggalAkhir") == null ? "" : " sd " + (String) header.get("tanggalAkhir")); + periode = periode + (header.get("tanggalAkhir") == null ? "" : " sd " + header.get("tanggalAkhir")); m.addObject("dataSource", result.get("listData")); m.addObject("periode", periode); m.addObject("format", "pdf"); @@ -7421,7 +7041,7 @@ public class ReportingController extends LocaleController m.addObject("periode", periode); } if (CommonUtil.isNotNullOrEmpty(statusPekerjaan)) { - m.addObject("statusPekerjaan", (String) itPerbaikan.get("statusPekerjaan")); + m.addObject("statusPekerjaan", itPerbaikan.get("statusPekerjaan")); } if (CommonUtil.isNotNullOrEmpty(pegawai)) { m.addObject("nama", pegawai.get("nama")); @@ -7445,7 +7065,7 @@ public class ReportingController extends LocaleController @RequestMapping("/formLembarKerjaPemeliharaanITI") public ModelAndView lembarKerjaPemeliharaanBarangITI(ModelAndView m, @RequestParam(value = "format", required = false) String format, - @RequestParam(value = "noRec", required = true) String noRec) { + @RequestParam(value = "noRec") String noRec) { List> listLembarKerjaPemeliharaanBarangITI = itJadwalPerawatanService .listLembarKerjaPemeliharaanBarangITI(noRec); @@ -7463,8 +7083,7 @@ public class ReportingController extends LocaleController @RequestMapping("/rekapPemakaianCuciLinen") public ModelAndView generateRekapPemakaianCuciLinen(ModelAndView m, @RequestParam(value = "format", required = false) String format, - @RequestParam(value = "startDate", required = true) String startDate, - @RequestParam(value = "endDate", required = true) String endDate) { + @RequestParam(value = "startDate") String startDate, @RequestParam(value = "endDate") String endDate) { DateFormat df = new SimpleDateFormat("yyyy-MM-dd"); @@ -7507,10 +7126,10 @@ public class ReportingController extends LocaleController @RequestMapping("/suratPelimpahanTugas") public ModelAndView generateSuratPelimpahanTugas(ModelAndView m, @RequestParam(value = "format", required = false) String format, - @RequestParam(value = "noRecPlanning", required = true) String noRecPlanning, - @RequestParam(value = "idPegawaiPelimpah", required = true) Integer idPegawaiPelimpah, - @RequestParam(value = "idJabatanPelimpah", required = true) Integer idJabatanPelimpah, - @RequestParam(value = "idPegawaiDilimpah", required = true) Integer idPegawaiDilimpah) { + @RequestParam(value = "noRecPlanning") String noRecPlanning, + @RequestParam(value = "idPegawaiPelimpah") Integer idPegawaiPelimpah, + @RequestParam(value = "idJabatanPelimpah") Integer idJabatanPelimpah, + @RequestParam(value = "idPegawaiDilimpah") Integer idPegawaiDilimpah) { List> result = new ArrayList<>(); @@ -7531,10 +7150,10 @@ public class ReportingController extends LocaleController @RequestMapping("/lapPencatatanSuhuMesin") public ModelAndView generatePencatatanSuhuMesin(ModelAndView m, @RequestParam(value = "format", required = false) String format, - @RequestParam(value = "idMesin", required = true) Integer idMesin, - @RequestParam(value = "idMappingMesin", required = true) Integer idMappingMesin, - @RequestParam(value = "tglCatSuhuMesin", required = true) String tglCatSuhuMesin, - @RequestParam(value = "idSupervisor", required = true) Integer idSupervisor) { + @RequestParam(value = "idMesin") Integer idMesin, + @RequestParam(value = "idMappingMesin") Integer idMappingMesin, + @RequestParam(value = "tglCatSuhuMesin") String tglCatSuhuMesin, + @RequestParam(value = "idSupervisor") Integer idSupervisor) { List> result = new ArrayList<>(); @@ -7555,10 +7174,10 @@ public class ReportingController extends LocaleController @RequestMapping("/lapGrafikSuhuMesin") public ModelAndView generateGrafikSuhuMesin(ModelAndView m, @RequestParam(value = "format", required = false) String format, - @RequestParam(value = "idMesin", required = true) Integer idMesin, - @RequestParam(value = "idMappingMesin", required = true) Integer idMappingMesin, - @RequestParam(value = "tglCatSuhuMesin", required = true) String tglCatSuhuMesin, - @RequestParam(value = "idSupervisor", required = true) Integer idSupervisor) { + @RequestParam(value = "idMesin") Integer idMesin, + @RequestParam(value = "idMappingMesin") Integer idMappingMesin, + @RequestParam(value = "tglCatSuhuMesin") String tglCatSuhuMesin, + @RequestParam(value = "idSupervisor") Integer idSupervisor) { List> result = reportService.generateReportGrafikSuhuMesin(idMesin, idMappingMesin, tglCatSuhuMesin); @@ -7582,7 +7201,7 @@ public class ReportingController extends LocaleController @RequestMapping(value = "/hitung-indikator-pelayanan", method = RequestMethod.GET) public ResponseEntity>> calculateIndikatorPelayanan(HttpServletRequest request, - @RequestParam("tahun") String tahun) throws ParseException { + @RequestParam("tahun") String tahun) { try { List> result = pasienDaftarService.findIndikatorPelayanan(tahun); mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, @@ -7601,7 +7220,7 @@ public class ReportingController extends LocaleController @RequestMapping(value = "/hitung-remun-dengan-ffs", method = RequestMethod.GET) public ResponseEntity>> hitungRemunDenganFfs(HttpServletRequest request, - @RequestParam("tglAwal") String tglAwal, @RequestParam("tglAkhir") String tglAkhir) throws ParseException { + @RequestParam("tglAwal") String tglAwal, @RequestParam("tglAkhir") String tglAkhir) { try { List> result = pelayananPasienService.hitungRemunerasiDokterDenganFfs(tglAwal, tglAkhir); @@ -7622,7 +7241,7 @@ public class ReportingController extends LocaleController @RequestMapping(value = "/histori-usulan-rincian-kegiatan", method = RequestMethod.GET) public ResponseEntity>> getHistoriUsulanRincianKegiatan(HttpServletRequest request, @RequestParam("idPelaksanaanTugas") Integer idPelaksanaanTugas, - @RequestParam("idRincianKegiatan") Integer idRincianKegiatan) throws ParseException { + @RequestParam("idRincianKegiatan") Integer idRincianKegiatan) { try { List> result = reportService.getHistoriUsulanRincianKegiatan(idPelaksanaanTugas, idRincianKegiatan); @@ -7665,7 +7284,7 @@ public class ReportingController extends LocaleController @SuppressWarnings("unchecked") @RequestMapping("/tarifLayananRuangan") public ModelAndView getTarifLayanan(ModelAndView m, @RequestParam(value = "format", required = false) String format, - @RequestParam(value = "idRuangan", required = true) Integer idRuangan, + @RequestParam(value = "idRuangan") Integer idRuangan, @RequestParam(value = "idKelas", required = false) Integer idKelas, @RequestParam(value = "idProduk", required = false) Integer idProduk) { List> result = produkService.findTarifLayanan(idRuangan, idKelas, idProduk); @@ -7687,7 +7306,7 @@ public class ReportingController extends LocaleController @RequestMapping("/tarifLayananLamaRuangan") public ModelAndView getTarifLayananLama(ModelAndView m, @RequestParam(value = "format", required = false) String format, - @RequestParam(value = "idRuangan", required = true) Integer idRuangan, + @RequestParam(value = "idRuangan") Integer idRuangan, @RequestParam(value = "idKelas", required = false) Integer idKelas, @RequestParam(value = "idProduk", required = false) Integer idProduk) { List> result = produkService.findTarifLayananLama(idRuangan, idKelas, idProduk); @@ -7725,7 +7344,7 @@ public class ReportingController extends LocaleController @RequestMapping(value = "/rekapitulasi-diskon", method = RequestMethod.GET) public ResponseEntity>> getRekapDiskon(HttpServletRequest request, - @RequestParam(value = "periode", required = true) Long periode) { + @RequestParam(value = "periode") Long periode) { try { List> result = pasienDaftarService.findRekapDiskon(periode); @@ -7767,8 +7386,7 @@ public class ReportingController extends LocaleController @SuppressWarnings("unchecked") @RequestMapping(value = "/daftar-ibu-dan-anak", method = RequestMethod.GET) public ResponseEntity>> daftarIbuDanAnak(HttpServletRequest request, - @RequestParam(value = "tglAwal", required = true) Long tglAwal, - @RequestParam(value = "tglAkhir", required = true) Long tglAkhir) { + @RequestParam(value = "tglAwal") Long tglAwal, @RequestParam(value = "tglAkhir") Long tglAkhir) { try { List> result = pasienService.findIbuAnak(tglAwal, tglAkhir); @@ -7788,7 +7406,7 @@ public class ReportingController extends LocaleController @RequestMapping(value = "/presensi-visite-dokter", method = RequestMethod.GET) public ResponseEntity> presensiVisiteDokter(HttpServletRequest request, - @RequestParam(value = "periode", required = true) Long periode, + @RequestParam(value = "periode") Long periode, @RequestParam(value = "ksmId", required = false) Integer idKsm, @RequestParam(value = "kkId", required = false) Integer idKk, @RequestParam(value = "drId", required = false) Integer idDr) { @@ -7810,7 +7428,7 @@ public class ReportingController extends LocaleController @RequestMapping("/resep") public ModelAndView generateResep(ModelAndView m, @RequestParam(value = "format", required = false) String format, - @RequestParam(value = "struk_order_id", required = true) String strukOrderId) { + @RequestParam(value = "struk_order_id") String strukOrderId) { Map headerResep = resepDokterService.findHeaderResep(strukOrderId); List> dsResep = resepDokterService.findResepSatuan(strukOrderId); List> sdsResep = resepDokterService.findResepRacikan(strukOrderId); @@ -7839,7 +7457,7 @@ public class ReportingController extends LocaleController @RequestMapping("/slipGaji") public ModelAndView getSlipGaji(ModelAndView m, @RequestParam(value = "format", required = false) String format, - @RequestParam(value = "bulan", required = true) Long bulan) { + @RequestParam(value = "bulan") Long bulan) { List> dataSource = new ArrayList<>(); LoginUser loginUser = loginUserService.getLoginUser(); if (CommonUtil.isNotNullOrEmpty(loginUser)) { @@ -7855,7 +7473,7 @@ public class ReportingController extends LocaleController @RequestMapping(value = "/slip-gaji/json", method = RequestMethod.GET) public ResponseEntity> jsonSlipGaji(HttpServletRequest request, - @RequestParam(value = "bulan", required = true) Long bulan) { + @RequestParam(value = "bulan") Long bulan) { try { List result = reportService.allSlipGajiDataSource(bulan); mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS,