From 17be64e92f37adb02d2002c527cce9b0aa7c0d96 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Wed, 24 Aug 2016 11:40:17 +0800 Subject: [PATCH] code update --- .../com/lyms/platform/biz/service/BabyBookbuildingService.java | 9 +++++++++ .../com/lyms/platform/biz/service/YunBookbuildingService.java | 5 +++++ .../lyms/platform/operate/web/facade/BabyBookbuildingFacade.java | 7 ++++--- .../com/lyms/platform/operate/web/facade/BookbuildingFacade.java | 5 +++-- 4 files changed, 21 insertions(+), 5 deletions(-) diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/BabyBookbuildingService.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/BabyBookbuildingService.java index adcf3d3..d693262 100644 --- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/BabyBookbuildingService.java +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/BabyBookbuildingService.java @@ -49,6 +49,15 @@ public class BabyBookbuildingService { return babyBookBuildingDao.queryBabyWithQuery(query.addOrder(Sort.Direction.DESC, "modified")); } + public List queryBabyBuildByCond(BabyModelQuery babyQuery,String sortkey,Sort.Direction sort) { + MongoQuery query = babyQuery.convertToQuery(); + if (StringUtils.isNotEmpty(babyQuery.getNeed())) { + babyQuery.mysqlBuild(babyBookBuildingDao.queryBabyManageCount(babyQuery.convertToQuery())); + query.start(babyQuery.getOffset()).end(babyQuery.getLimit()); + } + return babyBookBuildingDao.queryBabyWithQuery(query.addOrder(sort,sortkey)); + } + public int queryBabyCount(BabyModelQuery babyQuery) { return babyBookBuildingDao.queryBabyManageCount(babyQuery.convertToQuery()); } diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/YunBookbuildingService.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/YunBookbuildingService.java index 4912ee4..7f0093d 100644 --- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/YunBookbuildingService.java +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/YunBookbuildingService.java @@ -39,6 +39,11 @@ public class YunBookbuildingService { return yunBookBuildingDao.queryPatientWithQuery(query.addOrder(Sort.Direction.DESC, "created")); } + public List queryPregnantWithQuery(PatientsQuery patientsQuery,String sortkey,Sort.Direction sort) { + MongoQuery query = patientsQuery.convertToQuery(); + return yunBookBuildingDao.queryPatientWithQuery(query.addOrder(sort, sortkey)); + } + public List getBirthPatients(String dateStr) { return yunBookBuildingDao.getBirthIds(dateStr); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java index 65a220c..6465250 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java @@ -19,6 +19,7 @@ import com.lyms.platform.pojo.*; import com.lyms.platform.query.*; import org.apache.commons.collections.CollectionUtils; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.domain.Sort; import org.springframework.stereotype.Component; import java.util.*; @@ -1011,7 +1012,7 @@ public class BabyBookbuildingFacade { BabyModelQuery babyQuery = new BabyModelQuery(); babyQuery.setYn(YnEnums.YES.getId()); babyQuery.setPid(babayPerson.getId()); - List builds = babyBookbuildingService.queryBabyBuildByCond(babyQuery); + List builds = babyBookbuildingService.queryBabyBuildByCond(babyQuery,"buildDate", Sort.Direction.DESC); List> list = new ArrayList<>(); if (CollectionUtils.isNotEmpty(builds)) @@ -1052,7 +1053,7 @@ public class BabyBookbuildingFacade { { buildInfo = builds.get(0); } - + Collections.reverse(list); result.setBuildRecords(list); } results.add(result); @@ -1093,7 +1094,7 @@ public class BabyBookbuildingFacade { BabyModelQuery babyBuildQuery = new BabyModelQuery(); babyBuildQuery.setYn(YnEnums.YES.getId()); babyBuildQuery.setPid(model.getPid()); - List builds = babyBookbuildingService.queryBabyBuildByCond(babyBuildQuery); + List builds = babyBookbuildingService.queryBabyBuildByCond(babyQuery,"buildDate", Sort.Direction.DESC); List> list = new ArrayList<>(); if (CollectionUtils.isNotEmpty(builds)) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java index ac849ce..2529255 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java @@ -24,6 +24,7 @@ import com.lyms.platform.pojo.*; import com.lyms.platform.query.*; import org.apache.commons.collections.CollectionUtils; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.domain.Sort; import org.springframework.stereotype.Component; import com.lyms.platform.common.constants.ErrorCodeConstants; @@ -443,7 +444,7 @@ public class BookbuildingFacade { if (!StringUtils.isEmpty(bookbuildingQueryRequest.getCardNo())) { patientsQuery.setCardNo(bookbuildingQueryRequest.getCardNo()); - patients = yunBookbuildingService.queryPregnantWithQuery(patientsQuery); + patients = yunBookbuildingService.queryPregnantWithQuery(patientsQuery,"bookbuildingDate", Sort.Direction.DESC); } //否则用就诊卡号 查询到这个孕妇的身份证号码 再用身份证号码查询该孕妇的所有建档 包括产妇记录 else if (!StringUtils.isEmpty(bookbuildingQueryRequest.getVcCardNo()) && !StringUtils.isEmpty(String.valueOf(bookbuildingQueryRequest.getHospitalId()))) @@ -456,7 +457,7 @@ public class BookbuildingFacade { patientsQuery.setHospitalId(null); patientsQuery.setVcCardNo(null); patientsQuery.setCardNo(patientsVc.get(0).getCardNo()); - patients = yunBookbuildingService.queryPregnantWithQuery(patientsQuery); + patients = yunBookbuildingService.queryPregnantWithQuery(patientsQuery,"bookbuildingDate", Sort.Direction.DESC); } } -- 1.8.3.1