diff --git a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberServiceImpl.java b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberServiceImpl.java
index 447055431a..1cc431a9b3 100644
--- a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberServiceImpl.java
+++ b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberServiceImpl.java
@@ -10,7 +10,6 @@ import com.epmet.resi.mine.dto.from.PartyMemberSubmitFromDTO;
 import com.epmet.resi.mine.dto.from.VerificationCodeFromDTO;
 import com.epmet.resi.mine.dto.result.PartyMemberInitResultDTO;
 import com.epmet.resi.partymember.dto.partymember.PartymemberInfoDTO;
-import org.apache.poi.ss.formula.constant.ErrorConstant;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java
index 502a520dc3..ae67b95ebf 100644
--- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java
+++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java
@@ -580,6 +580,8 @@ public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService
 			userResiInfoDTO.setDistrict(partyMemberInfoDTO.getEstate());
 			userResiInfoDTO.setBuildingAddress(partyMemberInfoDTO.getBuilding());
 			userResiInfoDTO.setCustomerId(partyMemberInfoDTO.getCustomerId());
+			//注册居民需要录入身份证号
+			userResiInfoDTO.setIdNum(partyMemberInfoDTO.getIdCard());
 			Result result = epmetUserFeignClient.saveResiInfo(userResiInfoDTO);
 			log.info("isResiRegister epmetUserFeignClient.saveResiInfo result:{}",JSON.toJSONString(result));
 			if (!result.success()){
@@ -608,7 +610,7 @@ public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService
 
 
 	/**
-	 * 保存或者更新热心居民申请行为记录表
+	 * 保存或者更新党员认证行为记录表
 	 *
 	 * @param visitId 主键
 	 * @param fromDTO 参数
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserResiInfoServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserResiInfoServiceImpl.java
index 9da7ccac80..cede578427 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserResiInfoServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserResiInfoServiceImpl.java
@@ -221,7 +221,7 @@ public class UserResiInfoServiceImpl extends BaseServiceImpl<UserResiInfoDao, Us
 		//3、身份证号不为空时，判断当前客户下身份证号是否呀已经被使用
 		if (StringUtils.isNotBlank(userResiInfoDTO.getIdNum())) {
 			if (baseDao.selectCountByIdNum(userResiInfoDTO.getIdNum(), userResiInfoDTO.getCustomerId()) > NumConstant.ZERO) {
-				throw new EpmetException(EpmetErrorCode.SERVER_ERROR.getCode(), "user_resi_info已存在该身份证号", "身份证号已被使用");
+				throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "user_resi_info已存在该身份证号", "身份证号已被使用");
 			}
 		}
 		userResiRegisterVisitService.updateResiRegisterVisit(true, userResiInfoDTO);
@@ -303,24 +303,25 @@ public class UserResiInfoServiceImpl extends BaseServiceImpl<UserResiInfoDao, Us
 		Result result = new Result();
 
 		//判断手机号是否可用
-		if (getResiInfoByMobile(userResiInfoDTO.getRegMobile(), userResiInfoDTO.getCustomerId())) {
-			//居民注册关系表新增数据 首次注册数加一 注册数加一 参与数加一
-			registerRelationService.saveRegisterRelation(userResiInfoDTO);
-			//数据存入居民注册表
-			saveUserResiInfo(userResiInfoDTO);
+		if (!getResiInfoByMobile(userResiInfoDTO.getRegMobile(), userResiInfoDTO.getCustomerId())) {
+			log.warn("手机号客户内不可用，没有更新用户信息，param:{}", JSON.toJSONString(userResiInfoDTO));
+			throw new RenException(EpmetErrorCode.THE_MOBILE_HAS_BEEN_USED.getCode(), EpmetErrorCode.THE_MOBILE_HAS_BEEN_USED.getMsg());
+		}
+		if (baseDao.selectCountByIdNum(userResiInfoDTO.getIdNum(), userResiInfoDTO.getCustomerId()) > 0) {
+			throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "user_resi_info已存在该身份证号", "身份证号已被使用");
+		}
+		//居民注册关系表新增数据 首次注册数加一 注册数加一 参与数加一
+		registerRelationService.saveRegisterRelation(userResiInfoDTO);
+		//数据存入居民注册表
+		saveUserResiInfo(userResiInfoDTO);
 		/*	//将用户于居民角色关联  saveUserResiInfo已包含
 			UserRoleDTO userRole = new UserRoleDTO();
 			userRole.setUserId(userResiInfoDTO.getUserId());
 			userRole.setRoleKey(UserConstant.ROLE_RESI);
 			userRole.setApp(userResiInfoDTO.getApp());
 			userRoleService.saveUserRole(userRole);*/
-			//更新该用户在该客户下的注册状态
-			userCustomerDao.updateRegistered(userResiInfoDTO.getCustomerId(), userResiInfoDTO.getUserId());
-		}else{
-			log.warn("手机号客户内不可用，没有更新用户信息，param:{}", JSON.toJSONString(userResiInfoDTO));
-			throw new RenException(EpmetErrorCode.THE_MOBILE_HAS_BEEN_USED.getCode(),EpmetErrorCode.THE_MOBILE_HAS_BEEN_USED.getMsg());
-		}
-
+		//更新该用户在该客户下的注册状态
+		userCustomerDao.updateRegistered(userResiInfoDTO.getCustomerId(), userResiInfoDTO.getUserId());
 		return result;
 	}