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

Merge branch 'master' into dev-1211

Browse Source
This commit is contained in:
Salman Manoe 2023-09-18 14:09:49 +07:00
commit 4b6dcf19aa
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1153,8 +1153,7 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
*/
listPelayananRemun.add(next);
capaianRemun += Double.parseDouble(next.get("hargaJasa").toString());
} else if (drAnastesiList.contains(idPegawai)
&& DOKTER_PEMERIKSA.equals(next.get("idJenisPelaksana"))) {
} else if (drAnastesiList.contains(idPegawai)) {
if (idsPenunjangBukanAnestesi.contains(Integer.parseInt(next.get("idProduk").toString()))) {
/*
* Aturan dokter kk anestesi dengan pembatasan
@ -1162,7 +1161,8 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
*/
listPelayananRemun.add(next);
capaianRemun += Double.parseDouble(next.get("hargaJasa").toString());
} else if (RADIOLOGI.equals(next.get("idDepartemen"))) {
} else if (RADIOLOGI.equals(next.get("idDepartemen"))
&& DOKTER_PEMERIKSA.equals(next.get("idJenisPelaksana"))) {
listPelayananRemun.add(next);
capaianRemun += Double.parseDouble(next.get("hargaJasa").toString());
}
@ -1270,8 +1270,7 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
*/
listPelayananRemun.add(next);
capaianRemun += Double.parseDouble(next.get("hargaJasa").toString());
} else if (drAnastesiList.contains(idPegawai)
&& DOKTER_PEMERIKSA.equals(next.get("idJenisPelaksana"))) {
} else if (drAnastesiList.contains(idPegawai)) {
if (idsPenunjangBukanAnestesi.contains(Integer.parseInt(next.get("idProduk").toString()))) {
/*
* Aturan dokter kk anestesi dengan pembatasan
@ -1279,7 +1278,8 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
*/
listPelayananRemun.add(next);
capaianRemun += Double.parseDouble(next.get("hargaJasa").toString());
} else if (RADIOLOGI.equals(next.get("idDepartemen"))) {
} else if (RADIOLOGI.equals(next.get("idDepartemen"))
&& DOKTER_PEMERIKSA.equals(next.get("idJenisPelaksana"))) {
listPelayananRemun.add(next);
capaianRemun += Double.parseDouble(next.get("hargaJasa").toString());
}
@ -1380,15 +1380,15 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
* tindakan tertentu
*/
listPelayananFfs.add(next);
} else if (drAnastesiList.contains(idPegawai)
&& DOKTER_PEMERIKSA.equals(next.get("idJenisPelaksana"))) {
} else if (drAnastesiList.contains(idPegawai)) {
if (idsPenunjangBukanAnestesi.contains(Integer.parseInt(next.get("idProduk").toString()))) {
/*
* Aturan dokter kk anestesi dengan pembatasan
* tindakan tertentu
*/
listPelayananFfs.add(next);
} else if (RADIOLOGI.equals(next.get("idDepartemen"))) {
} else if (RADIOLOGI.equals(next.get("idDepartemen"))
&& DOKTER_PEMERIKSA.equals(next.get("idJenisPelaksana"))) {
listPelayananFfs.add(next);
}
} else if (CommonUtil.isNotNullOrEmpty(listDetailJenisProdukException)