jiangjiazhi / regional-platform

Authored by litao about 8 years ago

Exists in master and in 6 other branches

Showing 4 changed files with 10 additions and 10 deletions

...	...	@@ -11,14 +11,14 @@
11	11	private Integer limit; // 每页显示的条数
12	12	private Integer lastPage; // 总页数
13	13	private int size = 0;
14		- private Object rows;
	14	+ private Object grid;
15	15
16	16	public PageResult(Integer count, Integer page, Integer limit,
17	17	Object rows) {
18	18	this.count = count;
19	19	this.page = page;
20	20	this.limit = limit;
21		- this.rows = rows;
	21	+ this.grid = rows;
22	22	this.lastPage = ((count - 1)/this.limit) + 1;
23	23	}
24	24
25	25
...	...	@@ -62,12 +62,12 @@
62	62	this.size = size;
63	63	}
64	64
65		- public Object getRows() {
66		- return rows;
	65	+ public Object getGrid() {
	66	+ return grid;
67	67	}
68	68
69		- public void setRows(Object rows) {
70		- this.rows = rows;
	69	+ public void setGrid(Object grid) {
	70	+ this.grid = grid;
71	71	}
72	72	}

...	...	@@ -92,7 +92,7 @@
92	92	* @param startDate 建档开始时间
93	93	* @param endDate 建档结束时间
94	94	* @param childBirth 统计范围 1=孕妇 3=产妇不传=全部
95		- * @param number 产检次数
	95	+ * @param number 产检次数点的是产检人次的话就传1, 2次（含）以上就传2, 5次（含）以上就传5
96	96	* @param name 医生名称
97	97	* @return
98	98	*/

...	...	@@ -57,7 +57,7 @@
57	57	.append("WHERE ROWNUM <= ? ")
58	58	.append(" ) ")
59	59	.append("WHERE RN >= ? ");
60		- params.add(0, currentPage * pageSize);
	60	+ params.add(currentPage * pageSize);
61	61	params.add((currentPage - 1) * pageSize + 1);
62	62	return findList(rowSql.toString(), params);
63	63
...	...	@@ -70,7 +70,7 @@
70	70	countSql.append("select count(1) from ( ")
71	71	.append(sql)
72	72	.append(" )");
73		- List<Object> list = qr.query(countSql.toString(), new ColumnListHandler<>(), CollectionUtils.isNotEmpty(param) ? null : param.toArray());
	73	+ List<Object> list = qr.query(countSql.toString(), new ColumnListHandler<>(), CollectionUtils.isEmpty(param) ? null : param.toArray());
74	74	if(CollectionUtils.isNotEmpty(list)) {
75	75	return Integer.parseInt(list.get(0).toString());
76	76	}

...	...	@@ -495,7 +495,7 @@
495	495	.append("LEFT JOIN ODS_F_EXAMINE_HISTORY D ON A.RECORD_ID=D.RECORD_ID AND D.EXAMINE_HISTORY_NUM=1 ")
496	496	.append("LEFT JOIN ODS_F_CHILDBIRTH E ON A.RECORD_ID=E.RECORD_ID ")
497	497	.append("INNER JOIN ODS_F_EXAMINE_HISTORY_ASC F ON D.EXAMINE_ID=F.EXAMINE_ID ")
498		- .append("WHERE 1=1");
	498	+ .append("WHERE 1=1 ");
499	499
500	500	if(childBirth != null) {
501	501	sql.append("AND A.IS_CHILDBIRTH = ? ");