Merge branch 'dev' of yeshijie/patient-co-management into dev

patient-co/patient-co-wlyy-job/src/main/java/com/yihu/wlyy/event/ApplicationEvent.java

@@ -107,6 +107,7 @@ public class ApplicationEvent implements ApplicationListener<ContextRefreshedEve
            } else {
                logger.info("prescription_pay_query_job reorder job job exist");
            }
            //居民24小时未回复的咨询自动关闭 每小时59分开始执行一次
            if (!quartzHelper.isExistJob("finish_consult_job")) {
                String trigger = SystemConf.getInstance().getSystemProperties().getProperty("finish_consult_job");
@@ -151,7 +152,14 @@ public class ApplicationEvent implements ApplicationListener<ContextRefreshedEve
                logger.info("onepay_query_job  job exist");
            }
            //产检提醒 每天早上8点执行一次
            if (!quartzHelper.isExistJob("prenatal_inspector_job")) {
                String trigger = SystemConf.getInstance().getSystemProperties().getProperty("prenatal_inspector_job");
                quartzHelper.addJob(PrenatalInspectorJob.class, trigger, "prenatal_inspector_job", new HashMap<String, Object>());
                logger.info("prenatal_inspector_job success");
            } else {
                logger.info("prenatal_inspector_job exist");
            }
            // 启动redis 消息队列线程
            logger.info("redis message start");

patient-co/patient-co-wlyy-job/src/main/java/com/yihu/wlyy/repository/patient/PrenatalInspectorPlanDao.java

@@ -15,6 +15,6 @@ public interface PrenatalInspectorPlanDao extends PagingAndSortingRepository<Pre
    @Query("select a from PrenatalInspectorPlan a where a.inspectionCode = ?1 and a.status = '0' ")
    List<PrenatalInspectorPlan> findByCode(String inspectionCode);
    @Query("select a from PrenatalInspectorPlan a where a.inspectionTime is not null and a.status = '0' and ( TO_DAYS(a.inspectionTime)- TO_DAYS(NOW())=7 or TO_DAYS(a.inspectionTime)- TO_DAYS(NOW())=1 ) ")
    @Query("select a from PrenatalInspectorPlan a where a.inspectionTime is not null and a.status = '0' and a.del ='1' and ( TO_DAYS(a.inspectionTime)- TO_DAYS(NOW())=7 or TO_DAYS(a.inspectionTime)- TO_DAYS(NOW())=1 ) ")
    List<PrenatalInspectorPlan> findWxTipList();
}

patient-co/patient-co-wlyy-job/src/main/java/com/yihu/wlyy/web/quota/JobController.java

@@ -429,6 +429,23 @@ public class JobController extends BaseController {
        }
    }
    /**
     * 产检提醒
     * @author ysj
     * @date 2017/10/10 14:16
     */
    @RequestMapping(value = "/executePrenatalInspectorJob", method = RequestMethod.POST)
    @ApiOperation("产检提醒")
    public String executePrenatalInspectorJob() {
        try {
            quartzHelper.startNow(PrenatalInspectorJob.class, UUID.randomUUID().toString(), null);
            return write(200, "启动成功");
        } catch (Exception e) {
            error(e);
            return error(-1, e.getMessage());
        }
    }
    /**
     * 立即启动支付超时过期

patient-co/patient-co-wlyy-job/src/main/resources/system.properties

@@ -87,6 +87,9 @@ sfexpress_reorder_job=0 0/10 * * * ?
#同步智业字典
zy_dict_job=0 0 1 * * ?
#产检提醒
prenatal_inspector_job=0 0 8 * * ?
#遍历支付成功，院内结算失败的的记录，重新结算，3分钟跑一次
zy_execute_sick_settle_job=0 0/3 * * * ?
#处理当天支付，页面回调及异步回调失败的支付，每3分钟一次去主动查询并保存