From 534c63428753a597773eab9c830dbeea30f5d646 Mon Sep 17 00:00:00 2001 From: Devika Date: Thu, 24 Aug 2023 17:16:01 +0530 Subject: [PATCH] Added call type Id zero --- .../callhandling/BeneficiaryCallServiceImpl.java | 4 ++++ .../iemr/common/utils/http/HTTPRequestInterceptor.java | 10 +++++----- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/iemr/common/service/callhandling/BeneficiaryCallServiceImpl.java b/src/main/java/com/iemr/common/service/callhandling/BeneficiaryCallServiceImpl.java index 7b2cd926..0989a61f 100644 --- a/src/main/java/com/iemr/common/service/callhandling/BeneficiaryCallServiceImpl.java +++ b/src/main/java/com/iemr/common/service/callhandling/BeneficiaryCallServiceImpl.java @@ -294,6 +294,10 @@ else if (benCalls != null && benCalls.getPhoneNo() != null) } else if (benCalls.getAgentIPAddress() == null) { benCalls.setAgentIPAddress(agentIPAddress); } + + if(benCalls.getCallTypeID() == null) { + benCalls.setCallTypeID(0); + } // changes from null to new object, in controller obj.toString() is getting used BeneficiaryCall savedCalls = new BeneficiaryCall(); diff --git a/src/main/java/com/iemr/common/utils/http/HTTPRequestInterceptor.java b/src/main/java/com/iemr/common/utils/http/HTTPRequestInterceptor.java index edf5086c..7ec70dcd 100644 --- a/src/main/java/com/iemr/common/utils/http/HTTPRequestInterceptor.java +++ b/src/main/java/com/iemr/common/utils/http/HTTPRequestInterceptor.java @@ -95,11 +95,11 @@ public boolean preHandle(HttpServletRequest request, HttpServletResponse respons break; default: String remoteAddress = request.getHeader("X-FORWARDED-FOR"); -// if (remoteAddress == null || remoteAddress.trim().length() == 0) { -// remoteAddress = request.getRemoteAddr(); -// } -// validator.checkKeyExists(authorization, remoteAddress); -// break; + if (remoteAddress == null || remoteAddress.trim().length() == 0) { + remoteAddress = request.getRemoteAddr(); + } + validator.checkKeyExists(authorization, remoteAddress); + break; } } catch (Exception e) { OutputResponse output = new OutputResponse();