jiangjiazhi / regional-platform | GitLab

Commit 2090a69cb9ea93821d9ed6f8c4a0e4b64fd7b78b

Authored by liquanyu over 5 years ago

1 parent 47f8143e26

Exists in master and in 6 other branches

update

Showing 3 changed files with 23 additions and 1 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/HealthChargeFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExManagerQueryRequest.java

...	...	@@ -165,6 +165,17 @@
165	165	antExRecordQuery.setCheckTimeEnd(DateUtil.parseYMD(dates[1]));
166	166	}
167	167	}
	168	+
	169	+ //预约产检日期
	170	+ if (StringUtils.isNotEmpty(antExManagerQueryRequest.getNextTime())) {
	171	+ String nextTimestr = antExManagerQueryRequest.getNextTime();
	172	+ String[] dates = nextTimestr.split(" - ");
	173	+ antExRecordQuery.setNextCheckTimeStart(DateUtil.parseYMD(dates[0]));
	174	+ if (dates.length == 2) {
	175	+ antExRecordQuery.setNextCheckTimeEnd(DateUtil.parseYMD(dates[1]));
	176	+ }
	177	+ }
	178	+
168	179	//建档日期
169	180	if (org.apache.commons.lang.StringUtils.isNotEmpty(antExManagerQueryRequest.getbTime())) {
170	181	String nextDateStr = antExManagerQueryRequest.getbTime();

...	...	@@ -273,7 +273,8 @@
273	273	return null;
274	274	}
275	275	map.put("userName",babyModel.getName());
276		- map.put("age", DateUtil.getBabyMonthAge(babyModel.getBirth(), model.getCreated()));
	276	+ map.put("age", DateUtil.getBabyMonthAge(babyModel.getBirth(), new Date()));
	277	+ map.put("checkMonth", DateUtil.getBabyMonthAge(babyModel.getBirth(), model.getCreated()));
277	278	}
278	279	else
279	280	{

...	...	@@ -94,6 +94,16 @@
94	94
95	95	private boolean isCurrent;
96	96
	97	+ private String nextTime;
	98	+
	99	+ public String getNextTime() {
	100	+ return nextTime;
	101	+ }
	102	+
	103	+ public void setNextTime(String nextTime) {
	104	+ this.nextTime = nextTime;
	105	+ }
	106	+
97	107	public boolean isCurrent() {
98	108	return isCurrent;
99	109	}