From e598123b4c424d76a17211429c4a241fec74d7f8 Mon Sep 17 00:00:00 2001
From: gengxiaokai <gengxiaokai@lymsh.com>
Date: Thu, 2 Aug 2018 11:17:54 +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/MatDeliverQuery.java   | 31 ++++++++++++++++++++++
 .../com/lyms/hospitalapi/Cdfy/CdGwInterface.java   | 21 +++++++++++++--
 2 files changed, 50 insertions(+), 2 deletions(-)

diff --git a/platform-dal/src/main/java/com/lyms/platform/query/MatDeliverQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/MatDeliverQuery.java
index 0c44d32..e5543a8 100644
--- a/platform-dal/src/main/java/com/lyms/platform/query/MatDeliverQuery.java
+++ b/platform-dal/src/main/java/com/lyms/platform/query/MatDeliverQuery.java
@@ -31,6 +31,29 @@ public class MatDeliverQuery extends BaseQuery implements IConvertToNativeQuery
     private String hospitalId;
     private boolean neStart;
 
+
+    private Date createdTimeStart;
+    private Date createdTimeEnd;
+
+    public Date getCreatedTimeStart() {
+        return createdTimeStart;
+    }
+
+    public void setCreatedTimeStart(Date createdTimeStart) {
+        this.createdTimeStart = createdTimeStart;
+    }
+
+    public Date getCreatedTimeEnd() {
+        return createdTimeEnd;
+    }
+
+    public void setCreatedTimeEnd(Date createdTimeEnd) {
+        this.createdTimeEnd = createdTimeEnd;
+    }
+
+
+
+
     private boolean neEnd;
     /**
      * 出血量：
@@ -362,6 +385,14 @@ public class MatDeliverQuery extends BaseQuery implements IConvertToNativeQuery
             }
             isAddStart = Boolean.TRUE;
         }
+        if(null != createdTimeStart && null != createdTimeEnd){
+            if(null != c){
+                c = c.where("created").gte(createdTimeStart).lte(createdTimeEnd);
+            }else{
+                c = Criteria.where("created").gte(createdTimeStart).lte(createdTimeEnd);
+            }
+            isAddStart = Boolean.TRUE;
+        }
         if (isAddStart) {
             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 0d4c0eb..9c5f748 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
@@ -4285,9 +4285,25 @@ public class CdGwInterface {
         return br;
     }
 
-    public BaseObjectResponse saveFm(String startDate,String endDate){
 
-        return null;
+    /**
+     * 承德智业分娩调用方法
+     * @param startDate
+     * @param endDate
+     * @return
+     */
+    public BaseObjectResponse saveFm(String startDate,String endDate){
+        BaseObjectResponse br = null;
+        MatDeliverQuery deliverQuery = new MatDeliverQuery();
+        deliverQuery.setCreatedTimeStart(DateUtil.parseYMDHMS(startDate));
+        deliverQuery.setCreatedTimeEnd(DateUtil.parseYMDHMS(endDate));
+        List<MaternalDeliverModel> list = matDeliverService.query(deliverQuery);
+        if(null != list && list.size() > 0){
+            for(MaternalDeliverModel maternalDeliverModel : list){
+                    br = saveWomen_Delivery(maternalDeliverModel);
+            }
+        }
+        return br;
 
     }
 
@@ -4305,6 +4321,7 @@ public class CdGwInterface {
         saveYf(startDate, endDate);
         saveChuZhen(startDate, endDate);
         saveFuZhen(startDate, endDate);
+        saveFm(startDate, endDate);
 
     }
 
-- 
1.8.3.1