From 6483a5cca504afbb1ee897415901f57bc877c16c Mon Sep 17 00:00:00 2001 From: Saurav Mishra Date: Fri, 28 Nov 2025 10:29:49 +0530 Subject: [PATCH] fix Ors incentive logic --- .../com/iemr/flw/service/impl/ChildCareServiceImpl.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/iemr/flw/service/impl/ChildCareServiceImpl.java b/src/main/java/com/iemr/flw/service/impl/ChildCareServiceImpl.java index 7eb251f0..17c84b77 100644 --- a/src/main/java/com/iemr/flw/service/impl/ChildCareServiceImpl.java +++ b/src/main/java/com/iemr/flw/service/impl/ChildCareServiceImpl.java @@ -574,7 +574,7 @@ public String saveOrsDistributionDetails(List orsDistributio orsDistribution.setNumOrsPackets(orsDistributionDTO.getFields().getNum_ors_packets().toString()); orsDistribution.setChildCount(orsDistributionDTO.getFields().getNum_under5_children().toString()); orsDistribution.setHouseholdId(orsDistributionDTO.getHouseHoldId()); - orsDistribution.setUserId(userRepo.getUserIdByName(jwtUtil.getUserNameFromStorage())); + orsDistribution.setUserId(userRepo.getUserIdByName(orsDistributionDTO.getUserName())); orsDistribution.setVisitDate(LocalDate.parse(orsDistributionDTO.getFields().getVisit_date(),formatter)); orsDistributionList.add(orsDistribution); @@ -734,13 +734,13 @@ private void checkAndAddOrdDistributionIncentive(List orsDistr IncentiveActivity orsPacketActivityCH = incentivesRepo.findIncentiveMasterByNameAndGroup("ORS_DISTRIBUTION", GroupName.ACTIVITY.getDisplayName()); if(orsPacketActivityAM!=null){ if(orsDistribution.getNumOrsPackets()!=null){ - createIncentiveRecordforOrsDistribution(orsDistribution,orsDistribution.getBeneficiaryId(),orsPacketActivityAM,jwtUtil.getUserNameFromStorage(),false); + createIncentiveRecordforOrsDistribution(orsDistribution,orsDistribution.getBeneficiaryId(),orsPacketActivityAM,userRepo.getUserNamedByUserId(orsDistribution.getUserId()),false); } } if(orsPacketActivityCH!=null){ if(orsDistribution.getNumOrsPackets()!=null){ - createIncentiveRecordforOrsDistribution(orsDistribution,orsDistribution.getBeneficiaryId(),orsPacketActivityCH,jwtUtil.getUserNameFromStorage(),true); + createIncentiveRecordforOrsDistribution(orsDistribution,orsDistribution.getBeneficiaryId(),orsPacketActivityCH,userRepo.getUserNamedByUserId(orsDistribution.getUserId()),true); } }