From fd9ffc3226cb1eae9d4d89d16af271e2769b2b11 Mon Sep 17 00:00:00 2001 From: Ravi Shanigarapu Date: Tue, 17 Jun 2025 13:17:34 +0530 Subject: [PATCH] removed issanjeevani variable --- .../controller/users/IEMRAdminController.java | 2 +- .../java/com/iemr/common/data/users/Role.java | 44 +------------------ .../data/users/UserServiceRoleMapping.java | 8 ++-- .../users/UserRoleMappingRepository.java | 2 +- .../users/IEMRAdminUserServiceImpl.java | 4 +- 5 files changed, 10 insertions(+), 50 deletions(-) diff --git a/src/main/java/com/iemr/common/controller/users/IEMRAdminController.java b/src/main/java/com/iemr/common/controller/users/IEMRAdminController.java index 94367bfe..81acd8ca 100644 --- a/src/main/java/com/iemr/common/controller/users/IEMRAdminController.java +++ b/src/main/java/com/iemr/common/controller/users/IEMRAdminController.java @@ -406,7 +406,7 @@ private void createUserMapping(User mUser, JSONObject resMap, JSONObject service JSONArray roles = previlegeObj.getJSONObject(serv).getJSONArray("roles"); // roles.put(new JSONObject(m_UserServiceRoleMapping.getM_Role().toString())); JSONObject roleObject = new JSONObject(m_UserServiceRoleMapping.getM_Role().toString()); - roleObject.put("isSanjeevani", m_UserServiceRoleMapping.getIsSanjeevani()); + roleObject.put("teleConsultation", m_UserServiceRoleMapping.getTeleConsultation()); roles.put(roleObject); } } diff --git a/src/main/java/com/iemr/common/data/users/Role.java b/src/main/java/com/iemr/common/data/users/Role.java index 580e183a..90a1759c 100644 --- a/src/main/java/com/iemr/common/data/users/Role.java +++ b/src/main/java/com/iemr/common/data/users/Role.java @@ -99,11 +99,8 @@ public class Role @Expose @Transient - private Boolean isSanjeevani; + private String teleConsultation; - // protected Role() { - // } - // public Role createRole(Integer roleID, String roleName, String roleDesc, Boolean deleted, String createdBy, Timestamp createdDate, String modifiedBy, Timestamp lastModDate, Set m_UserServiceRoleMapping) @@ -124,35 +121,7 @@ public Role createRole(Integer roleID, String roleName, String roleDesc, Boolean return this; } -// public Integer getRoleID() -// { -// return this.RoleID; -// } -// -// public void setRoleID(int roleID) -// { -// this.RoleID = Integer.valueOf(roleID); -// } -// -// public String getRoleName() -// { -// return this.RoleName; -// } -// -// public void setRoleName(String roleName) -// { -// this.RoleName = roleName; -// } -// -// public String getRoleDesc() -// { -// return this.RoleDesc; -// } -// -// public void setRoleDesc(String roleDesc) -// { -// this.RoleDesc = roleDesc; -// } + public boolean isDeleted() { @@ -204,15 +173,6 @@ public void setLastModDate(Timestamp lastModDate) this.LastModDate = lastModDate; } - // public Set getM_UserServiceRoleMapping() - // { - // return this.m_UserServiceRoleMapping; - // } - // - // public void setM_UserServiceRoleMapping(Set m_UserServiceRoleMapping) - // { - // this.m_UserServiceRoleMapping = m_UserServiceRoleMapping; - // } public void setServiceRoleScreenMappings(List serviceRoleScreenMappings) { diff --git a/src/main/java/com/iemr/common/data/users/UserServiceRoleMapping.java b/src/main/java/com/iemr/common/data/users/UserServiceRoleMapping.java index 105cce5e..6c34e9c6 100644 --- a/src/main/java/com/iemr/common/data/users/UserServiceRoleMapping.java +++ b/src/main/java/com/iemr/common/data/users/UserServiceRoleMapping.java @@ -110,8 +110,8 @@ public class UserServiceRoleMapping private Boolean outbound; @Expose - @Column(name = "isSanjeevani") - private Boolean isSanjeevani; + @Column(name = "teleConsultation") + private String teleConsultation; // @Expose @@ -302,7 +302,7 @@ public String toString() public static UserServiceRoleMapping initializeUserRoleMappingObjs(Long USRMappingID, Long UserID, Integer roleID, Role m_Role, Integer providerServiceMapID, ProviderServiceMapping m_ProviderServiceMapping, - String agentID,Boolean inbound, Boolean outbound, Boolean isSanjeevani, String agentPassword, Integer workingLocationID, + String agentID,Boolean inbound, Boolean outbound, String teleConsultation, String agentPassword, Integer workingLocationID, ProviderServiceAddressMapping providerServiceAddressMapping) { UserServiceRoleMapping userRoleMapping = new UserServiceRoleMapping(); @@ -317,7 +317,7 @@ public static UserServiceRoleMapping initializeUserRoleMappingObjs(Long USRMappi userRoleMapping.agentID = agentID; userRoleMapping.inbound = inbound; userRoleMapping.outbound = outbound; - userRoleMapping.isSanjeevani = isSanjeevani; + userRoleMapping.teleConsultation = teleConsultation; userRoleMapping.agentPassword = agentPassword; userRoleMapping.workingLocationID = workingLocationID; userRoleMapping.m_Role.setWorkingLocationID(workingLocationID); diff --git a/src/main/java/com/iemr/common/repository/users/UserRoleMappingRepository.java b/src/main/java/com/iemr/common/repository/users/UserRoleMappingRepository.java index 7ec4276a..65fb8c2f 100644 --- a/src/main/java/com/iemr/common/repository/users/UserRoleMappingRepository.java +++ b/src/main/java/com/iemr/common/repository/users/UserRoleMappingRepository.java @@ -36,7 +36,7 @@ public interface UserRoleMappingRepository extends CrudRepository { @Query("select map.USRMappingID, map.UserID, map.RoleID, map.m_Role, map.providerServiceMapID, " - + "map.agentID, map.inbound, map.outbound, map.isSanjeevani, map.agentPassword, map.workingLocationID, map.providerServiceAddressMapping from " + + "map.agentID, map.inbound, map.outbound, map.teleConsultation, map.agentPassword, map.workingLocationID, map.providerServiceAddressMapping from " + "UserServiceRoleMapping map left join map.m_ProviderServiceMapping psm left join psm.serviceProvider sp " + "left join map.m_Role left join map.providerServiceAddressMapping " + "where map.Deleted = false and UserID = :UserID and sp.statusID in (1,2) " diff --git a/src/main/java/com/iemr/common/service/users/IEMRAdminUserServiceImpl.java b/src/main/java/com/iemr/common/service/users/IEMRAdminUserServiceImpl.java index 9a46eaef..a0efd373 100644 --- a/src/main/java/com/iemr/common/service/users/IEMRAdminUserServiceImpl.java +++ b/src/main/java/com/iemr/common/service/users/IEMRAdminUserServiceImpl.java @@ -473,7 +473,7 @@ public void updateCTIPasswordForUser(Long userID, String password) { .initializeUserRoleMappingObjs((Long) object[0], (Long) object[1], (Integer) object[2], (Role) object[3], (Integer) object[4], getUserProviderServiceRoleMapping((Integer) object[4]), (String) object[5], - (Boolean) object[6], (Boolean) object[7], (Boolean) object[8], (String) object[9], + (Boolean) object[6], (Boolean) object[7], (String) object[8], (String) object[9], (Integer) object[10], (ProviderServiceAddressMapping) object[11]); userRoles.add(userServiceRoleMapping); } @@ -670,7 +670,7 @@ public List getUserServiceRoleMapping(Long userID) throw UserServiceRoleMapping userServiceRoleMapping = UserServiceRoleMapping.initializeUserRoleMappingObjs( (Long) object[0], (Long) object[1], (Integer) object[2], (Role) object[3], (Integer) object[4], getUserProviderServiceRoleMapping((Integer) object[4]), (String) object[5], (Boolean) object[6], - (Boolean) object[7], (Boolean) object[8], (String) object[9], (Integer) object[10], + (Boolean) object[7], (String) object[8], (String) object[9], (Integer) object[10], (ProviderServiceAddressMapping) object[11]); List serviceRoleScreenMappings = getActiveScreenMappings( userServiceRoleMapping.getProviderServiceMapID(), userServiceRoleMapping.getRoleID());