From 7a073b7878125df1bd4f49f728bbe3fb0561b671 Mon Sep 17 00:00:00 2001 From: hujiaqi Date: Fri, 23 Dec 2016 09:28:05 +0800 Subject: [PATCH] =?UTF-8?q?=E5=87=BA=E9=99=A2=E5=B0=8F=E7=BB=93=E9=99=90?= =?UTF-8?q?=E5=AE=9A=E6=9F=A5=E8=AF=A2=E5=8C=BB=E9=99=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../operate/web/controller/DischargeAbstractController.java | 2 +- .../platform/operate/web/facade/DischargeAbstractFacade.java | 3 ++- .../operate/web/request/DischargeAbstractQueryRequest.java | 10 ++++++++++ 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/DischargeAbstractController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/DischargeAbstractController.java index 140ef65..4209f2d 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/DischargeAbstractController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/DischargeAbstractController.java @@ -44,7 +44,6 @@ public class DischargeAbstractController extends BaseController { BaseObjectResponse baseObjectResponse; try { dischargeAbstractSaveRequest.setOperatorId(((LoginContext) httpServletRequest.getAttribute("loginContext")).getId()); - DischargeAbstractSaveResult dischargeAbstractSaveResult = dischargeAbstractFacade.save(dischargeAbstractSaveRequest); if (dischargeAbstractSaveResult.getErrorcode() != ErrorCodeConstants.SUCCESS) { baseObjectResponse = new BaseObjectResponse().setErrorcode(dischargeAbstractSaveResult.getErrorcode()).setErrormsg(dischargeAbstractSaveResult.getErrormsg()); @@ -69,6 +68,7 @@ public class DischargeAbstractController extends BaseController { public BaseObjectResponse query(HttpServletRequest httpServletRequest, @RequestBody DischargeAbstractQueryRequest dischargeAbstractSaveRequest) { BaseObjectResponse baseObjectResponse; try { + dischargeAbstractSaveRequest.setOperatorId(((LoginContext) httpServletRequest.getAttribute("loginContext")).getId()); DischargeAbstractQueryResult dischargeAbstractQueryResult = dischargeAbstractFacade.query(dischargeAbstractSaveRequest); if (dischargeAbstractQueryResult.getErrorcode() != ErrorCodeConstants.SUCCESS) { baseObjectResponse = new BaseObjectResponse().setErrorcode(dischargeAbstractQueryResult.getErrorcode()).setErrormsg(dischargeAbstractQueryResult.getErrormsg()); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/DischargeAbstractFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/DischargeAbstractFacade.java index e384adc..63501e7 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/DischargeAbstractFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/DischargeAbstractFacade.java @@ -45,7 +45,7 @@ public class DischargeAbstractFacade { private PatientsService patientsService; @Autowired - private BasicConfigService basicConfigService; + private AutoMatchFacade autoMatchFacade; @Autowired private BabyService babyService; @@ -106,6 +106,7 @@ public class DischargeAbstractFacade { List typeList = new ArrayList<>(); typeList.add(1); typeList.add(3); + patientsQuery.setHospitalId(autoMatchFacade.getHospitalId(dischargeAbstractSaveRequest.getOperatorId())); patientsQuery.setTypeList(typeList); patientsQuery.setSort("lastMenses"); patientsQuery.setCardNo(StringUtils.isEmpty(dischargeAbstractSaveRequest.getCardNo()) ? null : dischargeAbstractSaveRequest.getCardNo()); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/DischargeAbstractQueryRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/DischargeAbstractQueryRequest.java index 3cace0b..550d5f8 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/DischargeAbstractQueryRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/DischargeAbstractQueryRequest.java @@ -21,6 +21,16 @@ public class DischargeAbstractQueryRequest { */ private String vcCardNo; + private Integer operatorId; + + public Integer getOperatorId() { + return operatorId; + } + + public void setOperatorId(Integer operatorId) { + this.operatorId = operatorId; + } + public String getCardNo() { return cardNo; } -- 1.8.3.1