From 3f88cd32eb3bfec98d34590097a96b2825be5f61 Mon Sep 17 00:00:00 2001
From: liquanyu <liquanyu@lymsh.com>
Date: Mon, 29 Oct 2018 11:44:56 +0800
Subject: [PATCH] =?UTF-8?q?=E8=8D=A3=E6=88=90=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/lyms/hospitalapi/rcfy/RcGlxtService.java   | 39 ++++++++++++----------
 1 file changed, 21 insertions(+), 18 deletions(-)

diff --git a/platform-operate-api/src/main/java/com/lyms/hospitalapi/rcfy/RcGlxtService.java b/platform-operate-api/src/main/java/com/lyms/hospitalapi/rcfy/RcGlxtService.java
index f819ac1..04e195b 100644
--- a/platform-operate-api/src/main/java/com/lyms/hospitalapi/rcfy/RcGlxtService.java
+++ b/platform-operate-api/src/main/java/com/lyms/hospitalapi/rcfy/RcGlxtService.java
@@ -25,6 +25,7 @@ import org.springframework.stereotype.Service;
 
 import java.sql.*;
 import java.util.*;
+import java.util.Date;
 
 
 /**
@@ -591,20 +592,6 @@ public class RcGlxtService {
                     ps.setString(6, typeName);
                     ps.setString(7, null);
 
-//                    SieveQuery sieveQuery = new SieveQuery();
-//                    sieveQuery.setYn(YnEnums.YES.getId());
-//                    sieveQuery.setParentId(model.getParentId());
-//                    List<SieveModel> modelList = sieveService.queryList(sieveQuery);
-//                    String sieveResult= "";
-//                    if (CollectionUtils.isNotEmpty(modelList))
-//                    {
-//                        Integer result =  modelList.get(0).getCqResult();
-//                        if (result != null)
-//                        {
-//                            sieveResult = result == 0 ? "1" :"2";
-//                        }
-//                    }
-
                     String sieveResult= "";
                     if (map.get(key) != null)
                     {
@@ -672,7 +659,7 @@ public class RcGlxtService {
         }
         catch (Exception e)
         {
-            ExceptionUtils.catchException(e,"saveRcSieveInfoCount error.");
+            ExceptionUtils.catchException(e,"saveRcSieveInfo error.");
         }finally {
             try {
                 if (ps != null)
@@ -1346,9 +1333,8 @@ public class RcGlxtService {
 
     public void taskWorker()
     {
-        //十分钟执行一次
         java.util.Date end = new java.util.Date();
-        java.util.Date start = new java.util.Date(end.getTime()-2*60*1000);
+        java.util.Date start = new java.util.Date(end.getTime()-5*60*1000);
 
         List<String> hids = getHids();
 
@@ -1462,10 +1448,11 @@ public class RcGlxtService {
         {
             for (SieveResultModel sieveResultModel : list)
             {
-                saveRcSieveInfo(sieveResultModel,hids);
+                saveRcSieveInfo(sieveResultModel, hids);
             }
         }
 
+        //孕产妇妊娠风险
         AntExRecordQuery antExRecordQuery = new AntExRecordQuery();
         antExRecordQuery.setHospitalList(hids);
         antExRecordQuery.setModifiedStart(start);
@@ -1480,6 +1467,22 @@ public class RcGlxtService {
             }
         }
 
+
+        //母婴阻断
+        AntExChuQuery antExChuQuery = new AntExChuQuery();
+        antExChuQuery.setYn(YnEnums.YES.getId());
+        antExChuQuery.setHospitalList(getHids());
+        antExChuQuery.setCreatedTimeStart(start);
+        antExChuQuery.setCreatedTimeEnd(end);
+        List<AntExChuModel> antExChuModels = antenatalExaminationService.queryAntExChu(antExChuQuery);
+        System.out.println("xxxxxx antExChuModels=" + antExChuModels.size()+"===="+antExChuQuery.convertToQuery().convertToMongoQuery().toString());
+        if (org.apache.commons.collections.CollectionUtils.isNotEmpty(antExChuModels))
+        {
+            for (AntExChuModel chuModel : antExChuModels)
+            {
+                saveRcZdInfo(chuModel);
+            }
+        }
     }
 
 }
-- 
1.8.3.1