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 014ad9f..af83c64 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 @@ -75,7 +75,7 @@ public class PostReviewController extends BaseController { @RequestMapping(method = RequestMethod.POST,value = "/postreviewDueDate") @ResponseBody @TokenRequired - public BaseResponse addPostReviewDueDate(@Valid @RequestBody PostReviewRequest postReviewRequest,HttpServletRequest request){ + public BaseResponse addPostReviewDueDate(@Valid @RequestBody PostReviewQueryRequest 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/facade/PostReviewFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PostReviewFacade.java index 88e8792..418ff3d 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 @@ -515,8 +515,16 @@ public class PostReviewFacade { } } - public BaseResponse addPostReviewDueDate(PostReviewRequest postReviewRequest, Integer id) { - patientsService.setAutoMatDeliver(postReviewRequest.getCardNo(),DateUtil.parseYMD(postReviewRequest.getDueDate())); + public BaseResponse addPostReviewDueDate(PostReviewQueryRequest postReviewRequest, Integer userId) { + + String hospitalId = autoMatchFacade.getHospitalId(userId); + Organization og = organizationService.getOrganization(Integer.valueOf(hospitalId)); + Patients patients = examinationFacade.findOnePatient(postReviewRequest.getCardNo(), postReviewRequest.getVcCardNo(), null, null, 1, false, null, og.getbStatus() != 1); + if (patients != null) + { + patientsService.setAutoMatDeliver(patients.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/PostReviewQueryRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PostReviewQueryRequest.java index 85efb7b..ce10ae3 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PostReviewQueryRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PostReviewQueryRequest.java @@ -24,10 +24,20 @@ public class PostReviewQueryRequest { private String patientId; + private String dueDate; + //空的时候表示 不只直接填写产后复查,不为空直接填写产后复查 private Integer flag; + public String getDueDate() { + return dueDate; + } + + public void setDueDate(String dueDate) { + this.dueDate = dueDate; + } + public Integer getFlag() { return flag; } 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 08c810f..5e6966a 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,15 +124,6 @@ public class PostReviewRequest implements IBasicRequestConvert