From c23abccf82a294db8a4ec874f22290eee551bf13 Mon Sep 17 00:00:00 2001 From: yangfei Date: Mon, 5 Mar 2018 16:52:36 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BF=BD=E8=AE=BF=E6=95=B0=E6=8D=AE=E4=B8=AA?= =?UTF-8?q?=E8=8A=82=E7=82=B9=E6=9B=B4=E6=96=B0bug=E7=AC=AC=E4=B8=89?= =?UTF-8?q?=E8=BD=AE=E8=87=AA=E6=B5=8Bbug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../platform/operate/web/facade/TrackDownFacade.java | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 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 445e800..f6200f6 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 @@ -341,24 +341,28 @@ public class TrackDownFacade { temp.put("residenceAddress", CommonsHelper.getFullAddress(downRecord.getProvinceRegisterId(), downRecord.getCityRegisterId(), downRecord.getAreaRegisterId(), downRecord.getAddressRegister(), basicConfigService)); /** 居住地 */ temp.put("phone", StringUtils.encryPhone(downRecord.getPhone())); - + temp.put("fmDate","--"); + temp.put("result","--"); + temp.put("trackDownTime","--"); + temp.put("yyTime","--"); + temp.put("trackCount","--"); List trackDowns = mongoTemplate.find(Query.query(Criteria.where("parentId").is(downRecord.getParentId()).and("yn").is(1).and("trackDownDateType").in(6,11)).with(new Sort(Sort.Direction.DESC, "created")), TrackDown.class); temp.put("age", DateUtil.getAge(downRecord.getBirth())); - if (CollectionUtils.isNotEmpty(trackDowns)) { + if (CollectionUtils.isNotEmpty(trackDowns)&&trackDowns.get(0)!=null) { TrackDown trackDown = trackDowns.get(0); // 追访结果 - temp.put("result", trackDown == null ? "--" : trackDown.getResult()); + temp.put("result", trackDown.getResult() == null ? "--" : trackDown.getResult()); // 追访时间 - temp.put("trackDownTime", trackDown == null ? "--" : DateUtil.getyyyy_MM_dd(trackDown.getTrackDownDate())); + temp.put("trackDownTime", trackDown.getTrackDownDate() == null ? "--" : DateUtil.getyyyy_MM_dd(trackDown.getTrackDownDate())); // 预约时间 - temp.put("yyTime", trackDown == null ? "--" : DateUtil.getyyyy_MM_dd(trackDown.getReservatDate())); + temp.put("yyTime", trackDown.getReservatDate() == null ? "--" : DateUtil.getyyyy_MM_dd(trackDown.getReservatDate())); //访视次数 temp.put("trackCount", trackDowns.size()); } Patients patients = patientsService.findOnePatientById(downRecord.getParentId()); if (patients != null) { //分娩日期 - temp.put("fmDate", DateUtil.getyyyy_MM_dd(patients.getFmDate())); + temp.put("fmDate", patients.getFmDate()==null?"--":DateUtil.getyyyy_MM_dd(patients.getFmDate())); } -- 1.8.3.1