From 8b02368ee6adee71c14ece16738c43001ff7e27b Mon Sep 17 00:00:00 2001 From: jiangjiazhi Date: Wed, 28 Feb 2018 09:53:31 +0800 Subject: [PATCH] 1 --- .../operate/web/facade/TrackDownFacade.java | 24 +++++++++++----------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TrackDownFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TrackDownFacade.java index 1e56a60..7d5630b 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TrackDownFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TrackDownFacade.java @@ -113,14 +113,14 @@ public class TrackDownFacade { //如果是产筛请求 if (null != downQueryRequest.getTrackType() && TrackDownDateEnums.D.getId() == downQueryRequest.getTrackType()) { downRecordQuery.setLastMensesStart(DateUtil.addDay(DateUtil.formatDate(new Date()), -140)); - downRecordQuery.setTrackTypes(Arrays.asList(3,8)); - }else if(null != downQueryRequest.getTrackType() && TrackDownDateEnums.C.getId() == downQueryRequest.getTrackType()){ - downRecordQuery.setTrackTypes(Arrays.asList(3,9)); - }else if(null != downQueryRequest.getTrackType() && TrackDownDateEnums.F.getId() == downQueryRequest.getTrackType()){ - downRecordQuery.setTrackTypes(Arrays.asList(6,11)); - }else if(null != downQueryRequest.getTrackType() && TrackDownDateEnums.G.getId() == downQueryRequest.getTrackType()){ - downRecordQuery.setTrackTypes(Arrays.asList(7,10)); - }else{ + downRecordQuery.setTrackTypes(Arrays.asList(3, 8)); + } else if (null != downQueryRequest.getTrackType() && TrackDownDateEnums.C.getId() == downQueryRequest.getTrackType()) { + downRecordQuery.setTrackTypes(Arrays.asList(3, 9)); + } else if (null != downQueryRequest.getTrackType() && TrackDownDateEnums.F.getId() == downQueryRequest.getTrackType()) { + downRecordQuery.setTrackTypes(Arrays.asList(6, 11)); + } else if (null != downQueryRequest.getTrackType() && TrackDownDateEnums.G.getId() == downQueryRequest.getTrackType()) { + downRecordQuery.setTrackTypes(Arrays.asList(7, 10)); + } else { downRecordQuery.setTrackType(downQueryRequest.getTrackType()); } /*else if(null != downQueryRequest.getTrackType() && TrackDownDateEnums.E.getId() == downQueryRequest.getTrackType()){ @@ -347,14 +347,14 @@ public class TrackDownFacade { temp.put("residenceAddress", CommonsHelper.getFullAddress(downRecord.getProvinceRegisterId(), downRecord.getCityRegisterId(), downRecord.getAreaRegisterId(), downRecord.getAddressRegister(), basicConfigService)); /** 居住地 */ temp.put("phone", StringUtils.encryPhone(downRecord.getPhone())); - TrackDown trackDown = mongoTemplate.findOne(Query.query(Criteria.where("parentId").is(downRecord.getResidentsArchiveId()).and("yn").is(1).and("trackDownType").is(downRecord.getTrackType())).with(new Sort(Sort.Direction.DESC, "created")), TrackDown.class); + List trackDown = mongoTemplate.find(Query.query(Criteria.where("parentId").is(downRecord.getResidentsArchiveId()).and("yn").is(1).and("trackDownType").is(downRecord.getTrackType())).with(new Sort(Sort.Direction.DESC, "created")), TrackDown.class); temp.put("age", DateUtil.getAge(downRecord.getBirth())); // 婚检追访结果 - temp.put("result", trackDown == null ? "--" : trackDown.getResult()); + temp.put("result", CollectionUtils.isEmpty(trackDown) ? "--" : trackDown.get(0).getResult()); // 婚检追访时间 - temp.put("trackDownTime", trackDown == null ? "--" : DateUtil.getyyyy_MM_dd(trackDown.getTrackDownDate())); + temp.put("trackDownTime", CollectionUtils.isEmpty(trackDown) ? "--" : DateUtil.getyyyy_MM_dd(trackDown.get(0).getTrackDownDate())); // 预约时间 - temp.put("yyTime", trackDown == null ? "--" : DateUtil.getyyyy_MM_dd(trackDown.getReservatDate())); + temp.put("yyTime", CollectionUtils.isEmpty(trackDown)? "--" : DateUtil.getyyyy_MM_dd(trackDown.get(0).getReservatDate())); return temp; } } -- 1.8.3.1