From ca75c67cf38c659f139a29566f80395ec95a794d Mon Sep 17 00:00:00 2001 From: yangfei Date: Wed, 27 Sep 2017 16:10:07 +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 --- .../controller/HighriskChangeHospitalController.java | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/HighriskChangeHospitalController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/HighriskChangeHospitalController.java index cd3ca7e..b47bbfb 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/HighriskChangeHospitalController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/HighriskChangeHospitalController.java @@ -16,12 +16,8 @@ import com.lyms.platform.operate.web.result.HighriskChangeHospitalListResult; import com.lyms.platform.operate.web.result.HighriskChangeHospitalOneResult; import com.lyms.platform.operate.web.utils.ResponseUtil; import com.lyms.platform.permission.model.*; -import com.lyms.platform.permission.service.BabyPatientExtendEarScreenService; -import com.lyms.platform.permission.service.HighriskChangeHospitalService; -import com.lyms.platform.permission.service.OrganizationService; -import com.lyms.platform.permission.service.UsersService; +import com.lyms.platform.permission.service.*; import com.lyms.platform.pojo.BabyModel; -import com.lyms.platform.query.BabyModelQuery; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang.StringUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -62,7 +58,8 @@ public class HighriskChangeHospitalController extends BaseController { private BabyBookbuildingService babyBookbuildingService; @Autowired private BabyEarFacade babyEarFacade; - + @Autowired + private BabyPatientExtendEarBabyService earBabyService; /** * 导出听力转诊列表 @@ -336,14 +333,16 @@ public class HighriskChangeHospitalController extends BaseController { //如果查询号不为空，根据查询号查询儿童档案表，获取儿童档案Id if (query.getQueryNo() != null) {//关键字：姓名、联系方式、就诊卡 查询babyId - BabyModelQuery babyQuery = new BabyModelQuery(); + BabyPatientExtendEarBabyQuery babyQuery = new BabyPatientExtendEarBabyQuery(); babyQuery.setQueryNo(query.getQueryNo()); + babyQuery.setHospitalId(hospitalId); + List models = earBabyService.queryBabyPatientExtendEarBaby(babyQuery); + //查询建档记录 - List models = babyBookbuildingService.queryBabyBuildByCond(babyQuery); if (CollectionUtils.isNotEmpty(models)) { List babyIds = new ArrayList<>(); - for (BabyModel babyModel : models) { - babyIds.add(babyModel.getId()); + for (BabyPatientExtendEarBaby babyModel : models) { + babyIds.add(babyModel.getBabyPatientId()); } query.setBabyIds(babyIds.toArray(new String[babyIds.size()])); } else { -- 1.8.3.1