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

This commit is contained in:
Salman Manoe 2024-03-04 14:54:40 +07:00
commit 4cc62200e1

View File

@ -3628,19 +3628,25 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
}
return builder.build();
}
if (CommonUtil.isNotNullOrEmpty(d.get("totalDiskonD"))
if (CommonUtil.isNotNullOrEmpty(d.get("persenDiskonD"))
&& Double.parseDouble(d.get("persenDiskonD").toString()) > 0.0
&& CommonUtil.isNotNullOrEmpty(d.get("totalDiskonD"))
&& Double.parseDouble(d.get("totalDiskonD").toString()) > 0.0
&& CommonUtil.isNotNullOrEmpty(d.get("persenDiskonAs"))
&& Double.parseDouble(d.get("persenDiskonAs").toString()) > 0.0
&& CommonUtil.isNotNullOrEmpty(d.get("totalDiskonAs"))
&& Double.parseDouble(d.get("totalDiskonAs").toString()) > 0.0
&& CommonUtil.isNotNullOrEmpty(d.get("persenDiskonAn"))
&& Double.parseDouble(d.get("persenDiskonAn").toString()) > 0.0
&& CommonUtil.isNotNullOrEmpty(d.get("totalDiskonAn"))
&& Double.parseDouble(d.get("totalDiskonAn").toString()) > 0.0
&& (CommonUtil.isNullOrEmpty(d.get("idSayatan")) || (CommonUtil.isNotNullOrEmpty(d.get("idSayatan"))
&& CommonUtil.isNotNullOrEmpty(d.get("persenDiskonSayatanD"))
&& Double.parseDouble(d.get("persenDiskonSayatanD").toString()) > 0
&& Double.parseDouble(d.get("persenDiskonSayatanD").toString()) >= 0
&& CommonUtil.isNotNullOrEmpty(d.get("persenDiskonSayatanAs"))
&& Double.parseDouble(d.get("persenDiskonSayatanAs").toString()) > 0
&& Double.parseDouble(d.get("persenDiskonSayatanAs").toString()) >= 0
&& CommonUtil.isNotNullOrEmpty(d.get("persenDiskonSayatanAn"))
&& Double.parseDouble(d.get("persenDiskonSayatanAn").toString()) > 0))) {
&& Double.parseDouble(d.get("persenDiskonSayatanAn").toString()) >= 0))) {
double totalDiskon = Double.parseDouble(d.get("totalDiskonD").toString())
+ Double.parseDouble(d.get("totalDiskonAs").toString())
+ Double.parseDouble(d.get("totalDiskonAn").toString());
@ -3669,17 +3675,22 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
+ d.get("persenDiskonD").toString() + "%, " + d.get("persenDiskonAs").toString() + "%, dan "
+ d.get("persenDiskonAn").toString() + "%");
}
} else if (CommonUtil.isNotNullOrEmpty(d.get("totalDiskonD"))
} else if (CommonUtil.isNotNullOrEmpty(d.get("persenDiskonD"))
&& Double.parseDouble(d.get("persenDiskonD").toString()) > 0.0
&& CommonUtil.isNotNullOrEmpty(d.get("totalDiskonD"))
&& Double.parseDouble(d.get("totalDiskonD").toString()) > 0.0
&& CommonUtil.isNotNullOrEmpty(d.get("persenDiskonAs"))
&& Double.parseDouble(d.get("persenDiskonAs").toString()) > 0.0
&& CommonUtil.isNotNullOrEmpty(d.get("totalDiskonAs"))
&& Double.parseDouble(d.get("totalDiskonAs").toString()) > 0.0
&& (CommonUtil.isNullOrEmpty(d.get("totalDiskonAn"))
|| Double.parseDouble(d.get("totalDiskonAn").toString()) <= 0.0)
&& (Double.parseDouble(d.get("persenDiskonAn").toString()) == 0.0
&& (CommonUtil.isNullOrEmpty(d.get("totalDiskonAn"))
|| Double.parseDouble(d.get("totalDiskonAn").toString()) <= 0.0))
&& (CommonUtil.isNullOrEmpty(d.get("idSayatan")) || (CommonUtil.isNotNullOrEmpty(d.get("idSayatan"))
&& CommonUtil.isNotNullOrEmpty(d.get("persenDiskonSayatanD"))
&& Double.parseDouble(d.get("persenDiskonSayatanD").toString()) > 0
&& Double.parseDouble(d.get("persenDiskonSayatanD").toString()) >= 0
&& CommonUtil.isNotNullOrEmpty(d.get("persenDiskonSayatanAs"))
&& Double.parseDouble(d.get("persenDiskonSayatanAs").toString()) > 0))) {
&& Double.parseDouble(d.get("persenDiskonSayatanAs").toString()) >= 0))) {
double totalDiskon = Double.parseDouble(d.get("totalDiskonD").toString())
+ Double.parseDouble(d.get("totalDiskonAs").toString());
double hargaJualSetelahDiskon = hargaJual - totalDiskon;
@ -3703,17 +3714,22 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
+ "% karena diskon komponen operator dan asisten berturut-turut "
+ d.get("persenDiskonD").toString() + "% dan " + d.get("persenDiskonAs").toString() + "%");
}
} else if (CommonUtil.isNotNullOrEmpty(d.get("totalDiskonD"))
} else if (CommonUtil.isNotNullOrEmpty(d.get("persenDiskonD"))
&& Double.parseDouble(d.get("persenDiskonD").toString()) > 0.0
&& CommonUtil.isNotNullOrEmpty(d.get("totalDiskonD"))
&& Double.parseDouble(d.get("totalDiskonD").toString()) > 0.0
&& CommonUtil.isNotNullOrEmpty(d.get("persenDiskonAn"))
&& Double.parseDouble(d.get("persenDiskonAn").toString()) > 0.0
&& CommonUtil.isNotNullOrEmpty(d.get("totalDiskonAn"))
&& Double.parseDouble(d.get("totalDiskonAn").toString()) > 0.0
&& (CommonUtil.isNullOrEmpty(d.get("totalDiskonAs"))
|| Double.parseDouble(d.get("totalDiskonAs").toString()) <= 0.0)
&& (Double.parseDouble(d.get("persenDiskonAs").toString()) == 0.0
&& (CommonUtil.isNullOrEmpty(d.get("totalDiskonAs"))
|| Double.parseDouble(d.get("totalDiskonAs").toString()) <= 0.0))
&& (CommonUtil.isNullOrEmpty(d.get("idSayatan")) || (CommonUtil.isNotNullOrEmpty(d.get("idSayatan"))
&& CommonUtil.isNotNullOrEmpty(d.get("persenDiskonSayatanD"))
&& Double.parseDouble(d.get("persenDiskonSayatanD").toString()) > 0
&& Double.parseDouble(d.get("persenDiskonSayatanD").toString()) >= 0
&& CommonUtil.isNotNullOrEmpty(d.get("persenDiskonSayatanAn"))
&& Double.parseDouble(d.get("persenDiskonSayatanAn").toString()) > 0))) {
&& Double.parseDouble(d.get("persenDiskonSayatanAn").toString()) >= 0))) {
double totalDiskon = Double.parseDouble(d.get("totalDiskonD").toString())
+ Double.parseDouble(d.get("totalDiskonAn").toString());
double hargaJualSetelahDiskon = hargaJual - totalDiskon;
@ -3737,17 +3753,22 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
+ "% karena diskon komponen operator dan anestesi berturut-turut "
+ d.get("persenDiskonD").toString() + "% dan " + d.get("persenDiskonAn").toString() + "%");
}
} else if (CommonUtil.isNotNullOrEmpty(d.get("totalDiskonAs"))
} else if (CommonUtil.isNotNullOrEmpty(d.get("persenDiskonAs"))
&& Double.parseDouble(d.get("persenDiskonAs").toString()) > 0.0
&& CommonUtil.isNotNullOrEmpty(d.get("totalDiskonAs"))
&& Double.parseDouble(d.get("totalDiskonAs").toString()) > 0.0
&& CommonUtil.isNotNullOrEmpty(d.get("persenDiskonAn"))
&& Double.parseDouble(d.get("persenDiskonAn").toString()) > 0.0
&& CommonUtil.isNotNullOrEmpty(d.get("totalDiskonAn"))
&& Double.parseDouble(d.get("totalDiskonAn").toString()) > 0.0
&& (CommonUtil.isNullOrEmpty(d.get("totalDiskonD"))
|| Double.parseDouble(d.get("totalDiskonD").toString()) <= 0.0)
&& (Double.parseDouble(d.get("persenDiskonD").toString()) == 0.0
&& (CommonUtil.isNullOrEmpty(d.get("totalDiskonD"))
|| Double.parseDouble(d.get("totalDiskonD").toString()) <= 0.0))
&& (CommonUtil.isNullOrEmpty(d.get("idSayatan")) || (CommonUtil.isNotNullOrEmpty(d.get("idSayatan"))
&& CommonUtil.isNotNullOrEmpty(d.get("persenDiskonSayatanAs"))
&& Double.parseDouble(d.get("persenDiskonSayatanAs").toString()) > 0
&& Double.parseDouble(d.get("persenDiskonSayatanAs").toString()) >= 0
&& CommonUtil.isNotNullOrEmpty(d.get("persenDiskonSayatanAn"))
&& Double.parseDouble(d.get("persenDiskonSayatanAn").toString()) > 0))) {
&& Double.parseDouble(d.get("persenDiskonSayatanAn").toString()) >= 0))) {
double totalDiskon = Double.parseDouble(d.get("totalDiskonAs").toString())
+ Double.parseDouble(d.get("totalDiskonAn").toString());
double hargaJualSetelahDiskon = hargaJual - totalDiskon;
@ -3771,15 +3792,19 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
+ "% karena diskon komponen asisten dan anestesi berturut-turut "
+ d.get("persenDiskonAs").toString() + "% dan " + d.get("persenDiskonAn").toString() + "%");
}
} else if (CommonUtil.isNotNullOrEmpty(d.get("totalDiskonD"))
} else if (CommonUtil.isNotNullOrEmpty(d.get("persenDiskonD"))
&& Double.parseDouble(d.get("persenDiskonD").toString()) > 0.0
&& CommonUtil.isNotNullOrEmpty(d.get("totalDiskonD"))
&& Double.parseDouble(d.get("totalDiskonD").toString()) > 0.0
&& (CommonUtil.isNullOrEmpty(d.get("totalDiskonAs"))
|| Double.parseDouble(d.get("totalDiskonAs").toString()) <= 0.0)
&& (CommonUtil.isNullOrEmpty(d.get("totalDiskonAn"))
|| Double.parseDouble(d.get("totalDiskonAn").toString()) <= 0.0)
&& (Double.parseDouble(d.get("persenDiskonAs").toString()) == 0.0
&& (CommonUtil.isNullOrEmpty(d.get("totalDiskonAs"))
|| Double.parseDouble(d.get("totalDiskonAs").toString()) <= 0.0))
&& (Double.parseDouble(d.get("persenDiskonAn").toString()) == 0.0
&& (CommonUtil.isNullOrEmpty(d.get("totalDiskonAn"))
|| Double.parseDouble(d.get("totalDiskonAn").toString()) <= 0.0))
&& (CommonUtil.isNullOrEmpty(d.get("idSayatan")) || (CommonUtil.isNotNullOrEmpty(d.get("idSayatan"))
&& CommonUtil.isNotNullOrEmpty(d.get("persenDiskonSayatanD"))
&& Double.parseDouble(d.get("persenDiskonSayatanD").toString()) > 0))) {
&& Double.parseDouble(d.get("persenDiskonSayatanD").toString()) >= 0))) {
double totalDiskon = Double.parseDouble(d.get("totalDiskonD").toString());
double hargaJualSetelahDiskon = hargaJual - totalDiskon;
double hargaJasa = persenRemunerasi * hargaJualSetelahDiskon;
@ -3794,15 +3819,19 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
+ " terlebih dahulu dan diakhiri dengan pengalian " + persenRemunOperator
+ "% karena diskon komponen operator " + d.get("persenDiskonD").toString() + "%");
}
} else if (CommonUtil.isNotNullOrEmpty(d.get("totalDiskonAs"))
} else if (CommonUtil.isNotNullOrEmpty(d.get("persenDiskonAs"))
&& Double.parseDouble(d.get("persenDiskonAs").toString()) > 0.0
&& CommonUtil.isNotNullOrEmpty(d.get("totalDiskonAs"))
&& Double.parseDouble(d.get("totalDiskonAs").toString()) > 0.0
&& (CommonUtil.isNullOrEmpty(d.get("totalDiskonD"))
|| Double.parseDouble(d.get("totalDiskonD").toString()) <= 0.0)
&& (CommonUtil.isNullOrEmpty(d.get("totalDiskonAn"))
|| Double.parseDouble(d.get("totalDiskonAn").toString()) <= 0.0)
&& (Double.parseDouble(d.get("persenDiskonD").toString()) == 0.0
&& (CommonUtil.isNullOrEmpty(d.get("totalDiskonD"))
|| Double.parseDouble(d.get("totalDiskonD").toString()) <= 0.0))
&& (Double.parseDouble(d.get("persenDiskonAn").toString()) == 0.0
&& (CommonUtil.isNullOrEmpty(d.get("totalDiskonAn"))
|| Double.parseDouble(d.get("totalDiskonAn").toString()) <= 0.0))
&& (CommonUtil.isNullOrEmpty(d.get("idSayatan")) || (CommonUtil.isNotNullOrEmpty(d.get("idSayatan"))
&& CommonUtil.isNotNullOrEmpty(d.get("persenDiskonSayatanAs"))
&& Double.parseDouble(d.get("persenDiskonSayatanAs").toString()) > 0))) {
&& Double.parseDouble(d.get("persenDiskonSayatanAs").toString()) >= 0))) {
double totalDiskon = Double.parseDouble(d.get("totalDiskonAs").toString());
double hargaJualSetelahDiskon = hargaJual - totalDiskon;
double hargaJasa = persenRemunerasi * hargaJualSetelahDiskon;
@ -3817,15 +3846,19 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
+ " terlebih dahulu dan diakhiri dengan pengalian " + persenRemunAsisten
+ "% karena diskon komponen asisten " + d.get("persenDiskonAs").toString() + "%");
}
} else if (CommonUtil.isNotNullOrEmpty(d.get("totalDiskonAn"))
} else if (CommonUtil.isNotNullOrEmpty(d.get("persenDiskonAn"))
&& Double.parseDouble(d.get("persenDiskonAn").toString()) > 0.0
&& CommonUtil.isNotNullOrEmpty(d.get("totalDiskonAn"))
&& Double.parseDouble(d.get("totalDiskonAn").toString()) > 0.0
&& (CommonUtil.isNullOrEmpty(d.get("totalDiskonD"))
|| Double.parseDouble(d.get("totalDiskonD").toString()) <= 0.0)
&& (CommonUtil.isNullOrEmpty(d.get("totalDiskonAs"))
|| Double.parseDouble(d.get("totalDiskonAs").toString()) <= 0.0)
&& (Double.parseDouble(d.get("persenDiskonD").toString()) == 0.0
&& (CommonUtil.isNullOrEmpty(d.get("totalDiskonD"))
|| Double.parseDouble(d.get("totalDiskonD").toString()) <= 0.0))
&& (Double.parseDouble(d.get("persenDiskonAs").toString()) == 0.0
&& (CommonUtil.isNullOrEmpty(d.get("totalDiskonAs"))
|| Double.parseDouble(d.get("totalDiskonAs").toString()) <= 0.0))
&& (CommonUtil.isNullOrEmpty(d.get("idSayatan")) || (CommonUtil.isNotNullOrEmpty(d.get("idSayatan"))
&& CommonUtil.isNotNullOrEmpty(d.get("persenDiskonSayatanAn"))
&& Double.parseDouble(d.get("persenDiskonSayatanAn").toString()) > 0))) {
&& Double.parseDouble(d.get("persenDiskonSayatanAn").toString()) >= 0))) {
double totalDiskon = Double.parseDouble(d.get("totalDiskonAn").toString());
double hargaJualSetelahDiskon = hargaJual - totalDiskon;
double hargaJasa = persenRemunerasi * hargaJualSetelahDiskon;