Merge branch 'dev/remun/logbook-tarif' into prod/no-cron
This commit is contained in:
commit
443a6c46d5
@ -4314,37 +4314,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;
|
||||||
@ -4365,17 +4398,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;
|
||||||
@ -4393,17 +4436,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;
|
||||||
@ -4421,17 +4474,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;
|
||||||
@ -4449,15 +4512,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)
|
||||||
@ -4468,15 +4539,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)
|
||||||
@ -4487,15 +4566,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)
|
||||||
|
|||||||
@ -0,0 +1,10 @@
|
|||||||
|
package com.jasamedika.medifirst2000.enums;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @author salmanoe
|
||||||
|
* @version 1.0.0
|
||||||
|
* @since 12/06/2024
|
||||||
|
*/
|
||||||
|
public enum StatusBerkasOperasi {
|
||||||
|
LENGKAP, BELUM_LENGKAP, TIDAK_ADA
|
||||||
|
}
|
||||||
@ -0,0 +1,47 @@
|
|||||||
|
package com.jasamedika.medifirst2000.entities;
|
||||||
|
|
||||||
|
import com.jasamedika.medifirst2000.base.BaseActive;
|
||||||
|
import com.jasamedika.medifirst2000.helper.Caption;
|
||||||
|
import lombok.Getter;
|
||||||
|
import lombok.Setter;
|
||||||
|
import org.hibernate.validator.constraints.NotBlank;
|
||||||
|
|
||||||
|
import javax.persistence.*;
|
||||||
|
import javax.validation.constraints.Size;
|
||||||
|
|
||||||
|
import java.io.Serializable;
|
||||||
|
|
||||||
|
import static javax.persistence.FetchType.LAZY;
|
||||||
|
import static javax.persistence.GenerationType.SEQUENCE;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @author salmanoe
|
||||||
|
* @version 1.0.0
|
||||||
|
* @since 12/06/2024
|
||||||
|
*/
|
||||||
|
@Getter
|
||||||
|
@Setter
|
||||||
|
@Entity
|
||||||
|
@Table(name = "berkasoperasi_m", schema = "public")
|
||||||
|
public class BerkasOperasi extends BaseActive implements Serializable {
|
||||||
|
|
||||||
|
@Id
|
||||||
|
@GeneratedValue(strategy = SEQUENCE, generator = "sg_berkasoperasi")
|
||||||
|
@SequenceGenerator(name = "sg_berkasoperasi", schema = "public", sequenceName = "public.berkasoperasi_m_seq", allocationSize = 1)
|
||||||
|
@Column(name = "id", columnDefinition = "bigint default nextval('public.berkasoperasi_m_seq'::regclass)")
|
||||||
|
protected Long id;
|
||||||
|
|
||||||
|
@Column(name = "berkasoperasi", length = 150, unique = true, nullable = false)
|
||||||
|
@Size(max = 150, message = "Berkas operasi maksimal {max} karakter")
|
||||||
|
@NotBlank(message = "Berkas operasi tidak boleh kosong")
|
||||||
|
@Caption("Berkas Operasi")
|
||||||
|
private String berkasOperasi;
|
||||||
|
|
||||||
|
@ManyToOne(fetch = LAZY)
|
||||||
|
@JoinColumn(name = "kelompokuserfk")
|
||||||
|
@Caption(value = "Kelompok User")
|
||||||
|
private KelompokUser kelompokUser;
|
||||||
|
|
||||||
|
@Column(name = "kelompokuserfk", insertable = false, updatable = false)
|
||||||
|
private Integer kelompokUserId;
|
||||||
|
}
|
||||||
@ -0,0 +1,52 @@
|
|||||||
|
package com.jasamedika.medifirst2000.entities;
|
||||||
|
|
||||||
|
import com.jasamedika.medifirst2000.base.BaseTransaction;
|
||||||
|
import com.jasamedika.medifirst2000.enums.StatusBerkasOperasi;
|
||||||
|
import com.jasamedika.medifirst2000.helper.Caption;
|
||||||
|
import lombok.Getter;
|
||||||
|
import lombok.Setter;
|
||||||
|
|
||||||
|
import javax.persistence.*;
|
||||||
|
import javax.validation.constraints.NotNull;
|
||||||
|
import java.io.Serializable;
|
||||||
|
|
||||||
|
import static javax.persistence.EnumType.STRING;
|
||||||
|
import static javax.persistence.FetchType.LAZY;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @author salmanoe
|
||||||
|
* @version 1.0.0
|
||||||
|
* @since 12/06/2024
|
||||||
|
*/
|
||||||
|
@Getter
|
||||||
|
@Setter
|
||||||
|
@Entity
|
||||||
|
@Table(name = "detailpersiapanoperasi_t")
|
||||||
|
public class DetailPersiapanOperasi extends BaseTransaction implements Serializable {
|
||||||
|
private static final long serialVersionUID = -6849730642670346L;
|
||||||
|
|
||||||
|
@ManyToOne(fetch = LAZY)
|
||||||
|
@JoinColumn(name = "berkasoperasifk")
|
||||||
|
@NotNull(message = "Berkas operasi tidak boleh kosong")
|
||||||
|
@Caption(value = "Berkas Operasi")
|
||||||
|
private BerkasOperasi berkasOperasi;
|
||||||
|
|
||||||
|
@Column(name = "berkasoperasifk", insertable = false, updatable = false, nullable = false)
|
||||||
|
private Long berkasOperasiId;
|
||||||
|
|
||||||
|
@Column(name = "statusberkas", length = 50)
|
||||||
|
@Enumerated(STRING)
|
||||||
|
private StatusBerkasOperasi statusBerkas;
|
||||||
|
|
||||||
|
@Column(name = "keterangan", length = 500)
|
||||||
|
private String keterangan;
|
||||||
|
|
||||||
|
@ManyToOne(fetch = LAZY)
|
||||||
|
@JoinColumn(name = "persiapanoperasifk")
|
||||||
|
@NotNull(message = "Persiapan operasi tidak boleh kosong")
|
||||||
|
@Caption(value = "Persiapan Operasi")
|
||||||
|
private PersiapanOperasi persiapanOperasi;
|
||||||
|
|
||||||
|
@Column(name = "persiapanoperasifk", columnDefinition = "CHAR(32)", insertable = false, updatable = false, nullable = false)
|
||||||
|
private String persiapanOperasiId;
|
||||||
|
}
|
||||||
@ -0,0 +1,71 @@
|
|||||||
|
package com.jasamedika.medifirst2000.entities;
|
||||||
|
|
||||||
|
import com.jasamedika.medifirst2000.base.BaseTransaction;
|
||||||
|
import com.jasamedika.medifirst2000.helper.Caption;
|
||||||
|
import lombok.Getter;
|
||||||
|
import lombok.Setter;
|
||||||
|
|
||||||
|
import javax.persistence.*;
|
||||||
|
import javax.validation.constraints.NotNull;
|
||||||
|
import java.io.Serializable;
|
||||||
|
import java.util.Date;
|
||||||
|
import java.util.Set;
|
||||||
|
|
||||||
|
import static javax.persistence.FetchType.EAGER;
|
||||||
|
import static javax.persistence.FetchType.LAZY;
|
||||||
|
import static javax.persistence.TemporalType.DATE;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @author salmanoe
|
||||||
|
* @version 1.0.0
|
||||||
|
* @since 12/06/2024
|
||||||
|
*/
|
||||||
|
@Getter
|
||||||
|
@Setter
|
||||||
|
@Entity
|
||||||
|
@Table(name = "persiapanoperasi_t")
|
||||||
|
public class PersiapanOperasi extends BaseTransaction implements Serializable {
|
||||||
|
private static final long serialVersionUID = 4059228362398801137L;
|
||||||
|
|
||||||
|
@ManyToOne(fetch = LAZY)
|
||||||
|
@JoinColumn(name = "nocmfk")
|
||||||
|
@NotNull(message = "Pasien tidak boleh kosong")
|
||||||
|
@Caption(value = "Pasien")
|
||||||
|
private Pasien pasien;
|
||||||
|
|
||||||
|
@Column(name = "nocmfk", insertable = false, updatable = false, nullable = false)
|
||||||
|
private Integer pasienId;
|
||||||
|
|
||||||
|
@ElementCollection(fetch = EAGER)
|
||||||
|
@CollectionTable(name = "diagnosispersiapan_t", joinColumns = @JoinColumn(name = "persiapantindakanoperasifk"))
|
||||||
|
@Column(name = "diagnosis", length = 150)
|
||||||
|
private Set<String> diagnosa;
|
||||||
|
|
||||||
|
@ElementCollection(fetch = EAGER)
|
||||||
|
@CollectionTable(name = "jenistindakanpersiapan_t", joinColumns = @JoinColumn(name = "persiapantindakanoperasifk"))
|
||||||
|
@Column(name = "jenistindakan", length = 150)
|
||||||
|
private Set<String> jenisTindakan;
|
||||||
|
|
||||||
|
@Column(name = "tglrencanatindakan", nullable = false)
|
||||||
|
@NotNull(message = "Tanggal rencana tindakan tidak boleh kosong")
|
||||||
|
@Temporal(DATE)
|
||||||
|
private Date tanggalRencanaTindakan;
|
||||||
|
|
||||||
|
@ManyToOne(fetch = LAZY)
|
||||||
|
@JoinColumn(name = "dpjpfk")
|
||||||
|
@NotNull(message = "DPJP tidak boleh kosong")
|
||||||
|
@Caption(value = "DPJP")
|
||||||
|
private Pegawai dpjp;
|
||||||
|
|
||||||
|
@Column(name = "dpjpfk", insertable = false, updatable = false, nullable = false)
|
||||||
|
private Integer dpjpId;
|
||||||
|
|
||||||
|
@ManyToOne(fetch = LAZY)
|
||||||
|
@JoinColumn(name = "ruanganfk")
|
||||||
|
@NotNull(message = "Ruangan tidak boleh kosong")
|
||||||
|
@Caption(value = "Ruangan")
|
||||||
|
private Ruangan ruangan;
|
||||||
|
|
||||||
|
@Column(name = "ruanganfk", insertable = false, updatable = false, nullable = false)
|
||||||
|
private Integer ruanganId;
|
||||||
|
}
|
||||||
Loading…
x
Reference in New Issue
Block a user