| 
						
						
							
								
							
						
						
					 | 
					@ -144,7 +144,7 @@ public class CaResidentServiceImpl extends BaseServiceImpl<CaResidentDao, CaResi | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					                pageNo++; | 
					 | 
					 | 
					                pageNo++; | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					                dto.setPageNo(pageNo); | 
					 | 
					 | 
					                dto.setPageNo(pageNo); | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					            } catch (Exception e) { | 
					 | 
					 | 
					            } catch (Exception e) { | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					                System.out.println(e); | 
					 | 
					 | 
					                e.printStackTrace(); | 
				
			
			
				
				
			
		
	
		
		
	
		
		
			
				
					 | 
					 | 
					            } | 
					 | 
					 | 
					            } | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					        } while (total > (pageNo * NumConstant.FIFTY)); | 
					 | 
					 | 
					        } while (total > (pageNo * NumConstant.FIFTY)); | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					    } | 
					 | 
					 | 
					    } | 
				
			
			
		
	
	
		
		
			
				
					| 
						
							
								
							
						
						
							
								
							
						
						
					 | 
					@ -184,14 +184,14 @@ public class CaResidentServiceImpl extends BaseServiceImpl<CaResidentDao, CaResi | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					
 | 
					 | 
					 | 
					
 | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					        ReturnDate returnDate = JSONObject.parseObject(JSONObject.toJSONString(result.getData()), ReturnDate.class); | 
					 | 
					 | 
					        ReturnDate returnDate = JSONObject.parseObject(JSONObject.toJSONString(result.getData()), ReturnDate.class); | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					
 | 
					 | 
					 | 
					
 | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					        returnDate.getList().forEach(item -> { | 
					 | 
					 | 
					//        returnDate.getList().forEach(item -> {
 | 
				
			
			
				
				
			
		
	
		
		
			
				
					
					 | 
					 | 
					            if (StringUtils.isNotBlank(item.getIdCard())) { | 
					 | 
					 | 
					//            if (StringUtils.isNotBlank(item.getIdCard())) {
 | 
				
			
			
				
				
			
		
	
		
		
			
				
					
					 | 
					 | 
					                Result<IcResiUserDTO> client = openFeignClient.getByResiIdCard(item.getIdCard()); | 
					 | 
					 | 
					//                Result<IcResiUserDTO> client = openFeignClient.getByResiIdCard(item.getIdCard());
 | 
				
			
			
				
				
			
		
	
		
		
			
				
					
					 | 
					 | 
					                IcResiUserDTO clientData = client.getData(); | 
					 | 
					 | 
					//                IcResiUserDTO clientData = client.getData();
 | 
				
			
			
				
				
			
		
	
		
		
			
				
					
					 | 
					 | 
					                item.setIcResiUser(clientData.getId()); | 
					 | 
					 | 
					//                item.setIcResiUser(clientData.getId());
 | 
				
			
			
				
				
			
		
	
		
		
			
				
					
					 | 
					 | 
					                item.setHomeId(clientData.getHomeId()); | 
					 | 
					 | 
					//                item.setHomeId(clientData.getHomeId());
 | 
				
			
			
				
				
			
		
	
		
		
			
				
					
					 | 
					 | 
					            } | 
					 | 
					 | 
					//            }
 | 
				
			
			
				
				
			
		
	
		
		
			
				
					
					 | 
					 | 
					        }); | 
					 | 
					 | 
					//        });
 | 
				
			
			
				
				
			
		
	
		
		
	
		
		
	
		
		
	
		
		
	
		
		
	
		
		
	
		
		
	
		
		
	
		
		
			
				
					 | 
					 | 
					
 | 
					 | 
					 | 
					
 | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					        this.insertBatch(returnDate.getList()); | 
					 | 
					 | 
					        this.insertBatch(returnDate.getList()); | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					        return returnDate.getTotal(); | 
					 | 
					 | 
					        return returnDate.getTotal(); | 
				
			
			
		
	
	
		
		
			
				
					| 
						
							
								
							
						
						
						
					 | 
					
  |