jiangjiazhi / regional-platform

Authored by liquanyu over 7 years ago

Exists in master and in 6 other branches

Showing 2 changed files with 28 additions and 0 deletions

...	...	@@ -149,6 +149,9 @@
149	149	//区域来源
150	150	private String source;
151	151
	152	+ //区域来源
	153	+ private Boolean extSource;
	154	+
152	155	private String desc;
153	156	//查询号
154	157	private String queryNo;
...	...	@@ -163,6 +166,14 @@
163	166	private Integer buildDaysStart;
164	167	private Integer buildDaysEnd;
165	168
	169	+ public Boolean isExtSource() {
	170	+ return extSource;
	171	+ }
	172	+
	173	+ public void setExtSource(Boolean extSource) {
	174	+ this.extSource = extSource;
	175	+ }
	176	+
166	177	public boolean isFace() {
167	178	return isFace;
168	179	}
...	...	@@ -1181,6 +1192,13 @@
1181	1192	if (isFace) {
1182	1193	condition = condition.and("face", true, MongoOper.EXISTS);
1183	1194	}
	1195	+
	1196	+
	1197	+ if (extSource != null) {
	1198	+ condition = condition.and("source", extSource, MongoOper.EXISTS);
	1199	+ }
	1200	+
	1201	+
1184	1202
1185	1203	if (isScreenResult) {
1186	1204	condition = condition.and("screenResult", true, MongoOper.EXISTS);

...	...	@@ -469,6 +469,16 @@
469	469	fmHospitalList.retainAll(orgId);
470	470	}
471	471	}
	472	+ else
	473	+ {
	474	+ //没有选择分娩医院并且未产妇查询的时候就只查询主档案
	475	+ if (type == 3)
	476	+ {
	477	+ patientsQuery.setExtSource(false);
	478	+ }
	479	+ }
	480	+
	481	+
472	482	if (com.lyms.platform.common.utils.StringUtils.isNotEmpty(riskPatientsQueryRequest.getFmHospital())) {
473	483	patientsQuery.setFmHospital(riskPatientsQueryRequest.getFmHospital());
474	484	} else {