| 
						
						
							
								
							
						
						
					 | 
					@ -47,9 +47,7 @@ import com.elink.esua.epdc.vaccine.epidemic.entity.EpidemicUserInfoEntity; | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					import com.elink.esua.epdc.vaccine.house.dao.PopulationInformationDao; | 
					 | 
					 | 
					import com.elink.esua.epdc.vaccine.house.dao.PopulationInformationDao; | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					import com.elink.esua.epdc.vaccine.house.entity.PopulationInformationEntity; | 
					 | 
					 | 
					import com.elink.esua.epdc.vaccine.house.entity.PopulationInformationEntity; | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					import org.apache.commons.lang3.StringUtils; | 
					 | 
					 | 
					import org.apache.commons.lang3.StringUtils; | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					import org.apache.poi.hssf.usermodel.*; | 
					 | 
					 | 
					 | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					import org.apache.poi.ss.usermodel.*; | 
					 | 
					 | 
					import org.apache.poi.ss.usermodel.*; | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					import org.apache.poi.ss.util.CellRangeAddressList; | 
					 | 
					 | 
					 | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					import org.springframework.beans.BeanUtils; | 
					 | 
					 | 
					import org.springframework.beans.BeanUtils; | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					import org.springframework.beans.factory.annotation.Autowired; | 
					 | 
					 | 
					import org.springframework.beans.factory.annotation.Autowired; | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					import org.springframework.stereotype.Service; | 
					 | 
					 | 
					import org.springframework.stereotype.Service; | 
				
			
			
		
	
	
		
		
			
				
					| 
						
							
								
							
						
						
							
								
							
						
						
					 | 
					@ -224,6 +222,7 @@ public class PersonTestingServiceImpl extends BaseServiceImpl<PersonTestingDao, | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					                entity.setImgUrl(uploadResult.getData()); | 
					 | 
					 | 
					                entity.setImgUrl(uploadResult.getData()); | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					            } | 
					 | 
					 | 
					            } | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					        } | 
					 | 
					 | 
					        } | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					 | 
					 | 
					 | 
					        entity.setCreatedByName(SecurityUser.getUser().getUsername()); | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					        insert(entity); | 
					 | 
					 | 
					        insert(entity); | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					        return new Result().ok("录入成功"); | 
					 | 
					 | 
					        return new Result().ok("录入成功"); | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					    } | 
					 | 
					 | 
					    } | 
				
			
			
		
	
	
		
		
			
				
					| 
						
							
								
							
						
						
							
								
							
						
						
					 | 
					@ -544,6 +543,7 @@ public class PersonTestingServiceImpl extends BaseServiceImpl<PersonTestingDao, | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					            PersonTestingEntity entity = ConvertUtils.sourceToTarget(dto, PersonTestingEntity.class); | 
					 | 
					 | 
					            PersonTestingEntity entity = ConvertUtils.sourceToTarget(dto, PersonTestingEntity.class); | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					            // 根据身份证号、核酸检测时间比对库里数据,有相同的更新这个人的这条核酸检测记录,匹配不到的插入
 | 
					 | 
					 | 
					            // 根据身份证号、核酸检测时间比对库里数据,有相同的更新这个人的这条核酸检测记录,匹配不到的插入
 | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					            String idPersonTesting = baseDao.getIdByIdCardAndTestingTime(entity.getIdcard(), entity.getTestingTime()); | 
					 | 
					 | 
					            String idPersonTesting = baseDao.getIdByIdCardAndTestingTime(entity.getIdcard(), entity.getTestingTime()); | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					 | 
					 | 
					 | 
					            entity.setCreatedByName(SecurityUser.getUser().getUsername()); | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					            if (null == idPersonTesting) { | 
					 | 
					 | 
					            if (null == idPersonTesting) { | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					                insert(entity); | 
					 | 
					 | 
					                insert(entity); | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					            } else { | 
					 | 
					 | 
					            } else { | 
				
			
			
		
	
	
		
		
			
				
					| 
						
							
								
							
						
						
						
					 | 
					
  |