jiangjiazhi / regional-platform

Authored by wtt over 4 years ago

Exists in master and in 6 other branches

Showing 2 changed files with 26 additions and 1 deletions

...	...	@@ -24,9 +24,11 @@
24	24	//儿童建档ID
25	25	private String pid;
26	26	private boolean pidNull;
	27	+ private boolean pidNoNull;
27	28	//居民健康档案(妇女健康 )模型 id
28	29	private String rid;
29	30	private boolean ridNull;
	31	+ private boolean ridNoNull;
30	32	private String hospitalId;
31	33
32	34	// 检查日期
...	...	@@ -150,6 +152,22 @@
150	152	this.nextDateEnd = nextDateEnd;
151	153	}
152	154
	155	+ public boolean isPidNoNull() {
	156	+ return pidNoNull;
	157	+ }
	158	+
	159	+ public void setPidNoNull(boolean pidNoNull) {
	160	+ this.pidNoNull = pidNoNull;
	161	+ }
	162	+
	163	+ public boolean isRidNoNull() {
	164	+ return ridNoNull;
	165	+ }
	166	+
	167	+ public void setRidNoNull(boolean ridNoNull) {
	168	+ this.ridNoNull = ridNoNull;
	169	+ }
	170	+
153	171	public String getInspectionPhase() {
154	172	return inspectionPhase;
155	173	}
...	...	@@ -185,6 +203,9 @@
185	203	if (pidNull) {
186	204	condition = condition.and("pid", null, MongoOper.IS);
187	205	}
	206	+ if (pidNoNull) {
	207	+ condition = condition.and("pid", null, MongoOper.NE);
	208	+ }
188	209
189	210	if (StringUtils.isNotEmpty(rid)) {
190	211	condition = condition.and("rid", rid, MongoOper.IS);
...	...	@@ -192,7 +213,9 @@
192	213	if (ridNull) {
193	214	condition = condition.and("rid", null, MongoOper.IS);
194	215	}
195		-
	216	+ if (ridNoNull) {
	217	+ condition = condition.and("rid", null, MongoOper.NE);
	218	+ }
196	219	if (StringUtils.isNotEmpty(hospitalId)) {
197	220
198	221	condition = condition.and("hospitalId", hospitalId, MongoOper.IS);

...	...	@@ -396,6 +396,7 @@
396	396	babyQuery.setNeed("true");
397	397	babyQuery.setYn(YnEnums.YES.getId());
398	398	babyQuery.setRidNull(true);
	399	+ babyQuery.setPidNoNull(true);
399	400	babyQuery.setHospitalId(hospitalId);
400	401	babyQuery.setSort("createDate");
401	402	if (babyQuery.getCheckDateEnd() != null) {
...	...	@@ -447,6 +448,7 @@
447	448	babyQuery.setNeed("true");
448	449	babyQuery.setYn(YnEnums.YES.getId());
449	450	babyQuery.setPidNull(true);
	451	+ babyQuery.setRidNoNull(true);
450	452	babyQuery.setHospitalId(hospitalId);
451	453	babyQuery.setSort("createDate");
452	454	if (babyQuery.getCheckDateEnd() != null) {