shiyang / regional-platform

Authored by jiangjiazhi almost 9 years ago

Showing 5 changed files with 26 additions and 9 deletions

...	...	@@ -7,7 +7,9 @@
7	7	import com.lyms.platform.common.dao.operator.MongoOper;
8	8	import com.lyms.platform.common.dao.operator.MongoQuery;
9	9
	10	+import java.util.ArrayList;
10	11	import java.util.Date;
	12	+import java.util.List;
11	13
12	14	/**
13	15	* Created by Administrator on 2016/6/15 0015.
14	16
15	17
16	18
...	...	@@ -186,17 +188,17 @@
186	188	if(null!=type){
187	189	condition=condition.and("type",type, MongoOper.IS);
188	190	}
189		-
	191	+ if(null!=outHospitalId){
	192	+ condition=condition.and("outHospitalId",outHospitalId, MongoOper.IS);
	193	+ }
	194	+ List<String> list = new ArrayList<>();
190	195	if(null!=transferredHospital){
	196	+ list.add(transferredHospital);
191	197	if(null!=hospitalName){
192		- MongoCondition mongoCondition= MongoCondition.newInstance("hospitalName",hospitalName,MongoOper.IS);
193		- MongoCondition mongoCondition1= MongoCondition.newInstance("transferredHospital",transferredHospital, MongoOper.IS);
194		- condition=condition.andCondition(mongoCondition.orCondition(mongoCondition1));
	198	+ list.add(hospitalName);
195	199	}
196		- }
197		- if(null!=outHospitalId){
198		-
199		- condition=condition.and("outHospitalId",outHospitalId, MongoOper.IS);
	200	+ MongoCondition mongoCondition1=MongoCondition.newInstance("transferredHospital", list, MongoOper.IN);
	201	+ condition=condition.andCondition(mongoCondition1);
200	202	}
201	203	return condition.toMongoQuery();
202	204	}

...	...	@@ -337,6 +337,9 @@
337	337	referralApplyOrderQuery.setTransferredHospital(applyOrderQueryRequest.getTransferredHospital());
338	338	referralApplyOrderQuery.setLimit(applyOrderQueryRequest.getLimit());
339	339	referralApplyOrderQuery.setType(applyOrderQueryRequest.getType());
	340	+
	341	+ String hospital=autoMatchFacade.getHospitalId(userId);
	342	+ referralApplyOrderQuery.setHospitalName(organizationService.getOrganization(Integer.valueOf(hospital)).getName());
340	343	//1 转入 0转出
341	344	if ("1".equals(applyOrderQueryRequest.getAction())) {
342	345	List data = autoMatchFacade.matchOrgId(userId);

...	...	@@ -322,6 +322,15 @@
322	322	list.add(baby3);
323	323	list.add(baby4); */
324	324	System.out.print(buildBabyName(list));;
	325	+
	326	+
	327	+ Date fmDate = DateUtil.parseYMD("2016-8-18");
	328	+
	329	+
	330	+ Date date= DateUtil.addDay(DateUtil.parseYMD("2015-8-11"), 168);
	331	+ System.out.print(DateUtil.getyyyy_MM_dd(date));
	332	+ System.out.print(fmDate.after(date));
	333	+
325	334	}
326	335
327	336	/**