From 07f6835eefa4f09afc8a517c93881fbd4b825952 Mon Sep 17 00:00:00 2001 From: "[wangbo]" Date: Fri, 26 Jul 2019 11:31:35 +0800 Subject: [PATCH] =?UTF-8?q?=E6=80=80=E5=AD=95=E5=BB=BA=E6=A1=A3=E6=98=AF?= =?UTF-8?q?=E5=90=A6=E5=A9=9A=E6=A3=80=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lyms/platform/operate/web/facade/TrackDownFacade.java | 13 ++++++++----- 1 file changed, 8 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 7524761..2014fe1 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 @@ -843,6 +843,8 @@ public class TrackDownFacade { temp.put("trackDownTime", trackDown == null ? "--" : DateUtil.getyyyy_MM_dd(trackDown.getTrackDownDate())); // 预约时间 temp.put("yyTime", trackDown == null ? "--" : DateUtil.getyyyy_MM_dd(downRecord.getAppointmentDate())); + + //孕妇建档日期 temp.put("womanCreatedTime", downRecord.getWomanBuildTime()); return temp; @@ -874,13 +876,14 @@ public class TrackDownFacade { temp.put("trackDownTime", CollectionUtils.isEmpty(trackDown) ? "--" : DateUtil.getyyyy_MM_dd(trackDown.get(0).getTrackDownDate())); // 预约时间 temp.put("yyTime", downRecord.getAppointmentDate() == null ? "--" : 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); - - //孕妇建档时间 temp.put("womanCreatedTime", downRecord.getWomanBuildTime() == null ? "--" : DateUtil.getyyyy_MM_dd(downRecord.getWomanBuildTime())); + + //是否婚检 + if (null != downRecord.getTrackType() && downRecord.getTrackType() == 2) { + Long checkNum = mongoTemplate.count(Query.query(Criteria.where("parentId").is(downRecord.getParentId()).and("hospitalId").is(downRecord.getHospitalId()).and("yn").is(1)), PremaritalCheckup.class); + temp.put("check", checkNum > 0 ? 1 : 2); // 婚检 1=勾勾 2=叉叉 + } return temp; } } -- 1.8.3.1