Commit dde1d376c6029a5e9ac9d00f2789ea37372a34e2
1 parent
ccc7b68eff
Exists in
master
and in
6 other branches
修复bug
Showing 1 changed file with 16 additions and 3 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AreaCountFacade.java
View file @
dde1d37
| ... | ... | @@ -1505,8 +1505,6 @@ |
| 1505 | 1505 | healthChargeQuery.setCreatedStart(startTime); |
| 1506 | 1506 | healthChargeQuery.setCreatedEnd(endTime); |
| 1507 | 1507 | healthChargeQuery.setYn(YnEnums.YES.getId()); |
| 1508 | - | |
| 1509 | - healthChargeQuery.setRemianType("4"); | |
| 1510 | 1508 | if (StringUtils.isNotEmpty(reportNameType)) { |
| 1511 | 1509 | healthChargeQuery.setHealthType(Integer.parseInt(reportNameType)); |
| 1512 | 1510 | } |
| ... | ... | @@ -1657,6 +1655,14 @@ |
| 1657 | 1655 | List<String> hospitalIds = getHospitalIds(query); |
| 1658 | 1656 | |
| 1659 | 1657 | HealthChargeQuery healthChargeQuery = getHealthChargeQuery(query, startTime, endTime, hospitalIds); |
| 1658 | + // 1体重 2 血糖 3 血压 4妊高症 5-儿童 | |
| 1659 | + String reportNameType = query.getReportNameType(); | |
| 1660 | + if (!"1".equals(reportNameType) && | |
| 1661 | + (!"2".equals(reportNameType)) && | |
| 1662 | + (!"3".equals(reportNameType)) && | |
| 1663 | + (!"5".equals(reportNameType))){ | |
| 1664 | + healthChargeQuery.setRemianType("4"); | |
| 1665 | + } | |
| 1660 | 1666 | List<HealthChargeModel> healthChargeModels = healthChargeService.queryHealthChargeList(healthChargeQuery); |
| 1661 | 1667 | LinkedList<Map<String, Object>> linkedList = new LinkedList<>(); |
| 1662 | 1668 | if (CollectionUtils.isNotEmpty(healthChargeModels)){ |
| ... | ... | @@ -1785,7 +1791,14 @@ |
| 1785 | 1791 | } |
| 1786 | 1792 | |
| 1787 | 1793 | HealthChargeQuery healthChargeQuery = getHealthChargeQuery(query, startTime, endTime, hospitalIds); |
| 1788 | - | |
| 1794 | + // 1体重 2 血糖 3 血压 4妊高症 5-儿童 | |
| 1795 | + String reportNameType = query.getReportNameType(); | |
| 1796 | + if (!"1".equals(reportNameType) && | |
| 1797 | + (!"2".equals(reportNameType)) && | |
| 1798 | + (!"3".equals(reportNameType)) && | |
| 1799 | + (!"5".equals(reportNameType))){ | |
| 1800 | + healthChargeQuery.setRemianType("4"); | |
| 1801 | + } | |
| 1789 | 1802 | List<HealthChargeModel> healthChargeModels = healthChargeService.queryHealthChargeList(healthChargeQuery); |
| 1790 | 1803 | LinkedList<Map<String, Object>> linkedList = new LinkedList<>(); |
| 1791 | 1804 |