Commit fab0b25216ad0d05fdd87691ab2524608741a77d
1 parent
d67eb7f8f4
Exists in
master
and in
6 other branches
update code
Showing 1 changed file with 7 additions and 9 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java
View file @
fab0b25
| ... | ... | @@ -700,16 +700,14 @@ |
| 700 | 700 | return new BaseResponse().setErrormsg("该孕妇还未在本院建档不能进行分娩").setErrorcode(ErrorCodeConstants.NO_DATA); |
| 701 | 701 | } |
| 702 | 702 | |
| 703 | - if (patients3 == null || !StringUtils.isNotEmpty(patients3.getId())) | |
| 704 | - { | |
| 705 | - int days = DateUtil.daysBetween(patients.getLastMenses(), new Date()); | |
| 706 | 703 | |
| 707 | - if (days < 168 && patients.getFmDate() == null) { | |
| 708 | - return new BaseResponse().setErrorcode(ErrorCodeConstants.BUSINESS_ERROR1).setErrormsg("当前孕妇的孕周小于24孕周，不能进行分娩"); | |
| 709 | - } | |
| 710 | - if (null != patients.getDueStatus() && 1 == patients.getDueStatus()) { | |
| 711 | - return new BaseResponse().setErrorcode(ErrorCodeConstants.BUSINESS_ERROR).setErrormsg(" 该孕妇在系统中已终止妊娠不能再进行分娩，请重新建档"); | |
| 712 | - } | |
| 704 | + int days = DateUtil.daysBetween(patients.getLastMenses(), new Date()); | |
| 705 | + | |
| 706 | + if (days < 168 && patients.getFmDate() == null) { | |
| 707 | + return new BaseResponse().setErrorcode(ErrorCodeConstants.BUSINESS_ERROR1).setErrormsg("当前孕妇的孕周小于24孕周，不能进行分娩"); | |
| 708 | + } | |
| 709 | + if (null != patients.getDueStatus() && 1 == patients.getDueStatus()) { | |
| 710 | + return new BaseResponse().setErrorcode(ErrorCodeConstants.BUSINESS_ERROR).setErrormsg(" 该孕妇在系统中已终止妊娠不能再进行分娩，请重新建档"); | |
| 713 | 711 | } |
| 714 | 712 | |
| 715 | 713 |