salmanoe/SC-be-java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update service reporting

Browse Source 
Perbaikan mekanisme tertanda cetakan menggunakan setting data fix dan perbaikan cetakan surat tugas
This commit is contained in:
Salman Manoe 2023-08-29 14:15:31 +07:00
parent a7a7326e14
commit 61524dad13
6 changed files with 47 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/PegawaiDao.java
View File

@ -850,8 +850,8 @@ public interface PegawaiDao extends PagingAndSortingRepository<Pegawai, Integer>
@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<String, Object> getKepalaPegawai(@Param("namaJabatan") String namaJabatan);
+ "inner join mapPegawai.jabatan jabatan " + "where mapPegawai.jabatan.id = :idJabatan")
Map<String, Object> 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 "

14
jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/PegawaiService.java
View File

@ -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<Pegawai, PegawaiVO, Integer> {
List<PegawaiVO> getAllDokter();
List<Map<String, Object>> getDokterBpjs();
List<PegawaiVO> getAllDokterByRuanganAndTanggal(String kodeRuangan, Date tanggal);
@ -23,7 +23,7 @@ public interface PegawaiService extends BaseVoService<Pegawai, PegawaiVO, Intege
PegawaiVO update(PegawaiVO vo);
PegawaiVO findById(Integer key);
Pegawai getById(Integer key);
PegawaiVO getPegawaiById(Integer id);
@ -123,7 +123,7 @@ public interface PegawaiService extends BaseVoService<Pegawai, PegawaiVO, Intege
Map<String, Object> findPegawaiOutSourcingNoPaging();
Map<String, Object> findKepalaPegawai(String namaJabatan);
Map<String, Object> findKepalaPegawai(String fieldDataFix);
Integer getRuanganByIdPegawaiCustom(Integer id);

5
jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PegawaiServiceImpl.java
View File

@ -1733,8 +1733,9 @@ public class PegawaiServiceImpl extends BaseVoServiceImpl implements PegawaiServ
}
@Override
public Map<String, Object> findKepalaPegawai(String namaJabatan) {
return pegawaiDao.getKepalaPegawai(namaJabatan);
public Map<String, Object> findKepalaPegawai(String fieldDataFix) {
String valueFix = GetSettingDataFixed(fieldDataFix);
return pegawaiDao.getKepalaPegawai(Integer.valueOf(valueFix));
}
@Override

21
jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/ReportServiceImpl.java
View File

@ -468,6 +468,7 @@ public class ReportServiceImpl extends BaseVoServiceImpl implements ReportServic
return diffMinutes;
}
@SuppressWarnings("unchecked")
public void skriningNyeriNeonatus(Map<String, Object> result, String noRecPengkajian) {
Map<String, Object> data = pengkajianAwalTransaksiService.loadPengkajianBaru(78, noRecPengkajian);
Map<String, Object> ekspresiWajah = (Map<String, Object>) data.get("pengkajianAwal");
@ -559,6 +560,7 @@ public class ReportServiceImpl extends BaseVoServiceImpl implements ReportServic
result.put("diagnosaKeperawatan", diagnosaKeperawatan.toString());
}
@SuppressWarnings("unchecked")
public Map<String, Object> kebutuhanEdukasi(Map<String, Object> 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<String, Object> 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<String, Object> 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<String, Object> klinik(Map<String, Object> 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<String, Object> statusFungsional(Map<String, Object> result, String noRecPengkajian) {
// statusFungsional
Map<String, Object> statusFungsional = (Map<String, Object>) pengkajianAwalTransaksiService
@ -1005,6 +1011,7 @@ public class ReportServiceImpl extends BaseVoServiceImpl implements ReportServic
return result;
}
@SuppressWarnings("unchecked")
public Map<String, Object> resikoJatuh(Map<String, Object> result, String noRecPengkajian) {
// PenilaianResikoJatuh
String resikoJatuh = "";
@ -1049,6 +1056,7 @@ public class ReportServiceImpl extends BaseVoServiceImpl implements ReportServic
return result;
}
@SuppressWarnings("unchecked")
public Map<String, Object> psikososial(Map<String, Object> 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<String, Object> 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<String, Object> 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<String, Object> 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<String, Object> perencanaanPulang(Map<String, Object> 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<String, Object> pengkajianKebutuhanDasar(Map<String, Object> 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<String, Object> result, String noRecPengkajian) {
// riwayatKelahiran
@ -1264,6 +1278,7 @@ public class ReportServiceImpl extends BaseVoServiceImpl implements ReportServic
}
@SuppressWarnings("unchecked")
public void skriningKekhususanNeonatus(Map<String, Object> result, String noRecPengkajian) {
// SKRINING KEKHUSUSAN
// INFORMASI IBU
@ -1404,6 +1419,7 @@ public class ReportServiceImpl extends BaseVoServiceImpl implements ReportServic
}
}
@SuppressWarnings("unchecked")
public void obstetrikDanGinekologi(Map<String, Object> 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<String, Object> result, String noRecPengkajian) {
Map<String, Object> daftarPenyakit = (Map<String, Object>) pengkajianAwalTransaksiService
.loadPengkajianBaru(16, noRecPengkajian).get("pengkajianAwal");
@ -2855,6 +2872,7 @@ public class ReportServiceImpl extends BaseVoServiceImpl implements ReportServic
return newDate;
}
@SuppressWarnings("unchecked")
@Override
public Map<String, Object> generateJadwalPerUnitKerja(Integer ruangan, Integer tahun, Integer bulan) {
Map<String, Object> result = new HashMap<>();
@ -3166,7 +3184,8 @@ public class ReportServiceImpl extends BaseVoServiceImpl implements ReportServic
Map<String, Object> result = pencatatanSuhuMesinDao.getReportPencatatanSuhuMesin(idMesin, idMappingMesin,
tglCatSuhuMesin);
Map<String, Object> supervisor = pegawaiDao.findPegawaiById(idSupervisor);
Map<String, Object> pegMonitorSterilisasi = pegawaiDao.getKepalaPegawai("Monitoring Sterilisasi");
String ttdCatatSuhuMesin = GetSettingDataFixed("ttdCatatSuhuMesin");
Map<String, Object> pegMonitorSterilisasi = pegawaiDao.getKepalaPegawai(Integer.valueOf(ttdCatatSuhuMesin));
result.put("idSupervisor", supervisor.get("idPegawai"));
result.put("namaSupervisor", supervisor.get("nama"));
result.put("idJabSupervisor", supervisor.get("idJabatanInternal"));

20
jasamedika-reporting/src/main/java/com/jasamedika/medifirst2000/controller/ReportingController.java
View File

@ -3072,13 +3072,8 @@ public class ReportingController extends LocaleController<RegistrasiPelayananVO>
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<RegistrasiPelayananVO>
persenKinerja = Double.parseDouble(strPersenKinerja);
Map<String, Object> result = neracaLimbahService.getJumlahJenisLimbahB3ByPeriode(startDate, endDate);
Map<String, Object> kepalaIK3KL = pegawaiService
.findKepalaPegawai("Kepala Instalasi Kesehatan Lingkungan Dan Pemeliharaan Sarana");
Map<String, Object> 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<RegistrasiPelayananVO>
List<Map<String, Object>> result = new ArrayList<>();
Map<String, Object> data = reportService.generateSuratTugas(noRecPlanning, idJabatan, idUnitKerja, idAtasan1,
idAtasan2, idKaRu, idJabatanAtasan1, idJabatanAtasan2);
Map<String, Object> kepalaPegawai = pegawaiService
.findKepalaPegawai("Direktur Sumber Daya Manusia dan Pendidikan");
Map<String, Object> kepalaPegawai = pegawaiService.findKepalaPegawai("ttdSuratTugas");
result.add(data);
m.addObject("dataSource", result);
m.addObject("format", "pdf");
@ -6450,6 +6443,7 @@ public class ReportingController extends LocaleController<RegistrasiPelayananVO>
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<RegistrasiPelayananVO>
DateFormat df = new SimpleDateFormat("yyyy-MM-dd");
Map<String, Object> kepalaCssd = pegawaiService
.findKepalaPegawai("Kepala Instalasi Sarana Sandang dan Sterilisasi Sentral");
Map<String, Object> kepalaCssd = pegawaiService.findKepalaPegawai("ttdKepalaCSSD");
Map<String, Object> grandTarifQty = cssdSterilisasiService.findGrandTarifQtySterilisasi(startDate, endDate);
List<Map<String, Object>> dsRekapLayananSterilisasi = cssdSterilisasiService
.findDepartemenTarifQtySterilisasi(startDate, endDate);
@ -7087,8 +7080,7 @@ public class ReportingController extends LocaleController<RegistrasiPelayananVO>
DateFormat df = new SimpleDateFormat("yyyy-MM-dd");
Map<String, Object> kepalaTtdRekap = pegawaiService
.findKepalaPegawai("Kepala Instalasi Loundry dan Sterilisasi Sentral");
Map<String, Object> kepalaTtdRekap = pegawaiService.findKepalaPegawai("ttdKepalaLaundry");
Map<String, Object> grandTarifQty = laundryService.findGrandTarifQtyCuciLinen(startDate, endDate);
List<Map<String, Object>> dsRekapCuciLinen = laundryService.findDepartemenTarifQtyCuciLinen(startDate, endDate);
List<Map<String, Object>> sdsRekapCuciLinen = laundryService.findRuanganTarifQtyCuciLinen(startDate, endDate);
@ -7182,7 +7174,7 @@ public class ReportingController extends LocaleController<RegistrasiPelayananVO>
List<Map<String, Object>> result = reportService.generateReportGrafikSuhuMesin(idMesin, idMappingMesin,
tglCatSuhuMesin);
Map<String, Object> supervisor = pegawaiService.findPegawaiByIdCustom(idSupervisor);
Map<String, Object> pegMonSterilisasi = pegawaiService.findKepalaPegawai("Monitoring Sterilisasi");
Map<String, Object> pegMonSterilisasi = pegawaiService.findKepalaPegawai("ttdCatatSuhuMesin");
m.addObject("dataSource", result);
m.addObject("idSupervisor", supervisor.get("idPegawai"));

17
jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/suratTugas.jrxml
View File

@ -1,9 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Created with Jaspersoft Studio version 6.11.0.final using JasperReports Library version 6.11.0-0c4056ccaa4d25a5a8c45672d2f764ea3498bebb -->
<!-- Created with Jaspersoft Studio version 6.20.5.final using JasperReports Library version 6.20.5-3efcf2e67f959db3888d79f73dde2dbd7acb4f8e -->
<jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="suratTugas" pageWidth="595" pageHeight="842" columnWidth="555" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" uuid="1d63a912-04ee-47d6-9d66-c47a2bbd2dca">
<property name="com.jaspersoft.studio.data.defaultdataadapter" value="One Empty Record"/>
<parameter name="nipPegawai" class="java.lang.String"/>
<parameter name="namaPegawai" class="java.lang.String"/>
<parameter name="ttdJabatan" class="java.lang.String"/>
<queryString>
<![CDATA[]]>
</queryString>
@ -179,13 +180,6 @@
</textElement>
<textFieldExpression><![CDATA["Jakarta, "+$F{today}]]></textFieldExpression>
</textField>
<staticText>
<reportElement x="300" y="280" width="252" height="20" uuid="5951bbc1-9cdd-4187-b94a-c3d4e1baeea6"/>
<textElement verticalAlignment="Middle">
<font size="11"/>
</textElement>
<text><![CDATA[Direktur SDM dan Pendidikan]]></text>
</staticText>
<textField>
<reportElement x="300" y="350" width="252" height="20" uuid="aec0481a-2569-4e43-a198-80746a6ea13a"/>
<textElement verticalAlignment="Middle">
@ -200,6 +194,13 @@
</textElement>
<textFieldExpression><![CDATA["NIP. "+$P{nipPegawai}]]></textFieldExpression>
</textField>
<textField>
<reportElement x="300" y="280" width="252" height="20" uuid="16e98c8f-a0fd-455d-befc-3fddd540ae93"/>
<textElement verticalAlignment="Middle">
<font size="11"/>
</textElement>
<textFieldExpression><![CDATA[$P{ttdJabatan}]]></textFieldExpression>
</textField>
</band>
</summary>
</jasperReport>