From e9580ec2d72e2f7604e99c735ae478ca5fd47c79 Mon Sep 17 00:00:00 2001 From: hujiaqi Date: Tue, 10 Jan 2017 16:40:50 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=86=E5=A8=A9=E6=8E=A5=E5=8F=A3=E7=BB=B4?= =?UTF-8?q?=E6=8A=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/facade/BabyStatisticsManagerFacade.java | 37 +++++++++++++++------- 1 file changed, 25 insertions(+), 12 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyStatisticsManagerFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyStatisticsManagerFacade.java index 18b538b..2e1d81d 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyStatisticsManagerFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyStatisticsManagerFacade.java @@ -16,6 +16,7 @@ import com.lyms.platform.pojo.BabyModel; import com.lyms.platform.query.BabyCheckModelQuery; import com.lyms.platform.query.BabyModelQuery; import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.lang.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; @@ -49,8 +50,10 @@ public class BabyStatisticsManagerFacade { BabyModelQuery babyModelQuery = new BabyModelQuery(); babyModelQuery.setYn(YnEnums.YES.getId()); - babyModelQuery.setBuildDateStart(DateUtil.getSNDate(babyStatisticsManagerBuildDoctorGroupRequest.getBuildDate())[0]); - babyModelQuery.setBuildDateEnd(DateUtil.getSNDate(babyStatisticsManagerBuildDoctorGroupRequest.getBuildDate())[1]); + if (StringUtils.isNotEmpty(babyStatisticsManagerBuildDoctorGroupRequest.getBuildDate())) { + babyModelQuery.setBuildDateStart(DateUtil.getSNDate(babyStatisticsManagerBuildDoctorGroupRequest.getBuildDate())[0]); + babyModelQuery.setBuildDateEnd(DateUtil.getSNDate(babyStatisticsManagerBuildDoctorGroupRequest.getBuildDate())[1]); + } List temp = babyService.babyStatisticsManagerBuildDoctorGroup(babyModelQuery); List babyStatisticsManagerBuildDoctorGroupQueryModelList = new ArrayList<>(); @@ -81,8 +84,10 @@ public class BabyStatisticsManagerFacade { BabyModelQuery babyModelQuery = new BabyModelQuery(); babyModelQuery.setYn(YnEnums.YES.getId()); - babyModelQuery.setBuildDateStart(DateUtil.getSNDate(babyStatisticsManagerBuildDoctorListRequest.getBuildDate())[0]); - babyModelQuery.setBuildDateEnd(DateUtil.getSNDate(babyStatisticsManagerBuildDoctorListRequest.getBuildDate())[1]); + if (StringUtils.isNotEmpty(babyStatisticsManagerBuildDoctorListRequest.getBuildDate())) { + babyModelQuery.setBuildDateStart(DateUtil.getSNDate(babyStatisticsManagerBuildDoctorListRequest.getBuildDate())[0]); + babyModelQuery.setBuildDateEnd(DateUtil.getSNDate(babyStatisticsManagerBuildDoctorListRequest.getBuildDate())[1]); + } babyModelQuery.setBuildDoctor(babyStatisticsManagerBuildDoctorListRequest.getBuildDoctorId()); if (!babyStatisticsManagerBuildDoctorListRequest.isExcel()) { babyModelQuery.setLimit(babyStatisticsManagerBuildDoctorListRequest.getLimit()); @@ -145,8 +150,10 @@ public class BabyStatisticsManagerFacade { BabyCheckModelQuery babyCheckModelQuery = new BabyCheckModelQuery(); babyCheckModelQuery.setYn(YnEnums.YES.getId()); - babyCheckModelQuery.setCheckDateStart(DateUtil.getSNDate(babyStatisticsManagerBuildDoctorGroupRequest.getCheckDate())[0]); - babyCheckModelQuery.setCheckDateEnd(DateUtil.getSNDate(babyStatisticsManagerBuildDoctorGroupRequest.getCheckDate())[1]); + if (StringUtils.isNotEmpty(babyStatisticsManagerBuildDoctorGroupRequest.getCheckDate())) { + babyCheckModelQuery.setCheckDateStart(DateUtil.getSNDate(babyStatisticsManagerBuildDoctorGroupRequest.getCheckDate())[0]); + babyCheckModelQuery.setCheckDateEnd(DateUtil.getSNDate(babyStatisticsManagerBuildDoctorGroupRequest.getCheckDate())[1]); + } List temp = babyCheckService.babyStatisticsManagerCheckDoctorGroup(babyCheckModelQuery); List babyStatisticsManagerCheckDoctorGroupQueryModelList = new ArrayList<>(); @@ -178,8 +185,10 @@ public class BabyStatisticsManagerFacade { BabyCheckModelQuery babyCheckModelQuery = new BabyCheckModelQuery(); babyCheckModelQuery.setYn(YnEnums.YES.getId()); - babyCheckModelQuery.setCheckDateStart(DateUtil.getSNDate(babyStatisticsManagerCheckDoctorListRequest.getCheckDate())[0]); - babyCheckModelQuery.setCheckDateEnd(DateUtil.getSNDate(babyStatisticsManagerCheckDoctorListRequest.getCheckDate())[1]); + if (StringUtils.isNotEmpty(babyStatisticsManagerCheckDoctorListRequest.getCheckDate())) { + babyCheckModelQuery.setCheckDateStart(DateUtil.getSNDate(babyStatisticsManagerCheckDoctorListRequest.getCheckDate())[0]); + babyCheckModelQuery.setCheckDateEnd(DateUtil.getSNDate(babyStatisticsManagerCheckDoctorListRequest.getCheckDate())[1]); + } babyCheckModelQuery.setCheckDoctor(babyStatisticsManagerCheckDoctorListRequest.getCheckDoctor()); if (!babyStatisticsManagerCheckDoctorListRequest.isExcel()) { babyCheckModelQuery.setLimit(babyStatisticsManagerCheckDoctorListRequest.getLimit()); @@ -257,8 +266,10 @@ public class BabyStatisticsManagerFacade { BabyCheckModelQuery babyCheckModelQuery = new BabyCheckModelQuery(); babyCheckModelQuery.setYn(YnEnums.YES.getId()); - babyCheckModelQuery.setCheckDateStart(DateUtil.getSNDate(babyStatisticsManagerWeekAgeGroupRequest.getCheckDate())[0]); - babyCheckModelQuery.setCheckDateEnd(DateUtil.getSNDate(babyStatisticsManagerWeekAgeGroupRequest.getCheckDate())[1]); + if (StringUtils.isNotEmpty(babyStatisticsManagerWeekAgeGroupRequest.getCheckDate())) { + babyCheckModelQuery.setCheckDateStart(DateUtil.getSNDate(babyStatisticsManagerWeekAgeGroupRequest.getCheckDate())[0]); + babyCheckModelQuery.setCheckDateEnd(DateUtil.getSNDate(babyStatisticsManagerWeekAgeGroupRequest.getCheckDate())[1]); + } List temp = babyCheckService.babyStatisticsManagerWeekAgeGroup(babyCheckModelQuery); List babyStatisticsManagerCheckDoctorGroupQueryModelList = new ArrayList<>(); @@ -283,8 +294,10 @@ public class BabyStatisticsManagerFacade { BabyCheckModelQuery babyCheckModelQuery = new BabyCheckModelQuery(); babyCheckModelQuery.setYn(YnEnums.YES.getId()); - babyCheckModelQuery.setCheckDateStart(DateUtil.getSNDate(babyStatisticsManagerWeekAgeListRequest.getCheckDate())[0]); - babyCheckModelQuery.setCheckDateEnd(DateUtil.getSNDate(babyStatisticsManagerWeekAgeListRequest.getCheckDate())[1]); + if (StringUtils.isNotEmpty(babyStatisticsManagerWeekAgeListRequest.getCheckDate())) { + babyCheckModelQuery.setCheckDateStart(DateUtil.getSNDate(babyStatisticsManagerWeekAgeListRequest.getCheckDate())[0]); + babyCheckModelQuery.setCheckDateEnd(DateUtil.getSNDate(babyStatisticsManagerWeekAgeListRequest.getCheckDate())[1]); + } babyCheckModelQuery.setCheckMonth(babyStatisticsManagerWeekAgeListRequest.getWeekAge() == null ? null : Integer.valueOf(babyStatisticsManagerWeekAgeListRequest.getWeekAge())); if (!babyStatisticsManagerWeekAgeListRequest.isExcel()) { babyCheckModelQuery.setLimit(babyStatisticsManagerWeekAgeListRequest.getLimit()); -- 1.8.3.1