jiangjiazhi / regional-platform

Authored by litao@lymsh.com over 8 years ago

Exists in master and in 6 other branches

Showing 3 changed files with 24 additions and 5 deletions

...	...	@@ -14,7 +14,7 @@
14	14	public class NewbornVisit {
15	15
16	16	/** 优惠券 */
17		- private String hemoglobinCoupon;
	17	+ private String couponCode;
18	18
19	19	private String id;
20	20
21	21
...	...	@@ -155,12 +155,12 @@
155	155	// 下次访视时间
156	156	private Date nextVisitTimeDesc;
157	157
158		- public String getHemoglobinCoupon() {
159		- return hemoglobinCoupon;
	158	+ public String getCouponCode() {
	159	+ return couponCode;
160	160	}
161	161
162		- public void setHemoglobinCoupon(String hemoglobinCoupon) {
163		- this.hemoglobinCoupon = hemoglobinCoupon;
	162	+ public void setCouponCode(String couponCode) {
	163	+ this.couponCode = couponCode;
164	164	}
165	165
166	166	public String getId() {

...	...	@@ -253,6 +253,14 @@
253	253	}
254	254	}
255	255
	256	+ /** 验证产检券是否可用可用就改为已使用状态(血红蛋白) */
	257	+ if(org.apache.commons.lang3.StringUtils.isNotBlank(request.getHemoglobinCoupon()) && request.getCouponType() != null) {
	258	+ BaseObjectResponse resp = couponService.validate(request.getHemoglobinCoupon(), request.getCouponType(), autoMatchFacade.getHospitalId(userId));
	259	+ if(resp.getErrorcode() != 0) {
	260	+ return resp;
	261	+ }
	262	+ }
	263	+
256	264	String hospitalId = autoMatchFacade.getHospitalId(userId);
257	265	//表示区域的
258	266	if (org.apache.commons.lang.StringUtils.isNotEmpty(groupsFacade.findByCurrentUserId(hospitalId))) {

...	...	@@ -13,6 +13,9 @@
13	13	public class BabyCheckRequest {
14	14
15	15
	16	+ /** 优惠券 */
	17	+ private String hemoglobinCoupon;
	18	+
16	19	private String id;
17	20
18	21	private String pid;
...	...	@@ -261,6 +264,14 @@
261	264
262	265	//脐部
263	266	private Map<String,String> navel;
	267	+
	268	+ public String getHemoglobinCoupon() {
	269	+ return hemoglobinCoupon;
	270	+ }
	271	+
	272	+ public void setHemoglobinCoupon(String hemoglobinCoupon) {
	273	+ this.hemoglobinCoupon = hemoglobinCoupon;
	274	+ }
264	275
265	276	public Map<String, String> getNavel() {
266	277	return navel;