Skip to content

Commit

Permalink
Change in Phone No Comparison while fetching call audit details (#94)
Browse files Browse the repository at this point in the history
* Added limit condition while fetching Item stock entry details in eaushadha API

* Minor modifications in 1097 referral sms template

* Added institute name along with referral SMS

* Removed myapp propeties and minor change in interceptor.

* Change in Phone No comparison while fetching call audit details

---------

Co-authored-by: Devika <[email protected]>
  • Loading branch information
devikasuresh20 and Devika authored Mar 21, 2024
1 parent a76c4df commit d5e4f91
Showing 1 changed file with 12 additions and 4 deletions.
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

0 comments on commit d5e4f91

Please sign in to comment.