diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PermohonanStatusPegawaiImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PermohonanStatusPegawaiImpl.java index 9c3bf717..e1f41f6e 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PermohonanStatusPegawaiImpl.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PermohonanStatusPegawaiImpl.java @@ -536,8 +536,10 @@ public class PermohonanStatusPegawaiImpl implements PermohonanStatusPegawaiServi } else { if (difCutiTerpakai(cutiTerpakaiN2, dataCutiB2) + difCutiTerpakai(cutiTerpakaiN1, dataCutiB1) < 6 && dataCutiN2 > 0) { - if (jatahCutiTerpakaiN2 == 0) { + if (jatahCutiTerpakaiN2 == 0 && !jCutiN1) { sisaCutiN2 = 6; + } else if (jatahCutiTerpakaiN2 == 0 && jCutiN1) { + sisaCutiN2 = 0; } else if (!jCutiN2 && !jCutiN1) { sisaCutiN2 = 6 - jatahCutiTerpakaiN2; } else { @@ -598,8 +600,10 @@ public class PermohonanStatusPegawaiImpl implements PermohonanStatusPegawaiServi } else { if (difCutiTerpakai(cutiTerpakaiN2, dataCutiB2) + difCutiTerpakai(cutiTerpakaiN1, dataCutiB1) < 6 && dataCutiN2 > 0) { - if (jatahCutiTerpakaiN2 == 0) { + if (jatahCutiTerpakaiN2 == 0 && !jCutiN1) { sisaCutiN2 = 6; + } else if (jatahCutiTerpakaiN2 == 0 && jCutiN1) { + sisaCutiN2 = 0; } else if (!jCutiN2 && !jCutiN1) { sisaCutiN2 = 6 - jatahCutiTerpakaiN2; } else { @@ -727,8 +731,10 @@ public class PermohonanStatusPegawaiImpl implements PermohonanStatusPegawaiServi } else { if (difCutiTerpakai(cutiTerpakaiN2, dataCutiB2) + difCutiTerpakai(cutiTerpakaiN1, dataCutiB1) < 6 && dataCutiN2 > 0) { - if (jatahCutiTerpakaiN2 == 0) { + if (jatahCutiTerpakaiN2 == 0 && !jCutiN1) { sisaCutiN2 = 6; + } else if (jatahCutiTerpakaiN2 == 0 && jCutiN1) { + sisaCutiN2 = 0; } else if (!jCutiN2 && !jCutiN1) { sisaCutiN2 = 6 - jatahCutiTerpakaiN2; } else {