liquanyu / regional-platform

Commit 3a4016dcd5c0553e000b858953bf69679466403a

Authored by dongqin about 7 years ago

修复bug

Showing 1 changed file with 33 additions and 22 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AreaCountFacade.java

...	...	@@ -1505,6 +1505,10 @@
1505	1505	healthChargeQuery.setCreatedStart(startTime);
1506	1506	healthChargeQuery.setCreatedEnd(endTime);
1507	1507	healthChargeQuery.setYn(YnEnums.YES.getId());
	1508	+ healthChargeQuery.setLimit(query.getLimit());
	1509	+ healthChargeQuery.setOffset(query.getOffset());
	1510	+ healthChargeQuery.setPage(query.getPage());
	1511	+ healthChargeQuery.setLastPage(query.getLastPage());
1508	1512	if (StringUtils.isNotEmpty(reportNameType)) {
1509	1513	healthChargeQuery.setHealthType(Integer.parseInt(reportNameType));
1510	1514	}
1511	1515
1512	1516
1513	1517
...	...	@@ -1653,26 +1657,16 @@
1653	1657	}
1654	1658
1655	1659	List<String> hospitalIds = getHospitalIds(query);
1656		-
1657	1660	HealthChargeQuery healthChargeQuery = getHealthChargeQuery(query, startTime, endTime, hospitalIds);
1658		- // 1体重 2 血糖 3 血压 4妊高症 5-儿童
1659		- String reportNameType = query.getReportNameType();
1660		- if (StringUtils.isEmpty(reportNameType)){
1661		- List<Integer> list = new ArrayList<>();
1662		- list.add(1);
1663		- list.add(2);
1664		- list.add(3);
1665		- list.add(5);
1666		- healthChargeQuery.setRemianType(list);
1667		- }
	1661	+ setHealthType(query, healthChargeQuery);
1668	1662	healthChargeQuery.setNeed("true");
1669	1663	List<HealthChargeModel> healthChargeModels = healthChargeService.queryHealthChargeList(healthChargeQuery);
	1664	+
1670	1665	LinkedList<Map<String, Object>> linkedList = new LinkedList<>();
1671	1666	if (CollectionUtils.isNotEmpty(healthChargeModels)){
1672	1667	for (HealthChargeModel model : healthChargeModels){
1673	1668	HashMap<String, Object> map = getStringObjectHashMap(model, false);
1674	1669	linkedList.add(map);
1675		-
1676	1670	}
1677	1671	}
1678	1672
...	...	@@ -1682,6 +1676,31 @@
1682	1676	return baseListResponse;
1683	1677	}
1684	1678
	1679	+ /**
	1680	+ * 设置healthChargeQuery 对象中healthType值
	1681	+ *
	1682	+ * @param query
	1683	+ * @param healthChargeQuery
	1684	+ */
	1685	+ private void setHealthType(HealthManagerListRequest query, HealthChargeQuery healthChargeQuery) {
	1686	+ // 1体重 2 血糖 3 血压 4妊高症 5-儿童
	1687	+ String reportNameType = query.getReportNameType();
	1688	+ if (StringUtils.isEmpty(reportNameType)) {
	1689	+ List<Integer> list = new ArrayList<>();
	1690	+ list.add(1);
	1691	+ list.add(2);
	1692	+ list.add(3);
	1693	+ list.add(5);
	1694	+ healthChargeQuery.setRemianType(list);
	1695	+ }
	1696	+ }
	1697	+
	1698	+ /**
	1699	+ * 获取医院ids
	1700	+ *
	1701	+ * @param query
	1702	+ * @return
	1703	+ */
1685	1704	private List<String> getHospitalIds(HealthManagerListRequest query) {
1686	1705	String hospitalId = query.getHospitalId();
1687	1706	String provinceId = query.getProvinceId();
...	...	@@ -1699,7 +1718,7 @@
1699	1718	}
1700	1719
1701	1720	/**
1702		- * 挑选需要的数据
	1721	+ * 挑选需要的数据/healthManagerDetail/list
1703	1722	*
1704	1723	* @param model
1705	1724	* @return
...	...	@@ -1799,15 +1818,7 @@
1799	1818
1800	1819	HealthChargeQuery healthChargeQuery = getHealthChargeQuery(query, startTime, endTime, hospitalIds);
1801	1820	// 1体重 2 血糖 3 血压 4妊高症 5-儿童
1802		- String reportNameType = query.getReportNameType();
1803		- if (StringUtils.isEmpty(reportNameType)){
1804		- List<Integer> list = new ArrayList<>();
1805		- list.add(1);
1806		- list.add(2);
1807		- list.add(3);
1808		- list.add(5);
1809		- healthChargeQuery.setRemianType(list);
1810		- }
	1821	+ setHealthType(query, healthChargeQuery);
1811	1822	List<HealthChargeModel> healthChargeModels = healthChargeService.queryHealthChargeList(healthChargeQuery);
1812	1823	LinkedList<Map<String, Object>> linkedList = new LinkedList<>();
1813	1824