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

Merge branch 'dev/cetakan/cuti' into dev/no-cron

Browse Source
This commit is contained in:
Salman Manoe 2024-03-26 08:33:57 +07:00
commit c983cbce42
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/ReportServiceImpl.java
View File

@ -1961,17 +1961,21 @@ public class ReportServiceImpl extends BaseVoServiceImpl implements ReportServic
String[] arrCutiA1 = cutiA1.split("_"); String[] arrCutiA1 = cutiA1.split("_");
labelTtdMenkes = arrCutiA1[0]; labelTtdMenkes = arrCutiA1[0];
menteriKesehatan = arrCutiA1[1]; menteriKesehatan = arrCutiA1[1];
nipMenkes = arrCutiA1[2];
result.put("labelTtdMenkes", labelTtdMenkes); result.put("labelTtdMenkes", labelTtdMenkes);
result.put("menteriKesehatan", menteriKesehatan); result.put("menteriKesehatan", menteriKesehatan);
result.put("nipMenkes", nipMenkes);
} else { } else {
String cutiA1 = settingDataFixedDao.getSettingDataFixed("cutiB2C"); String cutiA1 = settingDataFixedDao.getSettingDataFixed("cutiB2C");
String[] arrCutiA1 = cutiA1.split("_"); String[] arrCutiA1 = cutiA1.split("_");
labelTtdMenkes = arrCutiA1[0]; labelTtdMenkes = arrCutiA1[0];
menteriKesehatan = arrCutiA1[1]; menteriKesehatan = arrCutiA1[1];
nipMenkes = arrCutiA1[2];
result.put("labelTtdMenkes", labelTtdMenkes); result.put("labelTtdMenkes", labelTtdMenkes);
result.put("menteriKesehatan", menteriKesehatan); result.put("menteriKesehatan", menteriKesehatan);
result.put("nipMenkes", nipMenkes);
} }
} }
} }
@ -3237,7 +3241,7 @@ public class ReportServiceImpl extends BaseVoServiceImpl implements ReportServic
result.put("simpananWajibKoperasiGaji", "-"); result.put("simpananWajibKoperasiGaji", "-");
result.put("pinjamanKoperasiGaji", "-"); result.put("pinjamanKoperasiGaji", "-");
result.put("potonganPphRemunerasi", "-"); result.put("potonganPphRemunerasi", "-");
result.put("pinjamanBriGaji","-"); result.put("pinjamanBriGaji", "-");
result.put("potonganObat", "-"); result.put("potonganObat", "-");
result.put("potonganRawatInap", "-"); result.put("potonganRawatInap", "-");
result.put("potonganRawatJalan", "-"); result.put("potonganRawatJalan", "-");