|  | @ -9,6 +9,7 @@ import com.yihu.wlyy.repository.patient.SignFamilyDao;
 | 
	
		
			
				|  |  | import com.yihu.wlyy.util.ImUtill;
 | 
	
		
			
				|  |  | import com.yihu.wlyy.web.BaseController;
 | 
	
		
			
				|  |  | import io.swagger.annotations.Api;
 | 
	
		
			
				|  |  | import io.swagger.annotations.ApiParam;
 | 
	
		
			
				|  |  | import org.apache.commons.lang3.StringUtils;
 | 
	
		
			
				|  |  | import org.json.JSONArray;
 | 
	
		
			
				|  |  | import org.json.JSONObject;
 | 
	
	
		
			
				|  | @ -132,7 +133,10 @@ public class imController extends BaseController {
 | 
	
		
			
				|  |  |             @RequestParam(required = false) String doctor,
 | 
	
		
			
				|  |  |             @RequestParam Integer status,
 | 
	
		
			
				|  |  |             @RequestParam(required = false) Integer reply,
 | 
	
		
			
				|  |  |             @RequestParam(required = false) Integer type,
 | 
	
		
			
				|  |  |             @ApiParam(name = "type", value = "咨询类型") @RequestParam(required = false) Integer type,
 | 
	
		
			
				|  |  |             @ApiParam(name = "patientName", value = "居民姓名") @RequestParam(required = false) String patientName,
 | 
	
		
			
				|  |  |             @ApiParam(name = "startTime", value = "开始时间") @RequestParam(required = false) String startTime,
 | 
	
		
			
				|  |  |             @ApiParam(name = "endTime", value = "结束时间") @RequestParam(required = false) String endTime,
 | 
	
		
			
				|  |  |             @RequestParam int page,
 | 
	
		
			
				|  |  |             @RequestParam int pagesize) {
 | 
	
		
			
				|  |  |         try {
 | 
	
	
		
			
				|  | @ -143,7 +147,7 @@ public class imController extends BaseController {
 | 
	
		
			
				|  |  |             if(type==null){
 | 
	
		
			
				|  |  |                 consult = ImUtill.getConsultByStatus(doctor, status, reply, page, pagesize);
 | 
	
		
			
				|  |  |             }else {
 | 
	
		
			
				|  |  |                 consult = ImUtill.getConsultByStatusAndType(doctor, status, reply,type, page, pagesize);
 | 
	
		
			
				|  |  |                 consult = ImUtill.getConsultByStatusAndType(doctor, status, reply,type,patientName,startTime,endTime, page, pagesize);
 | 
	
		
			
				|  |  |             }
 | 
	
		
			
				|  |  |             JSONArray jsonArray = new JSONArray(consult);
 | 
	
		
			
				|  |  |             Iterator<Object> it = jsonArray.iterator();
 |