jiangjiazhi / regional-platform

Authored by wangbo over 6 years ago

Exists in master and in 6 other branches

Showing 4 changed files with 66 additions and 2 deletions

...	...	@@ -332,7 +332,26 @@
332	332	//乡镇卫生院id
333	333	private String townOrgId;
334	334
	335	+ private Date startAge;
	336	+ private Date endAge;
335	337
	338	+
	339	+ public Date getStartAge() {
	340	+ return startAge;
	341	+ }
	342	+
	343	+ public void setStartAge(Date startAge) {
	344	+ this.startAge = startAge;
	345	+ }
	346	+
	347	+ public Date getEndAge() {
	348	+ return endAge;
	349	+ }
	350	+
	351	+ public void setEndAge(Date endAge) {
	352	+ this.endAge = endAge;
	353	+ }
	354	+
336	355	public Boolean getServiceTypeIsExist() {
337	356	return serviceTypeIsExist;
338	357	}
339	358
...	...	@@ -665,7 +684,21 @@
665	684	c1 = Criteria.where("fmDate").gte(fmDateStart);
666	685	}
667	686	}
	687	+ if (startAge != null && endAge != null) {
	688	+ if (c1 != null) {
	689	+ c1 = c1.and("birth").lte(startAge).gte(endAge);
	690	+ } else {
	691	+ c1 = Criteria.where("birth").lte(startAge).gte(endAge);
	692	+ }
	693	+ } else if (startAge != null) {
	694	+ if (null != c1) {
	695	+ c1 = c1.and("birth").lte(startAge);
	696	+ } else {
	697	+ c1 = Criteria.where("birth").lte(startAge);
	698	+ }
668	699
	700	+ }
	701	+
669	702	if (null != serviceType) {
670	703	condition = condition.and("serviceType", serviceType, MongoOper.IS);
671	704	}
...	...	@@ -952,6 +985,7 @@
952	985	c1 = Criteria.where("fmWeek").lte(fmWeekEnd);
953	986	}
954	987	}
	988	+
955	989
956	990	if (null != nextCheckTime) {
957	991	condition = condition.and("nextCheckTime", nextCheckTime, MongoOper.NE);

...	...	@@ -505,7 +505,7 @@
505	505	try {
506	506	doc = new Document(ViewController.class.getClassLoader().getResourceAsStream("sfdjb.docx"));
507	507
508		- DocumentBuilder builder = new DocumentBuilder(doc);
	508	+ /* DocumentBuilder builder = new DocumentBuilder(doc);
509	509	if (map.containsKey("red")) {
510	510	builder.moveToBookmark("red");
511	511	markFrameText(builder, (String) map.get("red"));
...	...	@@ -515,7 +515,7 @@
515	515	builder.moveToBookmark("orange");
516	516	markFrameText(builder, (String) map.get("orange"));
517	517	map.remove("orange");
518		- }
	518	+ }*/
519	519
520	520	markData(doc, map);//普通数据
521	521	sendToBrowser(doc, "导出", "doc", true, response);
...	...	@@ -523,6 +523,9 @@
523	523	e.printStackTrace();
524	524	}
525	525	response.flushBuffer();
	526	+
	527	+
	528	+
526	529	} catch (IOException e) {
527	530	e.printStackTrace();
528	531	}

...	...	@@ -1152,6 +1152,13 @@
1152	1152	patientsQuery.setLimit(patientManagerRequest.getLimit());
1153	1153	patientsQuery.setPage(patientManagerRequest.getPage());
1154	1154	}
	1155	+
	1156	+ if (null != patientManagerRequest.getStartAge() && null != patientManagerRequest.getEndAge()) {
	1157	+ Date start = DateUtil.getBeforeAge(patientManagerRequest.getStartAge());
	1158	+ Date end = DateUtil.getBeforeAge(patientManagerRequest.getEndAge());
	1159	+ patientsQuery.setStartAge(start);
	1160	+ patientsQuery.setEndAge(end);
	1161	+ }
1155	1162	//排查本院隐藏建档
1156	1163	patientsQuery.setExtEnable(false);
1157	1164	patientsQuery.setBuildTypeNot(1);

...	...	@@ -90,6 +90,26 @@
90	90	//居住类别
91	91	private String liveType;
92	92
	93	+ private Integer startAge;
	94	+
	95	+ private Integer endAge;
	96	+
	97	+ public Integer getStartAge() {
	98	+ return startAge;
	99	+ }
	100	+
	101	+ public void setStartAge(Integer startAge) {
	102	+ this.startAge = startAge;
	103	+ }
	104	+
	105	+ public Integer getEndAge() {
	106	+ return endAge;
	107	+ }
	108	+
	109	+ public void setEndAge(Integer endAge) {
	110	+ this.endAge = endAge;
	111	+ }
	112	+
93	113	public String getLiveType() {
94	114	return liveType;
95	115	}