Commit f8139eaceb3f292366e42e41eae760f547c38f71
1 parent
f8b9365ca8
Exists in
master
and in
6 other branches
分娩
Showing 1 changed file with 33 additions and 10 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java
View file @
f8139ea
| ... | ... | @@ -967,6 +967,19 @@ |
| 967 | 967 | DateUtil.getYmd(DateUtil.parseYMD(deliverAddRequest.getDueDate())); |
| 968 | 968 | babyModel.setPhoneId(phoneId + babyModel.getName()); |
| 969 | 969 | } |
| 970 | + | |
| 971 | + | |
| 972 | + PersonModel personModel = new PersonModel(); | |
| 973 | + personModel.setType(2); | |
| 974 | + | |
| 975 | + personModel.setBirth(DateUtil.parseYMD(baby.getDueTime())); | |
| 976 | + personModel.setModified(new Date()); | |
| 977 | + personModel.setPhone(babyModel.getMphone()); | |
| 978 | + personModel.setCardNo(babyModel.getMcertNo()); | |
| 979 | + personModel.setName(babyModel.getName()); | |
| 980 | + personModel.setCreated(new Date()); | |
| 981 | + babyModel.setPid(personService.addPerson(personModel).getId()); | |
| 982 | + | |
| 970 | 983 | //判断妊娠结局是活产才添加数据 |
| 971 | 984 | if ((RenShenJieJuEnums.O.getId() + "").equals(baby.getPregnancyOut())) { |
| 972 | 985 | //babyModel.setYn(YnEnums.YES.getId()); |
| 973 | 986 | |
| 974 | 987 | |
| ... | ... | @@ -976,20 +989,30 @@ |
| 976 | 989 | babyModel.setYn(YnEnums.NO.getId()); |
| 977 | 990 | babyModel.setDataStatus(1); |
| 978 | 991 | |
| 979 | - PersonModel personModel = new PersonModel(); | |
| 980 | - personModel.setType(2); | |
| 981 | - personModel.setYn(YnEnums.YES.getId()); | |
| 982 | - personModel.setBirth(DateUtil.parseYMD(baby.getDueTime())); | |
| 983 | - personModel.setModified(new Date()); | |
| 984 | - personModel.setPhone(babyModel.getMphone()); | |
| 985 | - personModel.setCardNo(babyModel.getMcertNo()); | |
| 986 | - personModel.setName(babyModel.getName()); | |
| 987 | - personModel.setCreated(new Date()); | |
| 988 | - babyModel.setPid(personService.addPerson(personModel).getId()); | |
| 992 | +// PersonModel personModel = new PersonModel(); | |
| 993 | +// personModel.setType(2); | |
| 994 | +// personModel.setYn(YnEnums.YES.getId()); | |
| 995 | +// personModel.setBirth(DateUtil.parseYMD(baby.getDueTime())); | |
| 996 | +// personModel.setModified(new Date()); | |
| 997 | +// personModel.setPhone(babyModel.getMphone()); | |
| 998 | +// personModel.setCardNo(babyModel.getMcertNo()); | |
| 999 | +// personModel.setName(babyModel.getName()); | |
| 1000 | +// personModel.setCreated(new Date()); | |
| 1001 | +// babyModel.setPid(personService.addPerson(personModel).getId()); | |
| 989 | 1002 | //add lqy start 2017-03-01 |
| 990 | 1003 | babyModel.setBlNo(baby.getBlNo()); |
| 991 | 1004 | babyModel.setBabyDiagnosis(baby.getBabyDiagnosis()); |
| 1005 | + personModel.setYn(YnEnums.YES.getId()); | |
| 992 | 1006 | } |
| 1007 | + else | |
| 1008 | + { | |
| 1009 | + personModel.setYn(YnEnums.NO.getId()); | |
| 1010 | + } | |
| 1011 | + | |
| 1012 | + | |
| 1013 | + | |
| 1014 | + | |
| 1015 | + | |
| 993 | 1016 | babyIds.add(babyService.addOneBaby(babyModel).getId()); |
| 994 | 1017 | baby1.setId(babyModel.getId()); |
| 995 | 1018 |