Added teleconsultation extra field (#86)

* Jwttoken add in header

* Code rabbit comments addressed

* teleconsultation added

* Coderabbit comments updated

* indent format corrected

Author: ravishanigarapu

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) {

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")

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;

src/main/java/com/iemr/admin/service/employeemaster/EmployeeMasterServiceImpl.java

@@ -992,23 +992,22 @@ public ArrayList<V_Userservicerolemapping> 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);
 					mapping.setVillageID(null);
 					mapping.setVillageName(null);
 					mapping.setVillageidDb(null);
 					mapping.setVillageNameDb(null);
-					mapping.setIsSanjeevani(false);
-					
 				}
+				if(null != mapping.getTeleConsultation())
+					mapping.setTeleConsultation(mapping.getTeleConsultation());
 				mappedRoles.add(mapping);
 			}
 		}

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;
 	}