Commit c901d8a0f9f636d09ddc67e743398042c740e027
Exists in
master
and in
8 other branches
Merge remote-tracking branch 'origin/master'
Showing 1 changed file
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java
View file @
c901d8a
| ... | ... | @@ -773,7 +773,7 @@ |
| 773 | 773 | result.setBirthday(DateUtil.getyyyy_MM_dd(model.getBirth())); |
| 774 | 774 | result.setMommyName(model.getMname()); |
| 775 | 775 | result.setMommnyPhone(model.getMphone()); |
| 776 | - result.setServiceStatus(ServiceStatusEnums.getNameById(model.getServiceStatus())); | |
| 776 | + result.setServiceStatus(model.getServiceStatus() == null ? "" : ServiceStatusEnums.getNameById(model.getServiceStatus())); | |
| 777 | 777 | result.setNextDate(DateUtil.getyyyy_MM_dd(model.getNextDate())); |
| 778 | 778 | result.setMonthAge(DateUtil.getBabyMonthAge(model.getBirth(), new Date())); |
| 779 | 779 | result.setPatientId(model.getParentId()); |
| ... | ... | @@ -784,6 +784,7 @@ |
| 784 | 784 | List diagList = JsonUtil.toList(model.getDiagnose(),List.class); |
| 785 | 785 | if (CollectionUtils.isNotEmpty(diagList)) |
| 786 | 786 | { |
| 787 | + diagnose = ""; | |
| 787 | 788 | for(Object obj : diagList) |
| 788 | 789 | { |
| 789 | 790 | BasicConfig basicConfig = basicConfigService.getOneBasicConfigById((String)obj); |