diff --git a/src/main/java/com/iemr/admin/controller/employeemaster/EmployeeMasterController.java b/src/main/java/com/iemr/admin/controller/employeemaster/EmployeeMasterController.java index 701d68c..09b7ab4 100644 --- a/src/main/java/com/iemr/admin/controller/employeemaster/EmployeeMasterController.java +++ b/src/main/java/com/iemr/admin/controller/employeemaster/EmployeeMasterController.java @@ -1845,10 +1845,10 @@ public String UserRoleMappings(@RequestBody String userRoleMapping, HttpServletR resDataMap1.setRoleID(previl1.getRoleID()); resDataMap1.setInbound(previl1.getInbound()); resDataMap1.setOutbound(previl1.getOutbound()); - if(previl1.getIsSanjeevani() != null) { - resDataMap1.setIsSanjeevani(previl1.getIsSanjeevani()); - } + if (previl1.getTeleConsultation() != null) { + resDataMap1.setTeleConsultation(previl1.getTeleConsultation()); } + } resDataMap1.setUserID(employeeMaster.get(x).getUserID()); resDataMap1.setProviderServiceMapID(previl.getProviderServiceMapID()); resDataMap1.setWorkingLocationID(previl.getWorkingLocationID()); @@ -1905,8 +1905,8 @@ public String updateUserRoleMapping(@RequestBody String updateUserRoleMapping, H usrRole.setVillageID(pre.getVillageID()); usrRole.setVillageName(pre.getVillageName()); - if(pre.getIsSanjeevani() != null) { - usrRole.setIsSanjeevani(pre.getIsSanjeevani()); + if (pre.getTeleConsultation() != null) { + usrRole.setTeleConsultation(pre.getTeleConsultation()); } if (pre.getInbound() != null) { diff --git a/src/main/java/com/iemr/admin/data/employeemaster/M_UserServiceRoleMapping2.java b/src/main/java/com/iemr/admin/data/employeemaster/M_UserServiceRoleMapping2.java index d2afbdb..23c115e 100644 --- a/src/main/java/com/iemr/admin/data/employeemaster/M_UserServiceRoleMapping2.java +++ b/src/main/java/com/iemr/admin/data/employeemaster/M_UserServiceRoleMapping2.java @@ -107,8 +107,8 @@ public class M_UserServiceRoleMapping2 { private Boolean deleted=false; @Expose - @Column(name = "isSanjeevani") - private Boolean isSanjeevani; + @Column(name = "teleConsultation") + private String teleConsultation; @Expose @Column(name = "CreatedBy") diff --git a/src/main/java/com/iemr/admin/data/employeemaster/V_Userservicerolemapping.java b/src/main/java/com/iemr/admin/data/employeemaster/V_Userservicerolemapping.java index 1738dce..7b4b266 100644 --- a/src/main/java/com/iemr/admin/data/employeemaster/V_Userservicerolemapping.java +++ b/src/main/java/com/iemr/admin/data/employeemaster/V_Userservicerolemapping.java @@ -148,8 +148,8 @@ public class V_Userservicerolemapping { private String[] villageName; @Expose - @Column(name="isSanjeevani") - private Boolean isSanjeevani; + @Column(name="teleConsultation") + private String teleConsultation; public Integer getProviderServiceMapID() { return providerServiceMapID; diff --git a/src/main/java/com/iemr/admin/service/employeemaster/EmployeeMasterServiceImpl.java b/src/main/java/com/iemr/admin/service/employeemaster/EmployeeMasterServiceImpl.java index 23e9680..19032d6 100644 --- a/src/main/java/com/iemr/admin/service/employeemaster/EmployeeMasterServiceImpl.java +++ b/src/main/java/com/iemr/admin/service/employeemaster/EmployeeMasterServiceImpl.java @@ -992,13 +992,12 @@ public ArrayList getMappedRole(Integer serviceProvider } else { mapping.setVillageName(new String[0]); } - if (mapping.getServiceID()!=null) { + if (mapping.getServiceID() != null) { mapping.setBlockID(mapping.getBlockID()); mapping.setBlockName(mapping.getBlockName()); mapping.setVillageID(mapping.getVillageID()); mapping.setVillageName(mapping.getVillageName()); - if(null != mapping.getIsSanjeevani()) - mapping.setIsSanjeevani(mapping.getIsSanjeevani()); + } else { mapping.setBlockID(null); mapping.setBlockName(null); @@ -1006,9 +1005,9 @@ public ArrayList getMappedRole(Integer serviceProvider mapping.setVillageName(null); mapping.setVillageidDb(null); mapping.setVillageNameDb(null); - mapping.setIsSanjeevani(false); - } + if(null != mapping.getTeleConsultation()) + mapping.setTeleConsultation(mapping.getTeleConsultation()); mappedRoles.add(mapping); } } diff --git a/src/main/java/com/iemr/admin/to/employeemaster/Priveleges1097_2.java b/src/main/java/com/iemr/admin/to/employeemaster/Priveleges1097_2.java index 1205fde..b1ec127 100644 --- a/src/main/java/com/iemr/admin/to/employeemaster/Priveleges1097_2.java +++ b/src/main/java/com/iemr/admin/to/employeemaster/Priveleges1097_2.java @@ -26,7 +26,7 @@ public class Priveleges1097_2 { private Integer roleID; private Boolean inbound; private Boolean outbound; - private Boolean isSanjeevani; + private String teleConsultation; public Integer getRoleID() { return roleID; @@ -46,11 +46,11 @@ public Boolean getOutbound() { public void setOutbound(Boolean outbound) { this.outbound = outbound; } - public Boolean getIsSanjeevani() { - return isSanjeevani; + public String getTeleConsultation() { + return teleConsultation; } - public void setIsSanjeevani(Boolean isSanjeevani) { - this.isSanjeevani = isSanjeevani; + public void setTeleConsultation(String teleConsultation) { + this.teleConsultation = teleConsultation; }