Skip to content

Fix the Age issue while moving to nurse worklist #130

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
vanitha1822 merged 1 commit into from
Jan 8, 2026
Merged

Fix the Age issue while moving to nurse worklist #130

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 3 additions & 0 deletions src/main/java/com/iemr/common/identity/dto/BeneficiariesESDTO.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
import lombok.AllArgsConstructor;
import java.util.Date;
import java.util.List;

import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;

@Data
Expand Down Expand Up @@ -33,6 +35,7 @@ public class BeneficiariesESDTO {
private String genderName;

@JsonProperty("dOB")
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSS'Z'", timezone = "UTC")
private Date dOB;

@JsonProperty("age")
Expand Down
23 changes: 8 additions & 15 deletions src/main/java/com/iemr/common/identity/service/elasticsearch/ElasticsearchService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,15 +50,7 @@ public class ElasticsearchService {
@Value("${elasticsearch.enabled}")
private boolean esEnabled;

/**
* Universal search with optional user location for ranking
*/

/**
* Advanced search with multiple criteria
* Searches by firstName, lastName, gender, DOB, address fields, etc.
*/


/**
* Universal search with score-based filtering and location ranking
* Only returns records that actually match the query (not all 10000)
Expand Down Expand Up @@ -155,10 +147,10 @@ public List<Map<String, Object>> universalSearch(String query, Integer userId) {
.boostMode(FunctionBoostMode.Multiply)
)
)
.minScore(minScore) // KEY: Only return results above minimum score
.size(500) // Reasonable limit - returns only matches up to 500
.minScore(minScore)
.size(500)
.sort(so -> so
.score(sc -> sc.order(SortOrder.Desc)) // Sort by relevance score
.score(sc -> sc.order(SortOrder.Desc))
)
, BeneficiariesESDTO.class);

Expand All @@ -176,7 +168,7 @@ public List<Map<String, Object>> universalSearch(String query, Integer userId) {
}
Map<String, Object> result = mapESResultToExpectedFormat(hit.source());
if (result != null) {
result.put("_score", hit.score()); // Include score for debugging
result.put("_score", hit.score());
}
return result;
})
Expand Down Expand Up @@ -421,8 +413,8 @@ public List<Map<String, Object>> advancedSearch(
.boostMode(FunctionBoostMode.Multiply)
)
)
.minScore(2.0) // Only return good matches
.size(500) // Reasonable limit
.minScore(2.0)
.size(500)
.sort(so -> so
.score(sc -> sc.order(SortOrder.Desc))
)
Expand Down Expand Up @@ -615,6 +607,7 @@ private Map<String, Object> mapESResultToExpectedFormat(BeneficiariesESDTO esDat
result.put("genderID", esData.getGenderID());
result.put("genderName", esData.getGenderName());
result.put("dob", esData.getDOB());
result.put("dOB", esData.getDOB());
result.put("age", esData.getAge());
result.put("fatherName", esData.getFatherName() != null ? esData.getFatherName() : "");
result.put("spouseName", esData.getSpouseName() != null ? esData.getSpouseName() : "");
Expand Down