From d381acb4080da8020776f9b960bfe8661773da78 Mon Sep 17 00:00:00 2001
From: jiangjiazhi <jiangjiazhi@lymsh.com>
Date: Tue, 25 Oct 2016 12:01:17 +0800
Subject: [PATCH] s

---
 .../web/facade/AntenatalExaminationFacade.java     |  2 +-
 .../operate/web/facade/DeleteProcessHandler.java   | 22 +++++++++++++++++-----
 2 files changed, 18 insertions(+), 6 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 f749317..a9d8bde 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
@@ -1406,7 +1406,7 @@ public class AntenatalExaminationFacade {
             }*/
 
 //            if (CollectionUtils.isEmpty(list)) {
-            if (deleteProcessHandler.deleteAntExChu(antExChuModel11.getPid(), antExChuModel11.getCheckTime(), hospital, true)) {
+            if (deleteProcessHandler.deleteAntExChu(antExChuModel11.getPid(), antExChuModel11.getCheckTime(), hospital, true,antExQueryRequest.getId())) {
                 antenatalExaminationService.updateAntExChu(antExChuModel, antExQueryRequest.getId());
 
                 AntExChuModel antExChuModel1 = antenatalExaminationService.findOne(antExQueryRequest.getId());
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/DeleteProcessHandler.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/DeleteProcessHandler.java
index d1b2d15..ff427ad 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/DeleteProcessHandler.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/DeleteProcessHandler.java
@@ -5,11 +5,15 @@ import com.lyms.platform.biz.service.MatDeliverService;
 import com.lyms.platform.biz.service.PostReviewService;
 import com.lyms.platform.biz.service.StopPregnancyService;
 import com.lyms.platform.common.enums.YnEnums;
+import com.lyms.platform.common.utils.StringUtils;
+import com.lyms.platform.pojo.AntExChuModel;
 import com.lyms.platform.query.*;
+import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 import java.util.Date;
+import java.util.List;
 
 /**
  * 产后复查删除
@@ -31,7 +35,6 @@ public class DeleteProcessHandler {
     /**
      * 删除产后复查记录,查询有没有大于检查时间的本院数据
      *
-     * @param lastMenses 末次月经
      * @param pid
      * @param checkTime
      * @param hospitalId
@@ -83,7 +86,7 @@ public class DeleteProcessHandler {
      */
     public boolean deleteAntEx( String pid, Date checkTime, String hospitalId,boolean qufenHospital) {
         //先判断是否有复查记录
-        if (doBiz(pid, checkTime, hospitalId,false)) {
+        if (doBiz(pid, checkTime, hospitalId, false)) {
             StopPregQuery stopPregQuery = new StopPregQuery();
             stopPregQuery.setPid(pid);
             stopPregQuery.setYn(YnEnums.YES.getId());
@@ -110,7 +113,7 @@ public class DeleteProcessHandler {
         return false;
     }
 
-    public boolean deleteAntExChu( String pid, Date checkTime, String hospitalId,boolean qufenHospital) {
+    public boolean deleteAntExChu( String pid, Date checkTime, String hospitalId,boolean qufenHospital,String antExChuId) {
         if (deleteAntEx(pid, checkTime, hospitalId, false)) {
             AntExChuQuery antExChuQuery=new AntExChuQuery();
             antExChuQuery.setPid(pid);
@@ -119,13 +122,22 @@ public class DeleteProcessHandler {
             if(qufenHospital){
                 antExChuQuery.setHospitalId(hospitalId);
             }
-            return  antenatalExaminationService.queryAntExChuCount(antExChuQuery.convertToQuery()) ==0;
+            List<AntExChuModel> antExChuModels = antenatalExaminationService.queryAntExChu(antExChuQuery.convertToQuery());
+            if(StringUtils.isNotEmpty(antExChuId) && CollectionUtils.isNotEmpty(antExChuModels)){
+                for(int i=0;i<antExChuModels.size();i++){
+                    if(antExChuModels.get(i).equals(antExChuId)){
+                        antExChuModels.remove(i);
+                        break;
+                    }
+                }
+            }
+            return  antExChuModels.size()==0;
         }
         return false;
     }
 
     public boolean deleteBookBuild(String pid, Date checkTime, String hospitalId){
-        if(deleteAntExChu(pid,checkTime,hospitalId,false)){
+        if(deleteAntExChu(pid,checkTime,hospitalId,false,null)){
             return true;
         }
         return false;
-- 
1.8.3.1