From c2da500147fef14f0e488574e762d8d0a75bb269 Mon Sep 17 00:00:00 2001 From: "[wangbo]" Date: Thu, 11 Jul 2019 09:49:47 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A2=84=E7=BA=A6=E8=BF=BD?= =?UTF-8?q?=E8=AE=BF=E6=97=A5=E6=9C=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/lyms/platform/operate/web/facade/TrackDownFacade.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 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 9738bc9..ce9c5e2 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 @@ -689,7 +689,7 @@ public class TrackDownFacade { // 追访时间 temp.put("trackDownTime", trackDown == null ? "--" : DateUtil.getyyyy_MM_dd(trackDown.getTrackDownDate())); // 预约时间 - temp.put("yyTime", trackDown == null ? "--" : DateUtil.getyyyy_MM_dd(trackDown.getReservatDate())); + temp.put("yyTime", trackDown == null ? "--" : DateUtil.getyyyy_MM_dd(downRecord.getAppointmentDate())); //预约复查时间默认用追访时间 @@ -778,7 +778,7 @@ public class TrackDownFacade { // 追访时间 temp.put("trackDownTime", trackDown.getTrackDownDate() == null ? "--" : DateUtil.getyyyy_MM_dd(trackDown.getTrackDownDate())); // 预约时间 - temp.put("yyTime", trackDown.getReservatDate() == null ? "--" : DateUtil.getyyyy_MM_dd(trackDown.getReservatDate())); + temp.put("yyTime", trackDown.getReservatDate() == null ? "--" : DateUtil.getyyyy_MM_dd(downRecord.getAppointmentDate())); //访视次数 temp.put("trackCount", trackDowns.size()); } @@ -814,7 +814,7 @@ public class TrackDownFacade { // 婚检追访时间 temp.put("trackDownTime", trackDown == null ? "--" : DateUtil.getyyyy_MM_dd(trackDown.getTrackDownDate())); // 预约时间 - temp.put("yyTime", trackDown == null ? "--" : DateUtil.getyyyy_MM_dd(trackDown.getReservatDate())); + temp.put("yyTime", trackDown == null ? "--" : DateUtil.getyyyy_MM_dd(downRecord.getAppointmentDate())); //孕妇建档日期 temp.put("womanCreatedTime", trackDown == null ? "--" : DateUtil.getyyyy_MM_dd(trackDown.getCreated())); return temp; @@ -845,7 +845,7 @@ public class TrackDownFacade { // 婚检追访时间 temp.put("trackDownTime", CollectionUtils.isEmpty(trackDown) ? "--" : DateUtil.getyyyy_MM_dd(trackDown.get(0).getTrackDownDate())); // 预约时间 - temp.put("yyTime", CollectionUtils.isEmpty(trackDown) ? "--" : DateUtil.getyyyy_MM_dd(trackDown.get(0).getReservatDate())); + temp.put("yyTime", CollectionUtils.isEmpty(trackDown) ? "--" : DateUtil.getyyyy_MM_dd(downRecord.getAppointmentDate())); //Long checkNum = mongoTemplate.count(Query.query(Criteria.where("certificateNum").is(archiveModel.getCertificateNum()).and("hospitalId").is(archiveModel.getHospitalId()).and("yn").is(1)), PremaritalCheckup.class); @@ -913,7 +913,7 @@ public class TrackDownFacade { if (trackDown != null) { temp.put("result", StringUtils.isEmpty(trackDown.getResult()) ? "--" : trackDown.getResult()); // 追访结果 temp.put("trackDownTime", trackDown == null ? "--" : DateUtil.getyyyy_MM_dd(trackDown.getTrackDownDate())); // 追访时间 - temp.put("yyzfTime", trackDown == null ? "--" : DateUtil.getyyyy_MM_dd(trackDown.getReservatDate())); // 预约时间 + temp.put("yyzfTime", trackDown == null ? "--" : DateUtil.getyyyy_MM_dd(downRecord.getAppointmentDate())); // 预约时间 } else { temp.put("result", "--"); // 婚检追访结果 temp.put("trackDownTime", "--"); // 追访时间 -- 1.8.3.1