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

perbaikan dua tahun belum berturut-turut dengan kondisi status penangguhan tahun lalu

Browse Source
This commit is contained in:
salmanoe 2021-01-11 22:33:32 +07:00
parent 824baf5c7a
commit 98fd67ff5a
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PermohonanStatusPegawaiImpl.java
View File

@ -536,8 +536,10 @@ public class PermohonanStatusPegawaiImpl implements PermohonanStatusPegawaiServi
} else { } else {
if (difCutiTerpakai(cutiTerpakaiN2, dataCutiB2) if (difCutiTerpakai(cutiTerpakaiN2, dataCutiB2)
+ difCutiTerpakai(cutiTerpakaiN1, dataCutiB1) < 6 && dataCutiN2 > 0) { + difCutiTerpakai(cutiTerpakaiN1, dataCutiB1) < 6 && dataCutiN2 > 0) {
if (jatahCutiTerpakaiN2 == 0) { if (jatahCutiTerpakaiN2 == 0 && !jCutiN1) {
sisaCutiN2 = 6; sisaCutiN2 = 6;
} else if (jatahCutiTerpakaiN2 == 0 && jCutiN1) {
sisaCutiN2 = 0;
} else if (!jCutiN2 && !jCutiN1) { } else if (!jCutiN2 && !jCutiN1) {
sisaCutiN2 = 6 - jatahCutiTerpakaiN2; sisaCutiN2 = 6 - jatahCutiTerpakaiN2;
} else { } else {
@ -598,8 +600,10 @@ public class PermohonanStatusPegawaiImpl implements PermohonanStatusPegawaiServi
} else { } else {
if (difCutiTerpakai(cutiTerpakaiN2, dataCutiB2) if (difCutiTerpakai(cutiTerpakaiN2, dataCutiB2)
+ difCutiTerpakai(cutiTerpakaiN1, dataCutiB1) < 6 && dataCutiN2 > 0) { + difCutiTerpakai(cutiTerpakaiN1, dataCutiB1) < 6 && dataCutiN2 > 0) {
if (jatahCutiTerpakaiN2 == 0) { if (jatahCutiTerpakaiN2 == 0 && !jCutiN1) {
sisaCutiN2 = 6; sisaCutiN2 = 6;
} else if (jatahCutiTerpakaiN2 == 0 && jCutiN1) {
sisaCutiN2 = 0;
} else if (!jCutiN2 && !jCutiN1) { } else if (!jCutiN2 && !jCutiN1) {
sisaCutiN2 = 6 - jatahCutiTerpakaiN2; sisaCutiN2 = 6 - jatahCutiTerpakaiN2;
} else { } else {
@ -727,8 +731,10 @@ public class PermohonanStatusPegawaiImpl implements PermohonanStatusPegawaiServi
} else { } else {
if (difCutiTerpakai(cutiTerpakaiN2, dataCutiB2) + difCutiTerpakai(cutiTerpakaiN1, dataCutiB1) < 6 if (difCutiTerpakai(cutiTerpakaiN2, dataCutiB2) + difCutiTerpakai(cutiTerpakaiN1, dataCutiB1) < 6
&& dataCutiN2 > 0) { && dataCutiN2 > 0) {
if (jatahCutiTerpakaiN2 == 0) { if (jatahCutiTerpakaiN2 == 0 && !jCutiN1) {
sisaCutiN2 = 6; sisaCutiN2 = 6;
} else if (jatahCutiTerpakaiN2 == 0 && jCutiN1) {
sisaCutiN2 = 0;
} else if (!jCutiN2 && !jCutiN1) { } else if (!jCutiN2 && !jCutiN1) {
sisaCutiN2 = 6 - jatahCutiTerpakaiN2; sisaCutiN2 = 6 - jatahCutiTerpakaiN2;
} else { } else {