From 716ae1dc888a050248ae12a23d140bd01ce584da Mon Sep 17 00:00:00 2001 From: jiangjiazhi Date: Thu, 5 Jan 2017 17:35:12 +0800 Subject: [PATCH] 1 --- .../lyms/platform/operate/web/facade/AntenatalExaminationFacade.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java index 3b54eea..9d97088 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java @@ -961,7 +961,9 @@ public class AntenatalExaminationFacade { Date date = DateUtil.addWeek(patients.getLastMenses(), 42); Date currentDate = DateUtil.formatDate(new Date()); - if (date.getTime() <= currentDate.getTime() || patients.getBuildType() == 2) { + + + if ((date.getTime() <= currentDate.getTime() || patients.getBuildType() == 2)||patients.getType()==3&&patients.getFmDate()!=null) { //建档记录 if (null != patients.getHospitalId()) { organization = organizationService.getOrganization(Integer.valueOf(patients.getHospitalId())); -- 1.8.3.1