jiangjiazhi / regional-platform

Authored by yangfei about 8 years ago

Exists in master and in 6 other branches

Showing 3 changed files with 14 additions and 2 deletions

...	...	@@ -515,6 +515,7 @@
515	515	private Date fmDateStart;
516	516	private Date fmDateEnd;
517	517	private Date nextCheckTime;
	518	+ private Date isNextCheckTime;
518	519	private Date nextCheckTimeStart;
519	520	private Date nextCheckTimeEnd;
520	521
...	...	@@ -563,6 +564,14 @@
563	564
564	565	private String blNum;
565	566
	567	+ public Date getIsNextCheckTime() {
	568	+ return isNextCheckTime;
	569	+ }
	570	+
	571	+ public void setIsNextCheckTime(Date isNextCheckTime) {
	572	+ this.isNextCheckTime = isNextCheckTime;
	573	+ }
	574	+
566	575	public Date getNextCheckTime() {
567	576	return nextCheckTime;
568	577	}
...	...	@@ -1667,6 +1676,10 @@
1667	1676
1668	1677	if (null != nextCheckTime) {
1669	1678	condition = condition.and("nextCheckTime", nextCheckTime, MongoOper.NE);
	1679	+ }
	1680	+
	1681	+ if (null != isNextCheckTime) {
	1682	+ condition = condition.and("nextCheckTime", isNextCheckTime, MongoOper.IS);
1670	1683	}
1671	1684
1672	1685	if (StringUtils.isNotEmpty(fmHospital)) {

...	...	@@ -879,7 +879,7 @@
879	879	//该提醒的预约产检时间
880	880	Date yuYueDate = DateUtils.addDay(new Date(), sendTimeType);
881	881
882		- patientsQuery.setNextCheckTimeStart(yuYueDate);
	882	+ patientsQuery.setIsNextCheckTime(yuYueDate);
883	883	//查指定预约下次产检时间
884	884	List<Patients> patients = yunBookbuildingService.queryPregnantWithQuery(patientsQuery);
885	885

...	...	@@ -41,7 +41,6 @@
41	41	/**
42	42	* 查询当前医院的功能配置项
43	43	* @param hospitalId
44		- * @param request
45	44	* @return
46	45	*/
47	46	@RequestMapping(method = RequestMethod.GET, value = "/queryModularFunConfig")