diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/VisitFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/VisitFacade.java index 96f91cc..98b7d90 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/VisitFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/VisitFacade.java @@ -5,16 +5,19 @@ import com.lyms.platform.common.constants.ErrorCodeConstants; import com.lyms.platform.common.enums.YnEnums; import com.lyms.platform.common.result.BaseObjectResponse; import com.lyms.platform.common.result.BaseResponse; +import com.lyms.platform.common.utils.DateUtil; import com.lyms.platform.operate.web.request.BabyVisitAddRequest; import com.lyms.platform.operate.web.request.VisitAddRequest; import com.lyms.platform.operate.web.request.VisitAddRequest.SimpleVisitPuerpera; -import com.lyms.platform.operate.web.result.AddressInner; import com.lyms.platform.operate.web.result.BabyVisitResult; import com.lyms.platform.operate.web.result.BabyVisitResult.BabyVisit; import com.lyms.platform.operate.web.result.SimpleVisit; import com.lyms.platform.operate.web.result.VisitResult; import com.lyms.platform.operate.web.utils.CommonsHelper; -import com.lyms.platform.pojo.*; +import com.lyms.platform.pojo.BabyModel; +import com.lyms.platform.pojo.BabyVisitModel; +import com.lyms.platform.pojo.Patients; +import com.lyms.platform.pojo.VisitModel; import com.lyms.platform.query.BabyModelQuery; import com.lyms.platform.query.PatientsQuery; import com.lyms.platform.query.VisitQuery; @@ -80,7 +83,7 @@ public class VisitFacade { private BaseObjectResponse doBiz(Patients puerperaModel) { VisitResult data = new VisitResult(); if (null != puerperaModel) { - data.convertToResult1(puerperaModel, CommonsHelper.fullAddress(puerperaModel,basicConfigService)); + data.convertToResult1(puerperaModel, CommonsHelper.fullAddress(puerperaModel, basicConfigService)); VisitQuery visitQuery = new VisitQuery(); visitQuery.setParentId(puerperaModel.getId()); List visits = visitService.queryVisit(visitQuery); @@ -114,6 +117,7 @@ public class VisitFacade { return patientsService.findOnePatientByCardNo(query); } + /** * 增加产妇访视记录 * @@ -123,6 +127,14 @@ public class VisitFacade { public BaseResponse addOneVisit(VisitAddRequest visitRequest) { // 获取患者id String parentId = visitRequest.getParentId(); + String checkTime = visitRequest.getCheckTime(); + if (StringUtils.isNotEmpty(checkTime)&&null!=visitRequest.getPatients().getDueDate()) { + boolean f = DateUtil.parseYMD(checkTime).before(visitRequest.getPatients().getDueDate()); + if (f) { + return new BaseResponse().setErrorcode(ErrorCodeConstants.PARAMETER_ERROR).setErrormsg("检查时间必须大于分娩时间"); + } + } + if (StringUtils.isNotBlank(parentId)) { Patients model; PatientsQuery patientsQuery = new PatientsQuery();