diff --git a/health-services/libraries/health-services-models/CHANGELOG.md b/health-services/libraries/health-services-models/CHANGELOG.md index 3288bfcbfd1..ebef76b1fd0 100644 --- a/health-services/libraries/health-services-models/CHANGELOG.md +++ b/health-services/libraries/health-services-models/CHANGELOG.md @@ -1,8 +1,12 @@ All notable changes to this module will be documented in this file. +## 1.0.11 +- Client reference id added for member of household +- revert of household search change + ## 1.0.10 -- downsync models added -- boundarycode changed to localityCode in household search +- Downsync models added +- Boundarycode changed to localityCode in household search ## 1.0.9 - stock models updated with sender and receiver information fields. diff --git a/health-services/libraries/health-services-models/src/main/java/org/egov/common/models/household/HouseholdSearch.java b/health-services/libraries/health-services-models/src/main/java/org/egov/common/models/household/HouseholdSearch.java index faa018d0a4d..8adfbfeee88 100644 --- a/health-services/libraries/health-services-models/src/main/java/org/egov/common/models/household/HouseholdSearch.java +++ b/health-services/libraries/health-services-models/src/main/java/org/egov/common/models/household/HouseholdSearch.java @@ -36,7 +36,7 @@ public class HouseholdSearch { // @JsonProperty("memberCount") // private Integer memberCount = null; - @JsonProperty("localityCode") + @JsonProperty("boundaryCode") private String localityCode = null; } diff --git a/health-services/libraries/health-services-models/src/main/java/org/egov/common/models/referralmanagement/beneficiarydownsync/DownsyncCriteria.java b/health-services/libraries/health-services-models/src/main/java/org/egov/common/models/referralmanagement/beneficiarydownsync/DownsyncCriteria.java index cde6a1c3e50..6548e7c5025 100644 --- a/health-services/libraries/health-services-models/src/main/java/org/egov/common/models/referralmanagement/beneficiarydownsync/DownsyncCriteria.java +++ b/health-services/libraries/health-services-models/src/main/java/org/egov/common/models/referralmanagement/beneficiarydownsync/DownsyncCriteria.java @@ -1,5 +1,7 @@ package org.egov.common.models.referralmanagement.beneficiarydownsync; +import javax.validation.constraints.NotNull; + import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Builder.Default; @@ -12,12 +14,15 @@ @Builder public class DownsyncCriteria { + @NotNull private String locality; private Long lastSyncedTime; + @NotNull private String projectId; + @NotNull private String tenantId; @Default diff --git a/health-services/referralmanagement/pom.xml b/health-services/referralmanagement/pom.xml index cc9cda07138..5ddcf27b19b 100644 --- a/health-services/referralmanagement/pom.xml +++ b/health-services/referralmanagement/pom.xml @@ -51,7 +51,7 @@ org.egov.common health-services-models - 1.0.10-SNAPSHOT + 1.0.11-SNAPSHOT compile diff --git a/health-services/referralmanagement/src/main/java/org/egov/referralmanagement/service/DownsyncService.java b/health-services/referralmanagement/src/main/java/org/egov/referralmanagement/service/DownsyncService.java index e931dfa46b7..4cb8d8be52b 100644 --- a/health-services/referralmanagement/src/main/java/org/egov/referralmanagement/service/DownsyncService.java +++ b/health-services/referralmanagement/src/main/java/org/egov/referralmanagement/service/DownsyncService.java @@ -405,6 +405,8 @@ private StringBuilder appendUrlParams(StringBuilder url, DownsyncCriteria criter .append("&offset=") .append(criteria.getOffset()) .append("&limit=") - .append(criteria.getLimit()); + .append(criteria.getLimit()) + .append("&includeDeleted=") + .append(criteria.getIncludeDeleted()); } }