Commit 75b8f29208714c3d918a3344f69dd377679aef0e
1 parent
3ee8d8d1f6
Exists in
master
and in
6 other branches
修复bug
Showing 1 changed file with 17 additions and 5 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AreaCountFacade.java
View file @
75b8f29
| ... | ... | @@ -1696,7 +1696,10 @@ |
| 1696 | 1696 | private HashMap<String, Object> getStringObjectHashMap(HealthChargeModel model) { |
| 1697 | 1697 | Date createDate = model.getCreated(); |
| 1698 | 1698 | String name = "", healthTypeName = "", typeName = "", sourceName = "", doctorName = ""; |
| 1699 | + // 类型 1-体重 2-。。。 | |
| 1699 | 1700 | Integer healthType = model.getHealthType(); |
| 1701 | + // 1-院内 2-临时 | |
| 1702 | + Integer source = model.getSource(); | |
| 1700 | 1703 | if (5 == healthType){ |
| 1701 | 1704 | // 儿童 |
| 1702 | 1705 | String babyForeignId = model.getBabyForeignId(); |
| 1703 | 1706 | |
| 1704 | 1707 | |
| 1705 | 1708 | |
| ... | ... | @@ -1707,19 +1710,28 @@ |
| 1707 | 1710 | } |
| 1708 | 1711 | } |
| 1709 | 1712 | } else { |
| 1713 | + | |
| 1710 | 1714 | // 孕妇 |
| 1711 | 1715 | String yumForeignId = model.getForeignId(); |
| 1712 | 1716 | if (yumForeignId != null){ |
| 1713 | - Patients patients = mongoTemplate.findOne(Query.query(Criteria.where("_id").is(yumForeignId)), Patients.class); | |
| 1714 | - if (patients != null) { | |
| 1715 | - name = patients.getUsername(); | |
| 1716 | - | |
| 1717 | + // 建档 | |
| 1718 | + if ( source == 1){ | |
| 1719 | + Patients patients = mongoTemplate.findOne(Query.query(Criteria.where("_id").is(yumForeignId)), Patients.class); | |
| 1720 | + if (patients != null) { | |
| 1721 | + name = patients.getUsername(); | |
| 1722 | + } | |
| 1717 | 1723 | } |
| 1724 | + // 临时建档 | |
| 1725 | + if (source == 2){ | |
| 1726 | + TemporaryUserModel userModel = mongoTemplate.findOne(Query.query(Criteria.where("_id").is(yumForeignId)), TemporaryUserModel.class); | |
| 1727 | + if (userModel != null){ | |
| 1728 | + name = userModel.getUserName(); | |
| 1729 | + } | |
| 1730 | + } | |
| 1718 | 1731 | } |
| 1719 | 1732 | } |
| 1720 | 1733 | healthTypeName = getHealthTypeName(model, healthTypeName); |
| 1721 | 1734 | typeName = getTypeName(model, typeName); |
| 1722 | - Integer source = model.getSource(); | |
| 1723 | 1735 | if (source != null) { |
| 1724 | 1736 | if (source == 1) { |
| 1725 | 1737 | sourceName = "院内报告"; |