From b01744422bf1cbb20d1173d152f5d22b9897b65b Mon Sep 17 00:00:00 2001 From: yangfei Date: Tue, 8 Aug 2017 17:51:48 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=AC=E5=8A=9B=E8=AF=8A=E6=96=AD=E6=A8=A1?= =?UTF-8?q?=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../permission/model/BabyPatientExtendEarHearingDiagnose.java | 9 ++++++++- .../operate/web/controller/HearingDiagnoseController.java | 2 +- .../java/com/lyms/platform/operate/web/utils/MyComparator.java | 2 +- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEarHearingDiagnose.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEarHearingDiagnose.java index 0390a8a..9d6898e 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEarHearingDiagnose.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEarHearingDiagnose.java @@ -1,9 +1,10 @@ package com.lyms.platform.permission.model; +import java.awt.print.Book; import java.util.Date; import java.util.List; -public class BabyPatientExtendEarHearingDiagnose { +public class BabyPatientExtendEarHearingDiagnose implements Comparable { /** * 主键 @@ -1431,4 +1432,10 @@ public class BabyPatientExtendEarHearingDiagnose { public void setConfirmResult(String confirmResult) { this.confirmResult = confirmResult; } + + @Override + public int compareTo(Object obj) { + BabyPatientExtendEarHearingDiagnose b = (BabyPatientExtendEarHearingDiagnose) obj; + return this.id.compareTo(b.id); // 按书的id比较大小，用于默认排序 + } } \ No newline at end of file diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/HearingDiagnoseController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/HearingDiagnoseController.java index be782dc..e84db2b 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/HearingDiagnoseController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/HearingDiagnoseController.java @@ -360,7 +360,6 @@ public class HearingDiagnoseController extends BaseController { if(scrQuery.getCheckHospitalIds()==null||scrQuery.getCheckHospitalIds().length==0){ return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("没有找到数据"); } - //主数据 List babyIds = screenService.queryScrBabyIds(scrQuery); @@ -465,6 +464,7 @@ public class HearingDiagnoseController extends BaseController { List confiList = new ArrayList<>(); List hdrList = new ArrayList<>(); // for (int i = (hdReq.getPage() - 1) * hdReq.getLimit(); (i < babyIds.size() && i < hdReq.getLimit()); i++) { + Collections.sort(hearingDiagnoseList); for (int i = 0; i < babyIds.size(); i++) { BabyPatientExtendEarHearingDiagnose hd = new BabyPatientExtendEarHearingDiagnose(); hd.setBabyId(babyIds.get(i)); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/MyComparator.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/MyComparator.java index c2e3687..f2778a2 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/MyComparator.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/MyComparator.java @@ -12,7 +12,7 @@ import java.util.Comparator; public class MyComparator implements Comparator { @Override public int compare(BabyPatientExtendEarHearingDiagnose s1, BabyPatientExtendEarHearingDiagnose s2) { - int num1 = (s1.getBabyId().compareTo(s2.getBabyId())); + int num1 = s1.getBabyId().compareTo(s2.getBabyId()); return num1; } } -- 1.8.3.1