From 43c1b501203ddc80ec1e3864181f785cedbf2fff Mon Sep 17 00:00:00 2001 From: Saurav Mishra Date: Sun, 11 Oct 2026 15:08:05 +0530 Subject: [PATCH 1/2] fix sam visit sync issue --- .../java/com/iemr/flw/service/impl/ChildCareServiceImpl.java | 1 + 1 file changed, 1 insertion(+) 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 ad944aa4..16b38400 100644 --- a/src/main/java/com/iemr/flw/service/impl/ChildCareServiceImpl.java +++ b/src/main/java/com/iemr/flw/service/impl/ChildCareServiceImpl.java @@ -583,6 +583,7 @@ public String saveSamDetails(List samRequest, Integer userId, String use samVisit.setVisitLabel(samDTO.getFields().getVisit_label()); samVisit.setWeightForHeightStatus(samDTO.getFields().getWeight_for_height_status()); samVisit.setIsChildReferredNrc(samDTO.getFields().getIs_child_referred_nrc()); + samVisit.setIsChildAdmittedNrc(samDTO.getFields().getIs_child_admitted_nrc()); samVisit.setNrcAdmissionDate(samDTO.getFields().getNrc_admission_date()); samVisit.setIsChildDischargedNrc(samDTO.getFields().getIs_child_discharged_nrc()); samVisit.setNrcDischargeDate(samDTO.getFields().getNrc_discharge_date()); From 158e6ea077ee35bf3c15a0a772647324e1e65044 Mon Sep 17 00:00:00 2001 From: Saurav Mishra Date: Mon, 12 Oct 2026 16:18:26 +0530 Subject: [PATCH 2/2] fix ors distrubution backdate issue --- .../com/iemr/flw/service/impl/CampaignServiceImpl.java | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/iemr/flw/service/impl/CampaignServiceImpl.java b/src/main/java/com/iemr/flw/service/impl/CampaignServiceImpl.java index f9c07632..a97898b1 100644 --- a/src/main/java/com/iemr/flw/service/impl/CampaignServiceImpl.java +++ b/src/main/java/com/iemr/flw/service/impl/CampaignServiceImpl.java @@ -473,7 +473,6 @@ private void checkMonthlyPulseOrsDistribution(Integer ashaId,LocalDate startDate } private void addAshaIncentiveRecord(IncentiveActivity incentiveActivity, Integer ashaId,LocalDate startDate,LocalDate endDate) { - Timestamp timestamp = Timestamp.valueOf(LocalDateTime.now()); Timestamp startOfMonth = Timestamp.valueOf(startDate.atStartOfDay()); Timestamp endOfMonth = Timestamp.valueOf(endDate.atStartOfDay()); @@ -490,11 +489,11 @@ private void addAshaIncentiveRecord(IncentiveActivity incentiveActivity, Integer if (record == null) { record = new IncentiveActivityRecord(); record.setActivityId(incentiveActivity.getId()); - record.setCreatedDate(timestamp); + record.setCreatedDate(endOfMonth); record.setCreatedBy(userServiceRoleRepo.getUserNamedByUserId(ashaId)); - record.setStartDate(timestamp); - record.setEndDate(timestamp); - record.setUpdatedDate(timestamp); + record.setStartDate(endOfMonth); + record.setEndDate(endOfMonth); + record.setUpdatedDate(endOfMonth); record.setUpdatedBy(userServiceRoleRepo.getUserNamedByUserId(ashaId)); record.setBenId(0L); record.setAshaId(ashaId);