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

Merge branch 'dev/remun/diskon-dokter' into dev/no-cron

Browse Source
This commit is contained in:
Salman Manoe 2024-02-28 10:32:21 +07:00
commit ea225ec801
1 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3633,7 +3633,8 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
&& CommonUtil.isNotNullOrEmpty(d.get("totalDiskonAs")) && CommonUtil.isNotNullOrEmpty(d.get("totalDiskonAs"))
&& Double.parseDouble(d.get("totalDiskonAs").toString()) > 0.0 && Double.parseDouble(d.get("totalDiskonAs").toString()) > 0.0
&& CommonUtil.isNotNullOrEmpty(d.get("totalDiskonAn")) && CommonUtil.isNotNullOrEmpty(d.get("totalDiskonAn"))
&& Double.parseDouble(d.get("totalDiskonAn").toString()) > 0.0) { && Double.parseDouble(d.get("totalDiskonAn").toString()) > 0.0
&& CommonUtil.isNullOrEmpty(d.get("idSayatan"))) {
double totalDiskon = Double.parseDouble(d.get("totalDiskonD").toString()) double totalDiskon = Double.parseDouble(d.get("totalDiskonD").toString())
+ Double.parseDouble(d.get("totalDiskonAs").toString()) + Double.parseDouble(d.get("totalDiskonAs").toString())
+ Double.parseDouble(d.get("totalDiskonAn").toString()); + Double.parseDouble(d.get("totalDiskonAn").toString());
@ -3667,7 +3668,8 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
&& CommonUtil.isNotNullOrEmpty(d.get("totalDiskonAs")) && CommonUtil.isNotNullOrEmpty(d.get("totalDiskonAs"))
&& Double.parseDouble(d.get("totalDiskonAs").toString()) > 0.0 && Double.parseDouble(d.get("totalDiskonAs").toString()) > 0.0
&& (CommonUtil.isNullOrEmpty(d.get("totalDiskonAn")) && (CommonUtil.isNullOrEmpty(d.get("totalDiskonAn"))
|| Double.parseDouble(d.get("totalDiskonAn").toString()) <= 0.0)) { || Double.parseDouble(d.get("totalDiskonAn").toString()) <= 0.0)
&& CommonUtil.isNullOrEmpty(d.get("idSayatan"))) {
double totalDiskon = Double.parseDouble(d.get("totalDiskonD").toString()) double totalDiskon = Double.parseDouble(d.get("totalDiskonD").toString())
+ Double.parseDouble(d.get("totalDiskonAs").toString()); + Double.parseDouble(d.get("totalDiskonAs").toString());
double hargaJualSetelahDiskon = hargaJual - totalDiskon; double hargaJualSetelahDiskon = hargaJual - totalDiskon;
@ -3696,7 +3698,8 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
&& CommonUtil.isNotNullOrEmpty(d.get("totalDiskonAn")) && CommonUtil.isNotNullOrEmpty(d.get("totalDiskonAn"))
&& Double.parseDouble(d.get("totalDiskonAn").toString()) > 0.0 && Double.parseDouble(d.get("totalDiskonAn").toString()) > 0.0
&& (CommonUtil.isNullOrEmpty(d.get("totalDiskonAs")) && (CommonUtil.isNullOrEmpty(d.get("totalDiskonAs"))
|| Double.parseDouble(d.get("totalDiskonAs").toString()) <= 0.0)) { || Double.parseDouble(d.get("totalDiskonAs").toString()) <= 0.0)
&& CommonUtil.isNullOrEmpty(d.get("idSayatan"))) {
double totalDiskon = Double.parseDouble(d.get("totalDiskonD").toString()) double totalDiskon = Double.parseDouble(d.get("totalDiskonD").toString())
+ Double.parseDouble(d.get("totalDiskonAn").toString()); + Double.parseDouble(d.get("totalDiskonAn").toString());
double hargaJualSetelahDiskon = hargaJual - totalDiskon; double hargaJualSetelahDiskon = hargaJual - totalDiskon;
@ -3725,7 +3728,8 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
&& CommonUtil.isNotNullOrEmpty(d.get("totalDiskonAn")) && CommonUtil.isNotNullOrEmpty(d.get("totalDiskonAn"))
&& Double.parseDouble(d.get("totalDiskonAn").toString()) > 0.0 && Double.parseDouble(d.get("totalDiskonAn").toString()) > 0.0
&& (CommonUtil.isNullOrEmpty(d.get("totalDiskonD")) && (CommonUtil.isNullOrEmpty(d.get("totalDiskonD"))
|| Double.parseDouble(d.get("totalDiskonD").toString()) <= 0.0)) { || Double.parseDouble(d.get("totalDiskonD").toString()) <= 0.0)
&& CommonUtil.isNullOrEmpty(d.get("idSayatan"))) {
double totalDiskon = Double.parseDouble(d.get("totalDiskonAs").toString()) double totalDiskon = Double.parseDouble(d.get("totalDiskonAs").toString())
+ Double.parseDouble(d.get("totalDiskonAn").toString()); + Double.parseDouble(d.get("totalDiskonAn").toString());
double hargaJualSetelahDiskon = hargaJual - totalDiskon; double hargaJualSetelahDiskon = hargaJual - totalDiskon;
@ -3754,7 +3758,8 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
&& (CommonUtil.isNullOrEmpty(d.get("totalDiskonAs")) && (CommonUtil.isNullOrEmpty(d.get("totalDiskonAs"))
|| Double.parseDouble(d.get("totalDiskonAs").toString()) <= 0.0) || Double.parseDouble(d.get("totalDiskonAs").toString()) <= 0.0)
&& (CommonUtil.isNullOrEmpty(d.get("totalDiskonAn")) && (CommonUtil.isNullOrEmpty(d.get("totalDiskonAn"))
|| Double.parseDouble(d.get("totalDiskonAn").toString()) <= 0.0)) { || Double.parseDouble(d.get("totalDiskonAn").toString()) <= 0.0)
&& CommonUtil.isNullOrEmpty(d.get("idSayatan"))) {
double totalDiskon = Double.parseDouble(d.get("totalDiskonD").toString()); double totalDiskon = Double.parseDouble(d.get("totalDiskonD").toString());
double hargaJualSetelahDiskon = hargaJual - totalDiskon; double hargaJualSetelahDiskon = hargaJual - totalDiskon;
double hargaJasa = persenRemunerasi * hargaJualSetelahDiskon; double hargaJasa = persenRemunerasi * hargaJualSetelahDiskon;
@ -3774,7 +3779,8 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
&& (CommonUtil.isNullOrEmpty(d.get("totalDiskonD")) && (CommonUtil.isNullOrEmpty(d.get("totalDiskonD"))
|| Double.parseDouble(d.get("totalDiskonD").toString()) <= 0.0) || Double.parseDouble(d.get("totalDiskonD").toString()) <= 0.0)
&& (CommonUtil.isNullOrEmpty(d.get("totalDiskonAn")) && (CommonUtil.isNullOrEmpty(d.get("totalDiskonAn"))
|| Double.parseDouble(d.get("totalDiskonAn").toString()) <= 0.0)) { || Double.parseDouble(d.get("totalDiskonAn").toString()) <= 0.0)
&& CommonUtil.isNullOrEmpty(d.get("idSayatan"))) {
double totalDiskon = Double.parseDouble(d.get("totalDiskonAs").toString()); double totalDiskon = Double.parseDouble(d.get("totalDiskonAs").toString());
double hargaJualSetelahDiskon = hargaJual - totalDiskon; double hargaJualSetelahDiskon = hargaJual - totalDiskon;
double hargaJasa = persenRemunerasi * hargaJualSetelahDiskon; double hargaJasa = persenRemunerasi * hargaJualSetelahDiskon;
@ -3794,7 +3800,8 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
&& (CommonUtil.isNullOrEmpty(d.get("totalDiskonD")) && (CommonUtil.isNullOrEmpty(d.get("totalDiskonD"))
|| Double.parseDouble(d.get("totalDiskonD").toString()) <= 0.0) || Double.parseDouble(d.get("totalDiskonD").toString()) <= 0.0)
&& (CommonUtil.isNullOrEmpty(d.get("totalDiskonAs")) && (CommonUtil.isNullOrEmpty(d.get("totalDiskonAs"))
|| Double.parseDouble(d.get("totalDiskonAs").toString()) <= 0.0)) { || Double.parseDouble(d.get("totalDiskonAs").toString()) <= 0.0)
&& CommonUtil.isNullOrEmpty(d.get("idSayatan"))) {
double totalDiskon = Double.parseDouble(d.get("totalDiskonAn").toString()); double totalDiskon = Double.parseDouble(d.get("totalDiskonAn").toString());
double hargaJualSetelahDiskon = hargaJual - totalDiskon; double hargaJualSetelahDiskon = hargaJual - totalDiskon;
double hargaJasa = persenRemunerasi * hargaJualSetelahDiskon; double hargaJasa = persenRemunerasi * hargaJualSetelahDiskon;