From 9713ad3c085c022a1605e39c48054df74fd6f5fe Mon Sep 17 00:00:00 2001 From: jiangjiazhi Date: Wed, 16 Nov 2016 11:16:39 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=BD=AC=E8=AF=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/lyms/platform/biz/service/SieveService.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/SieveService.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/SieveService.java index af82963..fd7986c 100644 --- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/SieveService.java +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/SieveService.java @@ -83,7 +83,7 @@ public class SieveService { sieveQuery.mysqlBuild((int) iSieveDao.count(sieveQuery.convertToQuery())); mongoQuery.start(sieveQuery.getOffset()).end(sieveQuery.getLimit()); } - return iSieveDao.queryList(mongoQuery.addOrder(Sort.Direction.ASC, filed)); + return iSieveDao.queryList(mongoQuery.addOrder(Sort.Direction.ASC, "order").addOrder(Sort.Direction.DESC, "modified")); } /** @@ -119,13 +119,13 @@ public class SieveService { public static void handOrder(SieveModel sieveModel) { int days = DateUtil.getDays(sieveModel.getLastMenses(), DateUtil.formatDate(new Date())); int order = 100; - if (null != sieveModel.getStatus() && sieveModel.getStatus() == SieveStatusEnums.O.getId() && days >= 140 && StringUtils.isEmpty(sieveModel.getCsRemarkTypeId()) && StringUtils.isEmpty(sieveModel.getDetail())) { + if (null != sieveModel.getStatus() && sieveModel.getStatus().equals(SieveStatusEnums.O.getId()) && days >= 140 && StringUtils.isEmpty(sieveModel.getCsRemarkTypeId()) && StringUtils.isEmpty(sieveModel.getDetail())) { order = 1; - } else if (null != sieveModel.getStatus() && sieveModel.getStatus() == SieveStatusEnums.O1.getId() && days >= 140 && StringUtils.isEmpty(sieveModel.getCsRemarkTypeId()) && StringUtils.isEmpty(sieveModel.getDetail())) { + } else if (null != sieveModel.getStatus() && sieveModel.getStatus().equals(SieveStatusEnums.O1.getId()) && days >= 140 && StringUtils.isEmpty(sieveModel.getCsRemarkTypeId()) && StringUtils.isEmpty(sieveModel.getDetail())) { order = 2; - } else if (null != sieveModel.getStatus() && sieveModel.getStatus() == SieveStatusEnums.O2.getId() && null != sieveModel.getZtfx() && sieveModel.getZtfx() >= 1) { + } else if (null != sieveModel.getStatus() && sieveModel.getStatus().equals(SieveStatusEnums.O2.getId()) && null != sieveModel.getZtfx() && sieveModel.getZtfx() >= 1) { order = 3; - } else if (null != sieveModel.getStatus() && sieveModel.getStatus() == SieveStatusEnums.O3.getId() && null != sieveModel.getCqResult() && sieveModel.getCqResult() == ChanQResultEnums.CqResult.O.getId()) { + } else if (null != sieveModel.getStatus() && sieveModel.getStatus().equals(SieveStatusEnums.O3.getId()) && null != sieveModel.getCqResult() && sieveModel.getCqResult() == ChanQResultEnums.CqResult.O.getId()) { order = 4; } sieveModel.setOrder(order); @@ -133,8 +133,8 @@ public class SieveService { public static void main(String[] args) { SieveModel sieveModel = new SieveModel(); - sieveModel.setLastMenses(DateUtil.parseYMD("2016-4-5")); - sieveModel.setStatus(2); + sieveModel.setLastMenses(DateUtil.parseYMD("2016-7-2")); + sieveModel.setStatus(1); handOrder(sieveModel); System.out.print(sieveModel.getOrder()); } -- 1.8.3.1