jiangjiazhi / regional-platform

Download as
Browse Code »

Commit b39ce108737f69930777f12a3905ff6c27444d8e

Authored by dongqin
1 parent 9afe8ad621
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

修复bug

Showing 1 changed file with 19 additions and 10 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AreaCountFacade.java View file @ b39ce10
... ... @@ -1695,13 +1695,27 @@
1695 1695 */
1696 1696 private HashMap<String, Object> getStringObjectHashMap(HealthChargeModel model) {
1697 1697 Date createDate = model.getCreated();
1698   - String babyForeignId = model.getBabyForeignId();
1699 1698 String name = "", healthTypeName = "", typeName = "", sourceName = "", doctorName = "";
1700   - if (babyForeignId != null) {
1701   - BabyModel babyModel = mongoTemplate.findOne(Query.query(Criteria.where("_id").is(babyForeignId)), BabyModel.class);
1702   - if (babyModel != null) {
1703   - name = babyModel.getName();
  1699 + Integer healthType = model.getHealthType();
  1700 + if (5 == healthType){
  1701 + // 儿童
  1702 + String babyForeignId = model.getBabyForeignId();
  1703 + if (babyForeignId != null) {
  1704 + BabyModel babyModel = mongoTemplate.findOne(Query.query(Criteria.where("_id").is(babyForeignId)), BabyModel.class);
  1705 + if (babyModel != null) {
  1706 + name = babyModel.getName();
  1707 + }
1704 1708 }
  1709 + } else {
  1710 + // 孕妇
  1711 + String yumForeignId = model.getForeignId();
  1712 + 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 + }
1705 1719 }
1706 1720 healthTypeName = getHealthTypeName(model, healthTypeName);
1707 1721 typeName = getTypeName(model, typeName);
... ... @@ -1809,11 +1823,6 @@
1809 1823 }
1810 1824 }
1811 1825 return healthTypeName;
1812   - }
1813   -
1814   - public static void main(String[] args) {
1815   - Date date = new Date(1554048000000L);
1816   - System.out.println(DateUtil.getyyyy_MM_dd(date));
1817 1826 }
1818 1827 }