From 3899ece389a2b2f61440d4a4f61a63398eb27f03 Mon Sep 17 00:00:00 2001
From: jiangjiazhi <jiangjiazhi@lymsh.com>
Date: Sun, 1 May 2016 14:43:24 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../lyms/platform/operate/web/facade/VisitFacade.java  | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 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 96f91cc..98b7d90 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
@@ -5,16 +5,19 @@ import com.lyms.platform.common.constants.ErrorCodeConstants;
 import com.lyms.platform.common.enums.YnEnums;
 import com.lyms.platform.common.result.BaseObjectResponse;
 import com.lyms.platform.common.result.BaseResponse;
+import com.lyms.platform.common.utils.DateUtil;
 import com.lyms.platform.operate.web.request.BabyVisitAddRequest;
 import com.lyms.platform.operate.web.request.VisitAddRequest;
 import com.lyms.platform.operate.web.request.VisitAddRequest.SimpleVisitPuerpera;
-import com.lyms.platform.operate.web.result.AddressInner;
 import com.lyms.platform.operate.web.result.BabyVisitResult;
 import com.lyms.platform.operate.web.result.BabyVisitResult.BabyVisit;
 import com.lyms.platform.operate.web.result.SimpleVisit;
 import com.lyms.platform.operate.web.result.VisitResult;
 import com.lyms.platform.operate.web.utils.CommonsHelper;
-import com.lyms.platform.pojo.*;
+import com.lyms.platform.pojo.BabyModel;
+import com.lyms.platform.pojo.BabyVisitModel;
+import com.lyms.platform.pojo.Patients;
+import com.lyms.platform.pojo.VisitModel;
 import com.lyms.platform.query.BabyModelQuery;
 import com.lyms.platform.query.PatientsQuery;
 import com.lyms.platform.query.VisitQuery;
@@ -80,7 +83,7 @@ public class VisitFacade {
     private BaseObjectResponse doBiz(Patients puerperaModel) {
         VisitResult data = new VisitResult();
         if (null != puerperaModel) {
-            data.convertToResult1(puerperaModel, CommonsHelper.fullAddress(puerperaModel,basicConfigService));
+            data.convertToResult1(puerperaModel, CommonsHelper.fullAddress(puerperaModel, basicConfigService));
             VisitQuery visitQuery = new VisitQuery();
             visitQuery.setParentId(puerperaModel.getId());
             List<VisitModel> visits = visitService.queryVisit(visitQuery);
@@ -114,6 +117,7 @@ public class VisitFacade {
         return patientsService.findOnePatientByCardNo(query);
     }
 
+
     /**
      * 增加产妇访视记录
      *
@@ -123,6 +127,14 @@ public class VisitFacade {
     public BaseResponse addOneVisit(VisitAddRequest visitRequest) {
         // 获取患者id
         String parentId = visitRequest.getParentId();
+        String checkTime = visitRequest.getCheckTime();
+        if (StringUtils.isNotEmpty(checkTime)&&null!=visitRequest.getPatients().getDueDate()) {
+            boolean f = DateUtil.parseYMD(checkTime).before(visitRequest.getPatients().getDueDate());
+            if (f) {
+                return new BaseResponse().setErrorcode(ErrorCodeConstants.PARAMETER_ERROR).setErrormsg("检查时间必须大于分娩时间");
+            }
+        }
+
         if (StringUtils.isNotBlank(parentId)) {
             Patients model;
             PatientsQuery patientsQuery = new PatientsQuery();
-- 
1.8.3.1