jiangjiazhi / regional-platform

Download as
Browse Code »

Commit e9580ec2d72e2f7604e99c735ae478ca5fd47c79

Authored by hujiaqi
1 parent b2d9cd3607
Exists in master and in 7 other branches 0116, autism, dev, fengning, fengning2023-06-06, longhua, luanping

分娩接口维护

Showing 1 changed file with 25 additions and 12 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyStatisticsManagerFacade.java View file @ e9580ec
... ... @@ -16,6 +16,7 @@
16 16 import com.lyms.platform.query.BabyCheckModelQuery;
17 17 import com.lyms.platform.query.BabyModelQuery;
18 18 import org.apache.commons.collections.CollectionUtils;
  19 +import org.apache.commons.lang.StringUtils;
19 20 import org.springframework.beans.factory.annotation.Autowired;
20 21 import org.springframework.stereotype.Component;
21 22  
... ... @@ -49,8 +50,10 @@
49 50 BabyModelQuery babyModelQuery = new BabyModelQuery();
50 51  
51 52 babyModelQuery.setYn(YnEnums.YES.getId());
52   - babyModelQuery.setBuildDateStart(DateUtil.getSNDate(babyStatisticsManagerBuildDoctorGroupRequest.getBuildDate())[0]);
53   - babyModelQuery.setBuildDateEnd(DateUtil.getSNDate(babyStatisticsManagerBuildDoctorGroupRequest.getBuildDate())[1]);
  53 + if (StringUtils.isNotEmpty(babyStatisticsManagerBuildDoctorGroupRequest.getBuildDate())) {
  54 + babyModelQuery.setBuildDateStart(DateUtil.getSNDate(babyStatisticsManagerBuildDoctorGroupRequest.getBuildDate())[0]);
  55 + babyModelQuery.setBuildDateEnd(DateUtil.getSNDate(babyStatisticsManagerBuildDoctorGroupRequest.getBuildDate())[1]);
  56 + }
54 57  
55 58 List<HashMap> temp = babyService.babyStatisticsManagerBuildDoctorGroup(babyModelQuery);
56 59 List<BabyStatisticsManagerBuildDoctorGroupQueryModel> babyStatisticsManagerBuildDoctorGroupQueryModelList = new ArrayList<>();
... ... @@ -81,8 +84,10 @@
81 84  
82 85 BabyModelQuery babyModelQuery = new BabyModelQuery();
83 86 babyModelQuery.setYn(YnEnums.YES.getId());
84   - babyModelQuery.setBuildDateStart(DateUtil.getSNDate(babyStatisticsManagerBuildDoctorListRequest.getBuildDate())[0]);
85   - babyModelQuery.setBuildDateEnd(DateUtil.getSNDate(babyStatisticsManagerBuildDoctorListRequest.getBuildDate())[1]);
  87 + if (StringUtils.isNotEmpty(babyStatisticsManagerBuildDoctorListRequest.getBuildDate())) {
  88 + babyModelQuery.setBuildDateStart(DateUtil.getSNDate(babyStatisticsManagerBuildDoctorListRequest.getBuildDate())[0]);
  89 + babyModelQuery.setBuildDateEnd(DateUtil.getSNDate(babyStatisticsManagerBuildDoctorListRequest.getBuildDate())[1]);
  90 + }
86 91 babyModelQuery.setBuildDoctor(babyStatisticsManagerBuildDoctorListRequest.getBuildDoctorId());
87 92 if (!babyStatisticsManagerBuildDoctorListRequest.isExcel()) {
88 93 babyModelQuery.setLimit(babyStatisticsManagerBuildDoctorListRequest.getLimit());
... ... @@ -145,8 +150,10 @@
145 150 BabyCheckModelQuery babyCheckModelQuery = new BabyCheckModelQuery();
146 151  
147 152 babyCheckModelQuery.setYn(YnEnums.YES.getId());
148   - babyCheckModelQuery.setCheckDateStart(DateUtil.getSNDate(babyStatisticsManagerBuildDoctorGroupRequest.getCheckDate())[0]);
149   - babyCheckModelQuery.setCheckDateEnd(DateUtil.getSNDate(babyStatisticsManagerBuildDoctorGroupRequest.getCheckDate())[1]);
  153 + if (StringUtils.isNotEmpty(babyStatisticsManagerBuildDoctorGroupRequest.getCheckDate())) {
  154 + babyCheckModelQuery.setCheckDateStart(DateUtil.getSNDate(babyStatisticsManagerBuildDoctorGroupRequest.getCheckDate())[0]);
  155 + babyCheckModelQuery.setCheckDateEnd(DateUtil.getSNDate(babyStatisticsManagerBuildDoctorGroupRequest.getCheckDate())[1]);
  156 + }
150 157  
151 158 List<HashMap> temp = babyCheckService.babyStatisticsManagerCheckDoctorGroup(babyCheckModelQuery);
152 159 List<BabyStatisticsManagerCheckDoctorGroupQueryModel> babyStatisticsManagerCheckDoctorGroupQueryModelList = new ArrayList<>();
... ... @@ -178,8 +185,10 @@
178 185  
179 186 BabyCheckModelQuery babyCheckModelQuery = new BabyCheckModelQuery();
180 187 babyCheckModelQuery.setYn(YnEnums.YES.getId());
181   - babyCheckModelQuery.setCheckDateStart(DateUtil.getSNDate(babyStatisticsManagerCheckDoctorListRequest.getCheckDate())[0]);
182   - babyCheckModelQuery.setCheckDateEnd(DateUtil.getSNDate(babyStatisticsManagerCheckDoctorListRequest.getCheckDate())[1]);
  188 + if (StringUtils.isNotEmpty(babyStatisticsManagerCheckDoctorListRequest.getCheckDate())) {
  189 + babyCheckModelQuery.setCheckDateStart(DateUtil.getSNDate(babyStatisticsManagerCheckDoctorListRequest.getCheckDate())[0]);
  190 + babyCheckModelQuery.setCheckDateEnd(DateUtil.getSNDate(babyStatisticsManagerCheckDoctorListRequest.getCheckDate())[1]);
  191 + }
183 192 babyCheckModelQuery.setCheckDoctor(babyStatisticsManagerCheckDoctorListRequest.getCheckDoctor());
184 193 if (!babyStatisticsManagerCheckDoctorListRequest.isExcel()) {
185 194 babyCheckModelQuery.setLimit(babyStatisticsManagerCheckDoctorListRequest.getLimit());
... ... @@ -257,8 +266,10 @@
257 266  
258 267 BabyCheckModelQuery babyCheckModelQuery = new BabyCheckModelQuery();
259 268 babyCheckModelQuery.setYn(YnEnums.YES.getId());
260   - babyCheckModelQuery.setCheckDateStart(DateUtil.getSNDate(babyStatisticsManagerWeekAgeGroupRequest.getCheckDate())[0]);
261   - babyCheckModelQuery.setCheckDateEnd(DateUtil.getSNDate(babyStatisticsManagerWeekAgeGroupRequest.getCheckDate())[1]);
  269 + if (StringUtils.isNotEmpty(babyStatisticsManagerWeekAgeGroupRequest.getCheckDate())) {
  270 + babyCheckModelQuery.setCheckDateStart(DateUtil.getSNDate(babyStatisticsManagerWeekAgeGroupRequest.getCheckDate())[0]);
  271 + babyCheckModelQuery.setCheckDateEnd(DateUtil.getSNDate(babyStatisticsManagerWeekAgeGroupRequest.getCheckDate())[1]);
  272 + }
262 273  
263 274 List<HashMap> temp = babyCheckService.babyStatisticsManagerWeekAgeGroup(babyCheckModelQuery);
264 275 List<BabyStatisticsManagerWeekAgeGroupQueryModel> babyStatisticsManagerCheckDoctorGroupQueryModelList = new ArrayList<>();
... ... @@ -283,8 +294,10 @@
283 294  
284 295 BabyCheckModelQuery babyCheckModelQuery = new BabyCheckModelQuery();
285 296 babyCheckModelQuery.setYn(YnEnums.YES.getId());
286   - babyCheckModelQuery.setCheckDateStart(DateUtil.getSNDate(babyStatisticsManagerWeekAgeListRequest.getCheckDate())[0]);
287   - babyCheckModelQuery.setCheckDateEnd(DateUtil.getSNDate(babyStatisticsManagerWeekAgeListRequest.getCheckDate())[1]);
  297 + if (StringUtils.isNotEmpty(babyStatisticsManagerWeekAgeListRequest.getCheckDate())) {
  298 + babyCheckModelQuery.setCheckDateStart(DateUtil.getSNDate(babyStatisticsManagerWeekAgeListRequest.getCheckDate())[0]);
  299 + babyCheckModelQuery.setCheckDateEnd(DateUtil.getSNDate(babyStatisticsManagerWeekAgeListRequest.getCheckDate())[1]);
  300 + }
288 301 babyCheckModelQuery.setCheckMonth(babyStatisticsManagerWeekAgeListRequest.getWeekAge() == null ? null : Integer.valueOf(babyStatisticsManagerWeekAgeListRequest.getWeekAge()));
289 302 if (!babyStatisticsManagerWeekAgeListRequest.isExcel()) {
290 303 babyCheckModelQuery.setLimit(babyStatisticsManagerWeekAgeListRequest.getLimit());