湘雅同步数据

pom.xml

@@ -205,11 +205,11 @@
             <version>${aggregator.version}</version>
         </dependency>
 
-        <!--消息中心-->
-        <dependency>
-            <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter-stream-rabbit</artifactId>
-        </dependency>
+        <!--&lt;!&ndash;消息中心&ndash;&gt;-->
+        <!--<dependency>-->
+            <!--<groupId>org.springframework.cloud</groupId>-->
+            <!--<artifactId>spring-cloud-starter-stream-rabbit</artifactId>-->
+        <!--</dependency>-->
 
         <!-- easypoi -->
         <dependency>

src/main/java/com/diagbot/annotation/MrqcLog.java

@@ -1,15 +1,15 @@
-package com.diagbot.annotation;
-
-import java.lang.annotation.*;
-
-/**
- * @Description:日志记录
- * @Author:liuqq
- * @time: ${DATE} ${TIME}
- **/
-@Target(ElementType.METHOD)
-@Retention(RetentionPolicy.RUNTIME)
-@Documented
-public @interface MrqcLog {
-    String value() default "";
-}
+//package com.diagbot.annotation;
+//
+//import java.lang.annotation.*;
+//
+///**
+// * @Description:日志记录
+// * @Author:liuqq
+// * @time: ${DATE} ${TIME}
+// **/
+//@Target(ElementType.METHOD)
+//@Retention(RetentionPolicy.RUNTIME)
+//@Documented
+//public @interface MrqcLog {
+//    String value() default "";
+//}

src/main/java/com/diagbot/facade/BehospitalInfoFacade.java

@@ -1696,6 +1696,17 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
     //         authServiceClient.analyze_rpc(analyzeVO);
     //     }
     // }
+    //对未出院的评分
+     public void execute(TaskVO taskVO) {
+         List<BehospitalInfo> behospitalInfoList = getNoGrade(taskVO);
+         for (BehospitalInfo bean : behospitalInfoList) {
+             AnalyzeVO analyzeVO = new AnalyzeVO();
+             analyzeVO.setIsTask(true);
+             analyzeVO.setHospitalId(bean.getHospitalId());
+             analyzeVO.setBehospitalCode(bean.getBehospitalCode());
+             authServiceClient.analyze_rpc(analyzeVO);
+         }
+     }
 
     /**
      * 评分api

src/main/java/com/diagbot/facade/ViewFacade.java

@@ -90,6 +90,33 @@ public class ViewFacade {
 
     private TZDBConn tzDBConn = new TZDBConn();
 
+
+    /**
+     * 对未出院的评分
+     */
+    public void execute3() {
+        long start = System.currentTimeMillis();
+        List<BehospitalInfo> behospitalInfoList = aBehospitalInfoFacade.list(new QueryWrapper<BehospitalInfo>()
+                .eq("hospital_id", Long.valueOf("35"))
+                .eq("is_placefile","0"));
+
+        for (BehospitalInfo bean : behospitalInfoList) {
+            try {
+                AnalyzeRunVO analyzeVO = new AnalyzeRunVO();
+                analyzeVO.setHospitalId(bean.getHospitalId());
+                analyzeVO.setBehospitalCode(bean.getBehospitalCode());
+                behospitalInfoFacade.analyzeApi(analyzeVO);
+            }catch (Exception e){
+                aMedAbnormalInfoFacade.saveAbnormalInfo("定时评分失败", "", JSON.toJSONString(bean), "", e.getMessage());
+            }
+        }
+        long stop = System.currentTimeMillis();
+        aMedAbnormalInfoFacade.saveAbnormalInfo("定时评分全部完成", "", JSON.toJSONString(behospitalInfoList), "所耗时间+"+(stop-start),"");
+
+
+    }
+
+
     /**
      * 定时任务每天晚上11点拉取历史病例
      */

src/main/java/com/diagbot/facade/data/ABasDoctorInfoFacade.java

@@ -94,12 +94,14 @@ public class ABasDoctorInfoFacade extends BasDoctorInfoServiceImpl {
             try {
                 BasDoctorInfo basDoctorInfo = this.baseMapper.selectOne(new QueryWrapper<BasDoctorInfo>()
                         .eq("doctor_id", s.getDoctorId())
-                        .eq("hospital_id", s.getHospitalId()));
+                        .eq("hospital_id", s.getHospitalId())
+                        .eq("dept_id",s.getDeptId()));
                 if (basDoctorInfo != null) {
                     s.setGmtModified(new Date());
                     QueryWrapper<BasDoctorInfo> queryWrapper = new QueryWrapper<>();
                     queryWrapper.eq("doctor_id", s.getDoctorId())
-                            .eq("hospital_id", s.getHospitalId());
+                            .eq("hospital_id", s.getHospitalId())
+                            .eq("dept_id",s.getDeptId());
                     this.update(s, queryWrapper);
 //                updateE.add(s);
                 } else {

src/main/java/com/diagbot/facade/data/AHomePageFacade.java

@@ -266,7 +266,7 @@ public class AHomePageFacade extends HomePageServiceImpl{
                                 .eq("hospital_id", s.getHospitalId()), false);
                         if (behospitalInfo != null){
                             updateWrapper.eq("behospital_code",s.getBehospitalCode())
-                                    .eq("hospital_id", homePage.getHospitalId())
+                                    .eq("hospital_id", s.getHospitalId())
                                     .eq("is_deleted",IsDeleteEnum.N)
                                     .set("beh_doctor_name",behospitalDoctor)
                                     .set("doctor_name",attendingDoctor)

src/main/java/com/diagbot/facade/data/AMedicalRecordFacade.java

@@ -25,8 +25,7 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
 import java.util.*;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
+import java.util.concurrent.*;
 
 @Component
 public class AMedicalRecordFacade extends MedicalRecordServiceImpl {
@@ -312,30 +311,7 @@ public class AMedicalRecordFacade extends MedicalRecordServiceImpl {
             }else {
                 respDto.put("ret","0");respDto.put("mag","true");
             }
-
-//            aMedAbnormalInfoFacade.saveAbnormalInfo("文书信息入參", behospitalCode, JSON.toJSONString(aMrContentVO), JSON.toJSONString(respDto), "");
-            //异步调用评分接口
-            ExecutorService executorService = Executors.newCachedThreadPool();
-            executorService.execute(() -> {
-                try {
-                    //保存完数据后评分
-                    AnalyzeRunVO analyzeRunVO = new AnalyzeRunVO();
-                    analyzeRunVO.setHospitalId(Long.valueOf("35"));
-                    analyzeRunVO.setBehospitalCode(behospitalCode);
-                    behospitalInfoFacade.analyzeApi(analyzeRunVO);
-                } catch (Exception e) {
-                    aMedAbnormalInfoFacade.saveAbnormalInfo("保存文书后评分失败", behospitalCode, "", JSON.toJSONString(aMrContentVO), e.getMessage());
-                }
-            });
-
-
             return respDto;
-
-
-//            //数据解析,评分规则等还未完整时不解析
-//            if(xmlAnalyseFlag){
-//                splicingParam(aMrContentVO);
-//            }
 //            //评分后返回结构体
 //            return mrIng(aMrContentVO);
 
@@ -626,4 +602,7 @@ public class AMedicalRecordFacade extends MedicalRecordServiceImpl {
         }
     }
 
+
+
+
 }

src/main/java/com/diagbot/rabbit/MyProcessor.java

@@ -1,23 +1,23 @@
-package com.diagbot.rabbit;
-
-import org.springframework.cloud.stream.annotation.Input;
-import org.springframework.cloud.stream.annotation.Output;
-import org.springframework.messaging.MessageChannel;
-import org.springframework.messaging.SubscribableChannel;
-
-/**
- * @Description: 自定义Stream发布和消费对象
- * @author: gaodm
- * @time: 2018/8/29 13:39
- */
-public interface MyProcessor {
-
-    String INPUT_MrqcLog = "inputMrqcLog";
-    String OUTPUT_MrqcLog= "outputMrqcLog";
-
-    @Input(INPUT_MrqcLog)
-    SubscribableChannel inputMrqcLog();
-    @Output(OUTPUT_MrqcLog)
-    MessageChannel outputMrqcLog();
-
-}
+//package com.diagbot.rabbit;
+//
+//import org.springframework.cloud.stream.annotation.Input;
+//import org.springframework.cloud.stream.annotation.Output;
+//import org.springframework.messaging.MessageChannel;
+//import org.springframework.messaging.SubscribableChannel;
+//
+///**
+// * @Description: 自定义Stream发布和消费对象
+// * @author: gaodm
+// * @time: 2018/8/29 13:39
+// */
+//public interface MyProcessor {
+//
+//    String INPUT_MrqcLog = "inputMrqcLog";
+//    String OUTPUT_MrqcLog= "outputMrqcLog";
+//
+//    @Input(INPUT_MrqcLog)
+//    SubscribableChannel inputMrqcLog();
+//    @Output(OUTPUT_MrqcLog)
+//    MessageChannel outputMrqcLog();
+//
+//}

src/main/java/com/diagbot/task/BasDeptInfoTask.java

@@ -1,69 +1,69 @@
-package com.diagbot.task;
-
-import java.time.LocalDateTime;
-import java.util.Date;
-
-import com.diagbot.facade.data.ABasDeptInfoFacade;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.scheduling.Trigger;
-import org.springframework.scheduling.TriggerContext;
-import org.springframework.scheduling.annotation.EnableScheduling;
-import org.springframework.scheduling.annotation.SchedulingConfigurer;
-import org.springframework.scheduling.config.ScheduledTaskRegistrar;
-import org.springframework.scheduling.support.CronTrigger;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.diagbot.entity.SysTaskCron;
-import com.diagbot.enums.IsDeleteEnum;
-import com.diagbot.facade.SysTaskCronFacade;
-import com.diagbot.util.StringUtil;
-
-import lombok.extern.slf4j.Slf4j;
-
-@Configuration      //1.主要用于标记配置类，兼备Component的效果。
-@EnableScheduling   // 2.开启定时任务
-@Slf4j
-public class BasDeptInfoTask implements SchedulingConfigurer{
-
-	@Autowired
-    private SysTaskCronFacade sysTaskCronFacade;
-
-    private SysTaskCron task001 = new SysTaskCron();
-
-    @Autowired
-	private ABasDeptInfoFacade aBasDeptInfoFacade;
-    
-    /**
-     * 执行定时任务.
-     */
-    @Override
-    public void configureTasks(ScheduledTaskRegistrar taskRegistrar) {
-        taskRegistrar.addTriggerTask(new Runnable() {
-            @Override
-            public void run() {
-                //1.添加任务内容(Runnable)
-                if (null != task001
-                        && task001.getIsDeleted().equals(IsDeleteEnum.N.getKey())
-                        && task001.getIsUsed().equals(1)) {
-                    log.info("执行动态定时任务: " + LocalDateTime.now().toLocalTime());
-                    //aBasDeptInfoFacade.executeDept();
-                }
-            }
-        }, new Trigger() {
-            @Override
-            public Date nextExecutionTime(TriggerContext triggerContext) {
-                //2.1 从数据库获取执行周期
-                task001 = sysTaskCronFacade.getOne(new QueryWrapper<SysTaskCron>()
-                        .eq("cron_code", "TASK011"), false);
-                String cron = "0 0/1 * * * ?";
-                //2.2 合法性校验.
-                if (null != task001 && StringUtil.isNotBlank(task001.getCron())) {
-                    cron = task001.getCron();
-                }
-                CronTrigger trigger = new CronTrigger(cron);
-                return trigger.nextExecutionTime(triggerContext);
-            }
-        });
-    }
-}
+//package com.diagbot.task;
+//
+//import java.time.LocalDateTime;
+//import java.util.Date;
+//
+//import com.diagbot.facade.data.ABasDeptInfoFacade;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.context.annotation.Configuration;
+//import org.springframework.scheduling.Trigger;
+//import org.springframework.scheduling.TriggerContext;
+//import org.springframework.scheduling.annotation.EnableScheduling;
+//import org.springframework.scheduling.annotation.SchedulingConfigurer;
+//import org.springframework.scheduling.config.ScheduledTaskRegistrar;
+//import org.springframework.scheduling.support.CronTrigger;
+//
+//import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+//import com.diagbot.entity.SysTaskCron;
+//import com.diagbot.enums.IsDeleteEnum;
+//import com.diagbot.facade.SysTaskCronFacade;
+//import com.diagbot.util.StringUtil;
+//
+//import lombok.extern.slf4j.Slf4j;
+//
+//@Configuration      //1.主要用于标记配置类，兼备Component的效果。
+////@EnableScheduling   // 2.开启定时任务
+//@Slf4j
+//public class BasDeptInfoTask implements SchedulingConfigurer{
+//
+//	@Autowired
+//    private SysTaskCronFacade sysTaskCronFacade;
+//
+//    private SysTaskCron task001 = new SysTaskCron();
+//
+//    @Autowired
+//	private ABasDeptInfoFacade aBasDeptInfoFacade;
+//
+//    /**
+//     * 执行定时任务.
+//     */
+//    @Override
+//    public void configureTasks(ScheduledTaskRegistrar taskRegistrar) {
+//        taskRegistrar.addTriggerTask(new Runnable() {
+//            @Override
+//            public void run() {
+//                //1.添加任务内容(Runnable)
+//                if (null != task001
+//                        && task001.getIsDeleted().equals(IsDeleteEnum.N.getKey())
+//                        && task001.getIsUsed().equals(1)) {
+//                    log.info("执行动态定时任务: " + LocalDateTime.now().toLocalTime());
+//                    //aBasDeptInfoFacade.executeDept();
+//                }
+//            }
+//        }, new Trigger() {
+//            @Override
+//            public Date nextExecutionTime(TriggerContext triggerContext) {
+//                //2.1 从数据库获取执行周期
+//                task001 = sysTaskCronFacade.getOne(new QueryWrapper<SysTaskCron>()
+//                        .eq("cron_code", "TASK011"), false);
+//                String cron = "0 0/1 * * * ?";
+//                //2.2 合法性校验.
+//                if (null != task001 && StringUtil.isNotBlank(task001.getCron())) {
+//                    cron = task001.getCron();
+//                }
+//                CronTrigger trigger = new CronTrigger(cron);
+//                return trigger.nextExecutionTime(triggerContext);
+//            }
+//        });
+//    }
+//}

src/main/java/com/diagbot/task/BasDoctorInfoTask.java

@@ -1,68 +1,68 @@
-package com.diagbot.task;
-
-import java.time.LocalDateTime;
-import java.util.Date;
-
-import com.diagbot.facade.data.ABasDoctorInfoFacade;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.scheduling.Trigger;
-import org.springframework.scheduling.TriggerContext;
-import org.springframework.scheduling.annotation.EnableScheduling;
-import org.springframework.scheduling.annotation.SchedulingConfigurer;
-import org.springframework.scheduling.config.ScheduledTaskRegistrar;
-import org.springframework.scheduling.support.CronTrigger;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.diagbot.entity.SysTaskCron;
-import com.diagbot.enums.IsDeleteEnum;
-import com.diagbot.facade.SysTaskCronFacade;
-import com.diagbot.util.StringUtil;
-
-import lombok.extern.slf4j.Slf4j;
-
-@Configuration      //1.主要用于标记配置类，兼备Component的效果。
-@EnableScheduling   // 2.开启定时任务
-@Slf4j
-public class BasDoctorInfoTask implements SchedulingConfigurer{
-	@Autowired
-    private SysTaskCronFacade sysTaskCronFacade;
-
-    private SysTaskCron task001 = new SysTaskCron();
-
-    @Autowired
-	private ABasDoctorInfoFacade aBasDoctorInfoFacade;
-    
-    /**
-     * 执行定时任务.
-     */
-    @Override
-    public void configureTasks(ScheduledTaskRegistrar taskRegistrar) {
-        taskRegistrar.addTriggerTask(new Runnable() {
-            @Override
-            public void run() {
-                //1.添加任务内容(Runnable)
-                if (null != task001
-                        && task001.getIsDeleted().equals(IsDeleteEnum.N.getKey())
-                        && task001.getIsUsed().equals(1)) {
-                    log.info("执行动态定时任务: " + LocalDateTime.now().toLocalTime());
-                    //aBasDoctorInfoFacade.executeDoctor();
-                }
-            }
-        }, new Trigger() {
-            @Override
-            public Date nextExecutionTime(TriggerContext triggerContext) {
-                //2.1 从数据库获取执行周期
-                task001 = sysTaskCronFacade.getOne(new QueryWrapper<SysTaskCron>()
-                        .eq("cron_code", "TASK010"), false);
-                String cron = "0 0/1 * * * ?";
-                //2.2 合法性校验.
-                if (null != task001 && StringUtil.isNotBlank(task001.getCron())) {
-                    cron = task001.getCron();
-                }
-                CronTrigger trigger = new CronTrigger(cron);
-                return trigger.nextExecutionTime(triggerContext);
-            }
-        });
-    }
-}
+//package com.diagbot.task;
+//
+//import java.time.LocalDateTime;
+//import java.util.Date;
+//
+//import com.diagbot.facade.data.ABasDoctorInfoFacade;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.context.annotation.Configuration;
+//import org.springframework.scheduling.Trigger;
+//import org.springframework.scheduling.TriggerContext;
+//import org.springframework.scheduling.annotation.EnableScheduling;
+//import org.springframework.scheduling.annotation.SchedulingConfigurer;
+//import org.springframework.scheduling.config.ScheduledTaskRegistrar;
+//import org.springframework.scheduling.support.CronTrigger;
+//
+//import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+//import com.diagbot.entity.SysTaskCron;
+//import com.diagbot.enums.IsDeleteEnum;
+//import com.diagbot.facade.SysTaskCronFacade;
+//import com.diagbot.util.StringUtil;
+//
+//import lombok.extern.slf4j.Slf4j;
+//
+//@Configuration      //1.主要用于标记配置类，兼备Component的效果。
+////@EnableScheduling   // 2.开启定时任务
+//@Slf4j
+//public class BasDoctorInfoTask implements SchedulingConfigurer{
+//	@Autowired
+//    private SysTaskCronFacade sysTaskCronFacade;
+//
+//    private SysTaskCron task001 = new SysTaskCron();
+//
+//    @Autowired
+//	private ABasDoctorInfoFacade aBasDoctorInfoFacade;
+//
+//    /**
+//     * 执行定时任务.
+//     */
+//    @Override
+//    public void configureTasks(ScheduledTaskRegistrar taskRegistrar) {
+//        taskRegistrar.addTriggerTask(new Runnable() {
+//            @Override
+//            public void run() {
+//                //1.添加任务内容(Runnable)
+//                if (null != task001
+//                        && task001.getIsDeleted().equals(IsDeleteEnum.N.getKey())
+//                        && task001.getIsUsed().equals(1)) {
+//                    log.info("执行动态定时任务: " + LocalDateTime.now().toLocalTime());
+//                    //aBasDoctorInfoFacade.executeDoctor();
+//                }
+//            }
+//        }, new Trigger() {
+//            @Override
+//            public Date nextExecutionTime(TriggerContext triggerContext) {
+//                //2.1 从数据库获取执行周期
+//                task001 = sysTaskCronFacade.getOne(new QueryWrapper<SysTaskCron>()
+//                        .eq("cron_code", "TASK010"), false);
+//                String cron = "0 0/1 * * * ?";
+//                //2.2 合法性校验.
+//                if (null != task001 && StringUtil.isNotBlank(task001.getCron())) {
+//                    cron = task001.getCron();
+//                }
+//                CronTrigger trigger = new CronTrigger(cron);
+//                return trigger.nextExecutionTime(triggerContext);
+//            }
+//        });
+//    }
+//}

src/main/java/com/diagbot/task/BehospitalInfoAnalyzeTask.java

@@ -1,76 +1,76 @@
-package com.diagbot.task;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.diagbot.entity.SysTaskCron;
-import com.diagbot.enums.IsDeleteEnum;
-import com.diagbot.facade.BehospitalInfoFacade;
-import com.diagbot.facade.SysTaskCronFacade;
-import com.diagbot.util.StringUtil;
-import com.diagbot.vo.TaskVO;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.scheduling.Trigger;
-import org.springframework.scheduling.TriggerContext;
-import org.springframework.scheduling.annotation.EnableScheduling;
-import org.springframework.scheduling.annotation.SchedulingConfigurer;
-import org.springframework.scheduling.config.ScheduledTaskRegistrar;
-import org.springframework.scheduling.support.CronTrigger;
-
-import java.time.LocalDateTime;
-import java.util.Date;
-
-/**
- * @Description:
- * @author: gaodm
- * @time: 2020/4/15 17:45
- */
-@Configuration      //1.主要用于标记配置类，兼备Component的效果。
-@EnableScheduling   // 2.开启定时任务
-@Slf4j
-public class BehospitalInfoAnalyzeTask implements SchedulingConfigurer {
-    @Autowired
-    private SysTaskCronFacade sysTaskCronFacade;
-
-    private SysTaskCron task001 = new SysTaskCron();
-
-    private String param = "";
-
-    @Autowired
-    private BehospitalInfoFacade behospitalInfoFacade;
-
-    /**
-     * 执行定时任务.
-     */
-    @Override
-    public void configureTasks(ScheduledTaskRegistrar taskRegistrar) {
-        taskRegistrar.addTriggerTask(new Runnable() {
-            @Override
-            public void run() {
-                //1.添加任务内容(Runnable)
-                if (null != task001
-                        && task001.getIsDeleted().equals(IsDeleteEnum.N.getKey())
-                        && task001.getIsUsed().equals(1)) {
-                    log.info("执行动态定时任务: " + LocalDateTime.now().toLocalTime());
-                    TaskVO taskVO = new TaskVO();
-                    behospitalInfoFacade.execute(taskVO, param);
-                }
-            }
-        }, new Trigger() {
-            @Override
-            public Date nextExecutionTime(TriggerContext triggerContext) {
-                //2.1 从数据库获取执行周期
-                task001 = sysTaskCronFacade.getOne(new QueryWrapper<SysTaskCron>()
-                        .eq("cron_code", "TASK001"), false);
-                String cron = "0/5 * * * * ?";
-                //2.2 合法性校验.
-                if (null != task001 && StringUtil.isNotBlank(task001.getCron())) {
-                    cron = task001.getCron();
-                    param = task001.getParam();
-                }
-                CronTrigger trigger = new CronTrigger(cron);
-                return trigger.nextExecutionTime(triggerContext);
-            }
-        });
-    }
-}
+//package com.diagbot.task;
+//
+//import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+//import com.diagbot.entity.SysTaskCron;
+//import com.diagbot.enums.IsDeleteEnum;
+//import com.diagbot.facade.BehospitalInfoFacade;
+//import com.diagbot.facade.SysTaskCronFacade;
+//import com.diagbot.util.StringUtil;
+//import com.diagbot.vo.TaskVO;
+//import lombok.extern.slf4j.Slf4j;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.context.annotation.Configuration;
+//import org.springframework.scheduling.Trigger;
+//import org.springframework.scheduling.TriggerContext;
+//import org.springframework.scheduling.annotation.EnableScheduling;
+//import org.springframework.scheduling.annotation.SchedulingConfigurer;
+//import org.springframework.scheduling.config.ScheduledTaskRegistrar;
+//import org.springframework.scheduling.support.CronTrigger;
+//
+//import java.time.LocalDateTime;
+//import java.util.Date;
+//
+///**
+// * @Description:
+// * @author: gaodm
+// * @time: 2020/4/15 17:45
+// */
+//@Configuration      //1.主要用于标记配置类，兼备Component的效果。
+////@EnableScheduling   // 2.开启定时任务
+//@Slf4j
+//public class BehospitalInfoAnalyzeTask implements SchedulingConfigurer {
+//    @Autowired
+//    private SysTaskCronFacade sysTaskCronFacade;
+//
+//    private SysTaskCron task001 = new SysTaskCron();
+//
+//    private String param = "";
+//
+//    @Autowired
+//    private BehospitalInfoFacade behospitalInfoFacade;
+//
+//    /**
+//     * 执行定时任务.
+//     */
+//    @Override
+//    public void configureTasks(ScheduledTaskRegistrar taskRegistrar) {
+//        taskRegistrar.addTriggerTask(new Runnable() {
+//            @Override
+//            public void run() {
+//                //1.添加任务内容(Runnable)
+//                if (null != task001
+//                        && task001.getIsDeleted().equals(IsDeleteEnum.N.getKey())
+//                        && task001.getIsUsed().equals(1)) {
+//                    log.info("执行动态定时任务: " + LocalDateTime.now().toLocalTime());
+//                    TaskVO taskVO = new TaskVO();
+//                    behospitalInfoFacade.execute(taskVO, param);
+//                }
+//            }
+//        }, new Trigger() {
+//            @Override
+//            public Date nextExecutionTime(TriggerContext triggerContext) {
+//                //2.1 从数据库获取执行周期
+//                task001 = sysTaskCronFacade.getOne(new QueryWrapper<SysTaskCron>()
+//                        .eq("cron_code", "TASK001"), false);
+//                String cron = "0/5 * * * * ?";
+//                //2.2 合法性校验.
+//                if (null != task001 && StringUtil.isNotBlank(task001.getCron())) {
+//                    cron = task001.getCron();
+//                    param = task001.getParam();
+//                }
+//                CronTrigger trigger = new CronTrigger(cron);
+//                return trigger.nextExecutionTime(triggerContext);
+//            }
+//        });
+//    }
+//}

src/main/java/com/diagbot/task/BehospitalInfoTask.java

@@ -1,68 +1,68 @@
-package com.diagbot.task;
-
-import java.time.LocalDateTime;
-import java.util.Date;
-
-import com.diagbot.facade.data.ABehospitalInfoFacade;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.scheduling.Trigger;
-import org.springframework.scheduling.TriggerContext;
-import org.springframework.scheduling.annotation.EnableScheduling;
-import org.springframework.scheduling.annotation.SchedulingConfigurer;
-import org.springframework.scheduling.config.ScheduledTaskRegistrar;
-import org.springframework.scheduling.support.CronTrigger;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.diagbot.entity.SysTaskCron;
-import com.diagbot.enums.IsDeleteEnum;
-import com.diagbot.facade.SysTaskCronFacade;
-import com.diagbot.util.StringUtil;
-
-import lombok.extern.slf4j.Slf4j;
-
-@Configuration      //1.主要用于标记配置类，兼备Component的效果。
-@EnableScheduling   // 2.开启定时任务
-@Slf4j
-public class BehospitalInfoTask implements SchedulingConfigurer{
-	@Autowired
-    private SysTaskCronFacade sysTaskCronFacade;
-
-    private SysTaskCron task001 = new SysTaskCron();
-
-    @Autowired
-	private ABehospitalInfoFacade aBehospitalInfoFacade;
-
-    /**
-     * 执行定时任务.
-     */
-    @Override
-    public void configureTasks(ScheduledTaskRegistrar taskRegistrar) {
-        taskRegistrar.addTriggerTask(new Runnable() {
-            @Override
-            public void run() {
-                //1.添加任务内容(Runnable)
-                if (null != task001
-                        && task001.getIsDeleted().equals(IsDeleteEnum.N.getKey())
-                        && task001.getIsUsed().equals(1)) {
-                    log.info("执行动态定时任务: " + LocalDateTime.now().toLocalTime());
-                    //aBehospitalInfoFacade.executeBehospital();
-                }
-            }
-        }, new Trigger() {
-            @Override
-            public Date nextExecutionTime(TriggerContext triggerContext) {
-                //2.1 从数据库获取执行周期
-                task001 = sysTaskCronFacade.getOne(new QueryWrapper<SysTaskCron>()
-                        .eq("cron_code", "TASK008"), false);
-                String cron = "0 0/1 * * * ?";
-                //2.2 合法性校验.
-                if (null != task001 && StringUtil.isNotBlank(task001.getCron())) {
-                    cron = task001.getCron();
-                }
-                CronTrigger trigger = new CronTrigger(cron);
-                return trigger.nextExecutionTime(triggerContext);
-            }
-        });
-    }
-}
+//package com.diagbot.task;
+//
+//import java.time.LocalDateTime;
+//import java.util.Date;
+//
+//import com.diagbot.facade.data.ABehospitalInfoFacade;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.context.annotation.Configuration;
+//import org.springframework.scheduling.Trigger;
+//import org.springframework.scheduling.TriggerContext;
+//import org.springframework.scheduling.annotation.EnableScheduling;
+//import org.springframework.scheduling.annotation.SchedulingConfigurer;
+//import org.springframework.scheduling.config.ScheduledTaskRegistrar;
+//import org.springframework.scheduling.support.CronTrigger;
+//
+//import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+//import com.diagbot.entity.SysTaskCron;
+//import com.diagbot.enums.IsDeleteEnum;
+//import com.diagbot.facade.SysTaskCronFacade;
+//import com.diagbot.util.StringUtil;
+//
+//import lombok.extern.slf4j.Slf4j;
+//
+//@Configuration      //1.主要用于标记配置类，兼备Component的效果。
+////@EnableScheduling   // 2.开启定时任务
+//@Slf4j
+//public class BehospitalInfoTask implements SchedulingConfigurer{
+//	@Autowired
+//    private SysTaskCronFacade sysTaskCronFacade;
+//
+//    private SysTaskCron task001 = new SysTaskCron();
+//
+//    @Autowired
+//	private ABehospitalInfoFacade aBehospitalInfoFacade;
+//
+//    /**
+//     * 执行定时任务.
+//     */
+//    @Override
+//    public void configureTasks(ScheduledTaskRegistrar taskRegistrar) {
+//        taskRegistrar.addTriggerTask(new Runnable() {
+//            @Override
+//            public void run() {
+//                //1.添加任务内容(Runnable)
+//                if (null != task001
+//                        && task001.getIsDeleted().equals(IsDeleteEnum.N.getKey())
+//                        && task001.getIsUsed().equals(1)) {
+//                    log.info("执行动态定时任务: " + LocalDateTime.now().toLocalTime());
+//                    //aBehospitalInfoFacade.executeBehospital();
+//                }
+//            }
+//        }, new Trigger() {
+//            @Override
+//            public Date nextExecutionTime(TriggerContext triggerContext) {
+//                //2.1 从数据库获取执行周期
+//                task001 = sysTaskCronFacade.getOne(new QueryWrapper<SysTaskCron>()
+//                        .eq("cron_code", "TASK008"), false);
+//                String cron = "0 0/1 * * * ?";
+//                //2.2 合法性校验.
+//                if (null != task001 && StringUtil.isNotBlank(task001.getCron())) {
+//                    cron = task001.getCron();
+//                }
+//                CronTrigger trigger = new CronTrigger(cron);
+//                return trigger.nextExecutionTime(triggerContext);
+//            }
+//        });
+//    }
+//}

src/main/java/com/diagbot/task/DoctorAdviceTask.java

@@ -1,69 +1,69 @@
-package com.diagbot.task;
-
-import java.time.LocalDateTime;
-import java.util.Date;
-
-import com.diagbot.facade.data.ADoctorAdviceFacade;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.scheduling.Trigger;
-import org.springframework.scheduling.TriggerContext;
-import org.springframework.scheduling.annotation.EnableScheduling;
-import org.springframework.scheduling.annotation.SchedulingConfigurer;
-import org.springframework.scheduling.config.ScheduledTaskRegistrar;
-import org.springframework.scheduling.support.CronTrigger;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.diagbot.entity.SysTaskCron;
-import com.diagbot.enums.IsDeleteEnum;
-import com.diagbot.facade.SysTaskCronFacade;
-import com.diagbot.util.StringUtil;
-
-import lombok.extern.slf4j.Slf4j;
-
-@Configuration      //1.主要用于标记配置类，兼备Component的效果。
-@EnableScheduling   // 2.开启定时任务
-@Slf4j
-public class DoctorAdviceTask implements SchedulingConfigurer{
-
-	@Autowired
-    private SysTaskCronFacade sysTaskCronFacade;
-
-    private SysTaskCron task001 = new SysTaskCron();
-
-    @Autowired
-	private ADoctorAdviceFacade aDoctorAdviceFacade;
-    
-    /**
-     * 执行定时任务.
-     */
-    @Override
-    public void configureTasks(ScheduledTaskRegistrar taskRegistrar) {
-        taskRegistrar.addTriggerTask(new Runnable() {
-            @Override
-            public void run() {
-                //1.添加任务内容(Runnable)
-                if (null != task001
-                        && task001.getIsDeleted().equals(IsDeleteEnum.N.getKey())
-                        && task001.getIsUsed().equals(1)) {
-                    log.info("执行动态定时任务: " + LocalDateTime.now().toLocalTime());
-                    //aDoctorAdviceFacade.executeDoctorAdvice();
-                }
-            }
-        }, new Trigger() {
-            @Override
-            public Date nextExecutionTime(TriggerContext triggerContext) {
-                //2.1 从数据库获取执行周期
-                task001 = sysTaskCronFacade.getOne(new QueryWrapper<SysTaskCron>()
-                        .eq("cron_code", "TASK009"), false);
-                String cron = "0 0/1 * * * ?";
-                //2.2 合法性校验.
-                if (null != task001 && StringUtil.isNotBlank(task001.getCron())) {
-                    cron = task001.getCron();
-                }
-                CronTrigger trigger = new CronTrigger(cron);
-                return trigger.nextExecutionTime(triggerContext);
-            }
-        });
-    }
-}
+//package com.diagbot.task;
+//
+//import java.time.LocalDateTime;
+//import java.util.Date;
+//
+//import com.diagbot.facade.data.ADoctorAdviceFacade;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.context.annotation.Configuration;
+//import org.springframework.scheduling.Trigger;
+//import org.springframework.scheduling.TriggerContext;
+//import org.springframework.scheduling.annotation.EnableScheduling;
+//import org.springframework.scheduling.annotation.SchedulingConfigurer;
+//import org.springframework.scheduling.config.ScheduledTaskRegistrar;
+//import org.springframework.scheduling.support.CronTrigger;
+//
+//import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+//import com.diagbot.entity.SysTaskCron;
+//import com.diagbot.enums.IsDeleteEnum;
+//import com.diagbot.facade.SysTaskCronFacade;
+//import com.diagbot.util.StringUtil;
+//
+//import lombok.extern.slf4j.Slf4j;
+//
+//@Configuration      //1.主要用于标记配置类，兼备Component的效果。
+////@EnableScheduling   // 2.开启定时任务
+//@Slf4j
+//public class DoctorAdviceTask implements SchedulingConfigurer{
+//
+//	@Autowired
+//    private SysTaskCronFacade sysTaskCronFacade;
+//
+//    private SysTaskCron task001 = new SysTaskCron();
+//
+//    @Autowired
+//	private ADoctorAdviceFacade aDoctorAdviceFacade;
+//
+//    /**
+//     * 执行定时任务.
+//     */
+//    @Override
+//    public void configureTasks(ScheduledTaskRegistrar taskRegistrar) {
+//        taskRegistrar.addTriggerTask(new Runnable() {
+//            @Override
+//            public void run() {
+//                //1.添加任务内容(Runnable)
+//                if (null != task001
+//                        && task001.getIsDeleted().equals(IsDeleteEnum.N.getKey())
+//                        && task001.getIsUsed().equals(1)) {
+//                    log.info("执行动态定时任务: " + LocalDateTime.now().toLocalTime());
+//                    //aDoctorAdviceFacade.executeDoctorAdvice();
+//                }
+//            }
+//        }, new Trigger() {
+//            @Override
+//            public Date nextExecutionTime(TriggerContext triggerContext) {
+//                //2.1 从数据库获取执行周期
+//                task001 = sysTaskCronFacade.getOne(new QueryWrapper<SysTaskCron>()
+//                        .eq("cron_code", "TASK009"), false);
+//                String cron = "0 0/1 * * * ?";
+//                //2.2 合法性校验.
+//                if (null != task001 && StringUtil.isNotBlank(task001.getCron())) {
+//                    cron = task001.getCron();
+//                }
+//                CronTrigger trigger = new CronTrigger(cron);
+//                return trigger.nextExecutionTime(triggerContext);
+//            }
+//        });
+//    }
+//}

src/main/java/com/diagbot/task/HomeDiagnoseInfoTask.java

@@ -1,66 +1,66 @@
-package com.diagbot.task;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.diagbot.entity.SysTaskCron;
-import com.diagbot.enums.IsDeleteEnum;
-import com.diagbot.facade.SysTaskCronFacade;
-import com.diagbot.facade.data.AHomeDiagnoseInfoFacade;
-import com.diagbot.util.StringUtil;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.scheduling.Trigger;
-import org.springframework.scheduling.TriggerContext;
-import org.springframework.scheduling.annotation.EnableScheduling;
-import org.springframework.scheduling.annotation.SchedulingConfigurer;
-import org.springframework.scheduling.config.ScheduledTaskRegistrar;
-import org.springframework.scheduling.support.CronTrigger;
-
-import java.time.LocalDateTime;
-import java.util.Date;
-
-@Configuration      //1.主要用于标记配置类，兼备Component的效果。
-@EnableScheduling   // 2.开启定时任务
-@Slf4j
-public class HomeDiagnoseInfoTask implements SchedulingConfigurer {
-    @Autowired
-    private SysTaskCronFacade sysTaskCronFacade;
-
-    private SysTaskCron task001 = new SysTaskCron();
-
-    @Autowired
-    private AHomeDiagnoseInfoFacade aHomeDiagnoseInfoFacade;
-
-    /**
-     * 执行定时任务.
-     */
-    @Override
-    public void configureTasks(ScheduledTaskRegistrar taskRegistrar) {
-        taskRegistrar.addTriggerTask(new Runnable() {
-            @Override
-            public void run() {
-                //1.添加任务内容(Runnable)
-                if (null != task001
-                        && task001.getIsDeleted().equals(IsDeleteEnum.N.getKey())
-                        && task001.getIsUsed().equals(1)) {
-                    log.info("执行动态定时任务: " + LocalDateTime.now().toLocalTime());
-                    //aHomeDiagnoseInfoFacade.executeHomeDiagnose();
-                }
-            }
-        }, new Trigger() {
-            @Override
-            public Date nextExecutionTime(TriggerContext triggerContext) {
-                //2.1 从数据库获取执行周期
-                task001 = sysTaskCronFacade.getOne(new QueryWrapper<SysTaskCron>()
-                        .eq("cron_code", "TASK003"), false);
-                String cron = "0 0/1 * * * ?";
-                //2.2 合法性校验.
-                if (null != task001 && StringUtil.isNotBlank(task001.getCron())) {
-                    cron = task001.getCron();
-                }
-                CronTrigger trigger = new CronTrigger(cron);
-                return trigger.nextExecutionTime(triggerContext);
-            }
-        });
-    }
-}
+//package com.diagbot.task;
+//
+//import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+//import com.diagbot.entity.SysTaskCron;
+//import com.diagbot.enums.IsDeleteEnum;
+//import com.diagbot.facade.SysTaskCronFacade;
+//import com.diagbot.facade.data.AHomeDiagnoseInfoFacade;
+//import com.diagbot.util.StringUtil;
+//import lombok.extern.slf4j.Slf4j;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.context.annotation.Configuration;
+//import org.springframework.scheduling.Trigger;
+//import org.springframework.scheduling.TriggerContext;
+//import org.springframework.scheduling.annotation.EnableScheduling;
+//import org.springframework.scheduling.annotation.SchedulingConfigurer;
+//import org.springframework.scheduling.config.ScheduledTaskRegistrar;
+//import org.springframework.scheduling.support.CronTrigger;
+//
+//import java.time.LocalDateTime;
+//import java.util.Date;
+//
+//@Configuration      //1.主要用于标记配置类，兼备Component的效果。
+////@EnableScheduling   // 2.开启定时任务
+//@Slf4j
+//public class HomeDiagnoseInfoTask implements SchedulingConfigurer {
+//    @Autowired
+//    private SysTaskCronFacade sysTaskCronFacade;
+//
+//    private SysTaskCron task001 = new SysTaskCron();
+//
+//    @Autowired
+//    private AHomeDiagnoseInfoFacade aHomeDiagnoseInfoFacade;
+//
+//    /**
+//     * 执行定时任务.
+//     */
+//    @Override
+//    public void configureTasks(ScheduledTaskRegistrar taskRegistrar) {
+//        taskRegistrar.addTriggerTask(new Runnable() {
+//            @Override
+//            public void run() {
+//                //1.添加任务内容(Runnable)
+//                if (null != task001
+//                        && task001.getIsDeleted().equals(IsDeleteEnum.N.getKey())
+//                        && task001.getIsUsed().equals(1)) {
+//                    log.info("执行动态定时任务: " + LocalDateTime.now().toLocalTime());
+//                    //aHomeDiagnoseInfoFacade.executeHomeDiagnose();
+//                }
+//            }
+//        }, new Trigger() {
+//            @Override
+//            public Date nextExecutionTime(TriggerContext triggerContext) {
+//                //2.1 从数据库获取执行周期
+//                task001 = sysTaskCronFacade.getOne(new QueryWrapper<SysTaskCron>()
+//                        .eq("cron_code", "TASK003"), false);
+//                String cron = "0 0/1 * * * ?";
+//                //2.2 合法性校验.
+//                if (null != task001 && StringUtil.isNotBlank(task001.getCron())) {
+//                    cron = task001.getCron();
+//                }
+//                CronTrigger trigger = new CronTrigger(cron);
+//                return trigger.nextExecutionTime(triggerContext);
+//            }
+//        });
+//    }
+//}

src/main/java/com/diagbot/task/HomeOperationInfoTask.java

@@ -1,69 +1,69 @@
-package com.diagbot.task;
-
-import java.time.LocalDateTime;
-import java.util.Date;
-
-import com.diagbot.facade.*;
-import com.diagbot.facade.data.AHomeOperationInfoFacade;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.scheduling.Trigger;
-import org.springframework.scheduling.TriggerContext;
-import org.springframework.scheduling.annotation.EnableScheduling;
-import org.springframework.scheduling.annotation.SchedulingConfigurer;
-import org.springframework.scheduling.config.ScheduledTaskRegistrar;
-import org.springframework.scheduling.support.CronTrigger;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.diagbot.entity.SysTaskCron;
-import com.diagbot.enums.IsDeleteEnum;
-import com.diagbot.util.StringUtil;
-
-import lombok.extern.slf4j.Slf4j;
-
-@Configuration      //1.主要用于标记配置类，兼备Component的效果。
-@EnableScheduling   // 2.开启定时任务
-@Slf4j
-public class HomeOperationInfoTask implements SchedulingConfigurer{
-
-	@Autowired
-    private SysTaskCronFacade sysTaskCronFacade;
-
-    private SysTaskCron task001 = new SysTaskCron();
-
-    @Autowired
-   	private AHomeOperationInfoFacade aHomeOperationInfoFacade;
-    
-    /**
-     * 执行定时任务.
-     */
-    @Override
-    public void configureTasks(ScheduledTaskRegistrar taskRegistrar) {
-        taskRegistrar.addTriggerTask(new Runnable() {
-            @Override
-            public void run() {
-                //1.添加任务内容(Runnable)
-                if (null != task001
-                        && task001.getIsDeleted().equals(IsDeleteEnum.N.getKey())
-                        && task001.getIsUsed().equals(1)) {
-                    log.info("执行动态定时任务: " + LocalDateTime.now().toLocalTime());
-                    //aHomeOperationInfoFacade.executeHomeOperation();
-                }
-            }
-        }, new Trigger() {
-            @Override
-            public Date nextExecutionTime(TriggerContext triggerContext) {
-                //2.1 从数据库获取执行周期
-                task001 = sysTaskCronFacade.getOne(new QueryWrapper<SysTaskCron>()
-                        .eq("cron_code", "TASK004"), false);
-                String cron = "0 0/1 * * * ?";
-                //2.2 合法性校验.
-                if (null != task001 && StringUtil.isNotBlank(task001.getCron())) {
-                    cron = task001.getCron();
-                }
-                CronTrigger trigger = new CronTrigger(cron);
-                return trigger.nextExecutionTime(triggerContext);
-            }
-        });
-    }
-}
+//package com.diagbot.task;
+//
+//import java.time.LocalDateTime;
+//import java.util.Date;
+//
+//import com.diagbot.facade.*;
+//import com.diagbot.facade.data.AHomeOperationInfoFacade;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.context.annotation.Configuration;
+//import org.springframework.scheduling.Trigger;
+//import org.springframework.scheduling.TriggerContext;
+//import org.springframework.scheduling.annotation.EnableScheduling;
+//import org.springframework.scheduling.annotation.SchedulingConfigurer;
+//import org.springframework.scheduling.config.ScheduledTaskRegistrar;
+//import org.springframework.scheduling.support.CronTrigger;
+//
+//import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+//import com.diagbot.entity.SysTaskCron;
+//import com.diagbot.enums.IsDeleteEnum;
+//import com.diagbot.util.StringUtil;
+//
+//import lombok.extern.slf4j.Slf4j;
+//
+//@Configuration      //1.主要用于标记配置类，兼备Component的效果。
+////@EnableScheduling   // 2.开启定时任务
+//@Slf4j
+//public class HomeOperationInfoTask implements SchedulingConfigurer{
+//
+//	@Autowired
+//    private SysTaskCronFacade sysTaskCronFacade;
+//
+//    private SysTaskCron task001 = new SysTaskCron();
+//
+//    @Autowired
+//   	private AHomeOperationInfoFacade aHomeOperationInfoFacade;
+//
+//    /**
+//     * 执行定时任务.
+//     */
+//    @Override
+//    public void configureTasks(ScheduledTaskRegistrar taskRegistrar) {
+//        taskRegistrar.addTriggerTask(new Runnable() {
+//            @Override
+//            public void run() {
+//                //1.添加任务内容(Runnable)
+//                if (null != task001
+//                        && task001.getIsDeleted().equals(IsDeleteEnum.N.getKey())
+//                        && task001.getIsUsed().equals(1)) {
+//                    log.info("执行动态定时任务: " + LocalDateTime.now().toLocalTime());
+//                    //aHomeOperationInfoFacade.executeHomeOperation();
+//                }
+//            }
+//        }, new Trigger() {
+//            @Override
+//            public Date nextExecutionTime(TriggerContext triggerContext) {
+//                //2.1 从数据库获取执行周期
+//                task001 = sysTaskCronFacade.getOne(new QueryWrapper<SysTaskCron>()
+//                        .eq("cron_code", "TASK004"), false);
+//                String cron = "0 0/1 * * * ?";
+//                //2.2 合法性校验.
+//                if (null != task001 && StringUtil.isNotBlank(task001.getCron())) {
+//                    cron = task001.getCron();
+//                }
+//                CronTrigger trigger = new CronTrigger(cron);
+//                return trigger.nextExecutionTime(triggerContext);
+//            }
+//        });
+//    }
+//}

src/main/java/com/diagbot/task/HomePageTask.java

@@ -1,68 +1,68 @@
-package com.diagbot.task;
-
-import java.time.LocalDateTime;
-import java.util.Date;
-
-import com.diagbot.facade.data.AHomePageFacade;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.scheduling.Trigger;
-import org.springframework.scheduling.TriggerContext;
-import org.springframework.scheduling.annotation.EnableScheduling;
-import org.springframework.scheduling.annotation.SchedulingConfigurer;
-import org.springframework.scheduling.config.ScheduledTaskRegistrar;
-import org.springframework.scheduling.support.CronTrigger;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.diagbot.entity.SysTaskCron;
-import com.diagbot.enums.IsDeleteEnum;
-import com.diagbot.facade.SysTaskCronFacade;
-import com.diagbot.util.StringUtil;
-
-import lombok.extern.slf4j.Slf4j;
-
-@Configuration      //1.主要用于标记配置类，兼备Component的效果。
-@EnableScheduling   // 2.开启定时任务
-@Slf4j
-public class HomePageTask implements SchedulingConfigurer{
-	@Autowired
-    private SysTaskCronFacade sysTaskCronFacade;
-
-    private SysTaskCron task001 = new SysTaskCron();
-
-    @Autowired
-   	private AHomePageFacade aHomePageFacade;
-    
-    /**
-     * 执行定时任务.
-     */
-    @Override
-    public void configureTasks(ScheduledTaskRegistrar taskRegistrar) {
-        taskRegistrar.addTriggerTask(new Runnable() {
-            @Override
-            public void run() {
-                //1.添加任务内容(Runnable)
-                if (null != task001
-                        && task001.getIsDeleted().equals(IsDeleteEnum.N.getKey())
-                        && task001.getIsUsed().equals(1)) {
-                    log.info("执行动态定时任务: " + LocalDateTime.now().toLocalTime());
-                    //aHomePageFacade.executeHomePage();
-                }
-            }
-        }, new Trigger() {
-            @Override
-            public Date nextExecutionTime(TriggerContext triggerContext) {
-                //2.1 从数据库获取执行周期
-                task001 = sysTaskCronFacade.getOne(new QueryWrapper<SysTaskCron>()
-                        .eq("cron_code", "TASK002"), false);
-                String cron = "0 0/1 * * * ?";
-                //2.2 合法性校验.
-                if (null != task001 && StringUtil.isNotBlank(task001.getCron())) {
-                    cron = task001.getCron();
-                }
-                CronTrigger trigger = new CronTrigger(cron);
-                return trigger.nextExecutionTime(triggerContext);
-            }
-        });
-    }
-}
+//package com.diagbot.task;
+//
+//import java.time.LocalDateTime;
+//import java.util.Date;
+//
+//import com.diagbot.facade.data.AHomePageFacade;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.context.annotation.Configuration;
+//import org.springframework.scheduling.Trigger;
+//import org.springframework.scheduling.TriggerContext;
+//import org.springframework.scheduling.annotation.EnableScheduling;
+//import org.springframework.scheduling.annotation.SchedulingConfigurer;
+//import org.springframework.scheduling.config.ScheduledTaskRegistrar;
+//import org.springframework.scheduling.support.CronTrigger;
+//
+//import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+//import com.diagbot.entity.SysTaskCron;
+//import com.diagbot.enums.IsDeleteEnum;
+//import com.diagbot.facade.SysTaskCronFacade;
+//import com.diagbot.util.StringUtil;
+//
+//import lombok.extern.slf4j.Slf4j;
+//
+//@Configuration      //1.主要用于标记配置类，兼备Component的效果。
+////@EnableScheduling   // 2.开启定时任务
+//@Slf4j
+//public class HomePageTask implements SchedulingConfigurer{
+//	@Autowired
+//    private SysTaskCronFacade sysTaskCronFacade;
+//
+//    private SysTaskCron task001 = new SysTaskCron();
+//
+//    @Autowired
+//   	private AHomePageFacade aHomePageFacade;
+//
+//    /**
+//     * 执行定时任务.
+//     */
+//    @Override
+//    public void configureTasks(ScheduledTaskRegistrar taskRegistrar) {
+//        taskRegistrar.addTriggerTask(new Runnable() {
+//            @Override
+//            public void run() {
+//                //1.添加任务内容(Runnable)
+//                if (null != task001
+//                        && task001.getIsDeleted().equals(IsDeleteEnum.N.getKey())
+//                        && task001.getIsUsed().equals(1)) {
+//                    log.info("执行动态定时任务: " + LocalDateTime.now().toLocalTime());
+//                    //aHomePageFacade.executeHomePage();
+//                }
+//            }
+//        }, new Trigger() {
+//            @Override
+//            public Date nextExecutionTime(TriggerContext triggerContext) {
+//                //2.1 从数据库获取执行周期
+//                task001 = sysTaskCronFacade.getOne(new QueryWrapper<SysTaskCron>()
+//                        .eq("cron_code", "TASK002"), false);
+//                String cron = "0 0/1 * * * ?";
+//                //2.2 合法性校验.
+//                if (null != task001 && StringUtil.isNotBlank(task001.getCron())) {
+//                    cron = task001.getCron();
+//                }
+//                CronTrigger trigger = new CronTrigger(cron);
+//                return trigger.nextExecutionTime(triggerContext);
+//            }
+//        });
+//    }
+//}

src/main/java/com/diagbot/task/MedIndexTask.java

@@ -1,83 +1,83 @@
-package com.diagbot.task;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.diagbot.entity.SysTaskCron;
-import com.diagbot.enums.IsDeleteEnum;
-import com.diagbot.facade.ConsoleFacade;
-import com.diagbot.facade.SysTaskCronFacade;
-import com.diagbot.facade.data.ADoctorAdviceFacade;
-import com.diagbot.util.StringUtil;
-import com.diagbot.vo.FilterVO;
-import com.diagbot.vo.IndexTimeVO;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.scheduling.Trigger;
-import org.springframework.scheduling.TriggerContext;
-import org.springframework.scheduling.annotation.EnableScheduling;
-import org.springframework.scheduling.annotation.SchedulingConfigurer;
-import org.springframework.scheduling.config.ScheduledTaskRegistrar;
-import org.springframework.scheduling.support.CronTrigger;
-
-import java.text.SimpleDateFormat;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.time.ZoneId;
-import java.time.ZonedDateTime;
-import java.util.Date;
-
-@Configuration      //1.主要用于标记配置类，兼备Component的效果。
-@EnableScheduling   // 2.开启定时任务
-@Slf4j
-public class MedIndexTask implements SchedulingConfigurer{
-
-	@Autowired
-    private SysTaskCronFacade sysTaskCronFacade;
-
-    private SysTaskCron task001 = new SysTaskCron();
-
-    @Autowired
-    private ConsoleFacade consoleFacade;
-    
-    /**
-     * 执行定时任务.
-     */
-    @Override
-    public void configureTasks(ScheduledTaskRegistrar taskRegistrar) {
-        taskRegistrar.addTriggerTask(new Runnable() {
-            @Override
-            public void run() {
-                //1.添加任务内容(Runnable)
-                if (null != task001
-                        && task001.getIsDeleted().equals(IsDeleteEnum.N.getKey())
-                        && task001.getIsUsed().equals(1)) {
-                    log.info("执行动态定时任务: " + LocalDateTime.now().toLocalTime());
-                    IndexTimeVO IndexTimeVO = new IndexTimeVO();
-                    String param = task001.getParam();
-                    String[] split = {param};
-                    if(param.contains(",")){
-                        split = param.split(",");
-                    }
-                    for (String str : split) {
-                        IndexTimeVO.setHospitalId(str);
-                        consoleFacade.saveMedicaIndicator(IndexTimeVO);
-                    }
-                }
-            }
-        }, new Trigger() {
-            @Override
-            public Date nextExecutionTime(TriggerContext triggerContext) {
-                //2.1 从数据库获取执行周期
-                task001 = sysTaskCronFacade.getOne(new QueryWrapper<SysTaskCron>()
-                        .eq("cron_code", "TASK_INDEX"), false);
-                String cron = "0 0 3 * * ?";
-                //2.2 合法性校验.
-                if (null != task001 && StringUtil.isNotBlank(task001.getCron())) {
-                    cron = task001.getCron();
-                }
-                CronTrigger trigger = new CronTrigger(cron);
-                return trigger.nextExecutionTime(triggerContext);
-            }
-        });
-    }
-}
+//package com.diagbot.task;
+//
+//import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+//import com.diagbot.entity.SysTaskCron;
+//import com.diagbot.enums.IsDeleteEnum;
+//import com.diagbot.facade.ConsoleFacade;
+//import com.diagbot.facade.SysTaskCronFacade;
+//import com.diagbot.facade.data.ADoctorAdviceFacade;
+//import com.diagbot.util.StringUtil;
+//import com.diagbot.vo.FilterVO;
+//import com.diagbot.vo.IndexTimeVO;
+//import lombok.extern.slf4j.Slf4j;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.context.annotation.Configuration;
+//import org.springframework.scheduling.Trigger;
+//import org.springframework.scheduling.TriggerContext;
+//import org.springframework.scheduling.annotation.EnableScheduling;
+//import org.springframework.scheduling.annotation.SchedulingConfigurer;
+//import org.springframework.scheduling.config.ScheduledTaskRegistrar;
+//import org.springframework.scheduling.support.CronTrigger;
+//
+//import java.text.SimpleDateFormat;
+//import java.time.LocalDate;
+//import java.time.LocalDateTime;
+//import java.time.ZoneId;
+//import java.time.ZonedDateTime;
+//import java.util.Date;
+//
+//@Configuration      //1.主要用于标记配置类，兼备Component的效果。
+////@EnableScheduling   // 2.开启定时任务
+//@Slf4j
+//public class MedIndexTask implements SchedulingConfigurer{
+//
+//	@Autowired
+//    private SysTaskCronFacade sysTaskCronFacade;
+//
+//    private SysTaskCron task001 = new SysTaskCron();
+//
+//    @Autowired
+//    private ConsoleFacade consoleFacade;
+//
+//    /**
+//     * 执行定时任务.
+//     */
+//    @Override
+//    public void configureTasks(ScheduledTaskRegistrar taskRegistrar) {
+//        taskRegistrar.addTriggerTask(new Runnable() {
+//            @Override
+//            public void run() {
+//                //1.添加任务内容(Runnable)
+//                if (null != task001
+//                        && task001.getIsDeleted().equals(IsDeleteEnum.N.getKey())
+//                        && task001.getIsUsed().equals(1)) {
+//                    log.info("执行动态定时任务: " + LocalDateTime.now().toLocalTime());
+//                    IndexTimeVO IndexTimeVO = new IndexTimeVO();
+//                    String param = task001.getParam();
+//                    String[] split = {param};
+//                    if(param.contains(",")){
+//                        split = param.split(",");
+//                    }
+//                    for (String str : split) {
+//                        IndexTimeVO.setHospitalId(str);
+//                        consoleFacade.saveMedicaIndicator(IndexTimeVO);
+//                    }
+//                }
+//            }
+//        }, new Trigger() {
+//            @Override
+//            public Date nextExecutionTime(TriggerContext triggerContext) {
+//                //2.1 从数据库获取执行周期
+//                task001 = sysTaskCronFacade.getOne(new QueryWrapper<SysTaskCron>()
+//                        .eq("cron_code", "TASK_INDEX"), false);
+//                String cron = "0 0 3 * * ?";
+//                //2.2 合法性校验.
+//                if (null != task001 && StringUtil.isNotBlank(task001.getCron())) {
+//                    cron = task001.getCron();
+//                }
+//                CronTrigger trigger = new CronTrigger(cron);
+//                return trigger.nextExecutionTime(triggerContext);
+//            }
+//        });
+//    }
+//}

src/main/java/com/diagbot/task/MedicalRecordContentTask.java

@@ -1,69 +1,69 @@
-package com.diagbot.task;
-
-import java.time.LocalDateTime;
-import java.util.Date;
-
-import com.diagbot.facade.data.AMedicalRecordContentFacade;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.scheduling.Trigger;
-import org.springframework.scheduling.TriggerContext;
-import org.springframework.scheduling.annotation.EnableScheduling;
-import org.springframework.scheduling.annotation.SchedulingConfigurer;
-import org.springframework.scheduling.config.ScheduledTaskRegistrar;
-import org.springframework.scheduling.support.CronTrigger;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.diagbot.entity.SysTaskCron;
-import com.diagbot.enums.IsDeleteEnum;
-import com.diagbot.facade.SysTaskCronFacade;
-import com.diagbot.util.StringUtil;
-
-import lombok.extern.slf4j.Slf4j;
-
-@Configuration      //1.主要用于标记配置类，兼备Component的效果。
-@EnableScheduling   // 2.开启定时任务
-@Slf4j
-public class MedicalRecordContentTask implements SchedulingConfigurer{
-
-	@Autowired
-    private SysTaskCronFacade sysTaskCronFacade;
-
-    private SysTaskCron task001 = new SysTaskCron();
-
-    @Autowired
-   	private AMedicalRecordContentFacade aMedicalRecordContentFacade;
-    
-    /**
-     * 执行定时任务.
-     */
-    @Override
-    public void configureTasks(ScheduledTaskRegistrar taskRegistrar) {
-        taskRegistrar.addTriggerTask(new Runnable() {
-            @Override
-            public void run() {
-                //1.添加任务内容(Runnable)
-                if (null != task001
-                        && task001.getIsDeleted().equals(IsDeleteEnum.N.getKey())
-                        && task001.getIsUsed().equals(1)) {
-                    log.info("执行动态定时任务: " + LocalDateTime.now().toLocalTime());
-                    aMedicalRecordContentFacade.executeMrRecordContent();
-                }
-            }
-        }, new Trigger() {
-            @Override
-            public Date nextExecutionTime(TriggerContext triggerContext) {
-                //2.1 从数据库获取执行周期
-                task001 = sysTaskCronFacade.getOne(new QueryWrapper<SysTaskCron>()
-                        .eq("cron_code", "TASK007"), false);
-                String cron = "0 0/1 * * * ?";
-                //2.2 合法性校验.
-                if (null != task001 && StringUtil.isNotBlank(task001.getCron())) {
-                    cron = task001.getCron();
-                }
-                CronTrigger trigger = new CronTrigger(cron);
-                return trigger.nextExecutionTime(triggerContext);
-            }
-        });
-    }
-}
+//package com.diagbot.task;
+//
+//import java.time.LocalDateTime;
+//import java.util.Date;
+//
+//import com.diagbot.facade.data.AMedicalRecordContentFacade;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.context.annotation.Configuration;
+//import org.springframework.scheduling.Trigger;
+//import org.springframework.scheduling.TriggerContext;
+//import org.springframework.scheduling.annotation.EnableScheduling;
+//import org.springframework.scheduling.annotation.SchedulingConfigurer;
+//import org.springframework.scheduling.config.ScheduledTaskRegistrar;
+//import org.springframework.scheduling.support.CronTrigger;
+//
+//import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+//import com.diagbot.entity.SysTaskCron;
+//import com.diagbot.enums.IsDeleteEnum;
+//import com.diagbot.facade.SysTaskCronFacade;
+//import com.diagbot.util.StringUtil;
+//
+//import lombok.extern.slf4j.Slf4j;
+//
+//@Configuration      //1.主要用于标记配置类，兼备Component的效果。
+////@EnableScheduling   // 2.开启定时任务
+//@Slf4j
+//public class MedicalRecordContentTask implements SchedulingConfigurer{
+//
+//	@Autowired
+//    private SysTaskCronFacade sysTaskCronFacade;
+//
+//    private SysTaskCron task001 = new SysTaskCron();
+//
+//    @Autowired
+//   	private AMedicalRecordContentFacade aMedicalRecordContentFacade;
+//
+//    /**
+//     * 执行定时任务.
+//     */
+//    @Override
+//    public void configureTasks(ScheduledTaskRegistrar taskRegistrar) {
+//        taskRegistrar.addTriggerTask(new Runnable() {
+//            @Override
+//            public void run() {
+//                //1.添加任务内容(Runnable)
+//                if (null != task001
+//                        && task001.getIsDeleted().equals(IsDeleteEnum.N.getKey())
+//                        && task001.getIsUsed().equals(1)) {
+//                    log.info("执行动态定时任务: " + LocalDateTime.now().toLocalTime());
+//                    aMedicalRecordContentFacade.executeMrRecordContent();
+//                }
+//            }
+//        }, new Trigger() {
+//            @Override
+//            public Date nextExecutionTime(TriggerContext triggerContext) {
+//                //2.1 从数据库获取执行周期
+//                task001 = sysTaskCronFacade.getOne(new QueryWrapper<SysTaskCron>()
+//                        .eq("cron_code", "TASK007"), false);
+//                String cron = "0 0/1 * * * ?";
+//                //2.2 合法性校验.
+//                if (null != task001 && StringUtil.isNotBlank(task001.getCron())) {
+//                    cron = task001.getCron();
+//                }
+//                CronTrigger trigger = new CronTrigger(cron);
+//                return trigger.nextExecutionTime(triggerContext);
+//            }
+//        });
+//    }
+//}

src/main/java/com/diagbot/task/MedicalRecordTask.java

@@ -1,69 +1,69 @@
-package com.diagbot.task;
-
-import java.time.LocalDateTime;
-import java.util.Date;
-
-import com.diagbot.facade.data.AMedicalRecordFacade;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.scheduling.Trigger;
-import org.springframework.scheduling.TriggerContext;
-import org.springframework.scheduling.annotation.EnableScheduling;
-import org.springframework.scheduling.annotation.SchedulingConfigurer;
-import org.springframework.scheduling.config.ScheduledTaskRegistrar;
-import org.springframework.scheduling.support.CronTrigger;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.diagbot.entity.SysTaskCron;
-import com.diagbot.enums.IsDeleteEnum;
-import com.diagbot.facade.SysTaskCronFacade;
-import com.diagbot.util.StringUtil;
-
-import lombok.extern.slf4j.Slf4j;
-
-@Configuration      //1.主要用于标记配置类，兼备Component的效果。
-@EnableScheduling   // 2.开启定时任务
-@Slf4j
-public class MedicalRecordTask implements SchedulingConfigurer{
-
-	@Autowired
-    private SysTaskCronFacade sysTaskCronFacade;
-
-    private SysTaskCron task001 = new SysTaskCron();
-
-    @Autowired
-   	private AMedicalRecordFacade aMedicalRecordFacade;
-    
-    /**
-     * 执行定时任务.
-     */
-    @Override
-    public void configureTasks(ScheduledTaskRegistrar taskRegistrar) {
-        taskRegistrar.addTriggerTask(new Runnable() {
-            @Override
-            public void run() {
-                //1.添加任务内容(Runnable)
-                if (null != task001
-                        && task001.getIsDeleted().equals(IsDeleteEnum.N.getKey())
-                        && task001.getIsUsed().equals(1)) {
-                    log.info("执行动态定时任务: " + LocalDateTime.now().toLocalTime());
-                    //aMedicalRecordFacade.executeMrRecord();
-                }
-            }
-        }, new Trigger() {
-            @Override
-            public Date nextExecutionTime(TriggerContext triggerContext) {
-                //2.1 从数据库获取执行周期
-                task001 = sysTaskCronFacade.getOne(new QueryWrapper<SysTaskCron>()
-                        .eq("cron_code", "TASK006"), false);
-                String cron = "0 0/1 * * * ?";
-                //2.2 合法性校验.
-                if (null != task001 && StringUtil.isNotBlank(task001.getCron())) {
-                    cron = task001.getCron();
-                }
-                CronTrigger trigger = new CronTrigger(cron);
-                return trigger.nextExecutionTime(triggerContext);
-            }
-        });
-    }
-}
+//package com.diagbot.task;
+//
+//import java.time.LocalDateTime;
+//import java.util.Date;
+//
+//import com.diagbot.facade.data.AMedicalRecordFacade;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.context.annotation.Configuration;
+//import org.springframework.scheduling.Trigger;
+//import org.springframework.scheduling.TriggerContext;
+//import org.springframework.scheduling.annotation.EnableScheduling;
+//import org.springframework.scheduling.annotation.SchedulingConfigurer;
+//import org.springframework.scheduling.config.ScheduledTaskRegistrar;
+//import org.springframework.scheduling.support.CronTrigger;
+//
+//import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+//import com.diagbot.entity.SysTaskCron;
+//import com.diagbot.enums.IsDeleteEnum;
+//import com.diagbot.facade.SysTaskCronFacade;
+//import com.diagbot.util.StringUtil;
+//
+//import lombok.extern.slf4j.Slf4j;
+//
+//@Configuration      //1.主要用于标记配置类，兼备Component的效果。
+////@EnableScheduling   // 2.开启定时任务
+//@Slf4j
+//public class MedicalRecordTask implements SchedulingConfigurer{
+//
+//	@Autowired
+//    private SysTaskCronFacade sysTaskCronFacade;
+//
+//    private SysTaskCron task001 = new SysTaskCron();
+//
+//    @Autowired
+//   	private AMedicalRecordFacade aMedicalRecordFacade;
+//
+//    /**
+//     * 执行定时任务.
+//     */
+//    @Override
+//    public void configureTasks(ScheduledTaskRegistrar taskRegistrar) {
+//        taskRegistrar.addTriggerTask(new Runnable() {
+//            @Override
+//            public void run() {
+//                //1.添加任务内容(Runnable)
+//                if (null != task001
+//                        && task001.getIsDeleted().equals(IsDeleteEnum.N.getKey())
+//                        && task001.getIsUsed().equals(1)) {
+//                    log.info("执行动态定时任务: " + LocalDateTime.now().toLocalTime());
+//                    //aMedicalRecordFacade.executeMrRecord();
+//                }
+//            }
+//        }, new Trigger() {
+//            @Override
+//            public Date nextExecutionTime(TriggerContext triggerContext) {
+//                //2.1 从数据库获取执行周期
+//                task001 = sysTaskCronFacade.getOne(new QueryWrapper<SysTaskCron>()
+//                        .eq("cron_code", "TASK006"), false);
+//                String cron = "0 0/1 * * * ?";
+//                //2.2 合法性校验.
+//                if (null != task001 && StringUtil.isNotBlank(task001.getCron())) {
+//                    cron = task001.getCron();
+//                }
+//                CronTrigger trigger = new CronTrigger(cron);
+//                return trigger.nextExecutionTime(triggerContext);
+//            }
+//        });
+//    }
+//}

src/main/java/com/diagbot/task/MedicalRecordTypeTask.java

@@ -1,66 +1,66 @@
-package com.diagbot.task;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.diagbot.entity.SysTaskCron;
-import com.diagbot.enums.IsDeleteEnum;
-import com.diagbot.facade.data.AMedRecordTypeFacade;
-import com.diagbot.facade.SysTaskCronFacade;
-import com.diagbot.util.StringUtil;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.scheduling.Trigger;
-import org.springframework.scheduling.TriggerContext;
-import org.springframework.scheduling.annotation.EnableScheduling;
-import org.springframework.scheduling.annotation.SchedulingConfigurer;
-import org.springframework.scheduling.config.ScheduledTaskRegistrar;
-import org.springframework.scheduling.support.CronTrigger;
-
-import java.time.LocalDateTime;
-import java.util.Date;
-
-@Configuration      //1.主要用于标记配置类，兼备Component的效果。
-@EnableScheduling   // 2.开启定时任务
-@Slf4j
-public class MedicalRecordTypeTask implements SchedulingConfigurer {
-    @Autowired
-    private SysTaskCronFacade sysTaskCronFacade;
-
-    private SysTaskCron task001 = new SysTaskCron();
-
-    @Autowired
-    private AMedRecordTypeFacade aMedRecordTypeFacade;
-
-    /**
-     * 执行定时任务.
-     */
-    @Override
-    public void configureTasks(ScheduledTaskRegistrar taskRegistrar) {
-        taskRegistrar.addTriggerTask(new Runnable() {
-            @Override
-            public void run() {
-                //1.添加任务内容(Runnable)
-                if (null != task001
-                        && task001.getIsDeleted().equals(IsDeleteEnum.N.getKey())
-                        && task001.getIsUsed().equals(1)) {
-                    log.info("执行动态定时任务: " + LocalDateTime.now().toLocalTime());
-                    aMedRecordTypeFacade.executeMRType();
-                }
-            }
-        }, new Trigger() {
-            @Override
-            public Date nextExecutionTime(TriggerContext triggerContext) {
-                //2.1 从数据库获取执行周期
-                task001 = sysTaskCronFacade.getOne(new QueryWrapper<SysTaskCron>()
-                        .eq("cron_code", "TASK005"), false);
-                String cron = "0 0/1 * * * ?";
-                //2.2 合法性校验.
-                if (null != task001 && StringUtil.isNotBlank(task001.getCron())) {
-                    cron = task001.getCron();
-                }
-                CronTrigger trigger = new CronTrigger(cron);
-                return trigger.nextExecutionTime(triggerContext);
-            }
-        });
-    }
-}
+//package com.diagbot.task;
+//
+//import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+//import com.diagbot.entity.SysTaskCron;
+//import com.diagbot.enums.IsDeleteEnum;
+//import com.diagbot.facade.data.AMedRecordTypeFacade;
+//import com.diagbot.facade.SysTaskCronFacade;
+//import com.diagbot.util.StringUtil;
+//import lombok.extern.slf4j.Slf4j;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.context.annotation.Configuration;
+//import org.springframework.scheduling.Trigger;
+//import org.springframework.scheduling.TriggerContext;
+//import org.springframework.scheduling.annotation.EnableScheduling;
+//import org.springframework.scheduling.annotation.SchedulingConfigurer;
+//import org.springframework.scheduling.config.ScheduledTaskRegistrar;
+//import org.springframework.scheduling.support.CronTrigger;
+//
+//import java.time.LocalDateTime;
+//import java.util.Date;
+//
+//@Configuration      //1.主要用于标记配置类，兼备Component的效果。
+////@EnableScheduling   // 2.开启定时任务
+//@Slf4j
+//public class MedicalRecordTypeTask implements SchedulingConfigurer {
+//    @Autowired
+//    private SysTaskCronFacade sysTaskCronFacade;
+//
+//    private SysTaskCron task001 = new SysTaskCron();
+//
+//    @Autowired
+//    private AMedRecordTypeFacade aMedRecordTypeFacade;
+//
+//    /**
+//     * 执行定时任务.
+//     */
+//    @Override
+//    public void configureTasks(ScheduledTaskRegistrar taskRegistrar) {
+//        taskRegistrar.addTriggerTask(new Runnable() {
+//            @Override
+//            public void run() {
+//                //1.添加任务内容(Runnable)
+//                if (null != task001
+//                        && task001.getIsDeleted().equals(IsDeleteEnum.N.getKey())
+//                        && task001.getIsUsed().equals(1)) {
+//                    log.info("执行动态定时任务: " + LocalDateTime.now().toLocalTime());
+//                    aMedRecordTypeFacade.executeMRType();
+//                }
+//            }
+//        }, new Trigger() {
+//            @Override
+//            public Date nextExecutionTime(TriggerContext triggerContext) {
+//                //2.1 从数据库获取执行周期
+//                task001 = sysTaskCronFacade.getOne(new QueryWrapper<SysTaskCron>()
+//                        .eq("cron_code", "TASK005"), false);
+//                String cron = "0 0/1 * * * ?";
+//                //2.2 合法性校验.
+//                if (null != task001 && StringUtil.isNotBlank(task001.getCron())) {
+//                    cron = task001.getCron();
+//                }
+//                CronTrigger trigger = new CronTrigger(cron);
+//                return trigger.nextExecutionTime(triggerContext);
+//            }
+//        });
+//    }
+//}

src/main/java/com/diagbot/task/TASK_CX.java

@@ -5,6 +5,7 @@ import com.diagbot.entity.SysTaskCron;
 import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.facade.BehospitalInfoFacade;
 import com.diagbot.facade.SysTaskCronFacade;
+import com.diagbot.facade.ViewFacade;
 import com.diagbot.util.StringUtil;
 import com.diagbot.vo.TaskVO;
 import lombok.extern.slf4j.Slf4j;
@@ -37,6 +38,9 @@ public class TASK_CX implements SchedulingConfigurer {
 
     private String param = "";
 
+    @Autowired
+    private ViewFacade viewFacade;
+
     @Autowired
     private BehospitalInfoFacade behospitalInfoFacade;
 
@@ -56,7 +60,7 @@ public class TASK_CX implements SchedulingConfigurer {
                     TaskVO taskVO = new TaskVO();
                     taskVO.setType(1); // 类型过滤(1：出院时间比当前时间早3天前的病历（例如：长兴病历）)
                     taskVO.setIndividuation(Arrays.asList(1)); //个性化需求【1：近3天不含当天的病历强制评分更新】
-                    behospitalInfoFacade.execute(taskVO, param);
+                    viewFacade.execute3();
                 }
             }
         }, new Trigger() {
@@ -65,7 +69,7 @@ public class TASK_CX implements SchedulingConfigurer {
                 //2.1 从数据库获取执行周期
                 task = sysTaskCronFacade.getOne(new QueryWrapper<SysTaskCron>()
                         .eq("cron_code", "TASK_CX"), false);
-                String cron = "0/5 * * * * ?";
+                String cron = "0 0 20 * * ?";
                 //2.2 合法性校验.
                 if (null != task && StringUtil.isNotBlank(task.getCron())) {
                     cron = task.getCron();

src/main/java/com/diagbot/util/TZDBConn.java

@@ -262,153 +262,157 @@ public class TZDBConn {
 		try {
 			TZDBConn dbconn=new TZDBConn();
 			ResultSet rs =dbconn.Query(sql, null);
-			while(rs.next()){
-				HomePage homePageVO=new HomePage();
-				homePageVO.setHomePageId(rs.getString("homePageId"));//病案首页编号
-				homePageVO.setHospitalId(HOSPITAL_ID);//医院ID
-				homePageVO.setBehospitalCode(rs.getString("behospitalCode")+"_"+rs.getString("behospitalNum"));//病人住院序号
-				homePageVO.setHospitalCode(rs.getString("hospitalCode"));//组织机构id
-				homePageVO.setHospitalName(rs.getString("hospitalName"));//医疗机构名称
-				homePageVO.setOrgCode(rs.getString("orgCode"));//医疗机构代码
-				homePageVO.setPayType(rs.getString("payType"));//医疗付费方式
-				homePageVO.setHealthCard(rs.getString("healthCard"));//健康卡号
-				homePageVO.setBehospitalNum(rs.getString("behospitalNum"));//住院次数
-				homePageVO.setFileCode(rs.getString("fileCode"));//病案号
-				homePageVO.setName(rs.getString("name"));//姓名
-				homePageVO.setSex(rs.getString("sex"));//性别
-				homePageVO.setBirthday(rs.getDate("birthday"));//出生日期
-				homePageVO.setAge(rs.getString("age").equals("-")?null:rs.getString("age"));//病人年龄
-				homePageVO.setAgeUnit(rs.getString("ageUnit"));//年龄单位
-				homePageVO.setNationality(rs.getString("nationality"));//国籍
-				homePageVO.setNewbornMonth(rs.getString("newbornMonth"));//新生儿出生月数
-				homePageVO.setNewbornDay(rs.getString("newbornDay"));//新生儿出生天数
-				homePageVO.setNewbornWeight(rs.getString("newbornWeight"));//新生儿出生体重
-				homePageVO.setNewbornBehospitalWeight(rs.getString("newbornBehospitalWeight"));//新生儿入院体重
-				homePageVO.setBornAddress(rs.getString("bornAddress"));//出生地
-				homePageVO.setBornPlace(rs.getString("bornPlace"));//籍贯
-				homePageVO.setNation(rs.getString("nation"));//民族
-				homePageVO.setIdentityCardNo(rs.getString("identityCardNo"));//身份证号
-				homePageVO.setJobType(rs.getString("jobType"));//职业
-				homePageVO.setMarriage(rs.getString("marriage"));//婚姻
-				homePageVO.setCurAddress(rs.getString("curAddress"));//现住址
-				homePageVO.setCurPhone(rs.getString("curPhone"));//现住址电话
-				homePageVO.setCurPostCode(rs.getString("curPostCode"));//现住址邮编
-				homePageVO.setResidenceAddress(rs.getString("residenceAddress"));//户口地址
-				homePageVO.setResidencePostCode(rs.getString("residencePostCode"));//户口地址邮编
-				homePageVO.setWorkAddress(rs.getString("workAddress"));//工作单位
-				homePageVO.setWorkPhone(rs.getString("workPhone"));//工作单位电话
-				homePageVO.setWorkPostCode(rs.getString("workPostCode"));//工作单位邮编
-				homePageVO.setContactName(rs.getString("contactName"));//联系人姓名
-				homePageVO.setContactRelation(rs.getString("contactRelation"));//联系人关系
-				homePageVO.setContactAddress(rs.getString("contactAddress"));//联系人地址
-				homePageVO.setContactPhone(rs.getString("contactPhone"));//联系人电话
-				homePageVO.setBehospitalWay(rs.getString("behospitalWay"));//入院途径
-				homePageVO.setBehospitalDate(StringUtils.isNotBlank(rs.getString("behospitalDate"))?DateUtil.parseDateTime(rs.getString("behospitalDate")):null);//入院时间
-				homePageVO.setBehospitalDept(rs.getString("behospitalDept"));//入院科室
-				homePageVO.setBehospitalWard(rs.getString("behospitalWard"));//入院病房
-				homePageVO.setBehospitalBedId(rs.getString("behospitalBedId"));//入院床位序号
-				homePageVO.setBehospitalBedCode(rs.getString("behospitalBedCode"));//入院床位号码
-				homePageVO.setChangeDept(rs.getString("changeDept"));//转科科别
-				homePageVO.setLeaveHospitalDate(StringUtils.isNotBlank(rs.getString("leaveHospitalDate"))?DateUtil.parseDateTime(rs.getString("leaveHospitalDate")):null);//出院时间
-				homePageVO.setLeaveHospitalDept(rs.getString("leaveHospitalDept"));//出院科别
-				homePageVO.setLeaveHospitalWard(rs.getString("leaveHospitalWard"));//出院病房
-				homePageVO.setLeaveHospitalBedId(rs.getString("leaveHospitalBedId"));//出院床位序号
-				homePageVO.setLeaveHospitalBedCode(rs.getString("leaveHospitalBedCode"));//出院床位号码
-				homePageVO.setBehospitalDayNum(rs.getString("behospitalDayNum"));//实际住院天数
-				homePageVO.setOutpatientEmrDiagnose(rs.getString("outpatientEmrDiagnose"));//门急诊诊断
-				homePageVO.setOutpatientEmrDiagnoseCode(rs.getString("outpatientEmrDiagnoseCode"));//门急诊诊断编码
-				homePageVO.setPoisonFactor(rs.getString("poisonFactor"));//损伤中毒因素
-				homePageVO.setPoisonFactorCode(rs.getString("poisonFactorCode"));//损伤中毒因素编码
-				homePageVO.setPathologyDiagnose(rs.getString("pathologyDiagnose"));//病理诊断
-				homePageVO.setPathologyDiagnoseCode(rs.getString("pathologyDiagnoseCode"));//病理诊断编码
-				homePageVO.setPathologyDiagnoseId(rs.getString("pathologyDiagnoseId"));//病理诊断编号
-				homePageVO.setIsMedAllergy(rs.getString("isMedAllergy"));//药物过敏
-				homePageVO.setMedAllergyName(rs.getString("medAllergyName"));//过敏药物
-				homePageVO.setAutopsy(rs.getString("autopsy"));//死亡患者尸检
-				homePageVO.setBloodType(rs.getString("bloodType"));//血型
-				homePageVO.setRh(rs.getString("rh"));//Rh
-				homePageVO.setDeptDirector(rs.getString("deptDirector"));//科主任
-				homePageVO.setDirectorDoctor(rs.getString("directorDoctor"));//主任医师
-				homePageVO.setAttendingDoctor(rs.getString("attendingDoctor"));//主治医师
-				homePageVO.setBehospitalDoctor(rs.getString("behospitalDoctor"));//住院医师
-				homePageVO.setResponseNurse(rs.getString("responseNurse"));//责任护士
-				homePageVO.setStudyDoctor(rs.getString("studyDoctor"));//进修医师
-				homePageVO.setPracticeDoctor(rs.getString("practiceDoctor"));//实习医师
-				homePageVO.setEncodeMan(rs.getString("encodeMan"));//编码员
-				homePageVO.setHomePageQuality(rs.getString("homePageQuality"));//病案质量
-				homePageVO.setQcDoctor(rs.getString("qcDoctor"));//质控医师
-				homePageVO.setQcNurse(rs.getString("qcNurse"));//质控护士
-				if(!"".equals(rs.getString("qcDate"))){
-					homePageVO.setQcDate(DateUtil.parseDate(rs.getString("qcDate"),DateUtil.DATE_TIME_FORMAT));//质控日期
-				}
-				homePageVO.setLeaveHospitalType(rs.getString("leaveHospitalType"));//离院方式
-				homePageVO.setAcceptOrgCode(rs.getString("acceptOrgCode"));//接收机构名称
-				homePageVO.setAgainBehospitalPlan(rs.getString("againBehospitalPlan"));//31天内再住院计划
-				homePageVO.setAgainBehospitalGoal(rs.getString("againBehospitalGoal"));//再住院目的
-				homePageVO.setTbiBeforeDay(rs.getString("tbiBeforeDay"));//颅脑损伤患者昏迷前天数
-				homePageVO.setTbiBeforeHour(rs.getString("tbiBeforeHour"));//颅脑损伤患者昏迷前小时
-				homePageVO.setTbiBeforeMinute(rs.getString("tbiBeforeMinute"));//颅脑损伤患者昏迷前分钟
-				homePageVO.setTbiAfterDay(rs.getString("tbiAfterDay"));//颅脑损伤患者昏迷后天数
-				homePageVO.setTbiAfterHour(rs.getString("tbiAfterHour"));//颅脑损伤患者昏迷后小时
-				homePageVO.setTbiAfterMinute(rs.getString("tbiAfterMinute"));//颅脑损伤患者昏迷后分钟
-				homePageVO.setTotalFee(rs.getString("totalFee"));//总费用
-				homePageVO.setOwnFee(rs.getString("ownFee"));//自付金额
-				homePageVO.setGeneralFee(rs.getString("generalFee"));//一般医疗服务费
-				homePageVO.setServiceFee(rs.getString("serviceFee"));//一般治疗服务费
-				homePageVO.setNurseFee(rs.getString("nurseFee"));//护理费
-				homePageVO.setOtherFee(rs.getString("otherFee"));//其他费用
-				homePageVO.setPathologyFee(rs.getString("pathologyFee"));//病理诊断费
-				homePageVO.setLabFee(rs.getString("labFee"));//实验室诊断费
-				homePageVO.setPacsFee(rs.getString("pacsFee"));//影像学诊断费
-				homePageVO.setClinicDiagnoseFee(rs.getString("clinicDiagnoseFee"));//临床诊断项目费
-				homePageVO.setNotOperationFee(rs.getString("notOperationFee"));//非手术治疗项目费
-				homePageVO.setClinicPhysicFee(rs.getString("clinicPhysicFee"));//临床物理治疗费
-				homePageVO.setOperationTreatFee(rs.getString("operationTreatFee"));//手术治疗费
-				homePageVO.setAnaesthesiaFee(rs.getString("anaesthesiaFee"));//麻醉费
-				homePageVO.setOperationFee(rs.getString("operationFee"));//手术费
-				homePageVO.setHealthTypeFee(rs.getString("healthTypeFee"));//康复类
-				homePageVO.setChnTreatFee(rs.getString("chnTreatFee"));//中医治疗费
-				homePageVO.setWesternMedFee(rs.getString("westernMedFee"));//西药费
-				homePageVO.setAntibiosisFee(rs.getString("antibiosisFee"));//抗菌药物费用
-				homePageVO.setChnMedFee(rs.getString("chnMedFee"));//中成药费
-				homePageVO.setChnHerbFee(rs.getString("chnHerbFee"));//中草药费
-				homePageVO.setBloodFee(rs.getString("bloodFee"));//血费
-				homePageVO.setAlbumenFee(rs.getString("albumenFee"));//白蛋白类制品费
-				homePageVO.setGlobulinFee(rs.getString("globulinFee"));//球蛋白类制品费
-				homePageVO.setBloodFactorFee(rs.getString("bloodFactorFee"));//凝血因子类制品费
-				homePageVO.setCellFactorFee(rs.getString("cellFactorFee"));//细胞因子类制品费
-				homePageVO.setCheckMaterialFee(rs.getString("checkMaterialFee"));//检查用一次性医用材料费
-				homePageVO.setTreatMaterialFee(rs.getString("treatMaterialFee"));//治疗用一次性医用材料费
-				homePageVO.setOperationMaterialFee(rs.getString("operationMaterialFee"));//手术用一次性医用材料费
-				homePageVO.setOtherTypeFee(rs.getString("otherTypeFee"));//其他类其他费
-				homePageVO.setSingleDiagManage(rs.getString("singleDiagManage"));//单病种管理
-				homePageVO.setClinicPathwayManage(rs.getString("clinicPathwayManage"));//临床路径管理
-				homePageVO.setIsOutpatientBehospital(rs.getString("isOutpatientBehospital"));//门诊与住院
-				homePageVO.setIsLeaveBehospital(rs.getString("isLeaveBehospital"));//入院与出院
-				homePageVO.setIsOperationBeforeAfter(rs.getString("isOperationBeforeAfter"));//术前与术后
-				homePageVO.setIsClinicPathology(rs.getString("isClinicPathology"));//临床与病理
-				homePageVO.setIsRadiatePathology(rs.getString("isRadiatePathology"));//放射与病理
-				homePageVO.setRescueSuccessNum(rs.getString("rescueNum"));//病人抢救次数
-				homePageVO.setRescueSuccessNum(rs.getString("rescueSuccessNum"));//病人抢救成功次数
-				homePageVO.setIsAutoLeavehospital(rs.getString("isAutoLeavehospital"));//是否为自动出院
-				homePageVO.setReturnToType(rs.getString("returnToType"));//转归情况HomePage homePageVO=new HomePage();
-
-				homePageVO.setIsPhysicalRestraint(rs.getString("isPhysicalRestraint"));//住院期间身体约束
-				homePageVO.setTbiBehospitalBeforeTime(rs.getString("tbiBehospitalBeforeTime"));//颅脑损伤患者昏迷时间(入院前)
-				homePageVO.setIsPhysicalRestraint(rs.getString("isPhysicalRestraint"));//颅脑损伤患者昏迷时间(入院后)
-				homePageVO.setIsFallBed(rs.getString("isFallBed"));//住院期间是否发生跌倒或坠床
-				homePageVO.setIsNosocomialInfection(rs.getString("isNosocomialInfection"));//医院感染
-				homePageVO.setIsIntoIcu(rs.getString("isIntoIcu"));//入住ICU情况
-				homePageVO.setIsComplications(rs.getString("isComplications"));//并发症情况
-				homePageVO.setIsPressureSore(rs.getString("isPressureSore"));//是否发生压疮
-				homePageVO.setIsBehospitalPressureSore(rs.getString("isBehospitalPressureSore"));//是否住院期间发生压疮
-				homePageVO.setIsUnplannedReoperation(rs.getString("isUnplannedReoperation"));//非计划再次手术
-				homePageVO.setTreatmentResults(rs.getString("treatmentResults"));//治疗结果
-				homePageVO.setComplicationsResults(rs.getString("complicationsResults"));//并发症
-				homePageVO.setInfectionSite(rs.getString("infectionSite"));//感染部位
-				homePageVO.setIsBeInDanger(rs.getString("isBeInDanger"));//住院期间有无告病危
-				homePageList.add(homePageVO);
-			}
+//			if (!rs.next()){
+//                System.out.println("返回查询结果为空");
+//            }else {
+                while(rs.next()){
+                    HomePage homePageVO=new HomePage();
+                    homePageVO.setHomePageId(rs.getString("homePageId"));//病案首页编号
+                    homePageVO.setHospitalId(HOSPITAL_ID);//医院ID
+                    homePageVO.setBehospitalCode(rs.getString("behospitalCode")+"_"+rs.getString("behospitalNum"));//病人住院序号
+                    homePageVO.setHospitalCode(rs.getString("hospitalCode"));//组织机构id
+                    homePageVO.setHospitalName(rs.getString("hospitalName"));//医疗机构名称
+                    homePageVO.setOrgCode(rs.getString("orgCode"));//医疗机构代码
+                    homePageVO.setPayType(rs.getString("payType"));//医疗付费方式
+                    homePageVO.setHealthCard(rs.getString("healthCard"));//健康卡号
+                    homePageVO.setBehospitalNum(rs.getString("behospitalNum"));//住院次数
+                    homePageVO.setFileCode(rs.getString("fileCode"));//病案号
+                    homePageVO.setName(rs.getString("name"));//姓名
+                    homePageVO.setSex(rs.getString("sex"));//性别
+                    homePageVO.setBirthday(rs.getDate("birthday"));//出生日期
+                    homePageVO.setAge(rs.getString("age").equals("-")?null:rs.getString("age"));//病人年龄
+                    homePageVO.setAgeUnit(rs.getString("ageUnit"));//年龄单位
+                    homePageVO.setNationality(rs.getString("nationality"));//国籍
+                    homePageVO.setNewbornMonth(rs.getString("newbornMonth"));//新生儿出生月数
+                    homePageVO.setNewbornDay(rs.getString("newbornDay"));//新生儿出生天数
+                    homePageVO.setNewbornWeight(rs.getString("newbornWeight"));//新生儿出生体重
+                    homePageVO.setNewbornBehospitalWeight(rs.getString("newbornBehospitalWeight"));//新生儿入院体重
+                    homePageVO.setBornAddress(rs.getString("bornAddress"));//出生地
+                    homePageVO.setBornPlace(rs.getString("bornPlace"));//籍贯
+                    homePageVO.setNation(rs.getString("nation"));//民族
+                    homePageVO.setIdentityCardNo(rs.getString("identityCardNo"));//身份证号
+                    homePageVO.setJobType(rs.getString("jobType"));//职业
+                    homePageVO.setMarriage(rs.getString("marriage"));//婚姻
+                    homePageVO.setCurAddress(rs.getString("curAddress"));//现住址
+                    homePageVO.setCurPhone(rs.getString("curPhone"));//现住址电话
+                    homePageVO.setCurPostCode(rs.getString("curPostCode"));//现住址邮编
+                    homePageVO.setResidenceAddress(rs.getString("residenceAddress"));//户口地址
+                    homePageVO.setResidencePostCode(rs.getString("residencePostCode"));//户口地址邮编
+                    homePageVO.setWorkAddress(rs.getString("workAddress"));//工作单位
+                    homePageVO.setWorkPhone(rs.getString("workPhone"));//工作单位电话
+                    homePageVO.setWorkPostCode(rs.getString("workPostCode"));//工作单位邮编
+                    homePageVO.setContactName(rs.getString("contactName"));//联系人姓名
+                    homePageVO.setContactRelation(rs.getString("contactRelation"));//联系人关系
+                    homePageVO.setContactAddress(rs.getString("contactAddress"));//联系人地址
+                    homePageVO.setContactPhone(rs.getString("contactPhone"));//联系人电话
+                    homePageVO.setBehospitalWay(rs.getString("behospitalWay"));//入院途径
+                    homePageVO.setBehospitalDate(StringUtils.isNotBlank(rs.getString("behospitalDate"))?DateUtil.parseDateTime(rs.getString("behospitalDate")):null);//入院时间
+                    homePageVO.setBehospitalDept(rs.getString("behospitalDept"));//入院科室
+                    homePageVO.setBehospitalWard(rs.getString("behospitalWard"));//入院病房
+                    homePageVO.setBehospitalBedId(rs.getString("behospitalBedId"));//入院床位序号
+                    homePageVO.setBehospitalBedCode(rs.getString("behospitalBedCode"));//入院床位号码
+                    homePageVO.setChangeDept(rs.getString("changeDept"));//转科科别
+                    homePageVO.setLeaveHospitalDate(StringUtils.isNotBlank(rs.getString("leaveHospitalDate"))?DateUtil.parseDateTime(rs.getString("leaveHospitalDate")):null);//出院时间
+                    homePageVO.setLeaveHospitalDept(rs.getString("leaveHospitalDept"));//出院科别
+                    homePageVO.setLeaveHospitalWard(rs.getString("leaveHospitalWard"));//出院病房
+                    homePageVO.setLeaveHospitalBedId(rs.getString("leaveHospitalBedId"));//出院床位序号
+                    homePageVO.setLeaveHospitalBedCode(rs.getString("leaveHospitalBedCode"));//出院床位号码
+                    homePageVO.setBehospitalDayNum(rs.getString("behospitalDayNum"));//实际住院天数
+                    homePageVO.setOutpatientEmrDiagnose(rs.getString("outpatientEmrDiagnose"));//门急诊诊断
+                    homePageVO.setOutpatientEmrDiagnoseCode(rs.getString("outpatientEmrDiagnoseCode"));//门急诊诊断编码
+                    homePageVO.setPoisonFactor(rs.getString("poisonFactor"));//损伤中毒因素
+                    homePageVO.setPoisonFactorCode(rs.getString("poisonFactorCode"));//损伤中毒因素编码
+                    homePageVO.setPathologyDiagnose(rs.getString("pathologyDiagnose"));//病理诊断
+                    homePageVO.setPathologyDiagnoseCode(rs.getString("pathologyDiagnoseCode"));//病理诊断编码
+                    homePageVO.setPathologyDiagnoseId(rs.getString("pathologyDiagnoseId"));//病理诊断编号
+                    homePageVO.setIsMedAllergy(rs.getString("isMedAllergy"));//药物过敏
+                    homePageVO.setMedAllergyName(rs.getString("medAllergyName"));//过敏药物
+                    homePageVO.setAutopsy(rs.getString("autopsy"));//死亡患者尸检
+                    homePageVO.setBloodType(rs.getString("bloodType"));//血型
+                    homePageVO.setRh(rs.getString("rh"));//Rh
+                    homePageVO.setDeptDirector(rs.getString("deptDirector"));//科主任
+                    homePageVO.setDirectorDoctor(rs.getString("directorDoctor"));//主任医师
+                    homePageVO.setAttendingDoctor(rs.getString("attendingDoctor"));//主治医师
+                    homePageVO.setBehospitalDoctor(rs.getString("behospitalDoctor"));//住院医师
+                    homePageVO.setResponseNurse(rs.getString("responseNurse"));//责任护士
+                    homePageVO.setStudyDoctor(rs.getString("studyDoctor"));//进修医师
+                    homePageVO.setPracticeDoctor(rs.getString("practiceDoctor"));//实习医师
+                    homePageVO.setEncodeMan(rs.getString("encodeMan"));//编码员
+                    homePageVO.setHomePageQuality(rs.getString("homePageQuality"));//病案质量
+                    homePageVO.setQcDoctor(rs.getString("qcDoctor"));//质控医师
+                    homePageVO.setQcNurse(rs.getString("qcNurse"));//质控护士
+                    if(!"".equals(rs.getString("qcDate"))){
+                        homePageVO.setQcDate(DateUtil.parseDate(rs.getString("qcDate"),DateUtil.DATE_TIME_FORMAT));//质控日期
+                    }
+                    homePageVO.setLeaveHospitalType(rs.getString("leaveHospitalType"));//离院方式
+                    homePageVO.setAcceptOrgCode(rs.getString("acceptOrgCode"));//接收机构名称
+                    homePageVO.setAgainBehospitalPlan(rs.getString("againBehospitalPlan"));//31天内再住院计划
+                    homePageVO.setAgainBehospitalGoal(rs.getString("againBehospitalGoal"));//再住院目的
+                    homePageVO.setTbiBeforeDay(rs.getString("tbiBeforeDay"));//颅脑损伤患者昏迷前天数
+                    homePageVO.setTbiBeforeHour(rs.getString("tbiBeforeHour"));//颅脑损伤患者昏迷前小时
+                    homePageVO.setTbiBeforeMinute(rs.getString("tbiBeforeMinute"));//颅脑损伤患者昏迷前分钟
+                    homePageVO.setTbiAfterDay(rs.getString("tbiAfterDay"));//颅脑损伤患者昏迷后天数
+                    homePageVO.setTbiAfterHour(rs.getString("tbiAfterHour"));//颅脑损伤患者昏迷后小时
+                    homePageVO.setTbiAfterMinute(rs.getString("tbiAfterMinute"));//颅脑损伤患者昏迷后分钟
+                    homePageVO.setTotalFee(rs.getString("totalFee"));//总费用
+                    homePageVO.setOwnFee(rs.getString("ownFee"));//自付金额
+                    homePageVO.setGeneralFee(rs.getString("generalFee"));//一般医疗服务费
+                    homePageVO.setServiceFee(rs.getString("serviceFee"));//一般治疗服务费
+                    homePageVO.setNurseFee(rs.getString("nurseFee"));//护理费
+                    homePageVO.setOtherFee(rs.getString("otherFee"));//其他费用
+                    homePageVO.setPathologyFee(rs.getString("pathologyFee"));//病理诊断费
+                    homePageVO.setLabFee(rs.getString("labFee"));//实验室诊断费
+                    homePageVO.setPacsFee(rs.getString("pacsFee"));//影像学诊断费
+                    homePageVO.setClinicDiagnoseFee(rs.getString("clinicDiagnoseFee"));//临床诊断项目费
+                    homePageVO.setNotOperationFee(rs.getString("notOperationFee"));//非手术治疗项目费
+                    homePageVO.setClinicPhysicFee(rs.getString("clinicPhysicFee"));//临床物理治疗费
+                    homePageVO.setOperationTreatFee(rs.getString("operationTreatFee"));//手术治疗费
+                    homePageVO.setAnaesthesiaFee(rs.getString("anaesthesiaFee"));//麻醉费
+                    homePageVO.setOperationFee(rs.getString("operationFee"));//手术费
+                    homePageVO.setHealthTypeFee(rs.getString("healthTypeFee"));//康复类
+                    homePageVO.setChnTreatFee(rs.getString("chnTreatFee"));//中医治疗费
+                    homePageVO.setWesternMedFee(rs.getString("westernMedFee"));//西药费
+                    homePageVO.setAntibiosisFee(rs.getString("antibiosisFee"));//抗菌药物费用
+                    homePageVO.setChnMedFee(rs.getString("chnMedFee"));//中成药费
+                    homePageVO.setChnHerbFee(rs.getString("chnHerbFee"));//中草药费
+                    homePageVO.setBloodFee(rs.getString("bloodFee"));//血费
+                    homePageVO.setAlbumenFee(rs.getString("albumenFee"));//白蛋白类制品费
+                    homePageVO.setGlobulinFee(rs.getString("globulinFee"));//球蛋白类制品费
+                    homePageVO.setBloodFactorFee(rs.getString("bloodFactorFee"));//凝血因子类制品费
+                    homePageVO.setCellFactorFee(rs.getString("cellFactorFee"));//细胞因子类制品费
+                    homePageVO.setCheckMaterialFee(rs.getString("checkMaterialFee"));//检查用一次性医用材料费
+                    homePageVO.setTreatMaterialFee(rs.getString("treatMaterialFee"));//治疗用一次性医用材料费
+                    homePageVO.setOperationMaterialFee(rs.getString("operationMaterialFee"));//手术用一次性医用材料费
+                    homePageVO.setOtherTypeFee(rs.getString("otherTypeFee"));//其他类其他费
+                    homePageVO.setSingleDiagManage(rs.getString("singleDiagManage"));//单病种管理
+                    homePageVO.setClinicPathwayManage(rs.getString("clinicPathwayManage"));//临床路径管理
+                    homePageVO.setIsOutpatientBehospital(rs.getString("isOutpatientBehospital"));//门诊与住院
+                    homePageVO.setIsLeaveBehospital(rs.getString("isLeaveBehospital"));//入院与出院
+                    homePageVO.setIsOperationBeforeAfter(rs.getString("isOperationBeforeAfter"));//术前与术后
+                    homePageVO.setIsClinicPathology(rs.getString("isClinicPathology"));//临床与病理
+                    homePageVO.setIsRadiatePathology(rs.getString("isRadiatePathology"));//放射与病理
+                    homePageVO.setRescueSuccessNum(rs.getString("rescueNum"));//病人抢救次数
+                    homePageVO.setRescueSuccessNum(rs.getString("rescueSuccessNum"));//病人抢救成功次数
+                    homePageVO.setIsAutoLeavehospital(rs.getString("isAutoLeavehospital"));//是否为自动出院
+                    homePageVO.setReturnToType(rs.getString("returnToType"));//转归情况HomePage homePageVO=new HomePage();
+
+                    homePageVO.setIsPhysicalRestraint(rs.getString("isPhysicalRestraint"));//住院期间身体约束
+                    homePageVO.setTbiBehospitalBeforeTime(rs.getString("tbiBehospitalBeforeTime"));//颅脑损伤患者昏迷时间(入院前)
+                    homePageVO.setIsPhysicalRestraint(rs.getString("isPhysicalRestraint"));//颅脑损伤患者昏迷时间(入院后)
+                    homePageVO.setIsFallBed(rs.getString("isFallBed"));//住院期间是否发生跌倒或坠床
+                    homePageVO.setIsNosocomialInfection(rs.getString("isNosocomialInfection"));//医院感染
+                    homePageVO.setIsIntoIcu(rs.getString("isIntoIcu"));//入住ICU情况
+                    homePageVO.setIsComplications(rs.getString("isComplications"));//并发症情况
+                    homePageVO.setIsPressureSore(rs.getString("isPressureSore"));//是否发生压疮
+                    homePageVO.setIsBehospitalPressureSore(rs.getString("isBehospitalPressureSore"));//是否住院期间发生压疮
+                    homePageVO.setIsUnplannedReoperation(rs.getString("isUnplannedReoperation"));//非计划再次手术
+                    homePageVO.setTreatmentResults(rs.getString("treatmentResults"));//治疗结果
+                    homePageVO.setComplicationsResults(rs.getString("complicationsResults"));//并发症
+                    homePageVO.setInfectionSite(rs.getString("infectionSite"));//感染部位
+                    homePageVO.setIsBeInDanger(rs.getString("isBeInDanger"));//住院期间有无告病危
+                    homePageList.add(homePageVO);
+                }
+//            }
 		} catch (Exception e) {
 			e.printStackTrace();
 		}finally {

src/main/java/com/diagbot/web/DataController.java

@@ -1,6 +1,6 @@
 package com.diagbot.web;
 
-import com.diagbot.annotation.MrqcLog;
+//import com.diagbot.annotation.MrqcLog;
 import com.diagbot.annotation.SysLogger;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.data.*;
@@ -245,7 +245,7 @@ public class DataController {
     @ApiOperation(value = "化验信息")
     @PostMapping("/sendLisInfos")
     @SysLogger("sendLisInfos")
-    @MrqcLog
+//    @MrqcLog
     public RespDTO sendLisInfos(@RequestBody List<AMedLisInfoVO> list) {
         return aMedLisInfoFacade.dealData(list);
     }
@@ -279,8 +279,8 @@ public class DataController {
     }
 
     @ApiOperation(value = "数据引擎-历史数据拉取（出院时间）")
-    @PostMapping("/sendData")
-    @SysLogger("sendData")
+    @PostMapping("/sendDateOld")
+    @SysLogger("sendDateOld")
     public void sendDateOld(String startDate,String stopDate){
         viewFacade.executeData(startDate,stopDate);
     }

src/main/resources/application-local.yml

@@ -68,7 +68,7 @@ spring:
       # 初始化大小，最小，最大
       initialSize: 5
       minIdle: 5
-      maxActive: 65
+      maxActive: 20
       # 配置获取连接等待超时的时间
       maxWait: 60000
       # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒

src/main/resources/logback-spring.xml

@@ -185,7 +185,7 @@
         </encoder>
         <!--此日志appender是为开发使用，只配置最底级别，控制台输出的日志级别是大于或等于此级别的日志信息-->
         <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
-            <level>error</level>
+            <level>DEBUG</level>
         </filter>
     </appender>