|  | @@ -246,18 +246,14 @@ public class TriageService {
 | 
	
		
			
				|  |  |          return "OK";
 | 
	
		
			
				|  |  |      }
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  | -    public ResultVo<Map<String, Object>> getAllPatients(String searchContent, Integer currentPage, Integer pageSize) {
 | 
	
		
			
				|  |  | +    public ResultVo<List<MzfzPatientOrder>> getAllPatients(String searchContent) {
 | 
	
		
			
				|  |  |          String[] depts = StringUtil.triageDeptString2Array(dao.selectChosenDepts(TokenUtil.getInstance().getTokenUserId()));
 | 
	
		
			
				|  |  |          if (depts.length == 0) {
 | 
	
		
			
				|  |  |              return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, "请先前往【科室设置】分配分诊科室!");
 | 
	
		
			
				|  |  |          }
 | 
	
		
			
				|  |  | -        Map<String, Object> map = new HashMap<>(Capacity.TWO);
 | 
	
		
			
				|  |  |          searchContent = StringUtil.isBlank(searchContent) ? "%%" : searchContent + "%";
 | 
	
		
			
				|  |  | -        IPage<MzfzPatientOrder> iPage = new Page<>(currentPage, pageSize);
 | 
	
		
			
				|  |  | -        iPage = dao.getAllPatients(iPage, depts, searchContent);
 | 
	
		
			
				|  |  | -        map.put("totalSize", iPage.getTotal());
 | 
	
		
			
				|  |  | -        map.put("list", iPage.getRecords());
 | 
	
		
			
				|  |  | -        return ResultVoUtil.success(map);
 | 
	
		
			
				|  |  | +        List<MzfzPatientOrder> list = dao.getAllPatients(depts, searchContent);
 | 
	
		
			
				|  |  | +        return ResultVoUtil.success(list);
 | 
	
		
			
				|  |  |      }
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |      public ResultVo<MzYshTzxx> getMzVitalSigns(String patientId) {
 |