|  | @ -241,7 +241,7 @@ public class MedicineStockUpService extends BaseJpaService<Mediicinestockup, Med
 | 
	
		
			
				|  |  | 
 | 
	
		
			
				|  |  | 
 | 
	
		
			
				|  |  |     public JSONObject queryUpListFullInfo(
 | 
	
		
			
				|  |  |             String startTime, String endTime, String replenishErAndTrackNum,
 | 
	
		
			
				|  |  |             String startTime, String endTime, String content,
 | 
	
		
			
				|  |  |             String community, String userId, int page, int size,String wechatId) throws Exception {
 | 
	
		
			
				|  |  |         JSONObject result = new JSONObject();
 | 
	
		
			
				|  |  |         UserDO user = userDao.findOne(userId);
 | 
	
	
		
			
				|  | @ -328,8 +328,8 @@ public class MedicineStockUpService extends BaseJpaService<Mediicinestockup, Med
 | 
	
		
			
				|  |  |             conditionSql += " AND  t.doc_time >= '" + startTime +"'" +
 | 
	
		
			
				|  |  |                     " AND t.doc_time <= '" + endTime + "'";
 | 
	
		
			
				|  |  |         }
 | 
	
		
			
				|  |  |         if (!StringUtils.isEmpty(replenishErAndTrackNum)){
 | 
	
		
			
				|  |  |             conditionSql += " and t.doc_num like '%" + replenishErAndTrackNum + "%'";
 | 
	
		
			
				|  |  |         if (!StringUtils.isEmpty(content)){
 | 
	
		
			
				|  |  |             conditionSql += " and concat(ifnull(t.`doc_num`,''),ifnull(bu.`name`, '')) like '%" + content + "%'";
 | 
	
		
			
				|  |  |         }
 | 
	
		
			
				|  |  |         if (!StringUtils.isEmpty(community)){
 | 
	
		
			
				|  |  |             conditionSql += " and t.community = '" + community + "'";
 |