Skip to content

Change in Phone No Comparison while fetching call audit details #94

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 10 commits into from
Mar 21, 2024
Merged

Change in Phone No Comparison while fetching call audit details #94

Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
68bb080
Added limit condition while fetching Item stock entry details in eaus…
Dec 20, 2023
f52bb5a
Merge branch 'PSMRI:develop' into develop
devikasuresh20 Dec 21, 2023
1b34f6a
Merge branch 'PSMRI:develop' into develop
devikasuresh20 Jan 25, 2024
d4b8ae2
Merge branch 'PSMRI:develop' into develop
devikasuresh20 Jan 30, 2024
7afc342
Minor modifications in 1097 referral sms template
Jan 30, 2024
593728d
Added institute name along with referral SMS
Jan 31, 2024
98ddb98
Merge branch 'PSMRI:develop' into develop
devikasuresh20 Feb 16, 2024
0ad1dd7
Removed myapp propeties and minor change in interceptor.
Feb 16, 2024
d7e4511
Merge branch 'PSMRI:develop' into develop
devikasuresh20 Mar 12, 2024
6cfbb83
Change in Phone No comparison while fetching call audit details
Mar 21, 2024
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
16 changes: 12 additions & 4 deletions src/main/java/com/iemr/common/service/callhandling/BeneficiaryCallServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1070,8 +1070,12 @@ private Long getTotalCallCount(CriteriaBuilder criteriaBuilder, BeneficiaryCall
predicates.add(criteriaBuilder.equal(entityRoot.get("callTypeID"), callRequest.getCallTypeID()));
}

predicates.add(criteriaBuilder.like(entityRoot.get("phoneNo"),
(callRequest.getPhoneNo() == null) ? "%%" : callRequest.getPhoneNo()));
// predicates.add(criteriaBuilder.like(entityRoot.get("phoneNo"),
// (callRequest.getPhoneNo() == null) ? "%%" : callRequest.getPhoneNo()));

if (callRequest.getPhoneNo() != null) {
predicates.add(criteriaBuilder.equal(entityRoot.get("phoneNo"), callRequest.getPhoneNo()));
}

if (callRequest.getInboundOutbound() != null) {
callRequest.setIsOutbound(callRequest.getInboundOutbound().equalsIgnoreCase("outbound") ? true : false);
Expand Down Expand Up @@ -1211,8 +1215,12 @@ public String filterCallList(String request, String auth) throws IEMRException {
predicates.add(criteriaBuilder.equal(root.get("callTypeID"), callRequest.getCallTypeID()));
}

predicates.add(criteriaBuilder.like(root.get("phoneNo"),
(callRequest.getPhoneNo() == null) ? "%%" : callRequest.getPhoneNo()));
// predicates.add(criteriaBuilder.like(root.get("phoneNo"),
// (callRequest.getPhoneNo() == null) ? "%%" : callRequest.getPhoneNo()));

if (callRequest.getPhoneNo() != null) {
predicates.add(criteriaBuilder.equal(root.get("phoneNo"), callRequest.getPhoneNo()));
}

if (callRequest.getInboundOutbound() != null) {
callRequest.setIsOutbound(callRequest.getInboundOutbound().equalsIgnoreCase("outbound") ? true : false);
Expand Down