jiangjiazhi / regional-platform

Commit e9a9e9cc8b5c9aef7d57161ce1b07fa8900e5746

Authored by liquanyu over 7 years ago

Exists in master and in 6 other branches

产检节点统计

Showing 3 changed files with 31 additions and 13 deletions

platform-dal/src/main/java/com/lyms/platform/query/AntExRecordQuery.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AreaCountFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/CheckPointCountWorker.java

...	...	@@ -9,6 +9,7 @@
9	9	import org.apache.commons.collections.CollectionUtils;
10	10	import org.springframework.data.mongodb.core.query.Criteria;
11	11
	12	+import java.util.ArrayList;
12	13	import java.util.Date;
13	14	import java.util.List;
14	15
...	...	@@ -38,6 +39,17 @@
38	39	//患者ID
39	40	private List<String> parentIds;
40	41
	42	+ //是否范围孕周
	43	+ private boolean isRangeWeek;
	44	+
	45	+ public boolean isRangeWeek() {
	46	+ return isRangeWeek;
	47	+ }
	48	+
	49	+ public void setIsRangeWeek(boolean isRangeWeek) {
	50	+ this.isRangeWeek = isRangeWeek;
	51	+ }
	52	+
41	53	public List<String> getParentIds() {
42	54	return parentIds;
43	55	}
44	56
45	57
46	58
...	...	@@ -547,21 +559,23 @@
547	559	c = Criteria.where("brith").lte(birthEnd);
548	560	}
549	561	}
550		- if (null != cDueWeekStart) {
551		- if (null != c) {
552		- c = c.and("cDay").gte(cDueWeekStart);
553		- } else {
554		- c = Criteria.where("cDay").gte(cDueWeekStart);
	562	+
	563	+
	564	+ if (null != cDueWeekStart) {
	565	+ if (null != c) {
	566	+ c = c.and("cDay").gte(cDueWeekStart);
	567	+ } else {
	568	+ c = Criteria.where("cDay").gte(cDueWeekStart);
	569	+ }
555	570	}
556		- }
557	571
558		- if (null != cDueWeekEnd) {
559		- if (null != c) {
560		- c = c.lte(cDueWeekEnd);
561		- } else {
562		- c = Criteria.where("cDay").lte(cDueWeekEnd);
	572	+ if (null != cDueWeekEnd) {
	573	+ if (null != c) {
	574	+ c = c.lte(cDueWeekEnd);
	575	+ } else {
	576	+ c = Criteria.where("cDay").lte(cDueWeekEnd);
	577	+ }
563	578	}
564		- }
565	579
566	580	if (null != c) {
567	581	condition = condition.andCondition(new MongoCondition(c));
...	...	@@ -576,5 +590,6 @@
576	590	public void setParentId(String parentId) {
577	591	this.parentId = parentId;
578	592	}
	593	+
579	594	}

...	...	@@ -426,6 +426,7 @@
426	426
427	427	patientsQuery.setBookbuildingDateStart(startTime);
428	428	patientsQuery.setBookbuildingDateEnd(endTime);
	429	+ patientsQuery.setExtEnable(false);
429	430
430	431
431	432	patientsQuery.setPage(page);
...	...	@@ -611,6 +612,7 @@
611	612	{
612	613	antExRecordQuery.setcDueWeekStart(0);
613	614	antExRecordQuery.setcDueWeekEnd((40 + 1) * 7 - 1);
	615	+ antExRecordQuery.setIsRangeWeek(true);
614	616	}
615	617
616	618	List<AntExRecordModel> list = recordService.queryAntExRecords(antExRecordQuery);
...	...	@@ -640,7 +642,7 @@
640	642	query.setPid(model.getPid());
641	643
642	644	String times = "";
643		- List<AntExRecordModel> antExRecordModels = recordService.queryAntExRecords(query,Sort.Direction.DESC,"checkTime");
	645	+ List<AntExRecordModel> antExRecordModels = recordService.queryAntExRecords(query,Sort.Direction.ASC,"checkTime");
644	646	if (CollectionUtils.isNotEmpty(antExRecordModels))
645	647	{
646	648	for (int j = 0 ; j < antExRecordModels.size() ; j++)

...	...	@@ -88,6 +88,7 @@
88	88
89	89	patientsQuery.setBookbuildingDateStart(startTime);
90	90	patientsQuery.setBookbuildingDateEnd(endTime);
	91	+ patientsQuery.setExtEnable(false);
91	92
92	93	//建档人数
93	94	int buildCount = patientsService.queryPatientCount(patientsQuery);