Commit 3af52fbd088a579238a61bd29d4792022496d927
1 parent
277e152057
Exists in
master
and in
6 other branches
修复bug
Showing 1 changed file with 6 additions and 2 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyNutritionFacade.java
View file @
3af52fb
| ... | ... | @@ -1006,7 +1006,7 @@ |
| 1006 | 1006 | String doctorId = healthChargeModel.getDoctorId(); |
| 1007 | 1007 | String doctorName = ""; |
| 1008 | 1008 | if (doctorId != null) { |
| 1009 | - Users users = mongoTemplate.findOne(Query.query(Criteria.where("id")), Users.class); | |
| 1009 | + Users users = usersService.getUsers(Integer.parseInt(doctorId)); | |
| 1010 | 1010 | if (users != null) { |
| 1011 | 1011 | doctorName = users.getName(); |
| 1012 | 1012 | } |
| ... | ... | @@ -1018,7 +1018,11 @@ |
| 1018 | 1018 | hashMap.put("babyName", babayName); |
| 1019 | 1019 | hashMap.put("gender", sex != null ? sex == 1 ? "男" : "女" : ""); |
| 1020 | 1020 | hashMap.put("phone", mongoTemplateOne.getMphone()); |
| 1021 | - hashMap.put("cardNo", mongoTemplateOne.getCardNo()); | |
| 1021 | + String cardNo = mongoTemplateOne.getCardNo(); | |
| 1022 | + if (StringUtils.isEmpty(cardNo)){ | |
| 1023 | + cardNo = mongoTemplateOne.getMcertNo(); | |
| 1024 | + } | |
| 1025 | + hashMap.put("cardNo", cardNo); | |
| 1022 | 1026 | hashMap.put("weight", mongoTemplateOne.getBabyWeight()); |
| 1023 | 1027 | hashMap.put("babyHeight", mongoTemplateOne.getBabyHeight()); |
| 1024 | 1028 | hashMap.put("createTime", createTime); |