jiangjiazhi / regional-platform

Authored by jiangjiazhi over 8 years ago

Exists in master and in 8 other branches

Showing 3 changed files with 16 additions and 1 deletions

...	...	@@ -58,7 +58,7 @@
58	58	private Integer type;
59	59	//体验会员 0非会员 1会员
60	60	private Integer expVip;
61		-
	61	+ private Integer serviceType;
62	62	/**
63	63	* 生日
64	64	*/
...	...	@@ -156,6 +156,14 @@
156	156	return mCardNo;
157	157	}
158	158
	159	+ public Integer getServiceType() {
	160	+ return serviceType;
	161	+ }
	162	+
	163	+ public void setServiceType(Integer serviceType) {
	164	+ this.serviceType = serviceType;
	165	+ }
	166	+
159	167	public void setmCardNo(String mCardNo) {
160	168	this.mCardNo = mCardNo;
161	169	}
...	...	@@ -244,6 +252,9 @@
244	252	}
245	253	if(null!=expVip){
246	254	condition=condition.and("expVip",expVip, MongoOper.IS);
	255	+ }
	256	+ if(null!=serviceType){
	257	+ condition=condition.and("serviceType",serviceType, MongoOper.IS);
247	258	}
248	259	if(StringUtils.isNotEmpty(mCardNo)){
249	260	condition=condition.and("mCardNo",mCardNo, MongoOper.IS);

...	...	@@ -341,6 +341,7 @@
341	341	referralApplyOrderQuery.setCardNo(applyOrderQueryRequest.getCardNo());
342	342	referralApplyOrderQuery.setPhone(applyOrderQueryRequest.getPhone());
343	343	referralApplyOrderQuery.setmCardNo(applyOrderQueryRequest.getmCardNo());
	344	+ referralApplyOrderQuery.setServiceType(applyOrderQueryRequest.getServiceType());
344	345	String hospital = autoMatchFacade.getHospitalId(userId);
345	346	referralApplyOrderQuery.setHospitalId(hospital);
346	347	referralApplyOrderQuery.setHospitalName(organizationService.getOrganization(Integer.valueOf(hospital)).getName());

...	...	@@ -110,6 +110,9 @@
110	110	}
111	111
112	112	public Integer getServiceType() {
	113	+ if(null!=serviceType&&100==serviceType){
	114	+ return null;
	115	+ }
113	116	return serviceType;
114	117	}
115	118