diff --git a/platform-common/src/main/java/com/lyms/platform/common/result/PageResult.java b/platform-common/src/main/java/com/lyms/platform/common/result/PageResult.java index 399ce99..3c7ea01 100644 --- a/platform-common/src/main/java/com/lyms/platform/common/result/PageResult.java +++ b/platform-common/src/main/java/com/lyms/platform/common/result/PageResult.java @@ -11,14 +11,14 @@ public class PageResult extends BaseModel { private Integer limit; // 每页显示的条数 private Integer lastPage; // 总页数 private int size = 0; - private Object rows; + private Object grid; public PageResult(Integer count, Integer page, Integer limit, Object rows) { this.count = count; this.page = page; this.limit = limit; - this.rows = rows; + this.grid = rows; this.lastPage = ((count - 1)/this.limit) + 1; } @@ -62,11 +62,11 @@ public class PageResult extends BaseModel { this.size = size; } - public Object getRows() { - return rows; + public Object getGrid() { + return grid; } - public void setRows(Object rows) { - this.rows = rows; + public void setGrid(Object grid) { + this.grid = grid; } } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ReportController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ReportController.java index 95dc6d6..f010d35 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ReportController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ReportController.java @@ -92,7 +92,7 @@ public class ReportController extends BaseController { * @param startDate 建档开始时间 * @param endDate 建档结束时间 * @param childBirth 统计范围 1=孕妇 3=产妇 不传=全部 - * @param number 产检次数 + * @param number 产检次数 点的是产检人次的话就传1, 2次(含)以上就传2, 5次(含)以上就传5 * @param name 医生名称 * @return */ diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/dao/impl/BaseDaoImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/dao/impl/BaseDaoImpl.java index aabd7d4..737a1d4 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/dao/impl/BaseDaoImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/dao/impl/BaseDaoImpl.java @@ -57,7 +57,7 @@ public class BaseDaoImpl implements IBaseDao { .append("WHERE ROWNUM <= ? ") .append(" ) ") .append("WHERE RN >= ? "); - params.add(0, currentPage * pageSize); + params.add(currentPage * pageSize); params.add((currentPage - 1) * pageSize + 1); return findList(rowSql.toString(), params); @@ -70,7 +70,7 @@ public class BaseDaoImpl implements IBaseDao { countSql.append("select count(1) from ( ") .append(sql) .append(" )"); - List list = qr.query(countSql.toString(), new ColumnListHandler<>(), CollectionUtils.isNotEmpty(param) ? null : param.toArray()); + List list = qr.query(countSql.toString(), new ColumnListHandler<>(), CollectionUtils.isEmpty(param) ? null : param.toArray()); if(CollectionUtils.isNotEmpty(list)) { return Integer.parseInt(list.get(0).toString()); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java index c7fb612..2eeec1b 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java @@ -495,7 +495,7 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService .append("LEFT JOIN ODS_F_EXAMINE_HISTORY D ON A.RECORD_ID=D.RECORD_ID AND D.EXAMINE_HISTORY_NUM=1 ") .append("LEFT JOIN ODS_F_CHILDBIRTH E ON A.RECORD_ID=E.RECORD_ID ") .append("INNER JOIN ODS_F_EXAMINE_HISTORY_ASC F ON D.EXAMINE_ID=F.EXAMINE_ID ") - .append("WHERE 1=1"); + .append("WHERE 1=1 "); if(childBirth != null) { sql.append("AND A.IS_CHILDBIRTH = ? ");