Commit 4163205c1aa38dd60cd6a46c098edd9cee9034c4
1 parent
d460b9dad7
Exists in
master
and in
6 other branches
分娩
Showing 1 changed file with 4 additions and 6 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java
View file @
4163205
| ... | ... | @@ -978,8 +978,8 @@ |
| 978 | 978 | personModel.setCardNo(babyModel.getMcertNo()); |
| 979 | 979 | personModel.setName(babyModel.getName()); |
| 980 | 980 | personModel.setCreated(new Date()); |
| 981 | - babyModel.setPid(personService.addPerson(personModel).getId()); | |
| 982 | 981 | |
| 982 | + | |
| 983 | 983 | //判断妊娠结局是活产才添加数据 |
| 984 | 984 | if ((RenShenJieJuEnums.O.getId() + "").equals(baby.getPregnancyOut())) { |
| 985 | 985 | //babyModel.setYn(YnEnums.YES.getId()); |
| 986 | 986 | |
| ... | ... | @@ -1008,11 +1008,8 @@ |
| 1008 | 1008 | { |
| 1009 | 1009 | personModel.setYn(YnEnums.NO.getId()); |
| 1010 | 1010 | } |
| 1011 | + babyModel.setPid(personService.addPerson(personModel).getId()); | |
| 1011 | 1012 | |
| 1012 | - | |
| 1013 | - | |
| 1014 | - | |
| 1015 | - | |
| 1016 | 1013 | babyIds.add(babyService.addOneBaby(babyModel).getId()); |
| 1017 | 1014 | baby1.setId(babyModel.getId()); |
| 1018 | 1015 | |
| ... | ... | @@ -2402,7 +2399,8 @@ |
| 2402 | 2399 | babyModelQuery.setHospitalId(autoMatchFacade.getHospitalId(newBabyManagerRequest.getOperatorId())); |
| 2403 | 2400 | babyModelQuery.setBuildType(2); |
| 2404 | 2401 | babyModelQuery.setOrder("birth"); |
| 2405 | - // System.out.println(babyModelQuery.convertToQuery().convertToMongoQuery()); | |
| 2402 | + | |
| 2403 | + System.out.println(babyModelQuery.convertToQuery().convertToMongoQuery()); | |
| 2406 | 2404 | List<BabyModel> babyModelList = babyService.queryBabyWithQuery(babyModelQuery); |
| 2407 | 2405 | if (CollectionUtils.isEmpty(babyModelList)) { |
| 2408 | 2406 | newBabyManagerResult.setPageInfo(babyModelQuery.getPageInfo()); |