Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
b5794a7
fix jsy incentive issue
SauravBizbRolly Oct 1, 2026
52c6c4e
fix vhnc incentive issue
SauravBizbRolly Oct 1, 2026
f588eee
fix dto issue
SauravBizbRolly Oct 5, 2026
08677fe
fix dto issue
SauravBizbRolly Oct 5, 2026
fded8f3
tpt incentive logic
SauravBizbRolly Oct 5, 2026
b525a5f
tpt incentive logic
SauravBizbRolly Oct 5, 2026
9e3dd3b
tpt incentive logic
SauravBizbRolly Oct 5, 2026
4dc2459
tpt incentive logic
SauravBizbRolly Oct 6, 2026
8350ac1
tpt incentive logic
SauravBizbRolly Oct 6, 2026
6f364d2
tpt incentive logic
SauravBizbRolly Oct 6, 2026
85176ee
tpt incentive logic
SauravBizbRolly Oct 6, 2026
22ea14d
tpt incentive logic
SauravBizbRolly Oct 6, 2026
9a381e7
fix approval staus issue
SauravBizbRolly Oct 6, 2026
ad11dd7
fix approval staus issue
SauravBizbRolly Oct 6, 2026
3b4cc2b
fix approval staus issue
SauravBizbRolly Oct 6, 2026
77fd3bb
fix approval staus issue
SauravBizbRolly Oct 6, 2026
29e8a91
fix approval staus issue
SauravBizbRolly Oct 6, 2026
ebea387
fix approval staus issue
SauravBizbRolly Oct 6, 2026
4cf8205
fix approval staus issue
SauravBizbRolly Oct 6, 2026
86fdd55
fix approval staus issue
SauravBizbRolly Oct 6, 2026
d8edd9a
fix approval staus issue
SauravBizbRolly Oct 6, 2026
bc779a0
fix approval staus issue
SauravBizbRolly Oct 6, 2026
6e41771
fix approval staus issue
SauravBizbRolly Oct 7, 2026
6b317c8
fix approval staus issue
SauravBizbRolly Oct 7, 2026
d4ec10d
fix incentive activity code maping
SauravBizbRolly Oct 7, 2026
0d85ac3
fix mappping of asha with anm
SauravBizbRolly Oct 7, 2026
72d6015
fix child vaccination get all data issue
SauravBizbRolly Oct 9, 2026
7b1e855
fix child vaccination get all data issue
SauravBizbRolly Oct 9, 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
6 changes: 6 additions & 0 deletions src/main/java/com/iemr/flw/domain/iemr/TBScreening.java
Original file line number Diff line number Diff line change
Expand Up @@ -213,4 +213,10 @@ public class TBScreening {
@org.hibernate.annotations.CreationTimestamp
@Column(name = "synced_date")
private Timestamp syncedDate;

@Column(name = "failure_to_gainWeight")
private Boolean failureToGainWeight;

@Column(name = "decreased_activity_playfulness ")
private Boolean decreasedActivityOrPlayfulness ;
}
7 changes: 0 additions & 7 deletions src/main/java/com/iemr/flw/domain/iemr/VhncForm.java
Original file line number Diff line number Diff line change
Expand Up @@ -66,11 +66,4 @@ public class VhncForm {
@Column(name = "followup_previous")
private Boolean followupPrevius;

@Column(name = "synced_by")
private String syncedBy;

@org.hibernate.annotations.CreationTimestamp
@Column(name = "synced_date")
private Timestamp syncedDate;

}
3 changes: 3 additions & 0 deletions src/main/java/com/iemr/flw/dto/iemr/ANCVisitDTO.java
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@

@Data
public class ANCVisitDTO {
private String syncedBy;
private java.sql.Timestamp syncedDate;


private Long id;
private Long benId;
Expand Down
3 changes: 3 additions & 0 deletions src/main/java/com/iemr/flw/dto/iemr/AdolescentHealthDTO.java
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@
import java.util.List;
@Data
public class AdolescentHealthDTO {
private String syncedBy;
private java.sql.Timestamp syncedDate;

@NotNull(message = "User ID cannot be null")
Integer userId;
@NotNull(message = "Adolescent health records cannot be null")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@

@Data
public class AncCounsellingCareDTO {
private String syncedBy;
private java.sql.Timestamp syncedDate;

private String formId;
private Long id ;
private Long beneficiaryId;
Expand Down
3 changes: 3 additions & 0 deletions src/main/java/com/iemr/flw/dto/iemr/CdrDTO.java
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@

@Data
public class CdrDTO {
private String syncedBy;
private java.sql.Timestamp syncedDate;

private Long id;

private Long benId;
Expand Down
3 changes: 3 additions & 0 deletions src/main/java/com/iemr/flw/dto/iemr/ChildRegisterDTO.java
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@

@Data
public class ChildRegisterDTO {
private String syncedBy;
private java.sql.Timestamp syncedDate;


private Long id;
private Long benId;
Expand Down
3 changes: 3 additions & 0 deletions src/main/java/com/iemr/flw/dto/iemr/ChildVaccinationDTO.java
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@
@Data
@JsonIgnoreProperties(ignoreUnknown = true)
public class ChildVaccinationDTO {
private String syncedBy;
private java.sql.Timestamp syncedDate;


private long id;
private Long beneficiaryRegId;
Expand Down
3 changes: 3 additions & 0 deletions src/main/java/com/iemr/flw/dto/iemr/DeliveryOutcomeDTO.java
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package com.iemr.flw.dto.iemr;

import com.fasterxml.jackson.annotation.JsonFormat;
import jakarta.persistence.Column;
import lombok.Data;

import java.sql.Timestamp;
Expand Down Expand Up @@ -30,4 +31,6 @@ public class DeliveryOutcomeDTO {
private String createdBy;
private Timestamp updatedDate;
private String updatedBy;
private String syncedBy;
private Timestamp syncedDate;
}
3 changes: 3 additions & 0 deletions src/main/java/com/iemr/flw/dto/iemr/DewormingFormDTO.java
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@

@Data
public class DewormingFormDTO {
private String syncedBy;
private java.sql.Timestamp syncedDate;

private int id = 0;
private String dewormingDone;
private String dewormingDate;
Expand Down
3 changes: 3 additions & 0 deletions src/main/java/com/iemr/flw/dto/iemr/DynamicFormDTO.java
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,9 @@
@NoArgsConstructor
@AllArgsConstructor
public class DynamicFormDTO {
private String syncedBy;
private java.sql.Timestamp syncedDate;


private Long formId;

Expand Down
3 changes: 3 additions & 0 deletions src/main/java/com/iemr/flw/dto/iemr/EligibleCoupleDTO.java
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@

@Data
public class EligibleCoupleDTO implements Serializable {
private String syncedBy;
private Timestamp syncedDate;


private Long id;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@

@Data
public class EligibleCoupleTrackingDTO implements Serializable {
private String syncedBy;
private java.sql.Timestamp syncedDate;


private Long id;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@

@Data
public class FilariasisCampaignDTO {
private String syncedBy;
private java.sql.Timestamp syncedDate;

private Long id;
private String visitDate;
private FilariasisCampaignListDTO fields;
Expand Down
3 changes: 3 additions & 0 deletions src/main/java/com/iemr/flw/dto/iemr/FormResponseDTO.java
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,9 @@
@AllArgsConstructor
@Builder
public class FormResponseDTO {
private String syncedBy;
private java.sql.Timestamp syncedDate;


private Long responseId;
private Long beneficiaryId;
Expand Down
3 changes: 3 additions & 0 deletions src/main/java/com/iemr/flw/dto/iemr/FormSectionDTO.java
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,9 @@
@NoArgsConstructor
@AllArgsConstructor
public class FormSectionDTO {
private String syncedBy;
private java.sql.Timestamp syncedDate;


private Long sectionId;

Expand Down
3 changes: 3 additions & 0 deletions src/main/java/com/iemr/flw/dto/iemr/FormVersionDTO.java
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,9 @@
@NoArgsConstructor
@AllArgsConstructor
public class FormVersionDTO {
private String syncedBy;
private java.sql.Timestamp syncedDate;


private Long versionId;
private Integer versionNumber;
Expand Down
3 changes: 3 additions & 0 deletions src/main/java/com/iemr/flw/dto/iemr/HbncPart1DTO.java
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@

@Data
public class HbncPart1DTO {
private String syncedBy;
private java.sql.Timestamp syncedDate;


private Long id;
private Long benId;
Expand Down
3 changes: 3 additions & 0 deletions src/main/java/com/iemr/flw/dto/iemr/HbncPart2DTO.java
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@

@Data
public class HbncPart2DTO {
private String syncedBy;
private java.sql.Timestamp syncedDate;


private Long id;
private Long benId;
Expand Down
3 changes: 3 additions & 0 deletions src/main/java/com/iemr/flw/dto/iemr/HbncVisitCardDTO.java
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@

@Data
public class HbncVisitCardDTO {
private String syncedBy;
private java.sql.Timestamp syncedDate;


private Long id;
private Long benId;
Expand Down
3 changes: 3 additions & 0 deletions src/main/java/com/iemr/flw/dto/iemr/HbncVisitDTO.java
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@

@Data
public class HbncVisitDTO {
private String syncedBy;
private java.sql.Timestamp syncedDate;

@SerializedName("id")
private Integer id;

Expand Down
3 changes: 3 additions & 0 deletions src/main/java/com/iemr/flw/dto/iemr/HbycDTO.java
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,9 @@

@Data
public class HbycDTO {
private String syncedBy;
private java.sql.Timestamp syncedDate;


@SerializedName("visit_day")
private String visit_day; // 3 Months, 6 Months, etc.
Expand Down
3 changes: 3 additions & 0 deletions src/main/java/com/iemr/flw/dto/iemr/HighRiskAssessDTO.java
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@

@Data
public class HighRiskAssessDTO {
private String syncedBy;
private java.sql.Timestamp syncedDate;

private Long id;

private Integer userId;
Expand Down
3 changes: 3 additions & 0 deletions src/main/java/com/iemr/flw/dto/iemr/IRSRoundDTO.java
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,9 @@
@NoArgsConstructor
@AllArgsConstructor
public class IRSRoundDTO {
private String syncedBy;
private java.sql.Timestamp syncedDate;

private Long id;
@NotNull(message = "Date cannot be null")
private LocalDate date;
Expand Down
3 changes: 3 additions & 0 deletions src/main/java/com/iemr/flw/dto/iemr/IfaDistributionDTO.java
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@

@Data
public class IfaDistributionDTO {
private String syncedBy;
private java.sql.Timestamp syncedDate;


@SerializedName("beneficiaryId")
private Long beneficiaryId;
Expand Down
3 changes: 3 additions & 0 deletions src/main/java/com/iemr/flw/dto/iemr/IncentiveActivityDTO.java
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@

@Data
public class IncentiveActivityDTO implements Serializable {
private String syncedBy;
private java.sql.Timestamp syncedDate;


private Long id;

Expand Down
2 changes: 2 additions & 0 deletions src/main/java/com/iemr/flw/dto/iemr/IncentiveRecordDTO.java
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,8 @@ public class IncentiveRecordDTO {
private String supervisorRole;

private Boolean isApproved;
private String syncedBy;
private Timestamp syncedDate;



Expand Down
3 changes: 3 additions & 0 deletions src/main/java/com/iemr/flw/dto/iemr/LeprosyFollowUpDTO.java
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@

@Data
public class LeprosyFollowUpDTO {
private String syncedBy;
private java.sql.Timestamp syncedDate;


private Long id;
private Long benId;
Expand Down
3 changes: 3 additions & 0 deletions src/main/java/com/iemr/flw/dto/iemr/MalariaFollowUpDTO.java
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,9 @@
import java.util.List;
@Data
public class MalariaFollowUpDTO {
private String syncedBy;
private java.sql.Timestamp syncedDate;

private Integer userId;
private List<MalariaFollowListUpDTO> malariaFollowListUp;
}
3 changes: 3 additions & 0 deletions src/main/java/com/iemr/flw/dto/iemr/MdsrDTO.java
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@

@Data
public class MdsrDTO {
private String syncedBy;
private java.sql.Timestamp syncedDate;

private Long id;

private Long benId;
Expand Down
3 changes: 3 additions & 0 deletions src/main/java/com/iemr/flw/dto/iemr/MicroBirthPlanDTO.java
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@
import java.util.List;
@Data
public class MicroBirthPlanDTO implements Serializable {
private String syncedBy;
private java.sql.Timestamp syncedDate;

Integer userId;
List<MicroBirthPlan> entries;

Expand Down
3 changes: 3 additions & 0 deletions src/main/java/com/iemr/flw/dto/iemr/NotificationDTO.java
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@

@Data
public class NotificationDTO {
private String syncedBy;
private java.sql.Timestamp syncedDate;

private String title;
private String body;
private String token;
Expand Down
3 changes: 3 additions & 0 deletions src/main/java/com/iemr/flw/dto/iemr/OptionConditionDTO.java
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,9 @@
@NoArgsConstructor
@AllArgsConstructor
public class OptionConditionDTO {
private String syncedBy;
private java.sql.Timestamp syncedDate;


private Long conditionId;

Expand Down
3 changes: 3 additions & 0 deletions src/main/java/com/iemr/flw/dto/iemr/OrsDistributionDTO.java
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@

@Data
public class OrsDistributionDTO {
private String syncedBy;
private java.sql.Timestamp syncedDate;

private Long id;
private Long beneficiaryId;
private Long houseHoldId;
Expand Down
3 changes: 3 additions & 0 deletions src/main/java/com/iemr/flw/dto/iemr/PNCVisitDTO.java
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@

@Data
public class PNCVisitDTO {
private String syncedBy;
private java.sql.Timestamp syncedDate;

private Long id;
private Long benId;
// private Integer pncVisit;
Expand Down
3 changes: 3 additions & 0 deletions src/main/java/com/iemr/flw/dto/iemr/PmsmaDTO.java
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@

@Data
public class PmsmaDTO {
private String syncedBy;
private java.sql.Timestamp syncedDate;

private Long id;
private Long benId;
private String rchNumber;
Expand Down
3 changes: 3 additions & 0 deletions src/main/java/com/iemr/flw/dto/iemr/PregnantWomanDTO.java
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@

@Data
public class PregnantWomanDTO {
private String syncedBy;
private Timestamp syncedDate;


private Long id;
private Long benId;
Expand Down
3 changes: 3 additions & 0 deletions src/main/java/com/iemr/flw/dto/iemr/QuestionOptionDTO.java
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,9 @@
@NoArgsConstructor
@AllArgsConstructor
public class QuestionOptionDTO {
private String syncedBy;
private java.sql.Timestamp syncedDate;


private Long optionId;

Expand Down
3 changes: 3 additions & 0 deletions src/main/java/com/iemr/flw/dto/iemr/QuestionResponseDTO.java
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,9 @@
@AllArgsConstructor
@Builder
public class QuestionResponseDTO {
private String syncedBy;
private java.sql.Timestamp syncedDate;


private Long questionResponseId;
private Long questionId;
Expand Down
Loading
Loading