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

Update SkoringTindakanMedisService

Browse Source 
Perbaikan filter tmt paling baru yang ditampilkan di daftar skoring tindakan medis
This commit is contained in:
Salman Manoe 2022-01-10 17:23:22 +07:00
parent fc1f9ea677
commit 9ff89ae24d
2 changed files with 6 additions and 7 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/SkoringTindakanMedisDao.java
View File

@ -21,7 +21,8 @@ public interface SkoringTindakanMedisDao extends PagingAndSortingRepository<Skor
+ "when stm.statusVerifikasi is true then 'Terverifikasi' end) as statusVerifikasi," + "when stm.statusVerifikasi is true then 'Terverifikasi' end) as statusVerifikasi,"
+ "stm.tanggalMulaiBerlaku as tglMulaiBerlaku," + "stm.tanggalPembaharuanData as tglPembaharuanData) " + "stm.tanggalMulaiBerlaku as tglMulaiBerlaku," + "stm.tanggalPembaharuanData as tglPembaharuanData) "
+ "from SkoringTindakanMedis stm " + "inner join stm.produk pr " + "inner join stm.kelompokKerja sk " + "from SkoringTindakanMedis stm " + "inner join stm.produk pr " + "inner join stm.kelompokKerja sk "
+ "inner join sk.unitKerja uk " + "where stm.statusEnabled is true"; + "inner join sk.unitKerja uk " + "where stm.statusEnabled is true "
+ "and to_char(stm.tanggalMulaiBerlaku,'yyyy-MM-dd') <= to_char(now(),'yyyy-MM-dd')";
String kelompokKerja = " and sk.id in (:listSubunitKerjaId)"; String kelompokKerja = " and sk.id in (:listSubunitKerjaId)";
@ -31,7 +32,8 @@ public interface SkoringTindakanMedisDao extends PagingAndSortingRepository<Skor
String statusVerifikasi = " and stm.statusVerifikasi = :isStatusVerifikasi"; String statusVerifikasi = " and stm.statusVerifikasi = :isStatusVerifikasi";
String sortSearch = " order by sk.name asc,pr.namaProduk asc,stm.detailProduk asc,stm.tanggalPembaharuanData desc"; String sortSearch = " order by sk.name asc," + "pr.namaProduk asc," + "stm.detailProduk asc, "
+ "stm.tanggalMulaiBerlaku desc, stm.tanggalPembaharuanData desc";
@Query(strAllEnabled + sortSearch) @Query(strAllEnabled + sortSearch)
List<Map<String, Object>> findAllEnabled(); List<Map<String, Object>> findAllEnabled();

7
jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/SkoringTindakanMedisServiceImpl.java
View File

@ -235,8 +235,7 @@ public class SkoringTindakanMedisServiceImpl extends BaseVoServiceImpl implement
boolean isContained = false; boolean isContained = false;
for (Map<String, Object> mapFilter : filter) { for (Map<String, Object> mapFilter : filter) {
if (mapData.get("produkId").equals(mapFilter.get("produkId")) if (mapData.get("produkId").equals(mapFilter.get("produkId"))
&& mapData.get("kelompokKerjaId").equals(mapFilter.get("kelompokKerjaId")) && mapData.get("kelompokKerjaId").equals(mapFilter.get("kelompokKerjaId"))) {
&& mapData.get("tglMulaiBerlaku").equals(mapFilter.get("tglMulaiBerlaku"))) {
isContained = true; isContained = true;
break; break;
} }
@ -245,7 +244,6 @@ public class SkoringTindakanMedisServiceImpl extends BaseVoServiceImpl implement
Map<String, Object> mapFilter = new HashMap<>(); Map<String, Object> mapFilter = new HashMap<>();
mapFilter.put("produkId", mapData.get("produkId")); mapFilter.put("produkId", mapData.get("produkId"));
mapFilter.put("kelompokKerjaId", mapData.get("kelompokKerjaId")); mapFilter.put("kelompokKerjaId", mapData.get("kelompokKerjaId"));
mapFilter.put("tglMulaiBerlaku", mapData.get("tglMulaiBerlaku"));
filter.add(mapFilter); filter.add(mapFilter);
} }
} }
@ -253,8 +251,7 @@ public class SkoringTindakanMedisServiceImpl extends BaseVoServiceImpl implement
for (Map<String, Object> mapFilter : filter) { for (Map<String, Object> mapFilter : filter) {
for (Map<String, Object> mapData : data) { for (Map<String, Object> mapData : data) {
if (mapFilter.get("produkId").equals(mapData.get("produkId")) if (mapFilter.get("produkId").equals(mapData.get("produkId"))
&& mapFilter.get("kelompokKerjaId").equals(mapData.get("kelompokKerjaId")) && mapFilter.get("kelompokKerjaId").equals(mapData.get("kelompokKerjaId"))) {
&& mapFilter.get("tglMulaiBerlaku").equals(mapData.get("tglMulaiBerlaku"))) {
result.add(mapData); result.add(mapData);
break; break;
} }