From ba8cd51b397e8fdf03d8b5f3e322a6913437fdc7 Mon Sep 17 00:00:00 2001
From: lzy <qQ123456>
Date: Sat, 29 Jan 2022 21:39:04 +0800
Subject: [PATCH] =?UTF-8?q?=E7=9C=81=E4=B8=AD=E5=8C=BB=E4=BD=8F=E9=99=A2?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/docus/bgts/config/MyScheduling.java    | 13 +++++++++----
 .../docus/bgts/facade/IAfCollectTaskService.java    |  2 +-
 .../com/docus/bgts/mapper/AfCollectTaskMapper.java  |  2 +-
 .../bgts/service/AfCollectTaskServiceImpl.java      |  2 +-
 src/main/resources/mapper/AfCollectTaskMapper.xml   | 13 +++++++++++--
 5 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/docus/bgts/config/MyScheduling.java b/src/main/java/com/docus/bgts/config/MyScheduling.java
index 054b9b4..39155eb 100644
--- a/src/main/java/com/docus/bgts/config/MyScheduling.java
+++ b/src/main/java/com/docus/bgts/config/MyScheduling.java
@@ -85,13 +85,18 @@ public class MyScheduling {
     }
 
     //10分钟执行一次
-    @Scheduled(fixedRate = 1000 * 60 * 30)
+    @Scheduled(fixedRate = 1000 * 60 * 60 * 5)
     public void ruyuan() {
         log.info("----------开始采集------------");
-        log.info("-----采集时间："+oneDate);
+        SimpleDateFormat fmt = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        String format = fmt.format(oneDate);
+        log.info("-----采集时间：开始时间："+ format);
         Date twoDate = new Date();
+        String format1 = fmt.format(twoDate);
+        log.info("-----采集时间：结束时间："+ format1);
+
         //获取jzh列表
-        List<String> jzhs = afCollectTaskService.listJZHByDate(oneDate, twoDate);
+        List<String> jzhs = afCollectTaskService.listJZHByDate(format, format1);
         int size = jzhs.size();
         log.info("-------本次采集数：" + size);
         if(size==0){
@@ -189,7 +194,7 @@ public class MyScheduling {
             }
         }
         log.info("-------本次成功采集数：" + size);
-        oneDate = twoDate;
+//        oneDate = twoDate;
     }
 
     private String requestFunctionWebService(Object[] params,
diff --git a/src/main/java/com/docus/bgts/facade/IAfCollectTaskService.java b/src/main/java/com/docus/bgts/facade/IAfCollectTaskService.java
index 0d05667..c3ddf38 100644
--- a/src/main/java/com/docus/bgts/facade/IAfCollectTaskService.java
+++ b/src/main/java/com/docus/bgts/facade/IAfCollectTaskService.java
@@ -28,7 +28,7 @@ public interface IAfCollectTaskService extends IService<AfCollectTask> {
 
     void updateInterfaceCollect(String collectSubId, int state);
 
-    List<String> listJZHByDate(Date date1,Date date2);
+    List<String> listJZHByDate(String date1,String date2);
 
     /**
      * 撤销文件功能
diff --git a/src/main/java/com/docus/bgts/mapper/AfCollectTaskMapper.java b/src/main/java/com/docus/bgts/mapper/AfCollectTaskMapper.java
index e451ca1..9d16b44 100644
--- a/src/main/java/com/docus/bgts/mapper/AfCollectTaskMapper.java
+++ b/src/main/java/com/docus/bgts/mapper/AfCollectTaskMapper.java
@@ -19,7 +19,7 @@ import java.util.List;
  */
 public interface AfCollectTaskMapper extends BaseMapper<AfCollectTask> {
 
-    List<String> listJZHByDate(@Param("date1") Date date1, @Param("date2") Date date2);
+    List<String> listJZHByDate(@Param("date1") String date1, @Param("date2") String date2);
     /**
      * 获取病案id通过报告唯一单号
      * @param empId
diff --git a/src/main/java/com/docus/bgts/service/AfCollectTaskServiceImpl.java b/src/main/java/com/docus/bgts/service/AfCollectTaskServiceImpl.java
index 779490b..6808822 100644
--- a/src/main/java/com/docus/bgts/service/AfCollectTaskServiceImpl.java
+++ b/src/main/java/com/docus/bgts/service/AfCollectTaskServiceImpl.java
@@ -124,7 +124,7 @@ public class AfCollectTaskServiceImpl extends ServiceImpl<AfCollectTaskMapper, A
     }
 
     @Override
-    public List<String> listJZHByDate(Date date1, Date date2) {
+    public List<String> listJZHByDate(String date1, String date2) {
         return afCollectTaskMapper.listJZHByDate(date1, date2);
     }
 
diff --git a/src/main/resources/mapper/AfCollectTaskMapper.xml b/src/main/resources/mapper/AfCollectTaskMapper.xml
index caa87a4..ae30d10 100644
--- a/src/main/resources/mapper/AfCollectTaskMapper.xml
+++ b/src/main/resources/mapper/AfCollectTaskMapper.xml
@@ -5,8 +5,17 @@
 <mapper namespace="com.docus.bgts.mapper.AfCollectTaskMapper">
 
     <select id="listJZHByDate" resultType="string">
-        select jzh from docus_medicalrecord.t_basic
-        where create_time >=#{date1} and create_time &lt;=#{date2} and jzh is not null and is_archive=0
+        select jzh
+        from docus_medicalrecord.t_basic a
+        where
+        a.create_time >=#{date1}
+        and a.create_time &lt;=#{date2}
+        and a.jzh is not null
+        and a.is_archive=0
+        and a.dis_dept in ('1211','1252')
+        and jzh not in
+        (select C3 from af_collect_task where sysflag=22 and state=3)
+        order by create_time asc
     </select>
 
     <select id="getpatientIdByEmpId" resultType="string">