jiangjiazhi / regional-platform

Authored by jiangjiazhi almost 9 years ago

1 parent 20526499b3

Exists in master and in 8 other branches

Showing 2 changed files with 19 additions and 0 deletions

...	...	@@ -101,6 +101,8 @@
101	101	patientsQuery.setLastMensesEnd(endDate);
102	102	patientsQuery.setLastMensesStart(start);
103	103	patientsQuery.setYn(YnEnums.YES.getId());
	104	+ patientsQuery.setDueStatus(0);
	105	+ patientsQuery.setType(1);
104	106	List<Patients> patientses = iPatientDao.queryPatient(patientsQuery.convertToQuery());
105	107	int batchSize = 200;
106	108	if (CollectionUtils.isNotEmpty(patientses)) {

...	...	@@ -29,7 +29,10 @@
29	29	private Boolean isNull;
30	30
31	31	private Boolean isHighRisk;
	32	+ //分娩状态 0未终止妊娠 1终止妊娠
	33	+ private Integer dueStatus;
32	34
	35	+
33	36	/**
34	37	* 产妇名称
35	38	*/
...	...	@@ -43,6 +46,17 @@
43	46	* 产妇年龄
44	47	*/
45	48	private Integer age;
	49	+
	50	+ public Integer getDueStatus() {
	51	+ return dueStatus;
	52	+ }
	53	+
	54	+ public void setDueStatus(Integer dueStatus) {
	55	+ this.dueStatus = dueStatus;
	56	+ }
	57	+
	58	+
	59	+
46	60	/**
47	61	* 访视状态
48	62	*/
...	...	@@ -422,6 +436,9 @@
422	436	MongoCondition con1 = MongoCondition.newInstance("areaId", areaIdOrRestId, MongoOper.IS);
423	437	MongoCondition con = MongoCondition.newInstance("areaPostRestId", areaIdOrRestId, MongoOper.IS);
424	438	condition = condition.orCondition(new MongoCondition[]{con1, con});
	439	+ }
	440	+ if(null!=dueStatus){
	441	+ condition=condition.and("dueStatus",dueStatus,MongoOper.IS);
425	442	}
426	443	if( buildType!=-1){
427	444	condition=condition.and("buildType",buildType,MongoOper.NE);