Commit d965d46472207e5097c30dd9b367ea380505fbbb
Exists in
master
and in
6 other branches
Merge remote-tracking branch 'origin/master'
Showing 1 changed file
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java
View file @
d965d46
| ... | ... | @@ -588,9 +588,10 @@ |
| 588 | 588 | BabyModelQuery query = new BabyModelQuery(); |
| 589 | 589 | query.setId(babyModel.getId()); |
| 590 | 590 | babyModel1.setParentId(deliverAddRequest.getParentId()); |
| 591 | - if ((RenShenJieJuEnums.O.getId() + "").equals(baby.getPregnancyOut())) { | |
| 592 | - babyModel1.setYn(YnEnums.YES.getId()); | |
| 593 | - } else { | |
| 591 | + //修改分娩后自动建档了 的原因修改成这样 20180703 | |
| 592 | +// if ((RenShenJieJuEnums.O.getId() + "").equals(baby.getPregnancyOut())) { | |
| 593 | +// babyModel1.setYn(YnEnums.YES.getId()); | |
| 594 | +// } else { | |
| 594 | 595 | babyModel1.setYn(YnEnums.NO.getId()); |
| 595 | 596 | |
| 596 | 597 | //修改满足条件的person数据 |
| ... | ... | @@ -606,7 +607,7 @@ |
| 606 | 607 | } |
| 607 | 608 | } |
| 608 | 609 | } |
| 609 | - } | |
| 610 | +// } | |
| 610 | 611 | babyModel1.setBirth(DateUtil.parseYMD(baby.getDueTime())); |
| 611 | 612 | babyModel1.setSex(Integer.valueOf(baby.getBabyGender())); |
| 612 | 613 | Map map = deliverAddRequest.getDeliveryMode(); |