From 6dde52f9dad4412ef9221e818a9a302ed156f25f Mon Sep 17 00:00:00 2001 From: gengxiaokai Date: Mon, 8 Oct 2018 13:53:41 +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 --- .../platform/operate/web/controller/DiagnosisController.java | 4 ++-- .../com/lyms/platform/operate/web/facade/DiagnosisFacaed.java | 11 +++++------ 2 files changed, 7 insertions(+), 8 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..da95578 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 @@ -97,12 +97,12 @@ public class DiagnosisController extends BaseController { * @param request * @return */ - @TokenRequired + //@TokenRequired @ResponseBody @RequestMapping(value = "/getDiagnosisLab",method = RequestMethod.GET) public DiagnosisManagerResult getDiagnosisLab(DiagnosisAddRequest dataresult,HttpServletRequest request){ LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); - dataresult.setHospitalId(loginState.getId().toString()); + dataresult.setHospitalId("1000000185"); return diagnosisFacaed.queryDiagnosisLab(dataresult); } 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 d136eed..234cf8d 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 @@ -303,8 +303,8 @@ public class DiagnosisFacaed { diagnosisQuery.setLimit(dataresult.getLimit()); diagnosisQuery.setNeed("need"); diagnosisQuery.setOrder("created"); - //babyModelQuery.setHospitalId(autoMatchFacade.getHospitalId(babySieveAddRequest.getOperatorId())); - diagnosisQuery.setHospitalId("216"); + diagnosisQuery.setHospitalId(autoMatchFacade.getHospitalId(Integer.parseInt(dataresult.getHospitalId()))); + //diagnosisQuery.setHospitalId("216"); List diaList = diagnosisService.queryDiagnosis(diagnosisQuery); if(CollectionUtils.isEmpty(diaList)){ diagnosisManagerResult.setPageInfo(diagnosisQuery.getPageInfo()); @@ -453,8 +453,8 @@ public class DiagnosisFacaed { diagnosisQuery.setLimit(dataresult.getLimit()); diagnosisQuery.setNeed("need"); diagnosisQuery.setOrder("created"); - //babyModelQuery.setHospitalId(autoMatchFacade.getHospitalId(babySieveAddRequest.getOperatorId())); - diagnosisQuery.setHospitalId("216"); + diagnosisQuery.setHospitalId(autoMatchFacade.getHospitalId(Integer.parseInt(dataresult.getHospitalId()))); + //diagnosisQuery.setHospitalId("216"); List diaList = diagnosisService.queryDiagnosis(diagnosisQuery); if(CollectionUtils.isEmpty(diaList)){ diagnosisManagerResult.setPageInfo(diagnosisQuery.getPageInfo()); @@ -505,6 +505,7 @@ public class DiagnosisFacaed { diagnosisModel.setZtfx("2"); diagnosisModel.setZtfeText("高风险"); } + } //产筛项目 SieveApplyOrderQuery sieveApplyOrderQuery = new SieveApplyOrderQuery(); @@ -520,8 +521,6 @@ public class DiagnosisFacaed { } diagnosisModel.setSieveProject(sList); - } - } mList.add(diagnosisModel.contomap(patients)); } -- 1.8.3.1