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

Update service remunerasi

Browse Source 
Penyesuaian filter global karcis, buku bayi, dan embos kartu pasien tidak masuk logbook dokter
This commit is contained in:
Salman Manoe 2025-01-02 11:11:16 +07:00
parent 42531d028b
commit 030d6a2035
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/PelayananPasienDao.java
View File

@ -238,7 +238,8 @@ public interface PelayananPasienDao extends JpaRepository<PelayananPasien, Strin
+ "left join pp.kelas kls " + "left join pd.kelompokPasien kp " + "left join apd.ruangan ru "
+ "left join pr.detailJenisProduk djp " + "left join pp.sayatan sy ";
String WHERE_LOGBOOK_DOKTER = "where ppd.pelayananPasienId = pp.noRec and (ppp.statusEnabled is true or ppp.statusEnabled is null) "
String WHERE_LOGBOOK_DOKTER = "where pr.id not in (:listIdKarcis) "
+ "and ppd.pelayananPasienId = pp.noRec and (ppp.statusEnabled is true or ppp.statusEnabled is null) "
+ "and (pp.statusEnabled is true or pp.statusEnabled is null) and pp.strukResepId is null "
+ "and (pd.statusEnabled is true or pd.statusEnabled is null) ";
@ -275,7 +276,8 @@ public interface PelayananPasienDao extends JpaRepository<PelayananPasien, Strin
@Query(LOGBOOK_DOKTER + WHERE_LOGBOOK_DOKTER + PARAMATER_LOGBOOK_DOKTER + GROUP_LOGBOOK_DOKTER
+ ORDER_LOGBOOK_DOKTER)
List<Map<String, Object>> findPelayananPasienByPetugasAndTanggal(@Param("pegawaiId") Integer idPegawai,
@Param("tglAwal") Date tglAwal, @Param("tglAkhir") Date tglAkhir);
@Param("tglAwal") Date tglAwal, @Param("tglAkhir") Date tglAkhir,
@Param("listIdKarcis") List<Integer> listIdKarcis);
@Query("select new Map(jp.jenisPetugasPe as jenisPelaksana," + "pr.id as idProduk, pr.namaProduk as namaProduk,"
+ "pp.noRec as idPelayanan," + "coalesce(pp.hargaJual,0) as hargaJual,"

3
jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PelayananPasienServiceImpl.java
View File

@ -722,6 +722,7 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
List<Integer> idProdukLabGenetikaLuarRuangan = splitDataSettingDatafixed("idProdukLabGenetikaLuarRuangan");
List<Integer> idProdukKepalaPaketFixedPay = splitDataSettingDatafixed("idProdukKepalaPaketFixedPay");
List<Integer> paketBukanFixedPay = splitDataSettingDatafixed("produkPaketBukanFixedPay");
List<Integer> idsKarcis = splitDataSettingDatafixed("listKarcisIdProduk");
if (drKkPatologiAnatomiList.contains(idPegawai)) {
listDetailJenisProduk = idsRegDJPPenunjangPA;
} else if (pegawaiDao.getDokterByKelompokKerja(KK_PATOLOGI_KLINIK).contains(idPegawai)) {
@ -739,7 +740,7 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
* Mendapatkan data mentah pelayanan pasien
*/
List<Map<String, Object>> listRatedPay = pelayananPasienDao.findPelayananPasienByPetugasAndTanggal(idPegawai,
tglAwal, tglAkhir);
tglAwal, tglAkhir, idsKarcis);
/*
* Pemisahan produk kepala paket untuk fixed pay
*/

3
jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/RemunerasiServiceImpl.java
View File

@ -346,6 +346,7 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera
List<Integer> idProdukLabGenetikaLuarRuangan = splitDataSettingDatafixed("idProdukLabGenetikaLuarRuangan");
List<Integer> idProdukKepalaPaketFixedPay = splitDataSettingDatafixed("idProdukKepalaPaketFixedPay");
List<Integer> paketBukanFixedPay = splitDataSettingDatafixed("produkPaketBukanFixedPay");
List<Integer> idsKarcis = splitDataSettingDatafixed("listKarcisIdProduk");
if (drKkPatologiAnatomiList.contains(idPegawai)) {
listDetailJenisProduk = idsRegDJPPenunjangPA;
} else if (pegawaiDao.getDokterByKelompokKerja(KK_PATOLOGI_KLINIK).contains(idPegawai)) {
@ -363,7 +364,7 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera
* Mendapatkan data mentah pelayanan pasien
*/
List<Map<String, Object>> listRatedPay = pelayananPasienDao.findPelayananPasienByPetugasAndTanggal(idPegawai,
tglAwal, tglAkhir);
tglAwal, tglAkhir, idsKarcis);
/*
* Pemisahan produk kepala paket untuk fixed pay
*/