jiangjiazhi / regional-platform

Authored by litao@lymsh.com over 8 years ago

Exists in master and in 6 other branches

Showing 2 changed files with 16 additions and 6 deletions

...	...	@@ -475,11 +475,6 @@
475	475	resMap.put("baseInfo", base);
476	476	resMap.put("checkList", list);
477	477
478		- /** 优惠券编号 */
479		- String hemoglobinCoupon = couponService.findByUsedId(id);
480		- if(StringUtils.isNotEmpty(hemoglobinCoupon)) {
481		- resMap.put("hemoglobinCoupon", hemoglobinCoupon);
482		- }
483	478
484	479	br.setData(resMap);
485	480	br.setErrorcode(ErrorCodeConstants.SUCCESS);
486	481
...	...	@@ -915,10 +910,14 @@
915	910	BabyCheckModel checkModel = checkModels.get(0);
916	911	result = getBabyCheckResult(checkModel);
917	912	result.setCouponCode(couponService.findByUsedId(id));
	913	+ /** 优惠券编号 */
	914	+ String hemoglobinCoupon = couponService.findByUsedId(id);
	915	+ if(StringUtils.isNotEmpty(hemoglobinCoupon)) {
	916	+ result.setHemoglobinCoupon(hemoglobinCoupon);
	917	+ }
918	918	}
919	919
920	920	}
921		-
922	921
923	922
924	923	br.setData(result);

...	...	@@ -9,6 +9,9 @@
9	9	public class BabyCheckResult {
10	10	private String id;
11	11
	12	+ // 血红蛋白券
	13	+ private String hemoglobinCoupon;
	14	+
12	15	//建档ID
13	16	private String buildId;
14	17
...	...	@@ -792,6 +795,14 @@
792	795
793	796	public void setHighRisk(Integer highRisk) {
794	797	this.highRisk = highRisk;
	798	+ }
	799	+
	800	+ public void setHemoglobinCoupon(String hemoglobinCoupon) {
	801	+ this.hemoglobinCoupon = hemoglobinCoupon;
	802	+ }
	803	+
	804	+ public String getHemoglobinCoupon() {
	805	+ return hemoglobinCoupon;
795	806	}
796	807	}