From b815bb79bffb29c3a59095fc1abc4659e8408453 Mon Sep 17 00:00:00 2001 From: yangfei Date: Thu, 7 Sep 2017 16:00:56 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=AC=E5=8A=9B=E8=AF=8A=E6=96=AD=E6=A8=A1?= =?UTF-8?q?=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/controller/HearDiagnManageController.java | 59 +++++++++++----------- 1 file changed, 30 insertions(+), 29 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/HearDiagnManageController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/HearDiagnManageController.java index 10f80fd..6f0ffbb 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/HearDiagnManageController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/HearDiagnManageController.java @@ -169,13 +169,13 @@ public class HearDiagnManageController extends BaseController { BabyPatientExtendEarHearingDiagnoseQuery query = new BabyPatientExtendEarHearingDiagnoseQuery(); - // query.setHospitalId(hospitalId); + query.setHospitalId(hospitalId); //当前登录人医院Id - List hospiIds = earFacade.getOrgHospitalIds(hospitalId); - List hospitalIds = new ArrayList(); + // List hospiIds = earFacade.getOrgHospitalIds(hospitalId); + // List hospitalIds = new ArrayList(); //加入院组 - hospitalIds.addAll(hospiIds); - query.setCheckHospitalIds((String[]) hospitalIds.toArray(new String[hospitalIds.size()])); + // hospitalIds.addAll(hospiIds); + // query.setCheckHospitalIds((String[]) hospitalIds.toArray(new String[hospitalIds.size()])); if (hdReq.getDiagnDoctorId() != null) {//诊断医生 query.setDiagnDoctorId(hdReq.getDiagnDoctorId()); @@ -360,13 +360,13 @@ public class HearDiagnManageController extends BaseController { BabyPatientExtendEarHearingDiagnoseQuery query = new BabyPatientExtendEarHearingDiagnoseQuery(); - // query.setHospitalId(hospitalId); + query.setHospitalId(hospitalId); //当前登录人医院Id - List hospiIds = earFacade.getOrgHospitalIds(hospitalId); - List hospitalIds = new ArrayList(); + // List hospiIds = earFacade.getOrgHospitalIds(hospitalId); + // List hospitalIds = new ArrayList(); //加入院组 - hospitalIds.addAll(hospiIds); - query.setCheckHospitalIds((String[]) hospitalIds.toArray(new String[hospitalIds.size()])); + // hospitalIds.addAll(hospiIds); + // query.setCheckHospitalIds((String[]) hospitalIds.toArray(new String[hospitalIds.size()])); if (hdReq.getDiagnDoctorId() != null) {//诊断医生 query.setDiagnDoctorId(hdReq.getDiagnDoctorId()); @@ -564,12 +564,13 @@ public class HearDiagnManageController extends BaseController { screenQuery.setCheckDoctorId(model.getDiagnDoctorId()); } screenQuery.setStatus(0); + screenQuery.setCheckHospitalId(hospitalId); //当前登录人医院Id - List hospiIds = earFacade.getOrgHospitalIds(hospitalId); - List hospitalIds = new ArrayList(); - hospitalIds.addAll(hospiIds); + // List hospiIds = earFacade.getOrgHospitalIds(hospitalId); + // List hospitalIds = new ArrayList(); + // hospitalIds.addAll(hospiIds); //加入院组 - screenQuery.setCheckHospitalIds((String[]) hospitalIds.toArray(new String[hospitalIds.size()])); + // screenQuery.setCheckHospitalIds((String[]) hospitalIds.toArray(new String[hospitalIds.size()])); //查询全部数据 List earScreens = screenService.dubiousScreen(screenQuery); @@ -734,13 +735,13 @@ public class HearDiagnManageController extends BaseController { screenQuery.setCheckDoctorId(model.getDiagnDoctorId()); } screenQuery.setStatus(0); + screenQuery.setCheckHospitalId(hospitalId); //当前登录人医院Id - List hospiIds = earFacade.getOrgHospitalIds(hospitalId); - List hospitalIds = new ArrayList(); - hospitalIds.addAll(hospiIds); + // List hospiIds = earFacade.getOrgHospitalIds(hospitalId); + // List hospitalIds = new ArrayList(); + // hospitalIds.addAll(hospiIds); //加入院组 - screenQuery.setCheckHospitalIds((String[]) hospitalIds.toArray(new String[hospitalIds.size()])); - + // screenQuery.setCheckHospitalIds((String[]) hospitalIds.toArray(new String[hospitalIds.size()])); //查询全部数据 List earScreens = screenService.dubiousScreen(screenQuery); @@ -958,12 +959,12 @@ public class HearDiagnManageController extends BaseController { if (model.getDiagnDoctorId() != null) { screenQuery.setCheckDoctorId(model.getDiagnDoctorId()); } - // screenQuery.setCheckHospitalId(hospitalId); - List hospitalIds = new ArrayList(); + screenQuery.setCheckHospitalId(hospitalId); + // List hospitalIds = new ArrayList(); //当前登录人医院Id - List hospiIds = earFacade.getOrgHospitalIds(hospitalId); - hospitalIds.addAll(hospiIds); - screenQuery.setCheckHospitalIds((String[]) hospitalIds.toArray(new String[hospitalIds.size()])); + // List hospiIds = earFacade.getOrgHospitalIds(hospitalId); + // hospitalIds.addAll(hospiIds); + // screenQuery.setCheckHospitalIds((String[]) hospitalIds.toArray(new String[hospitalIds.size()])); screenQuery.setStatus(0); //根据儿童条件查询如果为空 @@ -1168,12 +1169,12 @@ public class HearDiagnManageController extends BaseController { if (model.getDiagnDoctorId() != null) { screenQuery.setCheckDoctorId(model.getDiagnDoctorId()); } - // screenQuery.setCheckHospitalId(hospitalId); - List hospitalIds = new ArrayList(); + screenQuery.setCheckHospitalId(hospitalId); + // List hospitalIds = new ArrayList(); //当前登录人医院Id - List hospiIds = earFacade.getOrgHospitalIds(hospitalId); - hospitalIds.addAll(hospiIds); - screenQuery.setCheckHospitalIds((String[]) hospitalIds.toArray(new String[hospitalIds.size()])); + // List hospiIds = earFacade.getOrgHospitalIds(hospitalId); + // hospitalIds.addAll(hospiIds); + // screenQuery.setCheckHospitalIds((String[]) hospitalIds.toArray(new String[hospitalIds.size()])); screenQuery.setStatus(0); //根据儿童条件查询如果为空 -- 1.8.3.1