From 11064f32a8e8935ac7a3a63b472f24a7e1ca31a4 Mon Sep 17 00:00:00 2001 From: gengxiaokai Date: Mon, 8 Oct 2018 16:23:00 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=A7=E5=89=8D=E8=AF=8A=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lyms/platform/operate/web/controller/DiagnosisController.java | 8 ++++---- .../com/lyms/platform/operate/web/facade/DiagnosisFacaed.java | 8 ++++++-- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/DiagnosisController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/DiagnosisController.java index 51dc2ca..ded4151 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/DiagnosisController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/DiagnosisController.java @@ -86,8 +86,8 @@ public class DiagnosisController extends BaseController { @RequestMapping(value = "/getDiagnosisList",method = RequestMethod.GET) public DiagnosisManagerResult getDiagnosisList(DiagnosisAddRequest dataresult,HttpServletRequest request){ LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); - dataresult.setHospitalId(loginState.getId().toString()); - return diagnosisFacaed.queryDiagnosisList(dataresult); + //dataresult.setHospitalId("1000000185"); + return diagnosisFacaed.queryDiagnosisList(dataresult,loginState.getId()); } @@ -102,8 +102,8 @@ public class DiagnosisController extends BaseController { @RequestMapping(value = "/getDiagnosisLab",method = RequestMethod.GET) public DiagnosisManagerResult getDiagnosisLab(DiagnosisAddRequest dataresult,HttpServletRequest request){ LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); - dataresult.setHospitalId(loginState.getId().toString()); - return diagnosisFacaed.queryDiagnosisLab(dataresult); + //dataresult.setHospitalId(loginState.getId().toString()); + return diagnosisFacaed.queryDiagnosisLab(dataresult,loginState.getId()); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/DiagnosisFacaed.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/DiagnosisFacaed.java index 7cd9b30..a200d5a 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/DiagnosisFacaed.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/DiagnosisFacaed.java @@ -255,8 +255,10 @@ public class DiagnosisFacaed { * @param dataresult * @return */ - public DiagnosisManagerResult queryDiagnosisList(DiagnosisAddRequest dataresult){ + public DiagnosisManagerResult queryDiagnosisList(DiagnosisAddRequest dataresult,Integer userId){ DiagnosisManagerResult diagnosisManagerResult = new DiagnosisManagerResult(); + String hospital = autoMatchFacade.getHospitalId(userId); + dataresult.setHospitalId(hospital); DiagnosisQuery diagnosisQuery = new DiagnosisQuery(); List> mList = new ArrayList>(); if(null != dataresult.getDiaResult()){ @@ -437,9 +439,11 @@ public class DiagnosisFacaed { * @param dataresult * @return */ - public DiagnosisManagerResult queryDiagnosisLab(DiagnosisAddRequest dataresult){ + public DiagnosisManagerResult queryDiagnosisLab(DiagnosisAddRequest dataresult,Integer userId){ List> mList = new ArrayList>(); DiagnosisManagerResult diagnosisManagerResult = new DiagnosisManagerResult(); + String hospital = autoMatchFacade.getHospitalId(userId); + dataresult.setHospitalId(hospital); DiagnosisQuery diagnosisQuery = new DiagnosisQuery(); if(StringUtils.isNotEmpty(dataresult.getApplyDate())){ String[] dates = dataresult.getApplyDate().split(" - "); -- 1.8.3.1