Update pelayanan pasien

Perubahan diskon dpjp menjadi isian berdasarkan master persen diskon dokter
This commit is contained in:
Salman Manoe 2024-02-07 14:40:07 +07:00
parent 7c24ab5bc1
commit ea623cafa1
2 changed files with 6 additions and 4 deletions

View File

@ -206,7 +206,8 @@ public interface PelayananPasienDao extends JpaRepository<PelayananPasien, Strin
+ "apd.noRec as idAntrianPasienDiperiksa,apd.pegawaiId as idDPJP," + "apd.ruanganId as idRuangan,"
+ "case when lower(ru.namaRuangan) like '%eksekutif%' then 'Eksekutif' else 'Reguler' end as jenisRuangan,"
+ "ru.departemenId as idDepartemen," + "pd.noRec as idPasienDaftar,pd.pasienId as pasienId,"
+ "sum(case when ppd.komponenHargaId = 35 then ppd.hargaDiscount else 0.0 end) as totalDiskon) "
+ "sum(case when ppd.komponenHargaId = 35 then ppd.hargaDiscount else 0.0 end) as totalDiskon,"
+ "sum(case when ppd.komponenHargaId = 35 then ppd.hargaJual else 0.0 end) as totalKomponen) "
+ "from PelayananPasienDetail ppd, PelayananPasienPetugas ppp " + "inner join ppp.pelayananPasien pp "
+ "inner join pp.pasienDaftar apd " + "inner join apd.pasienDaftar pd " + "left join pp.produk pr "
+ "left join pp.kelas kls " + "left join pd.kelompokPasien kp " + "left join apd.ruangan ru "

View File

@ -586,13 +586,14 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
double hargaJual = Double.parseDouble(d.get("hargaJual").toString());
if (Boolean.parseBoolean(d.get("isSelisihPaket").toString()))
hargaJual -= Double.parseDouble(d.get("hargaDiskon").toString());
if (DOKTER_PEMERIKSA.equals(d.get("idJenisPelaksana")) && CommonUtil.isNotNullOrEmpty(d.get("totalDiskon"))
if (CommonUtil.isNotNullOrEmpty(d.get("totalDiskon"))
&& Double.parseDouble(d.get("totalDiskon").toString()) > 0.0
&& CommonUtil.isNullOrEmpty(d.get("idSayatan"))) {
/*
* Untuk diskon jasa medis oleh dpjp
* Untuk diskon jasa medis oleh dokter
*/
d.put("hargaJasa", 0.0);
d.put("hargaJasa", Double.parseDouble(d.get("totalKomponen").toString())
- Double.parseDouble(d.get("totalDiskon").toString()));
} else if (KLINIK_KARYAWAN.equals(d.get("idRuangan")) || KLINIK_GIGI_KARYAWAN.equals(d.get("idRuangan"))) {
/*
* Untuk semua klaim di ruangan klinik karyawan