Commit 158f226db032c062ecad17df51eb46c619fead00
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 @
158f226
| ... | ... | @@ -700,14 +700,18 @@ |
| 700 | 700 | return new BaseResponse().setErrormsg("该孕妇还未在本院建档不能进行分娩").setErrorcode(ErrorCodeConstants.NO_DATA); |
| 701 | 701 | } |
| 702 | 702 | |
| 703 | - int days = DateUtil.daysBetween(patients.getLastMenses(), new Date()); | |
| 703 | + if (patients3 == null || !StringUtils.isNotEmpty(patients3.getId())) | |
| 704 | + { | |
| 705 | + int days = DateUtil.daysBetween(patients.getLastMenses(), new Date()); | |
| 704 | 706 | |
| 705 | - if (days < 168 && patients.getFmDate() == null) { | |
| 706 | - return new BaseResponse().setErrorcode(ErrorCodeConstants.BUSINESS_ERROR1).setErrormsg("当前孕妇的孕周小于24孕周，不能进行分娩"); | |
| 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 | + } | |
| 707 | 713 | } |
| 708 | - if (null != patients.getDueStatus() && 1 == patients.getDueStatus()) { | |
| 709 | - return new BaseResponse().setErrorcode(ErrorCodeConstants.BUSINESS_ERROR).setErrormsg(" 该孕妇在系统中已终止妊娠不能再进行分娩，请重新建档"); | |
| 710 | - } | |
| 714 | + | |
| 711 | 715 | |
| 712 | 716 | MatDeliverQuery matDeliverQuery = new MatDeliverQuery(); |
| 713 | 717 | matDeliverQuery.setPid(patients.getPid()); |