From d593af85b7a8879219fc0c8b22ffefdf9ad486a3 Mon Sep 17 00:00:00 2001
From: jiangjiazhi <jiangjiazhi@lymsh.com>
Date: Mon, 25 Jul 2016 15:50:27 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=98=AF=E5=90=A6=E9=80=9A?=
 =?UTF-8?q?=E7=9F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../web/facade/AntenatalExaminationFacade.java     | 33 ++++++++++++++++++++++
 .../web/result/AntenatalExaminationResult.java     | 10 ++++++-
 .../operate/web/result/AntexChuResult.java         | 10 +++++++
 3 files changed, 52 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 ec40d16..a766c97 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
@@ -318,6 +318,32 @@ public class AntenatalExaminationFacade {
         return patients;
     }
 
+    /**
+     * 查看是否满足产筛申请条件
+     *
+     * 1.孕周 15周-到20 周  并且没有做过产筛
+     * @param date
+     * @param parentId
+     * @return
+     */
+    public String cap(Date date,String parentId){
+        if(null==date){
+            return "0";
+        }
+        int day=  DateUtil.getDays(date,new Date());
+        int start = 15*7;
+        int end  = 20*7+6;
+        if(day>=start&&day<=end){
+            SieveApplyOrderQuery sieveApplyOrderQuery=new SieveApplyOrderQuery();
+            sieveApplyOrderQuery.setYn(YnEnums.YES.getId());
+            sieveApplyOrderQuery.setParentId(parentId);
+            List<SieveApplyOrderModel> list = applyOrderService.querySieveApplyOrderWithQuery(sieveApplyOrderQuery);
+            if(CollectionUtils.isNotEmpty(list)){
+                return "1";
+            }
+        }
+        return  "0";
+    }
 
     /**
      * 查询产前检查
@@ -416,6 +442,12 @@ public class AntenatalExaminationFacade {
             SieveApplyOrderQuery applyOrderQuery = new SieveApplyOrderQuery();
             applyOrderQuery.setParentId(examinationModel.getParentId());
             applyOrderQuery.setYn(YnEnums.YES.getId());
+            Patients patients = patientsService.findOnePatientById(examinationModel.getParentId());
+            Date data =  null;
+            if(null!=data){
+                data=patients.getLastMenses();
+            }
+            antenatalExaminationResult.setIsSieve(cap(data, examinationModel.getParentId()));
             antenatalExaminationResult.setHasSieve(CollectionUtils.isEmpty(applyOrderService.querySieveApplyOrderWithQuery(applyOrderQuery)) ? 0 : 1);
             object = antenatalExaminationResult;
         } else {
@@ -452,6 +484,7 @@ public class AntenatalExaminationFacade {
                 applyOrderQuery.setParentId(antExChuModel.getParentId());
                 applyOrderQuery.setYn(YnEnums.YES.getId());
                 antexChuResult.setHasSieve(CollectionUtils.isEmpty(applyOrderService.querySieveApplyOrderWithQuery(applyOrderQuery)) ? 0 : 1);
+                antexChuResult.setIsSieve(cap(antExChuModel.getLastMenses(),antExChuModel.getParentId()));
                 object = antexChuResult;
             }
         }
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntenatalExaminationResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntenatalExaminationResult.java
index d1b6500..1d8a7ce 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntenatalExaminationResult.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntenatalExaminationResult.java
@@ -16,7 +16,7 @@ import java.util.Map;
 public class AntenatalExaminationResult implements IBasicResultConvert<AntenatalExaminationResult, AntenatalExaminationModel> {
 
     private String id;
-
+    private String isSieve;
     private String parentId;
     //当前孕周
     private String currentDueDate;
@@ -76,6 +76,14 @@ public class AntenatalExaminationResult implements IBasicResultConvert<Antenatal
     private int hasSieve;
     private String cDueWeek;
 
+    public String getIsSieve() {
+        return isSieve;
+    }
+
+    public void setIsSieve(String isSieve) {
+        this.isSieve = isSieve;
+    }
+
     public String getcDueWeek() {
         return cDueWeek;
     }
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexChuResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexChuResult.java
index ae702ff..840172e 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexChuResult.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexChuResult.java
@@ -16,6 +16,8 @@ import java.util.Map;
 public class AntexChuResult {
 
     private String parentId;
+
+    private String isSieve;
     /**
      * 基本信息
      **/
@@ -208,6 +210,14 @@ public class AntexChuResult {
     //是否有产筛
     private int hasSieve;
 
+    public String getIsSieve() {
+        return isSieve;
+    }
+
+    public void setIsSieve(String isSieve) {
+        this.isSieve = isSieve;
+    }
+
     public Map getBp() {
         return bp;
     }
-- 
1.8.3.1