jiangjiazhi / regional-platform

Authored by yangfei almost 8 years ago

Exists in master and in 6 other branches

Showing 3 changed files with 10 additions and 3 deletions

1	1	package com.lyms.platform.permission.model;
2	2
	3	+import java.awt.print.Book;
3	4	import java.util.Date;
4	5	import java.util.List;
5	6
6		-public class BabyPatientExtendEarHearingDiagnose {
	7	+public class BabyPatientExtendEarHearingDiagnose implements Comparable {
7	8
8	9	/**
9	10	* 主键
...	...	@@ -1430,6 +1431,12 @@
1430	1431
1431	1432	public void setConfirmResult(String confirmResult) {
1432	1433	this.confirmResult = confirmResult;
	1434	+ }
	1435	+
	1436	+ @Override
	1437	+ public int compareTo(Object obj) {
	1438	+ BabyPatientExtendEarHearingDiagnose b = (BabyPatientExtendEarHearingDiagnose) obj;
	1439	+ return this.id.compareTo(b.id); // 按书的id比较大小，用于默认排序
1433	1440	}
1434	1441	}

...	...	@@ -360,7 +360,6 @@
360	360	if(scrQuery.getCheckHospitalIds()==null\|\|scrQuery.getCheckHospitalIds().length==0){
361	361	return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("没有找到数据");
362	362	}
363		-
364	363	//主数据
365	364	List<String> babyIds = screenService.queryScrBabyIds(scrQuery);
366	365
...	...	@@ -465,6 +464,7 @@
465	464	List<HearingDiagnoseListResult> confiList = new ArrayList<>();
466	465	List<HearingDiagnoseListResult> hdrList = new ArrayList<>();
467	466	// for (int i = (hdReq.getPage() - 1) * hdReq.getLimit(); (i < babyIds.size() && i < hdReq.getLimit()); i++) {
	467	+ Collections.sort(hearingDiagnoseList);
468	468	for (int i = 0; i < babyIds.size(); i++) {
469	469	BabyPatientExtendEarHearingDiagnose hd = new BabyPatientExtendEarHearingDiagnose();
470	470	hd.setBabyId(babyIds.get(i));

...	...	@@ -12,7 +12,7 @@
12	12	public class MyComparator implements Comparator<BabyPatientExtendEarHearingDiagnose> {
13	13	@Override
14	14	public int compare(BabyPatientExtendEarHearingDiagnose s1, BabyPatientExtendEarHearingDiagnose s2) {
15		- int num1 = (s1.getBabyId().compareTo(s2.getBabyId()));
	15	+ int num1 = s1.getBabyId().compareTo(s2.getBabyId());
16	16	return num1;
17	17	}
18	18	}