Skip to content

Fix/samvisit sync issue 3.11.0 #374

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
SauravBizbRolly merged 2 commits into from
Oct 12, 2026
Merged

Fix/samvisit sync issue 3.11.0 #374

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
43c1b50
fix sam visit sync issue
SauravBizbRolly Oct 11, 2026
158e6ea
fix ors distrubution backdate issue
SauravBizbRolly Oct 12, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions src/main/java/com/iemr/flw/service/impl/CampaignServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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());
Expand All @@ -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);
Expand Down
1 change: 1 addition & 0 deletions src/main/java/com/iemr/flw/service/impl/ChildCareServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -583,6 +583,7 @@ public String saveSamDetails(List<SamDTO> 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());
Expand Down
Loading