diff --git a/ht/src/main/java/com/ccsens/ht/api/PatientReportSearchController.java b/ht/src/main/java/com/ccsens/ht/api/PatientReportSearchController.java index d0652c32..457be7e7 100644 --- a/ht/src/main/java/com/ccsens/ht/api/PatientReportSearchController.java +++ b/ht/src/main/java/com/ccsens/ht/api/PatientReportSearchController.java @@ -9,6 +9,7 @@ import com.ccsens.ht.bean.vo.PatientReportVo; import com.ccsens.ht.service.IPatientReportService; import com.ccsens.util.JsonResponse; import com.ccsens.util.bean.dto.QueryDto; +import com.github.pagehelper.PageInfo; import io.swagger.annotations.*; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.RequestBody; @@ -56,7 +57,7 @@ public class PatientReportSearchController { @RequestMapping(value="/search", method = RequestMethod.POST) public JsonResponse search(@RequestBody @ApiParam @Valid QueryDto dto){ log.info("搜索报告单:{}", dto); - List params = patientReportService.search(dto.getParam()); + PageInfo params = patientReportService.search(dto.getParam()); log.info("搜索报告单已完成"); return JsonResponse.newInstance().ok(params); } diff --git a/ht/src/main/java/com/ccsens/ht/bean/dto/PatientReportSearchDto.java b/ht/src/main/java/com/ccsens/ht/bean/dto/PatientReportSearchDto.java index 74f8a004..a4afeac6 100644 --- a/ht/src/main/java/com/ccsens/ht/bean/dto/PatientReportSearchDto.java +++ b/ht/src/main/java/com/ccsens/ht/bean/dto/PatientReportSearchDto.java @@ -4,6 +4,8 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import javax.validation.constraints.Max; +import javax.validation.constraints.Min; import javax.validation.constraints.NotEmpty; import java.util.List; @@ -25,6 +27,13 @@ public class PatientReportSearchDto { @ApiModel("搜索报告单参数列表-请求") public static class SearchList { private List codes; + @ApiModelProperty("第几页") + @Min(value = 1) + private int pageNum = 1; + @ApiModelProperty("每页多少条") + @Min(value = 1) + @Max(value=100) + private int pageSize = 10; } @Data diff --git a/ht/src/main/java/com/ccsens/ht/service/IPatientReportService.java b/ht/src/main/java/com/ccsens/ht/service/IPatientReportService.java index c2cd78d1..56c022c1 100644 --- a/ht/src/main/java/com/ccsens/ht/service/IPatientReportService.java +++ b/ht/src/main/java/com/ccsens/ht/service/IPatientReportService.java @@ -156,5 +156,5 @@ public interface IPatientReportService { * @param param 搜索列表 * @return 报告单 */ - List search(PatientReportSearchDto.SearchList param); + PageInfo search(PatientReportSearchDto.SearchList param); } diff --git a/ht/src/main/java/com/ccsens/ht/service/PatientReportService.java b/ht/src/main/java/com/ccsens/ht/service/PatientReportService.java index 1c93eea0..ba91682b 100644 --- a/ht/src/main/java/com/ccsens/ht/service/PatientReportService.java +++ b/ht/src/main/java/com/ccsens/ht/service/PatientReportService.java @@ -603,9 +603,11 @@ public class PatientReportService implements IPatientReportService { } @Override - public List search(PatientReportSearchDto.SearchList param) { + public PageInfo search(PatientReportSearchDto.SearchList param) { + + PageHelper.startPage(param.getPageNum(), param.getPageSize()); List list = htPatientReportDao.search(param.getCodes()); - return list; + return new PageInfo<>(list); }