|
@@ -386,7 +386,7 @@ public class ClinicController {
|
|
|
|
|
|
|
|
|
/**
|
|
|
- * 初始化就诊记录表
|
|
|
+ * 初始化就诊记录表 全局初始化或者部分初始化
|
|
|
*
|
|
|
* @return
|
|
|
*/
|
|
@@ -398,7 +398,7 @@ public class ClinicController {
|
|
|
calendar.set(Calendar.YEAR, 2022);
|
|
|
//01 是2月。月份会加1
|
|
|
calendar.set(Calendar.MONTH, 01);
|
|
|
- calendar.set(Calendar.DAY_OF_MONTH, 18);
|
|
|
+ calendar.set(Calendar.DAY_OF_MONTH, 23);
|
|
|
calendar.set(Calendar.HOUR_OF_DAY, 0);
|
|
|
calendar.set(Calendar.MINUTE, 0);
|
|
|
calendar.set(Calendar.SECOND, 0);
|
|
@@ -415,7 +415,7 @@ public class ClinicController {
|
|
|
e.printStackTrace();
|
|
|
log.error("当前日期没有抓取 beginTime=" + beginTime + "----endTime=" + endTime);
|
|
|
}
|
|
|
- log.info("=====>>>>>开始日期{},结束日期{}初始化统计完成", DateUtil.fomart(beginTime, "yyyy-MM-dd HH:mm:ss"), DateUtil.fomart(endTime, "yyyy-MM-dd HH:mm:ss"));
|
|
|
+ log.info("=====>>>>>开始日期{},结束日期{}初始化就诊记录完成", DateUtil.fomart(beginTime, "yyyy-MM-dd HH:mm:ss"), DateUtil.fomart(endTime, "yyyy-MM-dd HH:mm:ss"));
|
|
|
beginTime = endTime;
|
|
|
if (beginTime.equals(breakDay)) {
|
|
|
break;
|
|
@@ -436,6 +436,47 @@ public class ClinicController {
|
|
|
}
|
|
|
|
|
|
|
|
|
+ /**
|
|
|
+ * 供定时任务调用的 初始化就诊记录表
|
|
|
+ *
|
|
|
+ * @return
|
|
|
+ */
|
|
|
+ @RequestMapping(value = "/initClinicWithDate", method = {RequestMethod.GET})
|
|
|
+ public Map<String, Object> initClinicWithDate(@RequestParam("beginDate") String beginDate,@RequestParam("endDate") String endDate) {
|
|
|
+ Map<String, Object> resultMap = new HashMap<>();
|
|
|
+ try {
|
|
|
+ if(StringUtils.isBlank(beginDate)){
|
|
|
+ resultMap.put("code", -1);
|
|
|
+ resultMap.put("message", "初始化就诊记录表失败,开始时间为空");
|
|
|
+ }
|
|
|
+ if(StringUtils.isBlank(endDate)){
|
|
|
+ resultMap.put("code", -1);
|
|
|
+ resultMap.put("message", "初始化就诊记录表失败,结束时间为空");
|
|
|
+ }
|
|
|
+ Date beginTime = DateUtil.pase(beginDate,"yyyy-MM-dd HH:mm:ss");
|
|
|
+ Date endTime =DateUtil.pase(endDate,"yyyy-MM-dd HH:mm:ss");
|
|
|
+ Set<String> set = new HashSet<>();
|
|
|
+ try {
|
|
|
+ process(beginTime, endTime, set);
|
|
|
+ } catch (Exception e) {
|
|
|
+ e.printStackTrace();
|
|
|
+ log.error("当前日期没有抓取 beginTime=" + beginTime + "----endTime=" + endTime);
|
|
|
+ }
|
|
|
+ log.info("=====>>>>>开始日期{},结束日期{}初始化就诊记录完成", DateUtil.fomart(beginTime, "yyyy-MM-dd HH:mm:ss"), DateUtil.fomart(endTime, "yyyy-MM-dd HH:mm:ss"));
|
|
|
+ resultMap.put("code", 0);
|
|
|
+ resultMap.put("message", "已经初始化就诊记录表成功");
|
|
|
+ return resultMap;
|
|
|
+ } catch (Exception e) {
|
|
|
+ e.printStackTrace();
|
|
|
+ log.error("初始化就诊记录表失败,错误信息{}", e);
|
|
|
+ resultMap.put("code", -1);
|
|
|
+ resultMap.put("message", "初始化就诊记录表失败");
|
|
|
+ return resultMap;
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
private void process(Date beginTime, Date endTime, Set<String> set) {
|
|
|
// List<MzVisitTable> mzVisitTableList = mzVisitTableService.queryByDateRages(beginTime, endTime, "mz_visit_table_b");
|
|
|
// setClinic(mzVisitTableList, set);
|