jiangjiazhi / regional-platform | GitLab

Commit 30b74223157228f0a88ad439fb46493b64285e48

Authored by liquanyu almost 9 years ago

1 parent b2d768899c

Exists in master and in 8 other branches

update code

Showing 2 changed files with 22 additions and 0 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyCheckResult.java

...	...	@@ -518,6 +518,17 @@
518	518	model.setHighRisk(checkModel.getHighRisk());
519	519	model.setCheckDate(DateUtil.getyyyy_MM_dd(checkModel.getCheckDate()));
520	520
	521	+ BabyModelQuery babyQuery = new BabyModelQuery();
	522	+ babyQuery.setId(checkModel.getBuildId());
	523	+ babyQuery.setYn(YnEnums.YES.getId());
	524	+
	525	+ List<BabyModel> models = babyBookbuildingService.queryBabyBuildByCond(babyQuery);
	526	+
	527	+ if (CollectionUtils.isNotEmpty(models))
	528	+ {
	529	+ model.setMonthAge(DateUtil.getBabyMonthAge(models.get(0).getBirth(), checkModel.getCheckDate()));
	530	+ }
	531	+
521	532	model.setDrugGllergic(JsonUtil.str2Obj(checkModel.getDrugGllergic(), Map.class));
522	533	model.setChestw(checkModel.getChestw());
523	534

...	...	@@ -208,6 +208,17 @@
208	208	//检查时间
209	209	private String checkDate;
210	210
	211	+ //月龄
	212	+ private String monthAge;
	213	+
	214	+ public String getMonthAge() {
	215	+ return monthAge;
	216	+ }
	217	+
	218	+ public void setMonthAge(String monthAge) {
	219	+ this.monthAge = monthAge;
	220	+ }
	221	+
211	222	public String getCheckDate() {
212	223	return checkDate;
213	224	}