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

Merge branch 'dev/logbook/terapis' into dev/no-cron

Browse Source
This commit is contained in:
Salman Manoe 2024-10-22 08:58:30 +07:00
commit 49fe2ac9d1
1 changed files with 3 additions and 3 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/RemunerasiServiceImpl.java
View File

@ -2321,7 +2321,7 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera
double persenJasaTerapis = Double.parseDouble(GetSettingDataFixed("persenJasaTerapis")); double persenJasaTerapis = Double.parseDouble(GetSettingDataFixed("persenJasaTerapis"));
double persenJasaTerapis24 = Double.parseDouble(GetSettingDataFixed("persenFfsTerapisTmt21Okt24")); double persenJasaTerapis24 = Double.parseDouble(GetSettingDataFixed("persenFfsTerapisTmt21Okt24"));
// Custom rule persentase jasa terapis 21 Oktober 2024 // Custom rule persentase jasa terapis 21 Oktober 2024
LocalDateTime tmtJasaTerapis24 = LocalDateTime.of(2024, 10, 21, 0, 0, 0, 0); LocalDateTime tmtJasaTerapis24 = LocalDateTime.of(2024, 11, 1, 0, 0, 0, 0);
/* /*
* Persiapan filter logic remunerasi * Persiapan filter logic remunerasi
*/ */
@ -2701,7 +2701,7 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera
double persenJasaTerapis24 = Double.parseDouble(GetSettingDataFixed("persenFfsTerapisTmt21Okt24")); double persenJasaTerapis24 = Double.parseDouble(GetSettingDataFixed("persenFfsTerapisTmt21Okt24"));
double persenJasaLuarTerapis = Double.parseDouble(GetSettingDataFixed("persenJasaLuarTerapis")); double persenJasaLuarTerapis = Double.parseDouble(GetSettingDataFixed("persenJasaLuarTerapis"));
// Custom rule persentase jasa terapis 21 Oktober 2024 // Custom rule persentase jasa terapis 21 Oktober 2024
LocalDateTime tmtJasaTerapis24 = LocalDateTime.of(2024, 10, 21, 0, 0, 0, 0); LocalDateTime tmtJasaTerapis24 = LocalDateTime.of(2024, 11, 1, 0, 0, 0, 0);
/* /*
* Persiapan filter logic remunerasi * Persiapan filter logic remunerasi
*/ */
@ -2981,7 +2981,7 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera
double persenJasaTerapis = Double.parseDouble(GetSettingDataFixed("persenJasaTerapis")); double persenJasaTerapis = Double.parseDouble(GetSettingDataFixed("persenJasaTerapis"));
double persenJasaTerapis24 = Double.parseDouble(GetSettingDataFixed("persenFfsTerapisTmt21Okt24")); double persenJasaTerapis24 = Double.parseDouble(GetSettingDataFixed("persenFfsTerapisTmt21Okt24"));
// Custom rule persentase jasa terapis 21 Oktober 2024 // Custom rule persentase jasa terapis 21 Oktober 2024
LocalDateTime tmtJasaTerapis24 = LocalDateTime.of(2024, 10, 21, 0, 0, 0, 0); LocalDateTime tmtJasaTerapis24 = LocalDateTime.of(2024, 11, 1, 0, 0, 0, 0);
/* /*
* Persiapan filter logic remunerasi * Persiapan filter logic remunerasi
*/ */