fangcheng / regional-platform

Authored by liquanyu over 8 years ago

Showing 2 changed files with 16 additions and 0 deletions

...	...	@@ -291,6 +291,7 @@
291	291	* 高危因素
292	292	*/
293	293	private String rFactor;
	294	+ private boolean norFactor;
294	295
295	296
296	297	/**
...	...	@@ -333,6 +334,14 @@
333	334	//建档医生
334	335	private String bookbuildingDoctor;
335	336
	337	+ public boolean isNorFactor() {
	338	+ return norFactor;
	339	+ }
	340	+
	341	+ public void setNorFactor(boolean norFactor) {
	342	+ this.norFactor = norFactor;
	343	+ }
	344	+
336	345	public boolean isLastCheckEId() {
337	346	return lastCheckEId;
338	347	}
...	...	@@ -878,6 +887,11 @@
878	887
879	888	if (StringUtils.isNotEmpty(rFactor)) {
880	889	condition = condition.and("riskFactorId", rFactor, MongoOper.LIKE);
	890	+ }
	891	+ else if(norFactor){
	892	+ condition = condition.and("riskFactorId", "", MongoOper.NE);
	893	+ MongoCondition c = MongoCondition.newInstance();
	894	+ c1= c.andCondition(MongoCondition.newInstance("riskFactorId", null, MongoOper.NE)).getCriteria();
881	895	}
882	896	if (-1 != yn) {
883	897	condition = condition.and("yn", yn, MongoOper.IS);

...	...	@@ -95,6 +95,8 @@
95	95	//产检医生
96	96	patientsQuery.setLastCheckEmployeeId(riskPatientsQueryRequest.getLastCheckDoctorId());
97	97
	98	+ patientsQuery.setNorFactor(Boolean.TRUE);
	99	+
98	100	//总的孕妇条数
99	101	int allPatientCount = patientsService.queryPatientCount(patientsQuery);
100	102