From 090f1b32b0363cf6720a8fdab39ca497055f2fc8 Mon Sep 17 00:00:00 2001
From: gengxiaokai <gengxiaokai@lymsh.com>
Date: Thu, 2 Aug 2018 11:32:23 +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

---
 .../lyms/platform/query/MatDeliverFollowQuery.java | 28 +++++++++++++++++++++-
 .../com/lyms/hospitalapi/Cdfy/CdGwInterface.java   | 23 ++++++++++++++++++
 2 files changed, 50 insertions(+), 1 deletion(-)

diff --git a/platform-dal/src/main/java/com/lyms/platform/query/MatDeliverFollowQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/MatDeliverFollowQuery.java
index 5bbf72e..7fc72a8 100644
--- a/platform-dal/src/main/java/com/lyms/platform/query/MatDeliverFollowQuery.java
+++ b/platform-dal/src/main/java/com/lyms/platform/query/MatDeliverFollowQuery.java
@@ -6,6 +6,7 @@ import com.lyms.platform.common.dao.operator.MongoCondition;
 import com.lyms.platform.common.dao.operator.MongoOper;
 import com.lyms.platform.common.dao.operator.MongoQuery;
 import org.apache.commons.lang.StringUtils;
+import org.springframework.data.mongodb.core.query.Criteria;
 
 import java.util.Date;
 
@@ -200,6 +201,25 @@ public class MatDeliverFollowQuery extends BaseQuery implements IConvertToNative
      */
     private String updateUser;
 
+    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;
+    }
+
     /**
      * @return
      */
@@ -244,7 +264,13 @@ public class MatDeliverFollowQuery extends BaseQuery implements IConvertToNative
         if (visitAffirm!=null) {
             condition = condition.and("visitAffirm", visitAffirm, MongoOper.IS);
         }
-
+        Criteria c = null;
+        if(null != createdTimeStart && createdTimeEnd != null){
+            c = Criteria.where("createDate").gte(createdTimeStart).lte(createdTimeEnd);
+        }
+        if(c != null){
+            return new MongoCondition(c.andOperator(condition.getCriteria())).toMongoQuery();
+        }
         return condition.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 9c5f748..69b0f04 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
@@ -55,6 +55,8 @@ public class CdGwInterface {
     @Autowired
     private BasicConfigService basicConfigService;
     @Autowired
+    private MatDeliverFollowService matDeliverFollowService;
+    @Autowired
     private AntenatalExaminationService antExService;
     @Autowired
     private OrganizationService organizationService;
@@ -4308,6 +4310,26 @@ public class CdGwInterface {
     }
 
 
+    /**
+     * 承德智业产后访视调用方法
+     * @param startDate
+     * @param endDate
+     * @return
+     */
+    public BaseResponse saveChFs(String startDate,String endDate){
+        BaseResponse br = null;
+        MatDeliverFollowQuery deliverQuery = new MatDeliverFollowQuery();
+        deliverQuery.setCreatedTimeStart(DateUtil.parseYMDHMS(startDate));
+        deliverQuery.setCreatedTimeEnd(DateUtil.parseYMDHMS(endDate));
+        List<MatdeliverFollowModel> list = matDeliverFollowService.query(deliverQuery);
+        if(null != list && list.size() > 0){
+            for(MatdeliverFollowModel matdeliverFollowModel : list){
+                br = saveWoman_Postvisit(matdeliverFollowModel);
+            }
+        }
+        return br;
+    }
+
 
 
 
@@ -4322,6 +4344,7 @@ public class CdGwInterface {
         saveChuZhen(startDate, endDate);
         saveFuZhen(startDate, endDate);
         saveFm(startDate, endDate);
+        saveChFs(startDate, endDate);
 
     }
 
-- 
1.8.3.1