jiangjiazhi / regional-platform

Authored by liquanyu over 5 years ago

Exists in master and in 6 other branches

Showing 2 changed files with 15 additions and 1 deletions

...	...	@@ -142,7 +142,9 @@
142	142	private Date checkupTimeStart;
143	143	private Date checkupTimeEnd;
144	144
	145	+ private Boolean checkupExist;
145	146
	147	+
146	148	@Override
147	149	public MongoQuery convertToQuery() {
148	150	MongoCondition condition = MongoCondition.newInstance();
...	...	@@ -153,6 +155,10 @@
153	155	if (checkup != null) {
154	156	condition = condition.and("checkup", checkup, MongoOper.IS);
155	157	}
	158	+
	159	+ if (checkupExist != null) {
	160	+ condition = condition.and("checkup", checkupExist, MongoOper.EXISTS);
	161	+ }
156	162	if (isHistory) {
157	163	condition = condition.and("isHistory", false, MongoOper.EXISTS);
158	164	}
...	...	@@ -346,6 +352,14 @@
346	352
347	353	//0 或者空不是 1是
348	354	private Integer hasHj;
	355	+
	356	+ public Boolean getCheckupExist() {
	357	+ return checkupExist;
	358	+ }
	359	+
	360	+ public void setCheckupExist(Boolean checkupExist) {
	361	+ this.checkupExist = checkupExist;
	362	+ }
349	363
350	364	public Date getCheckupTimeStart() {
351	365	return checkupTimeStart;

...	...	@@ -592,7 +592,7 @@
592	592	//查询条件
593	593	ResidentsArchiveQuery query = new ResidentsArchiveQuery();
594	594	query.setYn(YnEnums.YES.getId());
595		- query.setCheckup(1);
	595	+ query.setCheckupExist(true);
596	596	query.setSex(SystemConfig.WOMAN_ID);
597	597	query.setStreetId(item.getId());
598	598