jiangjiazhi / regional-platform

Authored by jiangjiazhi over 9 years ago

Exists in master and in 8 other branches

Showing 3 changed files with 15 additions and 1 deletions

...	...	@@ -147,6 +147,16 @@
147	147
148	148	private String hcertificateNum;
149	149
	150	+ private String buildType;
	151	+
	152	+ public String getBuildType() {
	153	+ return buildType;
	154	+ }
	155	+
	156	+ public void setBuildType(String buildType) {
	157	+ this.buildType = buildType;
	158	+ }
	159	+
150	160	public String getHcertificateNum() {
151	161	return hcertificateNum;
152	162	}
...	...	@@ -398,6 +408,9 @@
398	408	MongoCondition con1 = MongoCondition.newInstance("areaId", areaIdOrRestId, MongoOper.IS);
399	409	MongoCondition con = MongoCondition.newInstance("areaPostRestId", areaIdOrRestId, MongoOper.IS);
400	410	condition = condition.orCondition(new MongoCondition[]{con1, con});
	411	+ }
	412	+ if(null!=buildType){
	413	+ condition=condition.and("buildType",buildType,MongoOper.NE);
401	414	}
402	415	if (visitstatus != -1) {
403	416	condition = condition.and("isVisit", visitstatus, MongoOper.IS);

...	...	@@ -259,7 +259,7 @@
259	259	}
260	260	}
261	261	PostReviewQuery postReviewQuery = new PostReviewQuery();
262		- ;
	262	+
263	263	postReviewQuery.setYn(YnEnums.YES.getId());
264	264	if (StringUtils.isNotEmpty(dueDate)) {
265	265	Date date = DateUtil.parseYMD(dueDate);

...	...	@@ -209,6 +209,7 @@
209	209	patientsQuery.setIsHighRisk(isHighRisk);
210	210	patientsQuery.setServiceStatus(riskPatientsQueryRequest.getServiceStatus());
211	211	patientsQuery.setYn(YnEnums.YES.getId());
	212	+ patientsQuery.setBuildType("1");
212	213	//查询符合条件的孕妇
213	214	List<Patients> patientses = patientsService.queryPatient(patientsQuery);
214	215	List data = new ArrayList<>();