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

Update service logbook poin dokter

Browse Source 
Perbaikan dan penyesuaian aturan remun kk pediatrik gawat darurat, kk perinatologi, dan kk anestesi tindakan mandiri radiologi di cetakan detail pasien
This commit is contained in:
Salman Manoe 2023-06-14 13:09:30 +07:00
parent 35274feeba
commit 1b5b14210b
3 changed files with 962 additions and 475 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/RevIndekKinerjaDao.java
View File

@ -196,9 +196,9 @@ public interface RevIndekKinerjaDao extends PagingAndSortingRepository<IndekKine
+ "pasienDaftar.kelompokPasienId as kelompokPasienId," + "pasienDaftar.rekananId as rekananId,"
+ "pasienDaftar.diskonPegawai as statusDiskon, " + "antrian.pegawaiId as idDPJP, "
+ "kategoryPegawai.id as kategoryPegawaiId, " + "kelas.id as idKelas,"
+ "jenisPetugas.id as idJenisPetugas,jenisPetugas.jenisPetugasPe as jenisPetugas, " + "departemen.id as departemenId, "
+ "to_char(kalender.tanggal, 'yyyy-MM-dd') as tanggalKalender, " + "shift.jamMasuk as jamMasuk, "
+ "shift.jamPulang as jamPulang, " + "shift.namaShift as namaShift) "
+ "jenisPetugas.id as idJenisPetugas,jenisPetugas.jenisPetugasPe as jenisPetugas, "
+ "departemen.id as departemenId, " + "to_char(kalender.tanggal, 'yyyy-MM-dd') as tanggalKalender, "
+ "shift.jamMasuk as jamMasuk, " + "shift.jamPulang as jamPulang, " + "shift.namaShift as namaShift) "
+ "from PelayananPasienPetugas pelayananPasienPetugas, " + "PegawaiJadwalKerja jadwalKerja, "
+ "Kalender kalender, " + "ShiftKerja shift "
+ "left join pelayananPasienPetugas.pelayananPasien pelayananPasien "
@ -227,8 +227,9 @@ public interface RevIndekKinerjaDao extends PagingAndSortingRepository<IndekKine
+ "ruangan.namaRuangan as ruangan," + "pelayananPasien.noRec as noRecPelayananPasien,"
+ "detail.id as detailId, " + "produk.namaProduk as namaProduk," + "pasien.namaPasien as namapasien,"
+ "pasien.noCm as noCm," + "pasien.tglLahir as tglLahir," + "pasienDaftar.noRegistrasi as noRegistrasi,"
+ "pasienDaftar.tglRegistrasi as tglRegistrasi," + "pelayananPasien.hargaSatuan as harga,"
+ "coalesce(pelayananPasien.hargaDiscount,0) as diskon," + "pelayananPasien.jumlah as jumlah, "
+ "pasienDaftar.tglRegistrasi as tglRegistrasi," + "antrian.pegawaiId as idDPJP,"
+ "pelayananPasien.hargaSatuan as harga," + "coalesce(pelayananPasien.hargaDiscount,0) as diskon,"
+ "pelayananPasien.jumlah as jumlah, "
+ "(select distinct harga.hargaNetto1 from HargaNettoProdukByKelas harga "
+ "where harga.produkId = produk.id "
+ "and ((harga.statusEnabled is true and harga.reportDisplay = 'tarif_2022_Nov') "
@ -239,9 +240,9 @@ public interface RevIndekKinerjaDao extends PagingAndSortingRepository<IndekKine
+ "cast(pelayananPasien.tglPelayanan as timestamp) as tanggalPelayanan, "
+ "pasienDaftar.kelompokPasienId as kelompokPasienId, " + "pasienDaftar.rekananId as rekananId,"
+ "kategoryPegawai.id as kategoryPegawaiId, " + "kelas.id as idKelas,"
+ "jenisPetugas.jenisPetugasPe as jenisPetugas, " + "departemen.id as departemenId, "
+ "to_char(kalender.tanggal, 'yyyy-MM-dd') as tanggalKalender, " + "shift.jamMasuk as jamMasuk, "
+ "shift.jamPulang as jamPulang, " + "shift.namaShift as namaShift) "
+ "jenisPetugas.id as idJenisPetugas,jenisPetugas.jenisPetugasPe as jenisPetugas, "
+ "departemen.id as departemenId, " + "to_char(kalender.tanggal, 'yyyy-MM-dd') as tanggalKalender, "
+ "shift.jamMasuk as jamMasuk, " + "shift.jamPulang as jamPulang, " + "shift.namaShift as namaShift) "
+ "from PelayananPasienPetugas pelayananPasienPetugas, " + "PegawaiJadwalKerja jadwalKerja, "
+ "Kalender kalender, " + "ShiftKerja shift "
+ "left join pelayananPasienPetugas.pelayananPasien pelayananPasien "

1411
jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/IndekKinerjaServiceImpl.java
View File

File diff suppressed because it is too large Load Diff

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

@ -6561,8 +6561,6 @@ public class ReportingController extends LocaleController<RegistrasiPelayananVO>
@RequestParam(value = "idJabatanAtasan", required = true) Integer idJabatanAtasan,
@RequestParam(value = "ffs", required = true) Boolean ffs) {
// List<Map<String, Object>> result = new ArrayList<Map<String,
// Object>>();
List<Map<String, Object>> resultFFS = new ArrayList<Map<String, Object>>();
List<Map<String, Object>> allDetailTindakan = new ArrayList<>();
@ -6575,9 +6573,6 @@ public class ReportingController extends LocaleController<RegistrasiPelayananVO>
bulan = bulanArray[Integer.parseInt(splitData[1]) - 1];
}
// Pegawai pegawaiLoggedIn =
// indekKinerjaService.getPegawaiByUserLogin();
// Jabatan jabatan = jabatanDao.findOne(idJabatanAtasan);
Map<String, Object> mapJabatan = mapPegawaiJabatanToUnitKerjaService.findAtasanDanUnitKerja(idPegawai,
idJabatan);
Map<String, Object> atasan = mapPegawaiJabatanToUnitKerjaService.findAtasanDanUnitKerja(idAtasan,
@ -6586,7 +6581,9 @@ public class ReportingController extends LocaleController<RegistrasiPelayananVO>
Map<String, Object> pegawai = pegawaiDao.findPegawaiById(idPegawai);
if (ffs) {
// FFS : sudah tidak dipakai
/**
* @deprecated Unused services
*/
resultFFS = indekKinerjaService.getAllTindakanByDokterForfeeForServiceReview(periode, idPegawai);
allDetailTindakan = indekKinerjaService.findPatientDetailForEveryTindakanReview(idPegawai, periode, ffs);
} else {