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

Update SkoringTindakanNakesService

Browse Source 
Perbaikan filter tmt terakhir yang ditampilkan di daftar skoring tindakan nakes lain
This commit is contained in:
Salman Manoe 2022-01-10 17:24:15 +07:00
parent 9ff89ae24d
commit a67405f91f
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/SkoringTindakanNakesDao.java
View File

@ -20,7 +20,8 @@ public interface SkoringTindakanNakesDao extends PagingAndSortingRepository<Skor
+ "stn.tanggalMulaiBerlaku as tglMulaiBerlaku," + "stn.tanggalPembaharuanData as tglPembaharuanData,"
+ "prn.id as produkId,prn.namaProduk as namaProduk,"
+ "pfs.id as profesiId,pfs.namaProfesi as namaProfesi) " + "from SkoringTindakanNakes stn "
+ "inner join stn.produk prn " + "inner join prn.profesi pfs " + "where stn.statusEnabled is true ";
+ "inner join stn.produk prn " + "inner join prn.profesi pfs " + "where stn.statusEnabled is true "
+ "and to_char(stn.tanggalMulaiBerlaku,'yyyy-MM-dd') <= to_char(now(),'yyyy-MM-dd') ";
String produk = "and lower(prn.namaProduk) like %:namaProduk% ";
@ -28,7 +29,8 @@ public interface SkoringTindakanNakesDao extends PagingAndSortingRepository<Skor
String profesi = "and pfs.id = :profesiId ";
String sortSearch = "order by prn.namaProduk asc,stn.tanggalPembaharuanData desc";
String sortSearch = "order by pfs.namaProfesi asc, " + "prn.namaProduk asc, "
+ "stn.tanggalMulaiBerlaku desc, stn.tanggalPembaharuanData desc";
@Query(strAllEnabled + sortSearch)
List<Map<String, Object>> findAllEnabled();

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

@ -192,7 +192,7 @@ public class SkoringTindakanNakesServiceImpl extends BaseVoServiceImpl implement
boolean isContained = false;
for (Map<String, Object> mapFilter : filter) {
if (mapData.get("produkId").equals(mapFilter.get("produkId"))
&& mapData.get("tglMulaiBerlaku").equals(mapFilter.get("tglMulaiBerlaku"))) {
&& mapData.get("profesiId").equals(mapFilter.get("profesiId"))) {
isContained = true;
break;
}
@ -200,7 +200,7 @@ public class SkoringTindakanNakesServiceImpl extends BaseVoServiceImpl implement
if (!isContained) {
Map<String, Object> mapFilter = new HashMap<>();
mapFilter.put("produkId", mapData.get("produkId"));
mapFilter.put("tglMulaiBerlaku", mapData.get("tglMulaiBerlaku"));
mapFilter.put("profesiId", mapData.get("profesiId"));
filter.add(mapFilter);
}
}
@ -208,7 +208,7 @@ public class SkoringTindakanNakesServiceImpl extends BaseVoServiceImpl implement
for (Map<String, Object> mapFilter : filter) {
for (Map<String, Object> mapData : data) {
if (mapFilter.get("produkId").equals(mapData.get("produkId"))
&& mapFilter.get("tglMulaiBerlaku").equals(mapData.get("tglMulaiBerlaku"))) {
&& mapFilter.get("profesiId").equals(mapData.get("profesiId"))) {
if (Arrays.asList(Master.Profesi.FARMASI).contains(mapData.get("profesiId"))) {
mapData.put("unitKerjaId", Master.UnitKerja.INS_FARMASI);