Merge branch 'dev/remun/logbook-tarif' into dev/no-cron
This commit is contained in:
commit
7a21c119f3
@ -4328,37 +4328,70 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
|
|||||||
}
|
}
|
||||||
return builder.build();
|
return builder.build();
|
||||||
}
|
}
|
||||||
double totalDiskonD = Double.parseDouble(d.get("totalDiskonD").toString());
|
double totalDiskonD = 0.0;
|
||||||
double totalPersenDiskonSayatanD = Double.parseDouble(d.get("totalPersenDiskonSayatanD").toString());
|
if (CommonUtil.isNotNullOrEmpty(d.get("totalDiskonD")))
|
||||||
double totalHargaD = Double.parseDouble(d.get("totalHargaD").toString());
|
totalDiskonD = Double.parseDouble(d.get("totalDiskonD").toString());
|
||||||
double totalDiskonAs = Double.parseDouble(d.get("totalDiskonAs").toString());
|
double totalPersenDiskonSayatanD = 0.0;
|
||||||
double totalPersenDiskonSayatanAs = Double.parseDouble(d.get("totalPersenDiskonSayatanAs").toString());
|
if (CommonUtil.isNotNullOrEmpty(d.get("totalPersenDiskonSayatanD")))
|
||||||
double totalHargaAs = Double.parseDouble(d.get("totalHargaAs").toString());
|
totalPersenDiskonSayatanD = Double.parseDouble(d.get("totalPersenDiskonSayatanD").toString());
|
||||||
double totalDiskonAn = Double.parseDouble(d.get("totalDiskonAn").toString());
|
double totalHargaD = 0.0;
|
||||||
double totalPersenDiskonSayatanAn = Double.parseDouble(d.get("totalPersenDiskonSayatanAn").toString());
|
if (CommonUtil.isNotNullOrEmpty(d.get("totalHargaD")))
|
||||||
double totalHargaAn = Double.parseDouble(d.get("totalHargaAn").toString());
|
totalHargaD = Double.parseDouble(d.get("totalHargaD").toString());
|
||||||
|
double totalDiskonAs = 0.0;
|
||||||
|
if (CommonUtil.isNotNullOrEmpty(d.get("totalDiskonAs")))
|
||||||
|
totalDiskonAs = Double.parseDouble(d.get("totalDiskonAs").toString());
|
||||||
|
double totalPersenDiskonSayatanAs = 0.0;
|
||||||
|
if (CommonUtil.isNotNullOrEmpty(d.get("totalPersenDiskonSayatanAs")))
|
||||||
|
totalPersenDiskonSayatanAs = Double.parseDouble(d.get("totalPersenDiskonSayatanAs").toString());
|
||||||
|
double totalHargaAs = 0.0;
|
||||||
|
if (CommonUtil.isNotNullOrEmpty(d.get("totalHargaAs")))
|
||||||
|
totalHargaAs = Double.parseDouble(d.get("totalHargaAs").toString());
|
||||||
|
double totalDiskonAn = 0.0;
|
||||||
|
if (CommonUtil.isNotNullOrEmpty(d.get("totalDiskonAn")))
|
||||||
|
totalDiskonAn = Double.parseDouble(d.get("totalDiskonAn").toString());
|
||||||
|
double totalPersenDiskonSayatanAn = 0.0;
|
||||||
|
if (CommonUtil.isNotNullOrEmpty(d.get("totalPersenDiskonSayatanAn")))
|
||||||
|
totalPersenDiskonSayatanAn = Double.parseDouble(d.get("totalPersenDiskonSayatanAn").toString());
|
||||||
|
double totalHargaAn = 0.0;
|
||||||
|
if (CommonUtil.isNotNullOrEmpty(d.get("totalHargaAn")))
|
||||||
|
totalHargaAn = Double.parseDouble(d.get("totalHargaAn").toString());
|
||||||
double totalDiskon = 0.0;
|
double totalDiskon = 0.0;
|
||||||
if (Double.parseDouble(d.get("totalPersenDiskonD").toString()) > 0)
|
if (CommonUtil.isNotNullOrEmpty(d.get("totalPersenDiskonD"))
|
||||||
|
&& Double.parseDouble(d.get("totalPersenDiskonD").toString()) > 0)
|
||||||
totalDiskon += totalDiskonD - (totalPersenDiskonSayatanD * totalHargaD / 100);
|
totalDiskon += totalDiskonD - (totalPersenDiskonSayatanD * totalHargaD / 100);
|
||||||
if (Double.parseDouble(d.get("totalPersenDiskonAs").toString()) > 0)
|
if (CommonUtil.isNotNullOrEmpty(d.get("totalPersenDiskonAs"))
|
||||||
|
&& Double.parseDouble(d.get("totalPersenDiskonAs").toString()) > 0)
|
||||||
totalDiskon += totalDiskonAs - (totalPersenDiskonSayatanAs * totalHargaAs / 100);
|
totalDiskon += totalDiskonAs - (totalPersenDiskonSayatanAs * totalHargaAs / 100);
|
||||||
if (Double.parseDouble(d.get("totalPersenDiskonAn").toString()) > 0)
|
if (CommonUtil.isNotNullOrEmpty(d.get("totalPersenDiskonAn"))
|
||||||
|
&& Double.parseDouble(d.get("totalPersenDiskonAn").toString()) > 0)
|
||||||
totalDiskon += totalDiskonAn - (totalPersenDiskonSayatanAn * totalHargaAn / 100);
|
totalDiskon += totalDiskonAn - (totalPersenDiskonSayatanAn * totalHargaAn / 100);
|
||||||
double hargaJualSetelahDiskon = hargaJual - totalDiskon;
|
double hargaJualSetelahDiskon = hargaJual - totalDiskon;
|
||||||
double hargaJasa = persenRemunerasi * hargaJualSetelahDiskon;
|
double hargaJasa = persenRemunerasi * hargaJualSetelahDiskon;
|
||||||
if (Double.parseDouble(d.get("persenDiskonD").toString()) > 0.0
|
if (CommonUtil.isNotNullOrEmpty(d.get("persenDiskonD"))
|
||||||
|
&& Double.parseDouble(d.get("persenDiskonD").toString()) > 0.0
|
||||||
|
&& CommonUtil.isNotNullOrEmpty(d.get("diskonD"))
|
||||||
&& Double.parseDouble(d.get("diskonD").toString()) >= 0.0
|
&& Double.parseDouble(d.get("diskonD").toString()) >= 0.0
|
||||||
|
&& CommonUtil.isNotNullOrEmpty(d.get("persenDiskonAs"))
|
||||||
&& Double.parseDouble(d.get("persenDiskonAs").toString()) > 0.0
|
&& Double.parseDouble(d.get("persenDiskonAs").toString()) > 0.0
|
||||||
|
&& CommonUtil.isNotNullOrEmpty(d.get("diskonAs"))
|
||||||
&& Double.parseDouble(d.get("diskonAs").toString()) >= 0.0
|
&& Double.parseDouble(d.get("diskonAs").toString()) >= 0.0
|
||||||
|
&& CommonUtil.isNotNullOrEmpty(d.get("persenDiskonAn"))
|
||||||
&& Double.parseDouble(d.get("persenDiskonAn").toString()) > 0.0
|
&& Double.parseDouble(d.get("persenDiskonAn").toString()) > 0.0
|
||||||
|
&& CommonUtil.isNotNullOrEmpty(d.get("diskonAn"))
|
||||||
&& Double.parseDouble(d.get("diskonAn").toString()) >= 0.0
|
&& Double.parseDouble(d.get("diskonAn").toString()) >= 0.0
|
||||||
&& (CommonUtil.isNullOrEmpty(d.get("idSayatan")) || (CommonUtil.isNotNullOrEmpty(d.get("idSayatan"))
|
&& (CommonUtil.isNullOrEmpty(d.get("idSayatan")) || (CommonUtil.isNotNullOrEmpty(d.get("idSayatan"))
|
||||||
&& Double.parseDouble(d.get("persenDiskonSayatanD").toString()) >= 0 && Double
|
&& CommonUtil.isNotNullOrEmpty(d.get("persenDiskonSayatanD"))
|
||||||
.parseDouble(d.get("persenDiskonSayatanAs").toString()) >= 0
|
&& Double.parseDouble(d.get("persenDiskonSayatanD").toString()) >= 0
|
||||||
|
&& CommonUtil.isNotNullOrEmpty(d.get("persenDiskonSayatanAs"))
|
||||||
|
&& 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 persenRemunOperator = 100.00 - Double.parseDouble(d.get("persenDiskonD").toString());
|
double persenRemunOperator = 100.00 - (CommonUtil.isNotNullOrEmpty(d.get("persenDiskonD"))
|
||||||
double persenRemunAsisten = 100.00 - Double.parseDouble(d.get("persenDiskonAs").toString());
|
? Double.parseDouble(d.get("persenDiskonD").toString()) : 0.0);
|
||||||
double persenRemunAnestesi = 100.00 - Double.parseDouble(d.get("persenDiskonAn").toString());
|
double persenRemunAsisten = 100.00 - (CommonUtil.isNotNullOrEmpty(d.get("persenDiskonAs"))
|
||||||
|
? Double.parseDouble(d.get("persenDiskonAs").toString()) : 0.0);
|
||||||
|
double persenRemunAnestesi = 100.00 - (CommonUtil.isNotNullOrEmpty(d.get("persenDiskonAn"))
|
||||||
|
? Double.parseDouble(d.get("persenDiskonAn").toString()) : 0.0);
|
||||||
double hargaJasaOperator = persenRemunOperator * hargaJasa / 100;
|
double hargaJasaOperator = persenRemunOperator * hargaJasa / 100;
|
||||||
double hargaJasaAsisten = persenRemunAsisten * hargaJasa / 100;
|
double hargaJasaAsisten = persenRemunAsisten * hargaJasa / 100;
|
||||||
double hargaJasaAnestesi = persenRemunAnestesi * hargaJasa / 100;
|
double hargaJasaAnestesi = persenRemunAnestesi * hargaJasa / 100;
|
||||||
@ -4379,17 +4412,27 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
|
|||||||
+ d.get("persenDiskonD").toString() + "%, " + d.get("persenDiskonAs").toString() + "%, dan "
|
+ d.get("persenDiskonD").toString() + "%, " + d.get("persenDiskonAs").toString() + "%, dan "
|
||||||
+ d.get("persenDiskonAn").toString() + "%");
|
+ d.get("persenDiskonAn").toString() + "%");
|
||||||
}
|
}
|
||||||
} else if (Double.parseDouble(d.get("persenDiskonD").toString()) > 0.0
|
} else if (CommonUtil.isNotNullOrEmpty(d.get("persenDiskonD"))
|
||||||
|
&& Double.parseDouble(d.get("persenDiskonD").toString()) > 0.0
|
||||||
|
&& CommonUtil.isNotNullOrEmpty(d.get("diskonD"))
|
||||||
&& Double.parseDouble(d.get("diskonD").toString()) >= 0.0
|
&& Double.parseDouble(d.get("diskonD").toString()) >= 0.0
|
||||||
|
&& CommonUtil.isNotNullOrEmpty(d.get("persenDiskonAs"))
|
||||||
&& Double.parseDouble(d.get("persenDiskonAs").toString()) > 0.0
|
&& Double.parseDouble(d.get("persenDiskonAs").toString()) > 0.0
|
||||||
|
&& CommonUtil.isNotNullOrEmpty(d.get("diskonAs"))
|
||||||
&& Double.parseDouble(d.get("diskonAs").toString()) >= 0.0
|
&& Double.parseDouble(d.get("diskonAs").toString()) >= 0.0
|
||||||
|
&& CommonUtil.isNotNullOrEmpty(d.get("persenDiskonAn"))
|
||||||
&& Double.parseDouble(d.get("persenDiskonAn").toString()) == 0.0
|
&& Double.parseDouble(d.get("persenDiskonAn").toString()) == 0.0
|
||||||
|
&& CommonUtil.isNotNullOrEmpty(d.get("diskonAn"))
|
||||||
&& Double.parseDouble(d.get("diskonAn").toString()) <= 0.0
|
&& Double.parseDouble(d.get("diskonAn").toString()) <= 0.0
|
||||||
&& (CommonUtil.isNullOrEmpty(d.get("idSayatan")) || (CommonUtil.isNotNullOrEmpty(d.get("idSayatan"))
|
&& (CommonUtil.isNullOrEmpty(d.get("idSayatan")) || (CommonUtil.isNotNullOrEmpty(d.get("idSayatan"))
|
||||||
&& Double.parseDouble(d.get("persenDiskonSayatanD").toString()) >= 0 && Double
|
&& CommonUtil.isNotNullOrEmpty(d.get("persenDiskonSayatanD")) && Double
|
||||||
.parseDouble(d.get("persenDiskonSayatanAs").toString()) >= 0))) {
|
.parseDouble(d.get("persenDiskonSayatanD").toString()) >= 0
|
||||||
double persenRemunOperator = 100.00 - Double.parseDouble(d.get("persenDiskonD").toString());
|
&& CommonUtil.isNotNullOrEmpty(d.get("persenDiskonSayatanAs"))
|
||||||
double persenRemunAsisten = 100.00 - Double.parseDouble(d.get("persenDiskonAs").toString());
|
&& Double.parseDouble(d.get("persenDiskonSayatanAs").toString()) >= 0))) {
|
||||||
|
double persenRemunOperator = 100.00 - (CommonUtil.isNotNullOrEmpty(d.get("persenDiskonD"))
|
||||||
|
? Double.parseDouble(d.get("persenDiskonD").toString()) : 0.0);
|
||||||
|
double persenRemunAsisten = 100.00 - (CommonUtil.isNotNullOrEmpty(d.get("persenDiskonAs"))
|
||||||
|
? Double.parseDouble(d.get("persenDiskonAs").toString()) : 0.0);
|
||||||
double hargaJasaOperator = persenRemunOperator * hargaJasa / 100;
|
double hargaJasaOperator = persenRemunOperator * hargaJasa / 100;
|
||||||
double hargaJasaAsisten = persenRemunAsisten * hargaJasa / 100;
|
double hargaJasaAsisten = persenRemunAsisten * hargaJasa / 100;
|
||||||
double hargaJasaRemun = hargaJasaOperator + hargaJasaAsisten;
|
double hargaJasaRemun = hargaJasaOperator + hargaJasaAsisten;
|
||||||
@ -4407,17 +4450,27 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
|
|||||||
+ "% karena diskon komponen operator dan asisten berturut-turut "
|
+ "% karena diskon komponen operator dan asisten berturut-turut "
|
||||||
+ d.get("persenDiskonD").toString() + "% dan " + d.get("persenDiskonAs").toString() + "%");
|
+ d.get("persenDiskonD").toString() + "% dan " + d.get("persenDiskonAs").toString() + "%");
|
||||||
}
|
}
|
||||||
} else if (Double.parseDouble(d.get("persenDiskonD").toString()) > 0.0
|
} else if (CommonUtil.isNotNullOrEmpty(d.get("persenDiskonD"))
|
||||||
|
&& Double.parseDouble(d.get("persenDiskonD").toString()) > 0.0
|
||||||
|
&& CommonUtil.isNotNullOrEmpty(d.get("diskonD"))
|
||||||
&& Double.parseDouble(d.get("diskonD").toString()) >= 0.0
|
&& Double.parseDouble(d.get("diskonD").toString()) >= 0.0
|
||||||
|
&& CommonUtil.isNotNullOrEmpty(d.get("persenDiskonAn"))
|
||||||
&& Double.parseDouble(d.get("persenDiskonAn").toString()) > 0.0
|
&& Double.parseDouble(d.get("persenDiskonAn").toString()) > 0.0
|
||||||
|
&& CommonUtil.isNotNullOrEmpty(d.get("diskonAn"))
|
||||||
&& Double.parseDouble(d.get("diskonAn").toString()) >= 0.0
|
&& Double.parseDouble(d.get("diskonAn").toString()) >= 0.0
|
||||||
|
&& CommonUtil.isNotNullOrEmpty(d.get("persenDiskonAs"))
|
||||||
&& Double.parseDouble(d.get("persenDiskonAs").toString()) == 0.0
|
&& Double.parseDouble(d.get("persenDiskonAs").toString()) == 0.0
|
||||||
|
&& CommonUtil.isNotNullOrEmpty(d.get("diskonAs"))
|
||||||
&& Double.parseDouble(d.get("diskonAs").toString()) <= 0.0
|
&& Double.parseDouble(d.get("diskonAs").toString()) <= 0.0
|
||||||
&& (CommonUtil.isNullOrEmpty(d.get("idSayatan")) || (CommonUtil.isNotNullOrEmpty(d.get("idSayatan"))
|
&& (CommonUtil.isNullOrEmpty(d.get("idSayatan")) || (CommonUtil.isNotNullOrEmpty(d.get("idSayatan"))
|
||||||
&& Double.parseDouble(d.get("persenDiskonSayatanD").toString()) >= 0 && Double
|
&& CommonUtil.isNotNullOrEmpty(d.get("persenDiskonSayatanD")) && Double
|
||||||
.parseDouble(d.get("persenDiskonSayatanAn").toString()) >= 0))) {
|
.parseDouble(d.get("persenDiskonSayatanD").toString()) >= 0
|
||||||
double persenRemunOperator = 100.00 - Double.parseDouble(d.get("persenDiskonD").toString());
|
&& CommonUtil.isNotNullOrEmpty(d.get("persenDiskonSayatanAn"))
|
||||||
double persenRemunAnestesi = 100.00 - Double.parseDouble(d.get("persenDiskonAn").toString());
|
&& Double.parseDouble(d.get("persenDiskonSayatanAn").toString()) >= 0))) {
|
||||||
|
double persenRemunOperator = 100.00 - (CommonUtil.isNotNullOrEmpty(d.get("persenDiskonD"))
|
||||||
|
? Double.parseDouble(d.get("persenDiskonD").toString()) : 0.0);
|
||||||
|
double persenRemunAnestesi = 100.00 - (CommonUtil.isNotNullOrEmpty(d.get("persenDiskonAn"))
|
||||||
|
? Double.parseDouble(d.get("persenDiskonAn").toString()) : 0.0);
|
||||||
double hargaJasaOperator = persenRemunOperator * hargaJasa / 100;
|
double hargaJasaOperator = persenRemunOperator * hargaJasa / 100;
|
||||||
double hargaJasaAnestesi = persenRemunAnestesi * hargaJasa / 100;
|
double hargaJasaAnestesi = persenRemunAnestesi * hargaJasa / 100;
|
||||||
double hargaJasaRemun = hargaJasaOperator + hargaJasaAnestesi;
|
double hargaJasaRemun = hargaJasaOperator + hargaJasaAnestesi;
|
||||||
@ -4435,17 +4488,27 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
|
|||||||
+ "% karena diskon komponen operator dan anestesi berturut-turut "
|
+ "% karena diskon komponen operator dan anestesi berturut-turut "
|
||||||
+ d.get("persenDiskonD").toString() + "% dan " + d.get("persenDiskonAn").toString() + "%");
|
+ d.get("persenDiskonD").toString() + "% dan " + d.get("persenDiskonAn").toString() + "%");
|
||||||
}
|
}
|
||||||
} else if (Double.parseDouble(d.get("persenDiskonAs").toString()) > 0.0
|
} else if (CommonUtil.isNotNullOrEmpty(d.get("persenDiskonAs"))
|
||||||
|
&& Double.parseDouble(d.get("persenDiskonAs").toString()) > 0.0
|
||||||
|
&& CommonUtil.isNotNullOrEmpty(d.get("diskonAs"))
|
||||||
&& Double.parseDouble(d.get("diskonAs").toString()) >= 0.0
|
&& Double.parseDouble(d.get("diskonAs").toString()) >= 0.0
|
||||||
|
&& CommonUtil.isNotNullOrEmpty(d.get("persenDiskonAn"))
|
||||||
&& Double.parseDouble(d.get("persenDiskonAn").toString()) > 0.0
|
&& Double.parseDouble(d.get("persenDiskonAn").toString()) > 0.0
|
||||||
|
&& CommonUtil.isNotNullOrEmpty(d.get("diskonAn"))
|
||||||
&& Double.parseDouble(d.get("diskonAn").toString()) >= 0.0
|
&& Double.parseDouble(d.get("diskonAn").toString()) >= 0.0
|
||||||
|
&& CommonUtil.isNotNullOrEmpty(d.get("persenDiskonD"))
|
||||||
&& Double.parseDouble(d.get("persenDiskonD").toString()) == 0.0
|
&& Double.parseDouble(d.get("persenDiskonD").toString()) == 0.0
|
||||||
|
&& CommonUtil.isNotNullOrEmpty(d.get("diskonD"))
|
||||||
&& Double.parseDouble(d.get("diskonD").toString()) <= 0.0
|
&& Double.parseDouble(d.get("diskonD").toString()) <= 0.0
|
||||||
&& (CommonUtil.isNullOrEmpty(d.get("idSayatan")) || (CommonUtil.isNotNullOrEmpty(d.get("idSayatan"))
|
&& (CommonUtil.isNullOrEmpty(d.get("idSayatan")) || (CommonUtil.isNotNullOrEmpty(d.get("idSayatan"))
|
||||||
&& Double.parseDouble(d.get("persenDiskonSayatanAs").toString()) >= 0 && Double
|
&& CommonUtil.isNotNullOrEmpty(d.get("persenDiskonSayatanAs")) && Double
|
||||||
.parseDouble(d.get("persenDiskonSayatanAn").toString()) >= 0))) {
|
.parseDouble(d.get("persenDiskonSayatanAs").toString()) >= 0
|
||||||
double persenRemunAsisten = 100.00 - Double.parseDouble(d.get("persenDiskonAs").toString());
|
&& CommonUtil.isNotNullOrEmpty(d.get("persenDiskonSayatanAn"))
|
||||||
double persenRemunAnestesi = 100.00 - Double.parseDouble(d.get("persenDiskonAn").toString());
|
&& Double.parseDouble(d.get("persenDiskonSayatanAn").toString()) >= 0))) {
|
||||||
|
double persenRemunAsisten = 100.00 - (CommonUtil.isNotNullOrEmpty(d.get("persenDiskonAs"))
|
||||||
|
? Double.parseDouble(d.get("persenDiskonAs").toString()) : 0.0);
|
||||||
|
double persenRemunAnestesi = 100.00 - (CommonUtil.isNotNullOrEmpty(d.get("persenDiskonAn"))
|
||||||
|
? Double.parseDouble(d.get("persenDiskonAn").toString()) : 0.0);
|
||||||
double hargaJasaAsisten = persenRemunAsisten * hargaJasa / 100;
|
double hargaJasaAsisten = persenRemunAsisten * hargaJasa / 100;
|
||||||
double hargaJasaAnestesi = persenRemunAnestesi * hargaJasa / 100;
|
double hargaJasaAnestesi = persenRemunAnestesi * hargaJasa / 100;
|
||||||
double hargaJasaRemun = hargaJasaAsisten + hargaJasaAnestesi;
|
double hargaJasaRemun = hargaJasaAsisten + hargaJasaAnestesi;
|
||||||
@ -4463,15 +4526,23 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
|
|||||||
+ "% karena diskon komponen asisten dan anestesi berturut-turut "
|
+ "% karena diskon komponen asisten dan anestesi berturut-turut "
|
||||||
+ d.get("persenDiskonAs").toString() + "% dan " + d.get("persenDiskonAn").toString() + "%");
|
+ d.get("persenDiskonAs").toString() + "% dan " + d.get("persenDiskonAn").toString() + "%");
|
||||||
}
|
}
|
||||||
} else if (Double.parseDouble(d.get("persenDiskonD").toString()) > 0.0
|
} else if (CommonUtil.isNotNullOrEmpty(d.get("persenDiskonD"))
|
||||||
|
&& Double.parseDouble(d.get("persenDiskonD").toString()) > 0.0
|
||||||
|
&& CommonUtil.isNotNullOrEmpty(d.get("diskonD"))
|
||||||
&& Double.parseDouble(d.get("diskonD").toString()) >= 0.0
|
&& Double.parseDouble(d.get("diskonD").toString()) >= 0.0
|
||||||
|
&& CommonUtil.isNotNullOrEmpty(d.get("persenDiskonAs"))
|
||||||
&& Double.parseDouble(d.get("persenDiskonAs").toString()) == 0.0
|
&& Double.parseDouble(d.get("persenDiskonAs").toString()) == 0.0
|
||||||
|
&& CommonUtil.isNotNullOrEmpty(d.get("diskonAs"))
|
||||||
&& Double.parseDouble(d.get("diskonAs").toString()) <= 0.0
|
&& Double.parseDouble(d.get("diskonAs").toString()) <= 0.0
|
||||||
|
&& CommonUtil.isNotNullOrEmpty(d.get("persenDiskonAn"))
|
||||||
&& Double.parseDouble(d.get("persenDiskonAn").toString()) == 0.0
|
&& Double.parseDouble(d.get("persenDiskonAn").toString()) == 0.0
|
||||||
|
&& CommonUtil.isNotNullOrEmpty(d.get("diskonAn"))
|
||||||
&& Double.parseDouble(d.get("diskonAn").toString()) <= 0.0
|
&& Double.parseDouble(d.get("diskonAn").toString()) <= 0.0
|
||||||
&& (CommonUtil.isNullOrEmpty(d.get("idSayatan")) || (CommonUtil.isNotNullOrEmpty(d.get("idSayatan"))
|
&& (CommonUtil.isNullOrEmpty(d.get("idSayatan")) || (CommonUtil.isNotNullOrEmpty(d.get("idSayatan"))
|
||||||
&& Double.parseDouble(d.get("persenDiskonSayatanD").toString()) >= 0))) {
|
&& CommonUtil.isNotNullOrEmpty(d.get("persenDiskonSayatanD")) && Double
|
||||||
double persenRemunOperator = 100.00 - Double.parseDouble(d.get("persenDiskonD").toString());
|
.parseDouble(d.get("persenDiskonSayatanD").toString()) >= 0))) {
|
||||||
|
double persenRemunOperator = 100.00 - (CommonUtil.isNotNullOrEmpty(d.get("persenDiskonD"))
|
||||||
|
? Double.parseDouble(d.get("persenDiskonD").toString()) : 0.0);
|
||||||
builder.nilai(persenRemunOperator * hargaJasa / 100);
|
builder.nilai(persenRemunOperator * hargaJasa / 100);
|
||||||
if (isFrontNote) {
|
if (isFrontNote) {
|
||||||
builder.keterangan("Dari pengurangan tarif dengan diskon " + nf.format(totalDiskon)
|
builder.keterangan("Dari pengurangan tarif dengan diskon " + nf.format(totalDiskon)
|
||||||
@ -4482,15 +4553,23 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
|
|||||||
+ " terlebih dahulu dan diakhiri dengan pengalian " + persenRemunOperator
|
+ " terlebih dahulu dan diakhiri dengan pengalian " + persenRemunOperator
|
||||||
+ "% karena diskon komponen operator " + d.get("persenDiskonD").toString() + "%");
|
+ "% karena diskon komponen operator " + d.get("persenDiskonD").toString() + "%");
|
||||||
}
|
}
|
||||||
} else if (Double.parseDouble(d.get("persenDiskonAs").toString()) > 0.0
|
} else if (CommonUtil.isNotNullOrEmpty(d.get("persenDiskonAs"))
|
||||||
|
&& Double.parseDouble(d.get("persenDiskonAs").toString()) > 0.0
|
||||||
|
&& CommonUtil.isNotNullOrEmpty(d.get("diskonAs"))
|
||||||
&& Double.parseDouble(d.get("diskonAs").toString()) >= 0.0
|
&& Double.parseDouble(d.get("diskonAs").toString()) >= 0.0
|
||||||
|
&& CommonUtil.isNotNullOrEmpty(d.get("persenDiskonD"))
|
||||||
&& Double.parseDouble(d.get("persenDiskonD").toString()) == 0.0
|
&& Double.parseDouble(d.get("persenDiskonD").toString()) == 0.0
|
||||||
|
&& CommonUtil.isNotNullOrEmpty(d.get("diskonD"))
|
||||||
&& Double.parseDouble(d.get("diskonD").toString()) <= 0.0
|
&& Double.parseDouble(d.get("diskonD").toString()) <= 0.0
|
||||||
|
&& CommonUtil.isNotNullOrEmpty(d.get("persenDiskonAn"))
|
||||||
&& Double.parseDouble(d.get("persenDiskonAn").toString()) == 0.0
|
&& Double.parseDouble(d.get("persenDiskonAn").toString()) == 0.0
|
||||||
|
&& CommonUtil.isNotNullOrEmpty(d.get("diskonAn"))
|
||||||
&& Double.parseDouble(d.get("diskonAn").toString()) <= 0.0
|
&& Double.parseDouble(d.get("diskonAn").toString()) <= 0.0
|
||||||
&& (CommonUtil.isNullOrEmpty(d.get("idSayatan")) || (CommonUtil.isNotNullOrEmpty(d.get("idSayatan"))
|
&& (CommonUtil.isNullOrEmpty(d.get("idSayatan")) || (CommonUtil.isNotNullOrEmpty(d.get("idSayatan"))
|
||||||
&& Double.parseDouble(d.get("persenDiskonSayatanAs").toString()) >= 0))) {
|
&& CommonUtil.isNotNullOrEmpty(d.get("persenDiskonSayatanAs")) && Double
|
||||||
double persenRemunAsisten = 100.00 - Double.parseDouble(d.get("persenDiskonAs").toString());
|
.parseDouble(d.get("persenDiskonSayatanAs").toString()) >= 0))) {
|
||||||
|
double persenRemunAsisten = 100.00 - (CommonUtil.isNotNullOrEmpty(d.get("persenDiskonAs"))
|
||||||
|
? Double.parseDouble(d.get("persenDiskonAs").toString()) : 0.0);
|
||||||
builder.nilai(persenRemunAsisten * hargaJasa / 100);
|
builder.nilai(persenRemunAsisten * hargaJasa / 100);
|
||||||
if (isFrontNote) {
|
if (isFrontNote) {
|
||||||
builder.keterangan("Dari pengurangan tarif dengan diskon " + nf.format(totalDiskon)
|
builder.keterangan("Dari pengurangan tarif dengan diskon " + nf.format(totalDiskon)
|
||||||
@ -4501,15 +4580,23 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
|
|||||||
+ " terlebih dahulu dan diakhiri dengan pengalian " + persenRemunAsisten
|
+ " terlebih dahulu dan diakhiri dengan pengalian " + persenRemunAsisten
|
||||||
+ "% karena diskon komponen asisten " + d.get("persenDiskonAs").toString() + "%");
|
+ "% karena diskon komponen asisten " + d.get("persenDiskonAs").toString() + "%");
|
||||||
}
|
}
|
||||||
} else if (Double.parseDouble(d.get("persenDiskonAn").toString()) > 0.0
|
} else if (CommonUtil.isNotNullOrEmpty(d.get("persenDiskonAn"))
|
||||||
|
&& Double.parseDouble(d.get("persenDiskonAn").toString()) > 0.0
|
||||||
|
&& CommonUtil.isNotNullOrEmpty(d.get("diskonAn"))
|
||||||
&& Double.parseDouble(d.get("diskonAn").toString()) >= 0.0
|
&& Double.parseDouble(d.get("diskonAn").toString()) >= 0.0
|
||||||
|
&& CommonUtil.isNotNullOrEmpty(d.get("persenDiskonD"))
|
||||||
&& Double.parseDouble(d.get("persenDiskonD").toString()) == 0.0
|
&& Double.parseDouble(d.get("persenDiskonD").toString()) == 0.0
|
||||||
|
&& CommonUtil.isNotNullOrEmpty(d.get("diskonD"))
|
||||||
&& Double.parseDouble(d.get("diskonD").toString()) <= 0.0
|
&& Double.parseDouble(d.get("diskonD").toString()) <= 0.0
|
||||||
|
&& CommonUtil.isNotNullOrEmpty(d.get("persenDiskonAs"))
|
||||||
&& Double.parseDouble(d.get("persenDiskonAs").toString()) == 0.0
|
&& Double.parseDouble(d.get("persenDiskonAs").toString()) == 0.0
|
||||||
|
&& CommonUtil.isNotNullOrEmpty(d.get("diskonAs"))
|
||||||
&& Double.parseDouble(d.get("diskonAs").toString()) <= 0.0
|
&& Double.parseDouble(d.get("diskonAs").toString()) <= 0.0
|
||||||
&& (CommonUtil.isNullOrEmpty(d.get("idSayatan")) || (CommonUtil.isNotNullOrEmpty(d.get("idSayatan"))
|
&& (CommonUtil.isNullOrEmpty(d.get("idSayatan")) || (CommonUtil.isNotNullOrEmpty(d.get("idSayatan"))
|
||||||
&& Double.parseDouble(d.get("persenDiskonSayatanAn").toString()) >= 0))) {
|
&& CommonUtil.isNotNullOrEmpty(d.get("persenDiskonSayatanAn")) && Double
|
||||||
double persenRemunAnestesi = 100.00 - Double.parseDouble(d.get("persenDiskonAn").toString());
|
.parseDouble(d.get("persenDiskonSayatanAn").toString()) >= 0))) {
|
||||||
|
double persenRemunAnestesi = 100.00 - (CommonUtil.isNotNullOrEmpty(d.get("persenDiskonAn"))
|
||||||
|
? Double.parseDouble(d.get("persenDiskonAn").toString()) : 0.0);
|
||||||
builder.nilai(persenRemunAnestesi * hargaJasa / 100);
|
builder.nilai(persenRemunAnestesi * hargaJasa / 100);
|
||||||
if (isFrontNote) {
|
if (isFrontNote) {
|
||||||
builder.keterangan("Dari pengurangan tarif dengan diskon " + nf.format(totalDiskon)
|
builder.keterangan("Dari pengurangan tarif dengan diskon " + nf.format(totalDiskon)
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user