Merge branch 'dev/base' into dev/remun/logbook-nonjkn-dg-jam

This commit is contained in:
Salman Manoe 2024-05-14 13:38:25 +07:00
commit 32c90e9a17

View File

@ -1885,7 +1885,7 @@ public class ReportServiceImpl extends BaseVoServiceImpl implements ReportServic
String labelTtdMenkes = "Menteri Kesehatan Republik Indonesia";
String menteriKesehatan = settingDataFixedDao.getSettingDataFixed("menteriKesehatan");
String nipMenkes;
String nipMenkes = "";
result.put("labelTtdMenkes", labelTtdMenkes);
result.put("menteriKesehatan", menteriKesehatan);
@ -1959,9 +1959,12 @@ public class ReportServiceImpl extends BaseVoServiceImpl implements ReportServic
.contains(Integer.parseInt(pegawai.get("idGolongan").toString()))) {
String cutiA1 = settingDataFixedDao.getSettingDataFixed("cutiB1");
String[] arrCutiA1 = cutiA1.split("_");
labelTtdMenkes = arrCutiA1[0];
menteriKesehatan = arrCutiA1[1];
nipMenkes = arrCutiA1[2];
if (arrCutiA1.length >= 1)
labelTtdMenkes = arrCutiA1[0];
if (arrCutiA1.length >= 2)
menteriKesehatan = arrCutiA1[1];
if (arrCutiA1.length >= 3)
nipMenkes = arrCutiA1[2];
result.put("labelTtdMenkes", labelTtdMenkes);
result.put("menteriKesehatan", menteriKesehatan);
@ -1969,9 +1972,12 @@ public class ReportServiceImpl extends BaseVoServiceImpl implements ReportServic
} else {
String cutiA1 = settingDataFixedDao.getSettingDataFixed("cutiB2C");
String[] arrCutiA1 = cutiA1.split("_");
labelTtdMenkes = arrCutiA1[0];
menteriKesehatan = arrCutiA1[1];
nipMenkes = arrCutiA1[2];
if (arrCutiA1.length >= 1)
labelTtdMenkes = arrCutiA1[0];
if (arrCutiA1.length >= 2)
menteriKesehatan = arrCutiA1[1];
if (arrCutiA1.length >= 3)
nipMenkes = arrCutiA1[2];
result.put("labelTtdMenkes", labelTtdMenkes);
result.put("menteriKesehatan", menteriKesehatan);
@ -2112,7 +2118,7 @@ public class ReportServiceImpl extends BaseVoServiceImpl implements ReportServic
String labelTtdMenkes = "Menteri Kesehatan Republik Indonesia";
String menteriKesehatan = settingDataFixedDao.getSettingDataFixed("menteriKesehatan");
String nipMenkes;
String nipMenkes = "";
result.put("labelTtdMenkes", labelTtdMenkes);
result.put("menteriKesehatan", menteriKesehatan);
@ -2149,9 +2155,12 @@ public class ReportServiceImpl extends BaseVoServiceImpl implements ReportServic
.contains(Integer.parseInt(pegawai.get("idGolongan").toString()))) {
String cutiA1 = settingDataFixedDao.getSettingDataFixed("cutiA1");
String[] arrCutiA1 = cutiA1.split("_");
labelTtdMenkes = arrCutiA1[0];
menteriKesehatan = arrCutiA1[1];
nipMenkes = arrCutiA1[2];
if (arrCutiA1.length >= 1)
labelTtdMenkes = arrCutiA1[0];
if (arrCutiA1.length >= 2)
menteriKesehatan = arrCutiA1[1];
if (arrCutiA1.length >= 3)
nipMenkes = arrCutiA1[2];
result.put("labelTtdMenkes", labelTtdMenkes);
result.put("menteriKesehatan", menteriKesehatan);
@ -2159,9 +2168,12 @@ public class ReportServiceImpl extends BaseVoServiceImpl implements ReportServic
} else {
String cutiA1 = settingDataFixedDao.getSettingDataFixed("cutiA2");
String[] arrCutiA1 = cutiA1.split("_");
labelTtdMenkes = arrCutiA1[0];
menteriKesehatan = arrCutiA1[1];
nipMenkes = arrCutiA1[2];
if (arrCutiA1.length >= 1)
labelTtdMenkes = arrCutiA1[0];
if (arrCutiA1.length >= 2)
menteriKesehatan = arrCutiA1[1];
if (arrCutiA1.length >= 3)
nipMenkes = arrCutiA1[2];
result.put("labelTtdMenkes", labelTtdMenkes);
result.put("menteriKesehatan", menteriKesehatan);