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 40c0599a..3a384ced 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 @@ -850,8 +850,8 @@ public interface PegawaiDao extends PagingAndSortingRepository @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%") - Map getKepalaPegawai(@Param("namaJabatan") String namaJabatan); + + "inner join mapPegawai.jabatan jabatan " + "where mapPegawai.jabatan.id = :idJabatan") + Map getKepalaPegawai(@Param("idJabatan") Integer idJabatan); @Query("select pg.id from MapPegawaiJabatanToUnitKerja mj " + "inner join mj.pegawai pg " + "inner join mj.jabatan jb " + "where mj.unitKerjaPegawaiId = jb.unitKerjaId " diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/PegawaiService.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/PegawaiService.java index f8cc8672..9c836e25 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/PegawaiService.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/PegawaiService.java @@ -1,19 +1,19 @@ package com.jasamedika.medifirst2000.service; -import java.util.Date; -import java.util.List; -import java.util.Map; - import com.jasamedika.medifirst2000.dto.PegawaiDto; import com.jasamedika.medifirst2000.entities.Pegawai; import com.jasamedika.medifirst2000.vo.PegawaiVO; import com.jasamedika.medifirst2000.vo.RegistrasiPegawaiMobileVO; import com.jasamedika.medifirst2000.vo.RekamDataPegawaiVO; +import java.util.Date; +import java.util.List; +import java.util.Map; + public interface PegawaiService extends BaseVoService { List getAllDokter(); - + List> getDokterBpjs(); List getAllDokterByRuanganAndTanggal(String kodeRuangan, Date tanggal); @@ -23,7 +23,7 @@ public interface PegawaiService extends BaseVoService findPegawaiOutSourcingNoPaging(); - Map findKepalaPegawai(String namaJabatan); + Map findKepalaPegawai(String fieldDataFix); Integer getRuanganByIdPegawaiCustom(Integer id); 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 277bbd98..c98639fb 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 @@ -1733,8 +1733,9 @@ public class PegawaiServiceImpl extends BaseVoServiceImpl implements PegawaiServ } @Override - public Map findKepalaPegawai(String namaJabatan) { - return pegawaiDao.getKepalaPegawai(namaJabatan); + public Map findKepalaPegawai(String fieldDataFix) { + String valueFix = GetSettingDataFixed(fieldDataFix); + return pegawaiDao.getKepalaPegawai(Integer.valueOf(valueFix)); } @Override diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/ReportServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/ReportServiceImpl.java index ab72e032..636bd234 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/ReportServiceImpl.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/ReportServiceImpl.java @@ -468,6 +468,7 @@ public class ReportServiceImpl extends BaseVoServiceImpl implements ReportServic return diffMinutes; } + @SuppressWarnings("unchecked") public void skriningNyeriNeonatus(Map result, String noRecPengkajian) { Map data = pengkajianAwalTransaksiService.loadPengkajianBaru(78, noRecPengkajian); Map ekspresiWajah = (Map) data.get("pengkajianAwal"); @@ -559,6 +560,7 @@ public class ReportServiceImpl extends BaseVoServiceImpl implements ReportServic result.put("diagnosaKeperawatan", diagnosaKeperawatan.toString()); } + @SuppressWarnings("unchecked") public Map kebutuhanEdukasi(Map result, String noRecPengkajian) { // kebutuhan edukasi // hambatanPembelajaran @@ -619,6 +621,7 @@ public class ReportServiceImpl extends BaseVoServiceImpl implements ReportServic return result; } + @SuppressWarnings("unchecked") public void skriningKekhususan(Map result, String noRecPengkajian) { String skriningKekhususan = ""; String skriningKekhususanValue = ""; @@ -752,6 +755,7 @@ public class ReportServiceImpl extends BaseVoServiceImpl implements ReportServic result.put("skriningKekhususanValue", skriningKekhususanValue); } + @SuppressWarnings("unchecked") public void skriningNyeriAnakDewasa(Map result, String noRecPengkajian) { // SkriningNyeriAnak StringBuilder skriningNyeri = new StringBuilder(); @@ -844,6 +848,7 @@ public class ReportServiceImpl extends BaseVoServiceImpl implements ReportServic result.put("jumlahNilai", Integer.toString(jumlahNilai)); } + @SuppressWarnings("unchecked") public Map klinik(Map result, String noRecPengkajian) { // klinik StringBuilder klinikBedah = new StringBuilder(); @@ -954,6 +959,7 @@ public class ReportServiceImpl extends BaseVoServiceImpl implements ReportServic return result; } + @SuppressWarnings("unchecked") public Map statusFungsional(Map result, String noRecPengkajian) { // statusFungsional Map statusFungsional = (Map) pengkajianAwalTransaksiService @@ -1005,6 +1011,7 @@ public class ReportServiceImpl extends BaseVoServiceImpl implements ReportServic return result; } + @SuppressWarnings("unchecked") public Map resikoJatuh(Map result, String noRecPengkajian) { // PenilaianResikoJatuh String resikoJatuh = ""; @@ -1049,6 +1056,7 @@ public class ReportServiceImpl extends BaseVoServiceImpl implements ReportServic return result; } + @SuppressWarnings("unchecked") public Map psikososial(Map result, String noRecPengkajian) { // PENGKAJIAN KEBUTUHAN DASAR @@ -1086,6 +1094,7 @@ public class ReportServiceImpl extends BaseVoServiceImpl implements ReportServic return result; } + @SuppressWarnings("unchecked") public void resikoJatuhRawatInap(Map result, String noRecPengkajian) { // PenilaianResikoJatuh String resikoJatuh = ""; @@ -1132,6 +1141,7 @@ public class ReportServiceImpl extends BaseVoServiceImpl implements ReportServic result.put("totalSkor", Integer.toString(totalSkor)); } + @SuppressWarnings("unchecked") public void pengkajianKebutuhanDasarRawatInap(Map result, String noRecPengkajian) { StringBuilder pengkajianKebutuhanDasar = new StringBuilder(); @@ -1154,6 +1164,7 @@ public class ReportServiceImpl extends BaseVoServiceImpl implements ReportServic result.put("pengkajianKebutuhanDasarValue", pengkajianKebutuhanDasarValue.toString()); } + @SuppressWarnings("unchecked") public void statusFungsionalRawatInap(Map result, String noRecPengkajian) { StringBuilder fungsiStatusFungsional = new StringBuilder(); StringBuilder keteranganStatusFungsional = new StringBuilder(); @@ -1183,6 +1194,7 @@ public class ReportServiceImpl extends BaseVoServiceImpl implements ReportServic result.put("totalSkorStatusFungsional", Integer.toString(totalSkorStatusFungsional)); } + @SuppressWarnings("unchecked") public Map perencanaanPulang(Map result, String noRecPengkajian) { // perencanaanPulang StringBuilder komponenPenilaian = new StringBuilder(); @@ -1206,6 +1218,7 @@ public class ReportServiceImpl extends BaseVoServiceImpl implements ReportServic return result; } + @SuppressWarnings("unchecked") public Map pengkajianKebutuhanDasar(Map result, String noRecPengkajian) { // pengkajianKebutuhanDasar StringBuilder pengkajianKebutuhanDasar = new StringBuilder(); @@ -1225,6 +1238,7 @@ public class ReportServiceImpl extends BaseVoServiceImpl implements ReportServic return result; } + @SuppressWarnings("unchecked") public void riwayatKelahiranRawatInap(Map result, String noRecPengkajian) { // riwayatKelahiran @@ -1264,6 +1278,7 @@ public class ReportServiceImpl extends BaseVoServiceImpl implements ReportServic } + @SuppressWarnings("unchecked") public void skriningKekhususanNeonatus(Map result, String noRecPengkajian) { // SKRINING KEKHUSUSAN // INFORMASI IBU @@ -1404,6 +1419,7 @@ public class ReportServiceImpl extends BaseVoServiceImpl implements ReportServic } } + @SuppressWarnings("unchecked") public void obstetrikDanGinekologi(Map result, String noRecPengkajian) { String kawin; @@ -1560,6 +1576,7 @@ public class ReportServiceImpl extends BaseVoServiceImpl implements ReportServic result.put("penyakitLain", penyakit.toString()); } + @SuppressWarnings("unchecked") public void skriningGiziAnak(Map result, String noRecPengkajian) { Map daftarPenyakit = (Map) pengkajianAwalTransaksiService .loadPengkajianBaru(16, noRecPengkajian).get("pengkajianAwal"); @@ -2855,6 +2872,7 @@ public class ReportServiceImpl extends BaseVoServiceImpl implements ReportServic return newDate; } + @SuppressWarnings("unchecked") @Override public Map generateJadwalPerUnitKerja(Integer ruangan, Integer tahun, Integer bulan) { Map result = new HashMap<>(); @@ -3166,7 +3184,8 @@ public class ReportServiceImpl extends BaseVoServiceImpl implements ReportServic Map result = pencatatanSuhuMesinDao.getReportPencatatanSuhuMesin(idMesin, idMappingMesin, tglCatSuhuMesin); Map supervisor = pegawaiDao.findPegawaiById(idSupervisor); - Map pegMonitorSterilisasi = pegawaiDao.getKepalaPegawai("Monitoring Sterilisasi"); + String ttdCatatSuhuMesin = GetSettingDataFixed("ttdCatatSuhuMesin"); + Map pegMonitorSterilisasi = pegawaiDao.getKepalaPegawai(Integer.valueOf(ttdCatatSuhuMesin)); result.put("idSupervisor", supervisor.get("idPegawai")); result.put("namaSupervisor", supervisor.get("nama")); result.put("idJabSupervisor", supervisor.get("idJabatanInternal")); 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 a01f451f..98db7ca7 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 @@ -3072,13 +3072,8 @@ public class ReportingController extends LocaleController if (CommonUtil.isNullOrEmpty(reaksi)) { reaksi = ""; } - // alergiId = (Integer) data[2]; - // ket = ((String) data[3]); - // papalergi += "\n" + alergi + ", yaitu " + ket + " Reaksi - // " + reaksi; } } - // papalergi = "Tidak ada alergi"; } StringBuilder kebutuhanEdukasi = new StringBuilder(); @@ -5694,8 +5689,7 @@ public class ReportingController extends LocaleController persenKinerja = Double.parseDouble(strPersenKinerja); Map result = neracaLimbahService.getJumlahJenisLimbahB3ByPeriode(startDate, endDate); - Map kepalaIK3KL = pegawaiService - .findKepalaPegawai("Kepala Instalasi Kesehatan Lingkungan Dan Pemeliharaan Sarana"); + Map kepalaIK3KL = pegawaiService.findKepalaPegawai("ttdKepalaIPSRS"); m.addObject("dataSourceLimbah", resultSimpan.get("limbahMasuk")); m.addObject("subDataSourceLimbah", resultSimpan.get("limbahKeluar")); @@ -6441,8 +6435,7 @@ public class ReportingController extends LocaleController List> result = new ArrayList<>(); Map data = reportService.generateSuratTugas(noRecPlanning, idJabatan, idUnitKerja, idAtasan1, idAtasan2, idKaRu, idJabatanAtasan1, idJabatanAtasan2); - Map kepalaPegawai = pegawaiService - .findKepalaPegawai("Direktur Sumber Daya Manusia dan Pendidikan"); + Map kepalaPegawai = pegawaiService.findKepalaPegawai("ttdSuratTugas"); result.add(data); m.addObject("dataSource", result); m.addObject("format", "pdf"); @@ -6450,6 +6443,7 @@ public class ReportingController extends LocaleController if (CommonUtil.isNotNullOrEmpty(kepalaPegawai)) { m.addObject("nipPegawai", kepalaPegawai.get("nipPegawai")); m.addObject("namaPegawai", kepalaPegawai.get("namaPegawai")); + m.addObject("ttdJabatan", kepalaPegawai.get("namaJabatan")); } if (format != null && !format.isEmpty()) { @@ -6891,8 +6885,7 @@ public class ReportingController extends LocaleController DateFormat df = new SimpleDateFormat("yyyy-MM-dd"); - Map kepalaCssd = pegawaiService - .findKepalaPegawai("Kepala Instalasi Sarana Sandang dan Sterilisasi Sentral"); + Map kepalaCssd = pegawaiService.findKepalaPegawai("ttdKepalaCSSD"); Map grandTarifQty = cssdSterilisasiService.findGrandTarifQtySterilisasi(startDate, endDate); List> dsRekapLayananSterilisasi = cssdSterilisasiService .findDepartemenTarifQtySterilisasi(startDate, endDate); @@ -7087,8 +7080,7 @@ public class ReportingController extends LocaleController DateFormat df = new SimpleDateFormat("yyyy-MM-dd"); - Map kepalaTtdRekap = pegawaiService - .findKepalaPegawai("Kepala Instalasi Loundry dan Sterilisasi Sentral"); + Map kepalaTtdRekap = pegawaiService.findKepalaPegawai("ttdKepalaLaundry"); Map grandTarifQty = laundryService.findGrandTarifQtyCuciLinen(startDate, endDate); List> dsRekapCuciLinen = laundryService.findDepartemenTarifQtyCuciLinen(startDate, endDate); List> sdsRekapCuciLinen = laundryService.findRuanganTarifQtyCuciLinen(startDate, endDate); @@ -7182,7 +7174,7 @@ public class ReportingController extends LocaleController List> result = reportService.generateReportGrafikSuhuMesin(idMesin, idMappingMesin, tglCatSuhuMesin); Map supervisor = pegawaiService.findPegawaiByIdCustom(idSupervisor); - Map pegMonSterilisasi = pegawaiService.findKepalaPegawai("Monitoring Sterilisasi"); + Map pegMonSterilisasi = pegawaiService.findKepalaPegawai("ttdCatatSuhuMesin"); m.addObject("dataSource", result); m.addObject("idSupervisor", supervisor.get("idPegawai")); diff --git a/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/suratTugas.jrxml b/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/suratTugas.jrxml index dabdbe79..ade23566 100644 --- a/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/suratTugas.jrxml +++ b/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/suratTugas.jrxml @@ -1,9 +1,10 @@ - + + @@ -179,13 +180,6 @@ - - - - - - - @@ -200,6 +194,13 @@ + + + + + + +