jiangjiazhi / regional-platform | GitLab

Commit 30df695fc927a5d1ffe47ef2098aa73db3accc13

Authored by [wangbo] over 6 years ago

1 parent 11f668c61b

Exists in master and in 6 other branches

孕妇追访bug3修改

Showing 2 changed files with 5 additions and 3 deletions

platform-dal/src/main/java/com/lyms/platform/query/TrackDownRecordQuery.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TrackDownFacade.java

...	...	@@ -374,9 +374,11 @@
374	374	}
375	375	if (null != followupStatus) {
376	376	if (followupStatus == 0) {
377		- condition = condition.and("appointmentDate", new Date(), MongoOper.GT);
	377	+ Date newDate = DateUtil.parseYMDHMS(DateUtil.getyyyy_MM_dd(new Date()) + " 00:00:00");
	378	+ condition = condition.and("appointmentDate", newDate, MongoOper.GTE);
378	379	} else if (followupStatus == 1) {
379		- condition = condition.and("appointmentDate", new Date(), MongoOper.LT);
	380	+ Date newDate = DateUtil.parseYMDHMS(DateUtil.getyyyy_MM_dd(new Date()) + " 00:00:00");
	381	+ condition = condition.and("appointmentDate", newDate, MongoOper.LT);
380	382	} else if (followupStatus == 2) {
381	383	condition = condition.and("stop", "1", MongoOper.IS);
382	384	}

...	...	@@ -31,6 +31,7 @@
31	31	import javax.annotation.PostConstruct;
32	32	import javax.servlet.ServletOutputStream;
33	33	import javax.servlet.http.HttpServletResponse;
	34	+import java.text.SimpleDateFormat;
34	35	import java.util.*;
35	36
36	37
...	...	@@ -1041,7 +1042,6 @@
1041	1042
1042	1043
1043	1044	}
1044		-
1045	1045
1046	1046	}