|  | @@ -64,7 +64,7 @@ public class ExamRegistrationServiceImpl extends BaseServiceImpl<Long, ExamRegis
 | 
	
		
			
				|  |  |      @Override
 | 
	
		
			
				|  |  |      @Transactional(rollbackFor = Exception.class)
 | 
	
		
			
				|  |  |      public Map<String, Object> addRegistration(ExamRegistration examRegistration) throws Exception {
 | 
	
		
			
				|  |  | -        ExaminationBasic examinationBasic = examinationBasicDao.get(examRegistration.getExaminationBasicId().longValue());
 | 
	
		
			
				|  |  | +        ExaminationBasic examinationBasic = examinationBasicDao.get(examRegistration.getExaminationBasicId());
 | 
	
		
			
				|  |  |          if (examinationBasic == null || !examinationBasic.getStatus().equals(ExamStatusEnum.APPLYING)) {
 | 
	
		
			
				|  |  |              throw new BizException("项目不在报名中,请核对");
 | 
	
		
			
				|  |  |          }
 | 
	
	
		
			
				|  | @@ -82,6 +82,12 @@ public class ExamRegistrationServiceImpl extends BaseServiceImpl<Long, ExamRegis
 | 
	
		
			
				|  |  |          if (organization == null) {
 | 
	
		
			
				|  |  |              throw new BizException("机构不存在");
 | 
	
		
			
				|  |  |          }
 | 
	
		
			
				|  |  | +
 | 
	
		
			
				|  |  | +        ExamRegistration registration = examRegistrationDao.getRegistration(examinationBasic.getId(), examRegistration.getStudentId(), examRegistration.getSubjectId(), examSubjectSong.getLevel());
 | 
	
		
			
				|  |  | +        if(registration != null){
 | 
	
		
			
				|  |  | +            throw new BizException("该考级项目相同专业及等级您已报名,请勿重复报名");
 | 
	
		
			
				|  |  | +        }
 | 
	
		
			
				|  |  | +
 | 
	
		
			
				|  |  |          Date nowDate = new Date();
 | 
	
		
			
				|  |  |          String orderNo = idGeneratorService.generatorId("payment") + "";
 | 
	
		
			
				|  |  |  
 |