From 5fea138fd288d7581e39376371263b24087282d8 Mon Sep 17 00:00:00 2001
From: gengxiaokai <gengxiaokai@lymsh.com>
Date: Thu, 2 Aug 2018 11:56:04 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=BF=E5=BE=B7=E5=85=AC=E5=85=B1=E5=8D=AB?=
 =?UTF-8?q?=E7=94=9F=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/lyms/platform/query/BabyModelQuery.java    | 26 ++++++++++++++++++++++
 .../com/lyms/hospitalapi/Cdfy/CdGwInterface.java   | 24 ++++++++++++++++++++
 2 files changed, 50 insertions(+)

diff --git a/platform-dal/src/main/java/com/lyms/platform/query/BabyModelQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/BabyModelQuery.java
index e9042cc..dc7b8c2 100644
--- a/platform-dal/src/main/java/com/lyms/platform/query/BabyModelQuery.java
+++ b/platform-dal/src/main/java/com/lyms/platform/query/BabyModelQuery.java
@@ -173,6 +173,25 @@ public class BabyModelQuery extends BaseQuery implements IConvertToNativeQuery {
     //身长别体重
     private String heightWeight;
 
+    private Date createdTimeStart;
+    private Date createdTimeEnd;
+
+    public Date getCreatedTimeEnd() {
+        return createdTimeEnd;
+    }
+
+    public void setCreatedTimeEnd(Date createdTimeEnd) {
+        this.createdTimeEnd = createdTimeEnd;
+    }
+
+    public Date getCreatedTimeStart() {
+        return createdTimeStart;
+    }
+
+    public void setCreatedTimeStart(Date createdTimeStart) {
+        this.createdTimeStart = createdTimeStart;
+    }
+
     public List getHighRiskInfos() {
         return highRiskInfos;
     }
@@ -894,6 +913,13 @@ public class BabyModelQuery extends BaseQuery implements IConvertToNativeQuery {
             }
         }
 
+        if(null != createdTimeStart && createdTimeEnd != null){
+            if(c != null){
+                c = c.where("created").gte(createdTimeStart).lte(createdTimeEnd);
+            }else{
+                c = Criteria.where("created").gte(createdTimeStart).lte(createdTimeEnd);
+            }
+        }
 
         if (c != null) {
             return new MongoCondition(c.andOperator(condition.getCriteria())).toMongoQuery();
diff --git a/platform-operate-api/src/main/java/com/lyms/hospitalapi/Cdfy/CdGwInterface.java b/platform-operate-api/src/main/java/com/lyms/hospitalapi/Cdfy/CdGwInterface.java
index 7398c5b..673bd61 100644
--- a/platform-operate-api/src/main/java/com/lyms/hospitalapi/Cdfy/CdGwInterface.java
+++ b/platform-operate-api/src/main/java/com/lyms/hospitalapi/Cdfy/CdGwInterface.java
@@ -4354,6 +4354,29 @@ public class CdGwInterface {
     }
 
 
+    /**
+     * 承德智业儿童建档基本信息调用方法
+     * @param startDate
+     * @param endDate
+     * @return
+     */
+    public BaseObjectResponse saveEtDa(String startDate,String endDate){
+        BaseObjectResponse br = null;
+        BabyModelQuery babyQuery = new BabyModelQuery();
+        babyQuery.setCreatedTimeStart(DateUtil.parseYMDHMS(startDate));
+        babyQuery.setCreatedTimeEnd(DateUtil.parseYMDHMS(endDate));
+        babyQuery.setYn(YnEnums.YES.getId());
+        List<BabyModel> models = babyBookbuildingService.queryBabyBuildByCond(babyQuery);
+        if(models != null && models.size() > 0){
+            for(BabyModel babyModel : models){
+                br = saveChild_Info(babyModel);
+            }
+        }
+        return br;
+    }
+
+
+
 
 
     public void handleWork()  {
@@ -4368,6 +4391,7 @@ public class CdGwInterface {
         saveFm(startDate, endDate);
         saveChFs(startDate, endDate);
         saveChFc(startDate, endDate);
+        saveEtDa(startDate, endDate);
 
     }
 
-- 
1.8.3.1