Skip to content

Abha search change #109

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
ravishanigarapu merged 1 commit into from
Aug 6, 2024
Merged

Abha search change #109

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
32 changes: 26 additions & 6 deletions src/main/java/com/iemr/common/service/beneficiary/IEMRSearchUserServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,22 +188,42 @@ public List<BeneficiaryModel> userExitsCheckWithHealthId_ABHAId(String healthID,
throws Exception {
// result list
List<BeneficiaryModel> beneficiaryList = new ArrayList<BeneficiaryModel>();
// search patient by ben id, call Identity API
List<BeneficiariesDTO> listBen = identityBeneficiaryService.getBeneficiaryListByHealthID_ABHAAddress(healthID,
auth, is1097);
List<BeneficiariesDTO> listBen = null;
if (healthID.contains("@")) {
listBen = identityBeneficiaryService.getBeneficiaryListByHealthID_ABHAAddress(healthID, auth, is1097);
} else {
String healthIdNumber = getHealthId(healthID);
listBen = identityBeneficiaryService.getBeneficiaryListByHealthIDNo_ABHAIDNo(healthIdNumber, auth, is1097);
}

beneficiaryList = getBeneficiaryListFromMapper(listBen);
return beneficiaryList;
}

private String getHealthId(String healthID) {
String healthIdNumber = null;
if (null != healthID) {
if (healthID.length() == 17) {
healthIdNumber = healthID;
} else {
StringBuilder stringBuilder = new StringBuilder();
stringBuilder.append(healthID.substring(0, 2)).append("-");
stringBuilder.append(healthID.substring(2, 6)).append("-");
stringBuilder.append(healthID.substring(6, 10)).append("-");
stringBuilder.append(healthID.substring(10));
String formattedHealthID = stringBuilder.toString();
healthIdNumber = formattedHealthID;
}
}
return healthIdNumber;
}
// search patient by healthidNo / ABHA Id No
@Override
public List<BeneficiaryModel> userExitsCheckWithHealthIdNo_ABHAIdNo(String healthIDNo, String auth, Boolean is1097)
throws Exception {
// result list
List<BeneficiaryModel> beneficiaryList = new ArrayList<BeneficiaryModel>();
// search patient by ben id, call Identity API
List<BeneficiariesDTO> listBen = identityBeneficiaryService.getBeneficiaryListByHealthIDNo_ABHAIDNo(healthIDNo,
String healthId = getHealthId(healthIDNo);
List<BeneficiariesDTO> listBen = identityBeneficiaryService.getBeneficiaryListByHealthIDNo_ABHAIDNo(healthId,
auth, is1097);

beneficiaryList = getBeneficiaryListFromMapper(listBen);
Expand Down