fix: resolve ONLY_FULL_GROUP_BY violations and bulk registration username bug

src/main/java/com/iemr/admin/repo/blocking/MProviderservicemappingBlockingRepo.java

@@ -85,7 +85,7 @@ void blockProviderByProviderIdAndServiceId(@Param("serviceProviderID") Integer s
 	@Query(" SELECT distinct srm.providerServiceMapID,srm.serviceProviderID,srm.serviceID,"
 			+ " sm.serviceName as serviceName," + " sm.isNational as isNational "
 			+ " FROM M_Providerservicemapping_Blocking srm " + "  JOIN srm.m_ServicemasterForBlocking sm"
-			+ " WHERE srm.serviceProviderID =:serviceProviderID AND srm.deleted=false" + " GROUP BY sm.serviceName")
+			+ " WHERE srm.serviceProviderID =:serviceProviderID AND srm.deleted=false")
 	ArrayList<Object[]> getServiceLiensUsingProvider(@Param("serviceProviderID") Integer serviceProviderID);
 
 	@Transactional

src/main/java/com/iemr/admin/repository/rolemaster/M_UserservicerolemappingForRoleProviderAdminRepo.java

@@ -49,15 +49,14 @@ public interface M_UserservicerolemappingForRoleProviderAdminRepo
 	 * serviceProviderID, Integer serviceID);
 	 */
 
-	@Query("SELECT sm.serviceName as serviceName," +
+	@Query("SELECT DISTINCT sm.serviceName as serviceName," +
 	        " ssm.serviceID," +
 	        " sm.isNational as isNational," +
 	        " ssm.statusID" +
 	        " FROM M_UserservicerolemappingForRoleProviderAdmin usr" +
 	        " JOIN usr.stateServiceMapping ssm" +
 	        " JOIN ssm.serviceMaster sm" +
-	        " WHERE usr.userID = :userID AND ssm.statusID = 2 AND usr.deleted = false" +
-	        " GROUP BY sm.serviceName")
+	        " WHERE usr.userID = :userID AND ssm.statusID = 2 AND usr.deleted = false")
 	ArrayList<Object[]> getServiceByServiceProviderIds(@Param("userID") Integer serviceProviderID);
 
 	@Query("SELECT distinct ssm.stateID," + " sm.stateName, " + " ssm.providerServiceMapID," + " ssm.statusID"

src/main/java/com/iemr/admin/service/bulkRegistration/BulkRegistrationServiceImpl.java

@@ -305,7 +305,7 @@ private void saveUserUser(Employee employee, Integer row, String authorization,
                             mUser.setTitleID(getTitleId(employee.getTitle()));
                             mUser.setFirstName(employee.getFirstName());
                             mUser.setLastName(employee.getLastName());
-                            mUser.setUserName(employee.getContactNo());
+                            mUser.setUserName(employee.getUserName());
                             mUser.setdOB(convertStringIntoDate(employee.getDob()));
                             mUser.setEmployeeID(employee.getUserName());
                             mUser.setEmergencyContactNo(String.valueOf(employee.getEmergencyContactNo()));

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

@@ -27,6 +27,7 @@
 
 import com.iemr.admin.data.employeemaster.EmployeeSignature;
 import com.iemr.admin.repo.employeemaster.EmployeeSignatureRepo;
+import org.json.JSONObject;
 
 @Service
 public class EmployeeSignatureServiceImpl implements EmployeeSignatureService {

src/main/java/com/iemr/admin/utils/JwtUserIdValidationFilter.java

@@ -111,7 +111,6 @@ public void doFilter(ServletRequest servletRequest, ServletResponse servletRespo
 		}
 
 
-
 		try {
 			String jwtFromCookie = getJwtTokenFromCookies(request);
 			String jwtFromHeader = request.getHeader(Constants.JWT_TOKEN);