jiangjiazhi / regional-platform

Authored by litao almost 8 years ago

Exists in master and in 6 other branches

Showing 4 changed files with 31 additions and 3 deletions

...	...	@@ -1645,6 +1645,9 @@
1645	1645	}
1646	1646	}
1647	1647
	1648	+ /** 优惠券编号 */
	1649	+ result.setCouponCode(couponService.findByUsedId(id));
	1650	+
1648	1651	BaseObjectResponse objectResponse = new BaseObjectResponse();
1649	1652	objectResponse.setData(result);
1650	1653	objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS);
...	...	@@ -1676,6 +1679,8 @@
1676	1679	}
1677	1680	result = getBabyCheckResult(checkModel,babyModel);
1678	1681
	1682	+ /** 优惠券编号 */
	1683	+ result.setCouponCode(couponService.findByUsedId(id));
1679	1684
1680	1685	}
1681	1686	}

...	...	@@ -259,6 +259,8 @@
259	259	//脐部
260	260	private String navel;
261	261
	262	+ private String couponCode;
	263	+
262	264	public String getNavel() {
263	265	return navel;
264	266	}
...	...	@@ -881,6 +883,14 @@
881	883
882	884	public void setBregmaValue(String bregmaValue) {
883	885	this.bregmaValue = bregmaValue;
	886	+ }
	887	+
	888	+ public String getCouponCode() {
	889	+ return couponCode;
	890	+ }
	891	+
	892	+ public void setCouponCode(String couponCode) {
	893	+ this.couponCode = couponCode;
884	894	}
885	895	}

...	...	@@ -8,13 +8,10 @@
8	8	import com.lyms.platform.common.utils.DateUtil;
9	9	import com.lyms.platform.common.utils.JsonUtil;
10	10	import com.lyms.platform.common.utils.StringUtils;
11		-import com.lyms.platform.operate.web.utils.CommonsHelper;
12	11	import com.lyms.platform.operate.web.utils.UnitConstants;
13	12	import com.lyms.platform.pojo.BabyModel;
14		-import org.mortbay.util.StringUtil;
15	13
16	14	import java.util.Date;
17		-import java.util.List;
18	15	import java.util.Map;
19	16
20	17	/**
...	...	@@ -158,6 +155,7 @@
158	155	//病历号(住院号)
159	156	private String blNo;
160	157
	158	+ private String couponCode;
161	159
162	160	public String getId() {
163	161	return id;
...	...	@@ -572,6 +570,14 @@
572	570	setServiceType(ServiceTypeEnums.getTitleById(destModel.getServiceType()));
573	571
574	572	return this;
	573	+ }
	574	+
	575	+ public String getCouponCode() {
	576	+ return couponCode;
	577	+ }
	578	+
	579	+ public void setCouponCode(String couponCode) {
	580	+ this.couponCode = couponCode;
575	581	}
576	582	}

...	...	@@ -94,6 +94,13 @@
94	94	couponReportMap.put("8_4", "<div class='ag-double-line'>儿童保健券(三)<div><div>使用人次</div></div>");
95	95	couponReportMap.put("8_5", "<div class='ag-double-line'>儿童保健券(四)<div>使用人次</div></div>");
96	96	couponReportMap.put("8_6", "<div class='ag-double-line'>儿童保健券(五)<div>使用人次</div></div>");
	97	+ /** 产后 */
	98	+ couponReportMap.put("3_1", "<div class='ag-double-line'>产后建档券<div>使用人次</div></div>");
	99	+ couponReportMap.put("4_1", "<div class='ag-double-line'>分娩券<div>使用人次</div></div>");
	100	+ couponReportMap.put("6_1", "<div class='ag-double-line'>42天访视券<div>使用人次</div></div>");
	101	+ couponReportMap.put("6_2", "<div class='ag-double-line'>产后复查券(一)<div>使用人次</div></div>");
	102	+ couponReportMap.put("6_3", "<div class='ag-double-line'>产后复查券(二)<div>使用人次</div></div>");
	103	+ couponReportMap.put("6_4", "<div class='ag-double-line'>产后复查券(三)<div>使用人次</div></div>");
97	104	}
98	105
99	106	@Override