Merge branch 'master' into 'master'

增加住院诊疗活动定时任务

See merge request xiao/thyy-business-center!2

thyy-scheduled/src/main/java/org/thyy/scheduled/task/MainBusinessTask.java

@@ -84,6 +84,14 @@ public class MainBusinessTask {
         }
     }
 
+    @Scheduled(cron = "0 40 0,4,8,12,16,20 * * ?")
+    public void uploadEmrActivityInfoByZy() {
+        if (StrUtil.isNotBlank(thyy.getMainAddress())) {
+            String url = thyy.getMainAddress() + "/crbBase/uploadEmrActivityInfoByZy";
+            template.getForObject(url, String.class);
+        }
+    }
+
     @Scheduled(cron = "0 0 6 * * ?")
     public void notifyDailyCount() {
         if (StrUtil.isNotBlank(thyy.getMainAddress())) {