From 91690d5e3c4a47922fc7cf90de9240215108da56 Mon Sep 17 00:00:00 2001
From: jiangjiazhi <jiangjiazhi@lymsh.com>
Date: Wed, 7 Sep 2016 17:43:14 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=B0=E7=94=B5=E5=AD=90?=
 =?UTF-8?q?=E7=97=85=E5=8E=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../web/facade/AntenatalExaminationFacade.java     | 41 ++++++++++++++++++++--
 1 file changed, 39 insertions(+), 2 deletions(-)

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 0287a85..df3fb38 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
@@ -1163,7 +1163,13 @@ public class AntenatalExaminationFacade {
             }
             antExQuery.setId(null);
             list = antenatalExaminationService.queryAntenatalExamination(antExQuery.convertToQuery());
-
+            if(CollectionUtils.isNotEmpty(list)){
+                for(int i=0;i<list.size();i++){
+                    if(list.get(i).getId().equals(antExQueryRequest.getId())){
+                        list.remove(i);
+                    }
+                }
+            }
 
             if (CollectionUtils.isEmpty(list)) {
                 antenatalExaminationService.updateOneAnt(antEx, antExQueryRequest.getId());
@@ -1174,7 +1180,38 @@ public class AntenatalExaminationFacade {
             AntExChuModel antExChuModel = new AntExChuModel();
             antExChuModel.setYn(YnEnums.NO.getId());
             antExChuModel.setId(antExQueryRequest.getId());
-            antenatalExaminationService.updateAntExChu(antExChuModel, antExQueryRequest.getId());
+            String hospital = autoMatchFacade.getHospitalId(userId);
+
+
+            AntExChuQuery antExQuery = new AntExChuQuery();
+            antExQuery.setId(antExQueryRequest.getId());
+            antExQuery.setYn(YnEnums.YES.getId());
+            antExQuery.setHospitalId(hospital);
+
+            List<AntExChuModel> list = antenatalExaminationService.queryAntExChu(antExQuery);
+
+            //TODO  需要根据时间去查询是否是本院最后一条记录
+            if (CollectionUtils.isNotEmpty(list)) {
+                antExQuery.setStart(new Date(list.get(0).getCheckTime().getTime() + 40000));
+            }
+
+            antExQuery.setId(null);
+
+            list = antenatalExaminationService.queryAntExChu(antExQuery);
+
+            if(CollectionUtils.isNotEmpty(list)){
+                for(int i=0;i<list.size();i++){
+                    if(list.get(i).getId().equals(antExQueryRequest.getId())){
+                        list.remove(i);
+                    }
+                }
+            }
+
+            if (CollectionUtils.isEmpty(list)) {
+                antenatalExaminationService.updateAntExChu(antExChuModel, antExQueryRequest.getId());
+            }else{
+                return new BaseResponse().setErrorcode(ErrorCodeConstants.BUSINESS_ERROR).setErrormsg("当前产检记录不是本院最新的产检记录,不能删除");
+            }
         }
 
         return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功");
-- 
1.8.3.1