Commit c339e54033e25628258779a3c0d41f960ff8e791
1 parent
c6573c63cf
Exists in
master
and in
6 other branches
儿保
Showing 1 changed file with 3 additions and 2 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java
View file @
c339e54
| ... | ... | @@ -780,7 +780,9 @@ |
| 780 | 780 | base.setMonthAge(DateUtil.getBabyMonthAge(model.getBirth(), new Date())); |
| 781 | 781 | //计算儿童的预产期 |
| 782 | 782 | if(model.getBirth()!=null&&model.getDueWeek()!=null&&model.getDueWeek()<37){//早产儿，根据出生孕周计算末次月经，在根据末次月经计算预产期 |
| 783 | - if(DateUtil.isGtOrEq(model.getBirth(),model.getDueDate())){//如果相等，预产期与生日一致 | |
| 783 | + String birthStr = DateUtil.getyyyy_MM_dd(model.getBirth()); | |
| 784 | + Date ymdBirth = DateUtil.parseYMD(birthStr); | |
| 785 | + if(model.getDueDate()==null || ymdBirth.getTime() == model.getDueDate().getTime()){//预产期为空或者预产期与生日一致进行计算真实预产期 | |
| 784 | 786 | //根据出生孕周计算末次月经 |
| 785 | 787 | Date LastMens = DateUtil.addWeek(model.getBirth(),-model.getDueWeek()); |
| 786 | 788 | //根据末次月经计算预产期 |
| ... | ... | @@ -792,7 +794,6 @@ |
| 792 | 794 | base.setDueDate(DateUtil.getyyyy_MM_dd(model.getDueDate())); |
| 793 | 795 | } |
| 794 | 796 | } |
| 795 | - | |
| 796 | 797 | |
| 797 | 798 | base.setBirthday(DateUtil.getyyyy_MM_dd(model.getBirth())); |
| 798 | 799 | base.setSourceId(org.apache.commons.lang.StringUtils.isNotEmpty(model.getSource())?model.getSource():model.getId()); |