jiangjiazhi / regional-platform

Authored by wtt over 5 years ago

Exists in master and in 6 other branches

Showing 2 changed files with 8 additions and 5 deletions

...	...	@@ -18,7 +18,7 @@
18	18	private static final long serialVersionUID = SerialIdEnum.BabyEyeCheck.getCid();
19	19
20	20	//检查是儿童月龄
21		- private String monthAge;
	21	+ private String checkMonthAge;
22	22
23	23	/**
24	24	* start 秦皇岛新增的眼保健字段
25	25
...	...	@@ -835,12 +835,12 @@
835	835	this.lacrimalApparatus = lacrimalApparatus;
836	836	}
837	837
838		- public String getMonthAge() {
839		- return monthAge;
	838	+ public String getCheckMonthAge() {
	839	+ return checkMonthAge;
840	840	}
841	841
842		- public void setMonthAge(String monthAge) {
843		- this.monthAge = monthAge;
	842	+ public void setCheckMonthAge(String checkMonthAge) {
	843	+ this.checkMonthAge = checkMonthAge;
844	844	}
845	845
846	846	public String getEyeMovementsId() {

...	...	@@ -451,6 +451,8 @@
451	451	if (StringUtils.isNotEmpty(doctor)) {
452	452	map.put("doctor", couponMapper.getUserName(doctor));
453	453	}
	454	+ map.put("checkMonthAge", babyEyeCheck.getCheckMonthAge());//检查月龄是儿童月龄
	455	+
454	456	/**
455	457	* start 秦皇岛眼保健新增的
456	458	* @Author: 武涛涛
...	...	@@ -668,6 +670,7 @@
668	670	Map<String, Object> map = ReflectionUtils.beanToMap(babyEyeCheck);
669	671	map.put("checkTime", DateUtil.getYyyyMmDd(babyEyeCheck.getCheckTime()));
670	672	map.put("uncooperative", babyEyeCheck.isUncooperative());
	673	+ map.put("checkMonthAge", babyEyeCheck.getCheckMonthAge());
671	674	if (StringUtils.isNotEmpty(babyEyeCheck.getCheckMonthId())) {
672	675	//处理老数据
673	676	if ("0".equals(babyEyeCheck.getCheckMonthId())) {