|
|
@@ -825,7 +825,8 @@ public class SetlListUpldService {
|
|
|
*/
|
|
|
public ResultVo<IPage<SiSetlinfoTemp>> huoQuJieSuanRenYuan(JieSuanDanChaXun param) {
|
|
|
IPage<SiSetlinfoTemp> page = new Page<>();
|
|
|
- page.setRecords(dao.huoQuJieSuanRenYuan(statementQueryConditions(param),
|
|
|
+ QueryWrapper<?> queryWrapper = statementQueryConditions(param);
|
|
|
+ page.setRecords(dao.huoQuJieSuanRenYuan(queryWrapper,
|
|
|
param.getCurrentPage(), param.getPageSize()));
|
|
|
if (ListUtil.isBlank(page.getRecords())) {
|
|
|
return ResultVoUtil.fail(ExceptionEnum.NO_DATA_EXIST);
|
|
|
@@ -903,9 +904,7 @@ public class SetlListUpldService {
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
- if (param.getTotal() == 0) {
|
|
|
- page.setTotal(dao.huoQuJieSuanRenYuanTotal(param.getStartTime(), param.getEndTime(), param.getClrType(), param.getPatNo(), param.getInsutype(), param.getOutDept(), param.getMedType(), param.getPsnType(), param.getClrOptins(), param.getDecTypes(), param.getFlag(), param.getReferPhysician(), param.getAuditFlag(), param.getHiPaymtd()));
|
|
|
- }
|
|
|
+ page.setTotal(dao.huoQuJieSuanRenYuanTotal(queryWrapper));
|
|
|
return ResultVoUtil.success(page);
|
|
|
}
|
|
|
|