Skip to content

Fix the multi-word search issue on 3rd word #140

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
Feb 23, 2026
Merged

Fix the multi-word search issue on 3rd word #140

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
15 changes: 6 additions & 9 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 @@ -100,13 +100,13 @@ public List<Map<String, Object>> universalSearch(String query, Integer userId) {
boolean isMultiWord = queryWords.length > 1;

if (isMultiWord) {
// MULTI-WORD SEARCH: Each word must match at least one name field
// e.g., "Ravi Kumar" → "Ravi" must match firstName/middleName/lastName
// AND "Kumar" must match firstName/middleName/lastName
// MULTI-WORD SEARCH: Each word should match at least one name field
// Using should instead of must so that partial matches still return results
// e.g., "Ravi Kumar XYZ" → if only "Ravi" and "Kumar" match, results are still returned
for (String word : queryWords) {
final String w = word;
final String wLower = word.toLowerCase();
b.must(m -> m.bool(wb -> {
b.should(m -> m.bool(wb -> {
// Exact match (case-insensitive via lowercase)
wb.should(s1 -> s1.term(t -> t.field("firstName.keyword").value(wLower).boost(20.0f)));
wb.should(s2 -> s2.term(t -> t.field("middleName.keyword").value(wLower).boost(20.0f)));
Expand Down Expand Up @@ -298,11 +298,8 @@ public List<Map<String, Object>> universalSearch(String query, Integer userId) {
}
}

// For multi-word name queries, must clauses handle the AND logic
// For single-word or numeric queries, at least one should must match
if (isNumeric || !query.trim().contains(" ")) {
b.minimumShouldMatch("1");
}
// At least one should clause must match for all query types
b.minimumShouldMatch("1");
return b;
}))
.functions(getFunctionScores(userLocation))
Expand Down