jiangjiazhi / regional-platform | GitLab

Commit 8ffc7a82cd467dae7b062c327977b7e1b1105580

Authored by jiangjiazhi about 9 years ago

1 parent 793e14f577

Exists in master and in 8 other branches

增加设置parentid

Showing 2 changed files with 9 additions and 3 deletions

platform-dal/src/main/java/com/lyms/platform/query/ReferralApplyOrderQuery.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java

...	...	@@ -189,10 +189,16 @@
189	189	condition=condition.and("type",type, MongoOper.IS);
190	190	}
191	191	if(null!=outHospitalId){
192		- condition=condition.and("outHospitalId",outHospitalId, MongoOper.IS);
	192	+ List<String> list = new ArrayList<>();
	193	+ list.add(outHospitalId);
	194	+ if(null!=hospitalName){
	195	+ list.add(hospitalName);
	196	+ }
	197	+ condition=condition.and("outHospitalId",outHospitalId, MongoOper.IN);
193	198	}
194		- List<String> list = new ArrayList<>();
	199	+
195	200	if(null!=transferredHospital){
	201	+ List<String> list = new ArrayList<>();
196	202	list.add(transferredHospital);
197	203	if(null!=hospitalName){
198	204	list.add(hospitalName);

...	...	@@ -132,7 +132,7 @@
132	132	referralApplyOrderModel.setType(type);
133	133	referralApplyOrderModel.setOutHospitalId(hospital);
134	134	applyOrderService.addOneReferralApplyOrder(referralApplyOrderModel);
135		-
	135	+ referralApplyOrderModel.setId(null);
136	136	referralApplyOrderModel.setOutHospitalId(referralApplyOrderModel.getTransferredHospital());
137	137	referralApplyOrderModel.setTransferredHospital(hospital);
138	138