Commit eb8bec94cb16fd9db1445a4c006282c2663dfadc
1 parent
dde1d376c6
Exists in
master
and in
6 other branches
修复bug
Showing 2 changed files with 28 additions and 19 deletions
platform-dal/src/main/java/com/lyms/platform/query/HealthChargeQuery.java
View file @
eb8bec9
| ... | ... | @@ -66,13 +66,13 @@ |
| 66 | 66 | |
| 67 | 67 | private List<String> hospitalIds; |
| 68 | 68 | |
| 69 | - private String remianType; | |
| 69 | + private List<Integer> remianType; | |
| 70 | 70 | |
| 71 | - public String getRemianType() { | |
| 71 | + public List<Integer> getRemianType() { | |
| 72 | 72 | return remianType; |
| 73 | 73 | } |
| 74 | 74 | |
| 75 | - public void setRemianType(String remianType) { | |
| 75 | + public void setRemianType(List<Integer> remianType) { | |
| 76 | 76 | this.remianType = remianType; |
| 77 | 77 | } |
| 78 | 78 | |
| ... | ... | @@ -134,7 +134,7 @@ |
| 134 | 134 | condition = condition.and("chargeRecordId", chargeRecordId, MongoOper.IS); |
| 135 | 135 | } |
| 136 | 136 | if (null != remianType) { |
| 137 | - condition = condition.and("healthType", remianType, MongoOper.NE); | |
| 137 | + condition = condition.and("healthType", remianType, MongoOper.IN); | |
| 138 | 138 | } |
| 139 | 139 | |
| 140 | 140 | if (null != healthType) { |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AreaCountFacade.java
View file @
eb8bec9
| ... | ... | @@ -1657,17 +1657,20 @@ |
| 1657 | 1657 | HealthChargeQuery healthChargeQuery = getHealthChargeQuery(query, startTime, endTime, hospitalIds); |
| 1658 | 1658 | // 1体重 2 血糖 3 血压 4妊高症 5-儿童 |
| 1659 | 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"); | |
| 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); | |
| 1665 | 1667 | } |
| 1668 | + healthChargeQuery.setNeed("true"); | |
| 1666 | 1669 | List<HealthChargeModel> healthChargeModels = healthChargeService.queryHealthChargeList(healthChargeQuery); |
| 1667 | 1670 | LinkedList<Map<String, Object>> linkedList = new LinkedList<>(); |
| 1668 | 1671 | if (CollectionUtils.isNotEmpty(healthChargeModels)){ |
| 1669 | 1672 | for (HealthChargeModel model : healthChargeModels){ |
| 1670 | - HashMap<String, Object> map = getStringObjectHashMap(model); | |
| 1673 | + HashMap<String, Object> map = getStringObjectHashMap(model, false); | |
| 1671 | 1674 | linkedList.add(map); |
| 1672 | 1675 | |
| 1673 | 1676 | } |
| ... | ... | @@ -1701,7 +1704,7 @@ |
| 1701 | 1704 | * @param model |
| 1702 | 1705 | * @return |
| 1703 | 1706 | */ |
| 1704 | - private HashMap<String, Object> getStringObjectHashMap(HealthChargeModel model) { | |
| 1707 | + private HashMap<String, Object> getStringObjectHashMap(HealthChargeModel model, boolean isExport) { | |
| 1705 | 1708 | Date createDate = model.getCreated(); |
| 1706 | 1709 | String name = "", healthTypeName = "", typeName = "", sourceName = "", doctorName = ""; |
| 1707 | 1710 | // 类型 1-体重 2-。。。 |
| ... | ... | @@ -1756,7 +1759,11 @@ |
| 1756 | 1759 | } |
| 1757 | 1760 | } |
| 1758 | 1761 | HashMap<String, Object> map = new HashMap<>(16); |
| 1759 | - map.put("createDate", createDate); | |
| 1762 | + if (isExport){ | |
| 1763 | + map.put("createDate", DateUtil.getyyyy_MM_dd(createDate)); | |
| 1764 | + }else { | |
| 1765 | + map.put("createDate",createDate); | |
| 1766 | + } | |
| 1760 | 1767 | map.put("patientName", name); |
| 1761 | 1768 | map.put("healthType", healthTypeName); |
| 1762 | 1769 | map.put("type", typeName); |
| 1763 | 1770 | |
| ... | ... | @@ -1793,18 +1800,20 @@ |
| 1793 | 1800 | HealthChargeQuery healthChargeQuery = getHealthChargeQuery(query, startTime, endTime, hospitalIds); |
| 1794 | 1801 | // 1体重 2 血糖 3 血压 4妊高症 5-儿童 |
| 1795 | 1802 | 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"); | |
| 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); | |
| 1801 | 1810 | } |
| 1802 | 1811 | List<HealthChargeModel> healthChargeModels = healthChargeService.queryHealthChargeList(healthChargeQuery); |
| 1803 | 1812 | LinkedList<Map<String, Object>> linkedList = new LinkedList<>(); |
| 1804 | 1813 | |
| 1805 | 1814 | if (CollectionUtils.isNotEmpty(healthChargeModels)){ |
| 1806 | 1815 | for (HealthChargeModel model : healthChargeModels){ |
| 1807 | - HashMap<String, Object> map = getStringObjectHashMap(model); | |
| 1816 | + HashMap<String, Object> map = getStringObjectHashMap(model, true); | |
| 1808 | 1817 | linkedList.add(map); |
| 1809 | 1818 | |
| 1810 | 1819 | } |