From 8baf9d2f8662c3ef2790800c74313bc354405ff1 Mon Sep 17 00:00:00 2001 From: "litao@lymsh.com" Date: Fri, 12 Jan 2018 11:30:41 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BE=90=E5=80=A9=E8=AF=B4=E7=9A=84=20?= =?UTF-8?q?=E6=94=B9=E5=BB=BA=E6=A1=A3=E7=AE=A1=E7=90=86=E7=9A=84=E5=BB=BA?= =?UTF-8?q?=E6=A1=A3=E5=AD=95=E5=91=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/lyms/platform/operate/web/facade/PatientFacade.java | 4 ++-- .../lyms/platform/operate/web/service/impl/TrackDownServiceImpl.java | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java index 22361b2..5f95fe1 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java @@ -1050,8 +1050,8 @@ public class PatientFacade { String dueWeek = ""; try { // 徐倩说改的 - // if (patients.getBookbuildingDate().getTime() - patients.getDueDate().getTime() > 0 && patients.getBuildType() == 2) { - if (patients.getBookbuildingDate().getTime() - patients.getFmDate().getTime() > 0 && patients.getBuildType() == 2) { + if (patients.getBookbuildingDate().getTime() - patients.getDueDate().getTime() > 0 && patients.getBuildType() == 2) { +// if (patients.getBookbuildingDate().getTime() - patients.getFmDate().getTime() > 0 && patients.getBuildType() == 2) { dueWeek = "已分娩"; } else { int days = DateUtil.daysBetween(patients.getLastMenses(), patients.getBookbuildingDate()); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TrackDownServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TrackDownServiceImpl.java index f1c1114..25dbe3c 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TrackDownServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TrackDownServiceImpl.java @@ -385,6 +385,11 @@ public class TrackDownServiceImpl extends BaseServiceImpl implements ITrackDownS map.put("week", DateUtil.getWeekDesc(patients.getLastMenses(), new Date())); map.put("dueDate", DateUtil.getyyyy_MM_dd(patients.getDueDate())); /** 预产期 */ map.put("trackCount", mongoTemplate.count(Query.query(Criteria.where("parentId").is(parentId).and("trackDownDateType").is(TrackDownDateEnums.F.getId()).and("yn").is(1)), TrackDown.class)); /** 访视次数 */ + + TrackDown tc = mongoTemplate.findOne(Query.query(Criteria.where("parentId").is(parentId).and("trackDownDateType").is(TrackDownDateEnums.E.getId()).and("yn").is(1)).with(new Sort(Sort.Direction.DESC, "created")), TrackDown.class); + if(tc != null) { + map.put("reservatDate", DateUtil.getyyyy_MM_dd(tc.getReservatDate())); /** 预约住院日期 */ + } map.put("fcCount", mongoTemplate.count(Query.query(Criteria.where("parentId").is(parentId).and("trackDownDateType").is(TrackDownDateEnums.G.getId()).and("yn").is(1)), TrackDown.class)); /** 复查次数 */ map.put("checkCount", mongoTemplate.count(Query.query(Criteria.where("parentId").is(parentId).and("hospitalId").is(hospitalId)), AntenatalExaminationModel.class) + mongoTemplate.count(Query.query(Criteria.where("parentId").is(parentId)), AntExChuModel.class)); /** 本院产检次数 */ -- 1.8.3.1