From fab0b25216ad0d05fdd87691ab2524608741a77d Mon Sep 17 00:00:00 2001 From: liquanyu Date: Sat, 17 Jun 2017 17:20:07 +0800 Subject: [PATCH] update code --- .../platform/operate/web/facade/MatDeliverFacade.java | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) 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 49398f6..3a042e5 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,16 +700,14 @@ public class MatDeliverFacade { return new BaseResponse().setErrormsg("该孕妇还未在本院建档不能进行分娩").setErrorcode(ErrorCodeConstants.NO_DATA); } - 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(" 该孕妇在系统中已终止妊娠不能再进行分娩，请重新建档"); - } + 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(" 该孕妇在系统中已终止妊娠不能再进行分娩，请重新建档"); } -- 1.8.3.1