diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/ReferralApplyOrderModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/ReferralApplyOrderModel.java index 89fe24d..f28c367 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/ReferralApplyOrderModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/ReferralApplyOrderModel.java @@ -94,6 +94,16 @@ public class ReferralApplyOrderModel extends BaseModel { private String diagnosis; //其他诊断 private String otherDiagn; + //拒绝原因 + private String reason; + + public String getReason() { + return reason; + } + + public void setReason(String reason) { + this.reason = reason; + } public List getRiskFactorId() { return riskFactorId; diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ApplyOrderController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ApplyOrderController.java index 0fe5c69..cb004bf 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ApplyOrderController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ApplyOrderController.java @@ -180,8 +180,8 @@ public class ApplyOrderController extends BaseController { @RequestMapping(method = RequestMethod.GET, value = "/auditMessages") @TokenRequired @ResponseBody - public BaseResponse auditMessages(HttpServletRequest request, String id, String state) { - return applyOrderFacade.auditMessages(getUserId(request), id, state); + public BaseResponse auditMessages(HttpServletRequest request, String id, String state, String reason) { + return applyOrderFacade.auditMessages(getUserId(request), id, state, reason); } } \ No newline at end of file diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java index 82567ea..cefb8b7 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java @@ -965,7 +965,7 @@ public class ApplyOrderFacade { applyOrderResult.setrRisk(stringBuilder.toString()); applyOrderResult.setScore(orderModel.getScore()); - + applyOrderResult.setReason(StringUtils.isNotEmpty(orderModel.getReason()) ? orderModel.getReason() : "--"); List rLevel = new ArrayList(); if (CollectionUtils.isNotEmpty(orderModel.getrLevel())) { try { @@ -997,6 +997,7 @@ public class ApplyOrderFacade { applyOrderResult.setcDueWeek("已分娩"); } } + data.add(applyOrderResult); } } @@ -1357,13 +1358,14 @@ public class ApplyOrderFacade { } } - public BaseResponse auditMessages(Integer userId, String id, String state) { + public BaseResponse auditMessages(Integer userId, String id, String state, String reason) { ReferralApplyOrderModel referralApplyOrderModel = applyOrderService.findByIdReferralApplyOrder(id); String hospital = autoMatchFacade.getHospitalId(userId); if (null != referralApplyOrderModel) { ReferralApplyOrderQuery referralApplyOrderQuery = new ReferralApplyOrderQuery(); referralApplyOrderQuery.setId(id); referralApplyOrderModel.setStatus(Integer.parseInt(state)); + referralApplyOrderModel.setReason(reason); applyOrderService.updateByParentId(referralApplyOrderQuery, referralApplyOrderModel); } return new BaseObjectResponse().setData("").setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ApplyOrderOutResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ApplyOrderOutResult.java index 8769e6b..b1c1d1a 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ApplyOrderOutResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ApplyOrderOutResult.java @@ -71,6 +71,17 @@ public class ApplyOrderOutResult { private String diagnosis; + //拒绝接收的原因 + private String reason; + + public String getReason() { + return reason; + } + + public void setReason(String reason) { + this.reason = reason; + } + public String getDiagnosis() { return diagnosis; } @@ -356,7 +367,7 @@ public class ApplyOrderOutResult { setName(destModel.getName()); setScore(destModel.getScore()); if (null != destModel.getDueWeek()) { - if (destModel.getpStatus()==1) { + if (destModel.getpStatus() == 1) { setDueWeek("已分娩"); setIsGravida("0"); } else {