From a9b00f9cd927ff4b86c0bfcf2f845fd867cec73d Mon Sep 17 00:00:00 2001 From: liquanyu Date: Thu, 23 Apr 2020 13:58:14 +0800 Subject: [PATCH] update --- .../com/lyms/platform/biz/service/PatientsService.java | 6 +++--- .../operate/web/controller/PostReviewController.java | 16 ++++++++++++++++ .../operate/web/controller/RemoteController.java | 4 +++- .../platform/operate/web/facade/PostReviewFacade.java | 14 ++++++-------- .../platform/operate/web/request/PostReviewRequest.java | 9 +++++++++ 5 files changed, 37 insertions(+), 12 deletions(-) diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PatientsService.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PatientsService.java index d11986d..6b4da8c 100644 --- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PatientsService.java +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PatientsService.java @@ -445,14 +445,14 @@ public class PatientsService { * 自动分娩产妇的 */ public void autoMatDeliver() { - setAutoMatDeliver(null); + setAutoMatDeliver(null,null); } - public void setAutoMatDeliver(String cardNo) + public void setAutoMatDeliver(String cardNo,Date dueDate) { - Date endDate = DateUtil.addDay(new Date(), -294); + Date endDate = dueDate == null ? DateUtil.addDay(new Date(), -294) : dueDate; PatientsQuery patientsQuery = new PatientsQuery(); patientsQuery.setYn(YnEnums.YES.getId()); patientsQuery.setType(1); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PostReviewController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PostReviewController.java index cb9e582..014ad9f 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PostReviewController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PostReviewController.java @@ -65,6 +65,22 @@ public class PostReviewController extends BaseController { return baseResponse; } + + /** + * 南和不填写分娩记录 直接填写产后复查 先设置分娩时间 + * @param postReviewRequest + * @param request + * @return + */ + @RequestMapping(method = RequestMethod.POST,value = "/postreviewDueDate") + @ResponseBody + @TokenRequired + public BaseResponse addPostReviewDueDate(@Valid @RequestBody PostReviewRequest postReviewRequest,HttpServletRequest request){ + LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); + BaseResponse baseResponse = postReviewFacade.addPostReviewDueDate(postReviewRequest, loginState.getId()); + return baseResponse; + } + /** * 查询产后复查 * diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RemoteController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RemoteController.java index b8b902b..ea79c21 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RemoteController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RemoteController.java @@ -56,6 +56,8 @@ public class RemoteController extends BaseController { @Autowired private RemoteFacade remoteFacade; + private static final long TIMES = 24 * 60 * 60 * 1000 - 1; + public static final String center_statistics_url= PropertiesUtils.getPropertyValue("center_statistics_url"); @ResponseBody @@ -194,7 +196,7 @@ public class RemoteController extends BaseController { { String[] arr = created.split(" - "); Date start = DateUtil.parseYMD(arr[0]); - Date end = new Date(DateUtil.parseYMD(arr[1]).getTime() + 24 * 60 * 60 * 1000 - 1); + Date end = new Date(DateUtil.parseYMD(arr[1]).getTime() + TIMES); query.setCreatedStart(start); query.setCreatedEnd(end); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PostReviewFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PostReviewFacade.java index f2f23cc..88e8792 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PostReviewFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PostReviewFacade.java @@ -352,14 +352,7 @@ public class PostReviewFacade { //未分娩建档 if (null != patients) { - if (postReviewQueryRequest.getFlag() != null) - { - patientsService.setAutoMatDeliver(patients.getCardNo()); - } - else - { - return new BaseResponse().setErrorcode(ErrorCodeConstants.PARAMETER_ERROR).setErrormsg("该孕妇还未分娩，不能进行复查"); - } + return new BaseResponse().setErrorcode(ErrorCodeConstants.PARAMETER_ERROR).setErrormsg("该孕妇还未分娩，不能进行复查"); } //取所有医院的建档数据 优先取本院 ，然后取外院 @@ -521,4 +514,9 @@ public class PostReviewFacade { return new BaseResponse().setErrorcode(ErrorCodeConstants.BUSINESS_ERROR).setErrormsg("当前复查记录不是本院最新的复查记录,不能删除"); } } + + public BaseResponse addPostReviewDueDate(PostReviewRequest postReviewRequest, Integer id) { + patientsService.setAutoMatDeliver(postReviewRequest.getCardNo(),DateUtil.parseYMD(postReviewRequest.getDueDate())); + return new BaseResponse().setErrormsg("成功").setErrorcode(ErrorCodeConstants.SUCCESS); + } } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PostReviewRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PostReviewRequest.java index 5e6966a..08c810f 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PostReviewRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PostReviewRequest.java @@ -124,6 +124,15 @@ public class PostReviewRequest implements IBasicRequestConvert