jiangjiazhi / regional-platform

Authored by liquanyu over 8 years ago

Exists in master and in 8 other branches

Showing 2 changed files with 13 additions and 11 deletions

...	...	@@ -9,6 +9,7 @@
9	9	import org.apache.commons.collections.CollectionUtils;
10	10	import org.springframework.data.mongodb.core.query.Criteria;
11	11
	12	+import java.util.ArrayList;
12	13	import java.util.Arrays;
13	14	import java.util.Date;
14	15	import java.util.List;
...	...	@@ -889,7 +890,7 @@
889	890	condition = condition.and("riskFactorId", rFactor, MongoOper.LIKE);
890	891	}
891	892	else if(norFactor){
892		- condition = condition.and("riskFactorId", "[]", MongoOper.NE);
	893	+ condition = condition.and("riskFactorId", new ArrayList<String>(), MongoOper.NE);
893	894	MongoCondition c = MongoCondition.newInstance();
894	895	c1= c.andCondition(MongoCondition.newInstance("riskFactorId", null, MongoOper.NE)).getCriteria();
895	896	}

...	...	@@ -55,17 +55,18 @@
55	55	// antExChuQuery.setNextCheckTimeEnd(yuYueDate);
56	56	// antExChuQuery.setHospitalId("242");
57	57
58		- patientsQuery1.setLastCheckEId(true);
59	58	patientsQuery1.setHospitalId("242");
60		- patientsQuery1.setType(1);
61		-
62		- Date yuYueDate = DateUtil.addDay(new Date(), 2);
63		- if (yuYueDate != null) {
64		- //把时间格式化成 yyyy_MM_dd 的日期
65		- yuYueDate = DateUtil.formatDate(yuYueDate);
66		- }
67		- patientsQuery1.setDueDateStart(yuYueDate);
68		- patientsQuery1.setDueDateEnd(yuYueDate);
	59	+ patientsQuery1.setNorFactor(true);
	60	+ patientsQuery1.setrLevel("49a36aea-c5b6-4162-87d2-9eb3c6ec00c2");
	61	+// patientsQuery1.setType(1);
	62	+//
	63	+// Date yuYueDate = DateUtil.addDay(new Date(), 2);
	64	+// if (yuYueDate != null) {
	65	+// //把时间格式化成 yyyy_MM_dd 的日期
	66	+// yuYueDate = DateUtil.formatDate(yuYueDate);
	67	+// }
	68	+// patientsQuery1.setDueDateStart(yuYueDate);
	69	+// patientsQuery1.setDueDateEnd(yuYueDate);
69	70
70	71	System.out.println(patientsQuery1.convertToQuery().convertToMongoQuery());
71	72