diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java index f5e8d56..49398f6 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java @@ -700,15 +700,19 @@ public class MatDeliverFacade { return new BaseResponse().setErrormsg("该孕妇还未在本院建档不能进行分娩").setErrorcode(ErrorCodeConstants.NO_DATA); } - int days = DateUtil.daysBetween(patients.getLastMenses(), new Date()); + if (patients3 == null || !StringUtils.isNotEmpty(patients3.getId())) + { + int days = DateUtil.daysBetween(patients.getLastMenses(), new Date()); - if (days < 168 && patients.getFmDate() == null) { - return new BaseResponse().setErrorcode(ErrorCodeConstants.BUSINESS_ERROR1).setErrormsg("当前孕妇的孕周小于24孕周,不能进行分娩"); - } - if (null != patients.getDueStatus() && 1 == patients.getDueStatus()) { - return new BaseResponse().setErrorcode(ErrorCodeConstants.BUSINESS_ERROR).setErrormsg(" 该孕妇在系统中已终止妊娠不能再进行分娩,请重新建档"); + if (days < 168 && patients.getFmDate() == null) { + return new BaseResponse().setErrorcode(ErrorCodeConstants.BUSINESS_ERROR1).setErrormsg("当前孕妇的孕周小于24孕周,不能进行分娩"); + } + if (null != patients.getDueStatus() && 1 == patients.getDueStatus()) { + return new BaseResponse().setErrorcode(ErrorCodeConstants.BUSINESS_ERROR).setErrormsg(" 该孕妇在系统中已终止妊娠不能再进行分娩,请重新建档"); + } } + MatDeliverQuery matDeliverQuery = new MatDeliverQuery(); matDeliverQuery.setPid(patients.getPid()); //2017年2月14日 14:15:53 王平说的分娩管理取消产程概念,有好多显示好多。