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

- penerapan diskon penunggu pasien dan pasien indikasi tertentu disetujui mpp

Browse Source 
- perbaikan service data detail pasien di logbook poin dokter
This commit is contained in:
salmanoe 2021-08-26 10:27:17 +07:00
parent 39a089f3fc
commit bfcb8c23a2
3 changed files with 25 additions and 11 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/PelayananPasienDao.java
View File

@ -159,8 +159,8 @@ public interface PelayananPasienDao extends PagingAndSortingRepository<Pelayanan
@Param("tglAwal") Date tglAwal, @Param("tglAkhir") Date tglAkhir);
@Query("select new Map(pp.noRec as noRec,"
+ "(case when :jenisDiskon = 1 and pr.id in (:listProdukId) and coalesce(pp.hargaDiscount,0) >= pp.hargaJual then coalesce(pp.hargaDiscount,0) "
+ "when :jenisDiskon = 1 and pr.id in (:listProdukId) and coalesce(pp.hargaDiscount,0) < pp.hargaJual then pp.hargaJual "
+ "(case when :jenisDiskon in (1,3,4) and pr.id in (:listProdukId) and coalesce(pp.hargaDiscount,0) >= pp.hargaJual then coalesce(pp.hargaDiscount,0) "
+ "when :jenisDiskon in (1,3,4) and pr.id in (:listProdukId) and coalesce(pp.hargaDiscount,0) < pp.hargaJual then pp.hargaJual "
+ "when :jenisDiskon = 1 and lower(pr.namaProduk) like '%konsul%' and ru.departemenId in (:listDepartemenId) and coalesce(pp.hargaDiscount,0) >= pp.hargaJual then coalesce(pp.hargaDiscount,0) "
+ "when :jenisDiskon = 1 and lower(pr.namaProduk) like '%konsul%' and ru.departemenId in (:listDepartemenId) and coalesce(pp.hargaDiscount,0) < pp.hargaJual then pp.hargaJual "
+ "when :jenisDiskon = 2 and lower(pr.namaProduk) like '%konsul%' and ru.departemenId in (:listDepartemenId) and coalesce(pp.hargaDiscount,0) >= (pp.hargaJual/2) then coalesce(pp.hargaDiscount,0) "

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

@ -184,11 +184,11 @@ public interface RevIndekKinerjaDao extends PagingAndSortingRepository<IndekKine
+ "pasienDaftar.tglPulang as tglPulang," + "produk.id as idProduk," + "dokter.id as idPegawai,"
+ "to_char(pelayananPasien.tglPelayanan,'yyyy-MM-dd') as tglpel,"
+ "cast(pelayananPasien.tglPelayanan as timestamp) as tanggalPelayanan, "
+ "pasienDaftar.kelompokPasienId as kelompokPasienId, " + "pasienDaftar.diskonPegawai as statusDiskon, "
+ "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) "
+ "pasienDaftar.kelompokPasienId as kelompokPasienId," + "pasienDaftar.rekananId as rekananId,"
+ "pasienDaftar.diskonPegawai as statusDiskon, " + "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) "
+ "from PelayananPasienPetugas pelayananPasienPetugas, " + "PegawaiJadwalKerja jadwalKerja, "
+ "Kalender kalender, " + "ShiftKerja shift "
+ "left join pelayananPasienPetugas.pelayananPasien pelayananPasien "

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

@ -4823,7 +4823,12 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK
}
}
} else if (Master.KelompokPasien.BPJS
.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))) {
.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
|| (Master.KelompokPasien.ASURANSI_LAIN
.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
&& Master.Rekanan.JAMINAN_KEMENKES
.equals(Integer.parseInt(map.get("rekananId").toString())))) {
if (diskon > 0 && (CommonUtil.isNullOrEmpty(statusDiskon) || statusDiskon.equals(0))) {
if (Double.valueOf(map.get("diskon").toString()) > 0
&& (CommonUtil.isNullOrEmpty(map.get("statusDiskon"))
@ -5017,8 +5022,12 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK
&& map.get("departemenId").equals(Master.Departemen.IGD)
&& drKsmUmumList.contains(idPegawai) && Arrays.asList(Master.Produk.DOKTER_UMUM_IGD)
.contains(Integer.parseInt(map.get("idProduk").toString()))) {
if (Master.KelompokPasien.BPJS
.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))) {
if (Master.KelompokPasien.BPJS.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
|| (Master.KelompokPasien.ASURANSI_LAIN
.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
&& Master.Rekanan.JAMINAN_KEMENKES
.equals(Integer.parseInt(map.get("rekananId").toString())))) {
if (diskon > 0 && (CommonUtil.isNullOrEmpty(statusDiskon) || statusDiskon.equals(0))) {
if (Double.valueOf(map.get("diskon").toString()) > 0
&& (CommonUtil.isNullOrEmpty(map.get("statusDiskon"))
@ -5232,7 +5241,12 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK
}
}
} else if (Master.KelompokPasien.BPJS
.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))) {
.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
|| (Master.KelompokPasien.ASURANSI_LAIN
.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
&& Master.Rekanan.JAMINAN_KEMENKES
.equals(Integer.parseInt(map.get("rekananId").toString())))) {
if (diskon > 0 && (CommonUtil.isNullOrEmpty(statusDiskon) || statusDiskon.equals(0))) {
if (Double.valueOf(map.get("diskon").toString()) > 0
&& (CommonUtil.isNullOrEmpty(map.get("statusDiskon"))