diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AreaCountFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AreaCountFacade.java index e3e9947..1764adf 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AreaCountFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AreaCountFacade.java @@ -1696,7 +1696,10 @@ public class AreaCountFacade { private HashMap getStringObjectHashMap(HealthChargeModel model) { Date createDate = model.getCreated(); String name = "", healthTypeName = "", typeName = "", sourceName = "", doctorName = ""; + // 类型 1-体重 2-。。。 Integer healthType = model.getHealthType(); + // 1-院内 2-临时 + Integer source = model.getSource(); if (5 == healthType){ // 儿童 String babyForeignId = model.getBabyForeignId(); @@ -1707,19 +1710,28 @@ public class AreaCountFacade { } } } else { + // 孕妇 String yumForeignId = model.getForeignId(); if (yumForeignId != null){ - Patients patients = mongoTemplate.findOne(Query.query(Criteria.where("_id").is(yumForeignId)), Patients.class); - if (patients != null) { - name = patients.getUsername(); - + // 建档 + if ( source == 1){ + Patients patients = mongoTemplate.findOne(Query.query(Criteria.where("_id").is(yumForeignId)), Patients.class); + if (patients != null) { + name = patients.getUsername(); + } + } + // 临时建档 + if (source == 2){ + TemporaryUserModel userModel = mongoTemplate.findOne(Query.query(Criteria.where("_id").is(yumForeignId)), TemporaryUserModel.class); + if (userModel != null){ + name = userModel.getUserName(); + } } } } healthTypeName = getHealthTypeName(model, healthTypeName); typeName = getTypeName(model, typeName); - Integer source = model.getSource(); if (source != null) { if (source == 1) { sourceName = "院内报告";