liquanyu / regional-platform

Authored by yangfei over 7 years ago

Showing 2 changed files with 8 additions and 1 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.Date;
13	14	import java.util.List;
14	15
15	16
16	17
...	...	@@ -634,10 +635,15 @@
634	635	if (null != source) {
635	636	condition = condition.and("source", source, MongoOper.IS);
636	637	}
	638	+ List<MongoCondition> mongoCondits = new ArrayList<>();
637	639
638	640	if (-1 != yn) {
639		- condition = condition.and("yn", yn, MongoOper.IS);
	641	+ // MongoCondition mongoCondition1 = condition.and("yn", yn, MongoOper.IS);
	642	+ mongoCondits.add(new MongoCondition("yn", yn, MongoOper.IS));
	643	+ mongoCondits.add(new MongoCondition("dataStatus", 1, MongoOper.IS).andCondition(new MongoCondition("yn", 0, MongoOper.IS)));
640	644	}
	645	+
	646	+ condition = condition.orCondition(mongoCondits.toArray(new MongoCondition[mongoCondits.size()]));
641	647
642	648	if (dataStatus) {//分娩自动建档
643	649	condition = condition.and("dataStatus", 1, MongoOper.NE);

...	...	@@ -1800,6 +1800,7 @@
1800	1800	babyModelQuery.setYn(YnEnums.YES.getId());
1801	1801	babyModelQuery.setParentId(patients.getId());
1802	1802	babyModelQuery.setPregnancyOut(RenShenJieJuEnums.O.getId());
	1803	+ System.out.println("查询调价n:"+babyModelQuery.convertToQuery().convertToMongoQuery());
1803	1804	List<BabyModel> babyModelList = babyService.queryBabyWithQuery(babyModelQuery);
1804	1805	if (CollectionUtils.isNotEmpty(babyModelList)) {
1805	1806	childbirthManagerQueryModel.setLivingNumber(babyModelList.size());