jiangjiazhi / regional-platform

Authored by yangfei over 8 years ago

Exists in master and in 6 other branches

Showing 8 changed files with 13 additions and 11 deletions

...	...	@@ -109,7 +109,7 @@
109	109
110	110	<sql id="orderAndLimit">
111	111	<if test="sort != null and sort != '' ">
112		- order by ${sort} desc
	112	+ order by ${sort}
113	113	<if test="need != null">
114	114	limit #{offset, jdbcType=INTEGER} , #{limit, jdbcType=INTEGER}
115	115	</if>

...	...	@@ -149,7 +149,7 @@
149	149
150	150	<sql id="orderAndLimit">
151	151	<if test="sort != null and sort != '' ">
152		- order by ${sort} desc
	152	+ order by ${sort}
153	153	<if test="need != null">
154	154	limit #{offset, jdbcType=INTEGER} , #{limit, jdbcType=INTEGER}
155	155	</if>
...	...	@@ -309,7 +309,7 @@
309	309	</foreach>
310	310	</if>
311	311	and ifdel = 0
312		- order by follow_time desc
	312	+ order by follow_time
313	313	</where>
314	314	</select>
315	315	</mapper>

...	...	@@ -451,7 +451,7 @@
451	451
452	452	<sql id="orderAndLimit">
453	453	<if test="sort != null and sort != '' ">
454		- order by ${sort} desc
	454	+ order by ${sort}
455	455	<if test="need != null">
456	456	limit #{offset, jdbcType=INTEGER} , #{limit, jdbcType=INTEGER}
457	457	</if>

...	...	@@ -169,7 +169,7 @@
169	169
170	170	<sql id="orderAndLimit">
171	171	<if test="sort != null and sort != '' ">
172		- order by ${sort} desc
	172	+ order by ${sort}
173	173	<if test="need != null">
174	174	limit #{offset, jdbcType=INTEGER} , #{limit, jdbcType=INTEGER}
175	175	</if>

...	...	@@ -353,7 +353,7 @@
353	353	query.setHospitalId(hospitalId);
354	354	//分页信息
355	355	query.setNeed("1");
356		- query.setSort("follow_time");
	356	+ query.setSort("follow_time desc");
357	357	query.setLimit(fur.getLimit());
358	358	query.setOffset((fur.getPage()-1)*fur.getLimit());
359	359	if (CollectionUtils.isNotEmpty(pids)) {

...	...	@@ -236,7 +236,7 @@
236	236	}
237	237	query.setConfirmResults(cfList.toArray(new String[cfList.size()]));
238	238	}
239		- query.setSort("diagnose_time");
	239	+ query.setSort("diagnose_time desc");
240	240
241	241	List<BabyPatientExtendEarHearingDiagnose> hearingDiagnoseList = hearingDiagnoseService.getHdAndScreen(query);
242	242
...	...	@@ -427,7 +427,7 @@
427	427	}
428	428	query.setConfirmResults(cfList.toArray(new String[cfList.size()]));
429	429	}
430		- query.setSort("diagnose_time");
	430	+ query.setSort("diagnose_time desc");
431	431	query.setNeed("1");
432	432	query.setLimit(hdReq.getLimit());
433	433	query.setOffset((hdReq.getPage()-1)*hdReq.getLimit());
...	...	@@ -937,7 +937,7 @@
937	937
938	938	babyQuery.setHospitalId(hospitalId);
939	939	babyQuery.setNoEnable("0");
940		-
	940	+ babyQuery.setSort("build_date desc");
941	941	List<String> babyIds = new ArrayList<>();
942	942
943	943	//如果查询号不为空，根据查询号查询儿童档案表，获取儿童档案Id
...	...	@@ -1145,6 +1145,7 @@
1145	1145	babyQuery.setHospitalId(hospitalId);
1146	1146	babyQuery.setNoEnable("0");
1147	1147	babyQuery.setNeed("y");
	1148	+ babyQuery.setSort("build_date desc");
1148	1149	babyQuery.setOffset((model.getPage()-1)*model.getLimit());
1149	1150	babyQuery.setLimit(model.getLimit());
1150	1151	List<String> babyIds = new ArrayList<>();

...	...	@@ -499,7 +499,7 @@
499	499	}
500	500
501	501	query.setHospitalId(hospitalId);
502		- query.setSort("diagnose_time");
	502	+ query.setSort("diagnose_time desc");
503	503
504	504	//已经诊断的数据
505	505	List<BabyPatientExtendEarHearingDiagnose> hearingDiagnoseList = hearingDiagnoseService.getHdAndScreen(query);

...	...	@@ -330,8 +330,9 @@
330	330	} else {
331	331	return new BaseResponse().setErrorcode(ErrorCodeConstants.PARAMETER_ERROR).setErrormsg("请传入查询类型");
332	332	}
	333	+ query.setOffset((query.getPage()-1)*query.getLimit());
333	334	query.setNeed("1");
334		- query.setSort("CREATE_TIME");
	335	+ query.setSort("CREATE_TIME desc");
335	336
336	337	//如果查询号不为空，根据查询号查询儿童档案表，获取儿童档案Id
337	338	if (query.getQueryNo() != null) {//关键字：姓名、联系方式、就诊卡查询babyId