Commit 7e64302c19057c0d1738405ea4df1032bcb7d3d7
1 parent
affc0fb21e
Exists in
master
and in
1 other branch
增加是否通知
Showing 1 changed file with 6 additions and 5 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java
View file @
7e64302
| ... | ... | @@ -81,21 +81,22 @@ |
| 81 | 81 | } |
| 82 | 82 | } |
| 83 | 83 | for (MatDeliverAddRequest.Baby baby : list) { |
| 84 | + | |
| 85 | + BabyModel babyModel = baby.convertToDataModel(); | |
| 86 | + babyModel.setParentId(parentId); | |
| 87 | + babyModel.setName(userName + (babyModel.getSex() == 1 ? "之子" : "之女")); | |
| 88 | + babyModel.setYn(YnEnums.NO.getId()); | |
| 84 | 89 | //判断妊娠结局是活产才添加数据 |
| 85 | 90 | if ((RenShenJieJuEnums.O.getId() + "").equals(baby.getPregnancyOut())) { |
| 86 | - BabyModel babyModel = baby.convertToDataModel(); | |
| 87 | - babyModel.setParentId(parentId); | |
| 88 | - babyModel.setName(userName + (babyModel.getSex() == 1 ? "之子" : "之女")); | |
| 89 | 91 | babyModel.setYn(YnEnums.YES.getId()); |
| 90 | - | |
| 91 | 92 | PersonModel personModel = new PersonModel(); |
| 92 | 93 | personModel.setType(2); |
| 93 | 94 | personModel.setYn(YnEnums.YES.getId()); |
| 94 | 95 | personModel.setBirth(DateUtil.parseYMD(deliverAddRequest.getDueDate())); |
| 95 | 96 | personModel.setModified(new Date()); |
| 96 | 97 | babyModel.setPid(personService.addPerson(personModel).getId()); |
| 97 | - babyIds.add(babyService.addOneBaby(babyModel).getId()); | |
| 98 | 98 | } |
| 99 | + babyIds.add(babyService.addOneBaby(babyModel).getId()); | |
| 99 | 100 | } |
| 100 | 101 | } |
| 101 | 102 | List list1 = autoMatchFacade.matchOrgId(userId); |