Merge branch 'dev' of http://192.168.1.220:10080/Amoy/patient-co-management into dev

patient-co-statistics/src/main/java/com/yihu/wlyy/statistics/job/message/NoticeJob.java

@@ -70,7 +70,7 @@ public class NoticeJob implements Job {
            //发送通知
            for (Doctor doctor : doctors) {
                //判断医生是不是在工作时间内
                String noticeContent1 = " 您当前有[zxsize]条未处理消息，其中[qysize]为条签约消息。请尽快处理~";
                String noticeContent1 = " 您当前有[zxsize]条未处理消息，其中[qysize]条为签约消息。请尽快处理~";
                String noticeContent2 = " 您当前有[zxsize]条未处理消息，请尽快处理~";
                String noticeContent3 = " 您当前有[qysize]条签约消息待处理，请尽快处理~";
                String workTime = "";

patient-co-statistics/src/main/java/com/yihu/wlyy/statistics/service/JobService.java

@@ -460,8 +460,8 @@ public class JobService {
    public void startNoticeJob() throws Exception {
        if (!quartzHelper.isExistJob(NoticeJob.jobKey)) {
            // quartzHelper.addJob(NoticeJob.class,NoticeJob.jobCron,NoticeJob.jobKey,new HashMap<>());
            quartzHelper.startNow(NoticeJob.class, UUID.randomUUID().toString().replace("-", ""), new HashMap<>());
            quartzHelper.addJob(NoticeJob.class,NoticeJob.jobCron,NoticeJob.jobKey,new HashMap<>());
           // quartzHelper.startNow(NoticeJob.class, UUID.randomUUID().toString().replace("-", ""), new HashMap<>());
        } else {
            throw new Exception("已经启动");