From 0ce1b0f60975b10dff59f1b90f2d58ca1d7f641e Mon Sep 17 00:00:00 2001 From: jiangjiazhi Date: Thu, 5 May 2016 16:35:30 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=96=B0=E7=94=9F=E5=84=BF?= =?UTF-8?q?=E8=AE=BF=E8=A7=86=E7=9A=84=E6=97=B6=E9=97=B4=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/lyms/platform/operate/web/facade/VisitFacade.java | 9 +++++++++ .../lyms/platform/operate/web/request/BabyVisitAddRequest.java | 5 +++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/VisitFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/VisitFacade.java index 8782bd6..37c3b83 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/VisitFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/VisitFacade.java @@ -240,6 +240,15 @@ public class VisitFacade { public BaseResponse addOrUpdateBabyAndVisit(BabyVisitAddRequest babyVisitAddRequest) { String babyId = babyVisitAddRequest.getParentId(); + String currentTime = babyVisitAddRequest.getCurrentVisit(); + if (StringUtils.isNotEmpty(currentTime)&&StringUtils.isNotEmpty(babyVisitAddRequest.getBirth())) { + Date currentVisit = DateUtil.parseYMD(babyVisitAddRequest.getCurrentVisit()); + Date birth = DateUtil.parseYMD(babyVisitAddRequest.getBirth()); + boolean f = currentVisit.before(birth); + if (f) { + return new BaseResponse().setErrorcode(ErrorCodeConstants.PARAMETER_ERROR).setErrormsg("检查时间必须大于小孩出生时间"); + } + } // 访视记录id为空表示新增 BabyVisitModel babyVisitModel = babyVisitAddRequest.convertToDataModel(); //表示需要新增小孩的数据 diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyVisitAddRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyVisitAddRequest.java index 51841f7..08f70d1 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyVisitAddRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyVisitAddRequest.java @@ -9,6 +9,7 @@ import com.lyms.platform.pojo.BabyModel; import com.lyms.platform.pojo.BabyVisitModel; import com.lyms.platform.pojo.Patients; import org.apache.commons.lang.StringUtils; +import org.hibernate.validator.constraints.NotEmpty; import java.util.Map; @@ -66,7 +67,7 @@ public class BabyVisitAddRequest implements IBasicRequestConvert // 性别 private int sex; - + @NotEmpty(message = "生日不能为空") // 生日 private String birth; @@ -203,7 +204,7 @@ public class BabyVisitAddRequest implements IBasicRequestConvert // 指导 private Map guide; - + @NotEmpty(message = "本次访视时间不能为空") // 本次访视时间 private String currentVisit; -- 1.8.3.1