From 7ea7b6df2ad7050d71151238e7e3a4b3e52746ad Mon Sep 17 00:00:00 2001 From: liquanyu Date: Thu, 26 Mar 2020 08:40:02 +0800 Subject: [PATCH] update --- .../com/lyms/platform/operate/web/facade/MatDeliverFacade.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 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 cf07ef3..6f9b411 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 @@ -1273,9 +1273,13 @@ public class MatDeliverFacade { int days = DateUtil.daysBetween(patients.getLastMenses(), new Date()); - if (days < 168 && patients.getFmDate() == null) { - return new BaseResponse().setErrorcode(ErrorCodeConstants.BUSINESS_ERROR1).setErrormsg("当前孕妇的孕周小于24孕周，不能进行分娩"); + if (!"2100001635".equals(hospital)) + { + 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