shiyang / regional-platform

Authored by baohanddd over 9 years ago

Showing 2 changed files with 16 additions and 2 deletions

...	...	@@ -200,7 +200,6 @@
200	200	// 4. 按省或市或地区查询区域内近12个自然月每月建档人数
201	201	List<AreaData> patientMonthList = statisticsService.queryMonthPatients(new AreaDataQuery());
202	202	Map<String, Map<String, Integer>> patientMonthMap = new HashMap<>();
203		-
204	203	Map<String, Integer> pmap = new HashMap<>();
205	204	for (AreaData areaData:patientMonthList) {
206	205	String month = buildMonth(areaData.getYear());
...	...	@@ -211,6 +210,21 @@
211	210	}
212	211	}
213	212	patientMonthMap.put("建档人数", pmap);
	213	+ // 6. 按省或市或地区查询区域内近12个自然月每月产检中历史高危人数（按颜色分组）
	214	+ AreaDataQuery query = new AreaDataQuery();
	215	+ query.setDays(12);
	216	+ List<AreaData> riskMonthList = statisticsService.queryHrefYearRisks(query);
	217	+ Map<String, Integer> rmap = new HashMap<>();
	218	+ for (AreaData areaData:riskMonthList) {
	219	+ String month = buildMonth(areaData.getYear());
	220	+ if (rmap.containsKey(month)) {
	221	+ rmap.put(month, rmap.get(month) + areaData.getVal());
	222	+ } else {
	223	+ rmap.put(month, areaData.getVal());
	224	+ }
	225	+ }
	226	+ patientMonthMap.put("高危人数", rmap);
	227	+
214	228
215	229	Option patientMonthOption = buildLineOption("建档&高危人数", null, patientMonthMap, buildDefaultMonth(12));
216	230

...	...	@@ -549,7 +549,7 @@
549	549	AND F.HIGH_RISK_GROUP<>'其他'
550	550	AND B.EXAMINE_HISTORY_NUM=1
551	551	AND B.INSERT_DATE<=TRUNC(SYSDATE)
552		- AND B.INSERT_DATE>=TRUNC(ADD_MONTHS(SYSDATE,-12))
	552	+ AND B.INSERT_DATE>=TRUNC(ADD_MONTHS(SYSDATE,-${days}))
553	553	]]>
554	554	<if test="provinceId != null and provinceId != ''">
555	555	AND D.PROVINCE_ID=#{provinceId}