From ba3c8e1e881a2b766bf84c313d6022d6f3bd9d2d Mon Sep 17 00:00:00 2001 From: yangfei Date: Thu, 24 Aug 2017 10:16:11 +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 --- .../model/BabyPatientExtendEarScreenQuery.java | 7 +++---- .../operate/web/controller/FollowUpController.java | 2 +- .../web/controller/HearDiagnManageController.java | 2 +- .../web/controller/HearingDiagnoseController.java | 4 ++-- .../platform/operate/web/facade/BabyEarFacade.java | 21 +++++++++++++++++++++ 5 files changed, 28 insertions(+), 8 deletions(-) diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEarScreenQuery.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEarScreenQuery.java index e84b239..2ffcba3 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEarScreenQuery.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEarScreenQuery.java @@ -4,13 +4,12 @@ package com.lyms.platform.permission.model; import com.lyms.platform.common.dao.BaseQuery; import java.util.Date; -import java.util.List; public class BabyPatientExtendEarScreenQuery extends BaseQuery { private String id; //听诊儿童档案集合 - private List babyIds; + private String[] babyIds; private String babyId; @@ -285,11 +284,11 @@ public class BabyPatientExtendEarScreenQuery extends BaseQuery { this.screenEndDate = screenEndDate; } - public List getBabyIds() { + public String[] getBabyIds() { return babyIds; } - public void setBabyIds(List babyIds) { + public void setBabyIds(String[] babyIds) { this.babyIds = babyIds; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/FollowUpController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/FollowUpController.java index 055d467..1cb869e 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/FollowUpController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/FollowUpController.java @@ -244,7 +244,7 @@ public class FollowUpController extends BaseController { query.setIfdel(0); //如果查询号不为空，根据查询号查询儿童档案表，获取儿童档案Id - if (fur.getKeyWord() != null) {//关键字：姓名、联系方式、就诊卡 查询babyId + if (StringUtils.isNotEmpty(fur.getKeyWord())) {//关键字：姓名、联系方式、就诊卡 查询babyId BabyModelQuery babyQuery = new BabyModelQuery(); babyQuery.setQueryNo(fur.getKeyWord()); //查询建档记录 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 28060d9..9bc22f8 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 @@ -468,7 +468,7 @@ public class HearDiagnManageController extends BaseController { for (Patients pa : patientses) { babyIds.add(pa.getId()); } - screenQuery.setBabyIds(babyIds); + screenQuery.setBabyIds(babyIds.toArray(new String[babyIds.size()])); } else if (com.lyms.platform.common.utils.StringUtils.isNotEmpty(model.getKeyWord())) { return new BaseListResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/HearingDiagnoseController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/HearingDiagnoseController.java index 8d5f147..84989a9 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/HearingDiagnoseController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/HearingDiagnoseController.java @@ -353,7 +353,7 @@ public class HearingDiagnoseController extends BaseController { } BabyPatientExtendEarScreenQuery scrQuery = new BabyPatientExtendEarScreenQuery(); //如果查询号不为空，根据查询号查询儿童档案表，获取儿童档案Id - if (hdReq.getKeyWord() != null) {//关键字：姓名、联系方式、就诊卡 查询babyId + if (StringUtils.isNotEmpty(hdReq.getKeyWord())) {//关键字：姓名、联系方式、就诊卡 查询babyId BabyModelQuery babyQuery = new BabyModelQuery(); babyQuery.setQueryNo(hdReq.getKeyWord()); //查询建档记录 @@ -363,7 +363,7 @@ public class HearingDiagnoseController extends BaseController { for(BabyModel babyModel:models){ babyIds.add(babyModel.getId()); } - scrQuery.setBabyIds(babyIds); + scrQuery.setBabyIds(babyIds.toArray(new String[babyIds.size()])); }else{ return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("没有找到数据"); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyEarFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyEarFacade.java index 62057f9..44dd066 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyEarFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyEarFacade.java @@ -1,6 +1,7 @@ package com.lyms.platform.operate.web.facade; import com.alibaba.fastjson.JSONObject; +import com.lyms.platform.biz.service.BabyBookbuildingService; import com.lyms.platform.biz.service.BabyService; import com.lyms.platform.biz.service.BasicConfigService; import com.lyms.platform.biz.service.PersonService; @@ -94,6 +95,8 @@ public class BabyEarFacade { private AntenatalExaminationFacade examinationFacade; @Autowired private OrganizationGroupsFacade groupsFacade; + @Autowired + private BabyBookbuildingService babyBookbuildingService; //处理儿童person信息 private PersonModel handBabyPerson(BabyModel baby) { @@ -1534,6 +1537,24 @@ public class BabyEarFacade { String[] checkHospitalIds = (String[])hospitalIds.toArray(new String[hospitalIds.size()]); screenQuery.setCheckHospitalIds(checkHospitalIds); + //如果查询号不为空，根据查询号查询儿童档案表，获取儿童档案Id + if (StringUtils.isNotEmpty(earScreenListRequest.getKeyWord())) {//关键字：姓名、联系方式、就诊卡 查询babyId + BabyModelQuery babyQuery = new BabyModelQuery(); + babyQuery.setQueryNo(earScreenListRequest.getKeyWord()); + //查询建档记录 + List models = babyBookbuildingService.queryBabyBuildByCond(babyQuery); + if(CollectionUtils.isNotEmpty(models)){ + List babyIds = new ArrayList<>(); + for(BabyModel babyModel:models){ + babyIds.add(babyModel.getId()); + } + screenQuery.setBabyIds(babyIds.toArray(new String[babyIds.size()])); + }else{ + return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("没有找到数据"); + } + } + + List babyPatientExtendEarScreens = babyPatientExtendEarScreenService.queryEarScreenList(screenQuery); List earScreenResults = new ArrayList<>(); for (BabyPatientExtendEarScreen earScreen : babyPatientExtendEarScreens) { -- 1.8.3.1