liquanyu / talkonline | GitLab

Commit 19dd57131f576222e7183660a8a7f8c993daf6a0

Authored by zhangchao over 1 year ago

1 parent 1f99a4e778

Exists in dev

#fix 优化一键上传订单查询的逻辑问题

Showing 3 changed files with 7 additions and 3 deletions

oss/src/main/java/com/lyms/oss/utils/DateUtils.java
talkonlineweb/src/main/java/com/lyms/talkonlineweb/service/impl/LymsHisInfoServiceImpl.java
talkonlineweb/src/main/java/com/lyms/talkonlineweb/task/ServiceContentTask.java

...	...	@@ -174,5 +174,9 @@
174	174	DateTime dateTime = new DateTime(date);
175	175	return dateTime.plusYears(years).toDate();
176	176	}
	177	+
	178	+ public static void main(String[] args) {
	179	+ System.out.println(DateUtils.format(DateUtils.addDateDays(new Date(),-14)));
	180	+ }
177	181	}

...	...	@@ -282,8 +282,8 @@
282	282	}
283	283	QueryWrapper<LymsOrder> queryWrapper = new QueryWrapper<>();
284	284	queryWrapper.eq("pid",patient.getId());
285		- queryWrapper.gt("status",0);
286		- queryWrapper.gt("createdtime", DateUtil.addDay(new Date(),-2));
	285	+ queryWrapper.eq("status",1);
	286	+ queryWrapper.ge("service_end_time", new Date());
287	287	List<LymsOrder> list = lymsOrderService.list(queryWrapper);
288	288	if(CollectionUtils.isEmpty(list)){
289	289	String remark= "患者还没有缴费，暂时不能上传";

...	...	@@ -34,7 +34,7 @@
34	34	log.info("serviceContent startup");
35	35	Date day=new Date();
36	36	String seven= DateUtils.format(DateUtils.addDateDays(day,-7));
37		- String fourteen= DateUtils.format(DateUtils.addDateDays(day,-15));
	37	+ String fourteen= DateUtils.format(DateUtils.addDateDays(day,-14));
38	38	String twenty=DateUtils.format(DateUtils.addDateDays(day,-21));
39	39	String twentyEight=DateUtils.format(DateUtils.addDateDays(day,-28));
40	40	String startStr=" 00:00:00";