From 29feef838c5e2e033b054856d36b812eef8f345f Mon Sep 17 00:00:00 2001 From: liquanyu Date: Tue, 23 Jun 2020 13:08:42 +0800 Subject: [PATCH] update --- .../web/facade/AntenatalExaminationFacade.java | 22 ++++++++++++++++++++++ .../operate/web/facade/BabyBookbuildingFacade.java | 2 +- .../operate/web/facade/MatDeliverFacade.java | 21 ++++++++++++++++++++- 3 files changed, 43 insertions(+), 2 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java index cbaca97..d4a5863 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java @@ -311,6 +311,16 @@ public class AntenatalExaminationFacade { */ public BaseResponse addOneAntEx(AntExAddRequest antExAddRequest, Integer userId) { String hospitalId = autoMatchFacade.getHospitalId(userId); + + //秦皇岛市山海关人民医院 零时处理 + if (StringUtils.isNotEmpty(antExAddRequest.getCheckDate()) && "1000000004".equals(hospitalId)) { + if (!antExAddRequest.getCheckDate().equals(DateUtil.getyyyy_MM_dd(new Date()))) + { + return new BaseResponse().setErrormsg("检查日期不是当天不能保存").setErrorcode(ErrorCodeConstants.DATA_EXIST); + } + + } + AntenatalExaminationModel model = antExAddRequest.convertToDataModel(); //表示区域的 if (StringUtils.isNotEmpty(groupsFacade.findByCurrentUserId(hospitalId))) { @@ -622,6 +632,18 @@ public class AntenatalExaminationFacade { StopWatch stopWatch = new StopWatch("addOneAnetExChu"); final String hospitalId = autoMatchFacade.getHospitalId(userId); + + + //秦皇岛市山海关人民医院 零时处理 + if (StringUtils.isNotEmpty(excAddRequest.getCheckTime()) && "1000000004".equals(hospitalId)) { + if (!excAddRequest.getCheckTime().equals(DateUtil.getyyyy_MM_dd(new Date()))) + { + return new BaseResponse().setErrormsg("检查日期不是当天不能保存").setErrorcode(ErrorCodeConstants.DATA_EXIST); + } + + } + + /** 验证产检券是否可用 可用就改为已使用状态 */ if (StringUtils.isNotBlank(excAddRequest.getCouponCode()) && excAddRequest.getCouponType() != null) { stopWatch.start("couponService.validate"); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java index 23e46d6..701000f 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java @@ -4183,7 +4183,7 @@ public class BabyBookbuildingFacade { public void autoGetBabyDiagnose() { Date end = new Date(); - Date start = new Date(end.getTime() - 3600000); + Date start = DateUtil.addDay(end,-2); String lrrqStart = DateUtil.getYyyyMMddHHssmm(start); String lrrqEnd = DateUtil.getYyyyMMddHHssmm(end); 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 ae68448..f8f7c15 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 @@ -212,6 +212,25 @@ public class MatDeliverFacade { * @return */ public BaseResponse addOrUpdateMatDeliver(MatDeliverAddRequest deliverAddRequest, Integer userId) { + + String hospitalId = autoMatchFacade.getHospitalId(userId); + + //秦皇岛市山海关人民医院 零时处理 + if (CollectionUtils.isNotEmpty(deliverAddRequest.getBabies()) && "1000000004".equals(hospitalId)) { + if (com.lyms.platform.common.utils.StringUtils.isNotEmpty(deliverAddRequest.getBabies().get(0).getDueTime())) + { + Date birth = DateUtil.parseYMDHM(deliverAddRequest.getBabies().get(0).getDueTime()); + String birtStr = DateUtil.getyyyy_MM_dd(birth); + if (!birtStr.equals(DateUtil.getyyyy_MM_dd(new Date()))) + { + return new BaseResponse().setErrormsg("儿童分娩日期不是当天不能保存").setErrorcode(ErrorCodeConstants.DATA_EXIST); + } + } + + } + + + /** 验证产检券是否可用 可用就改为已使用状态 */ if (StringUtils.isNotBlank(deliverAddRequest.getCouponCode()) && deliverAddRequest.getCouponType() != null) { BaseObjectResponse resp = couponService.validate(deliverAddRequest.getCouponCode(), deliverAddRequest.getCouponType(), autoMatchFacade.getHospitalId(userId)); @@ -221,7 +240,7 @@ public class MatDeliverFacade { } List babyList = new ArrayList<>(); - String hospitalId = autoMatchFacade.getHospitalId(userId); + MaternalDeliverModel maternalDeliverModel = deliverAddRequest.convertToDataModel(); //非卫计委出修改做区域隐藏建档 -- 1.8.3.1