From d674b5c3d832db3200546cec18d3526371227ad7 Mon Sep 17 00:00:00 2001 From: jiangjiazhi Date: Tue, 28 Nov 2017 15:28:43 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=9F=A5=E8=AF=A2=E5=A4=9A?= =?UTF-8?q?=E9=A1=B9=E9=AB=98=E5=8D=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/lyms/platform/query/AntExRecordQuery.java | 16 ++++++++++++++++ .../platform/job/index/restore/data/SyncDataWork.java | 4 ++-- .../platform/operate/web/facade/AntExRecordFacade.java | 1 + 3 files changed, 19 insertions(+), 2 deletions(-) diff --git a/platform-dal/src/main/java/com/lyms/platform/query/AntExRecordQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/AntExRecordQuery.java index a217de8..c166727 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/AntExRecordQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/AntExRecordQuery.java @@ -218,6 +218,19 @@ public class AntExRecordQuery extends BaseQuery implements IConvertToNativeQuery private String levelId; private String rFactor; + /** + * 高危因素集合 + */ + private List rFactorList; + + public List getrFactorList() { + return rFactorList; + } + + public void setrFactorList(List rFactorList) { + this.rFactorList = rFactorList; + } + public String getrFactor() { return rFactor; } @@ -434,6 +447,9 @@ public class AntExRecordQuery extends BaseQuery implements IConvertToNativeQuery if (StringUtils.isNotEmpty(levelId)) { condition = condition.and("hLevel", levelId, MongoOper.IN); } + if(null!=rFactorList &&!rFactorList.isEmpty()){ + condition = condition.and("hRisk", rFactorList, MongoOper.IN); + }else if (StringUtils.isNotEmpty(rFactor)) { condition = condition.and("hRisk", rFactor, MongoOper.IN); } diff --git a/platform-job-index/src/main/java/com/lyms/platform/job/index/restore/data/SyncDataWork.java b/platform-job-index/src/main/java/com/lyms/platform/job/index/restore/data/SyncDataWork.java index b956be1..5290209 100644 --- a/platform-job-index/src/main/java/com/lyms/platform/job/index/restore/data/SyncDataWork.java +++ b/platform-job-index/src/main/java/com/lyms/platform/job/index/restore/data/SyncDataWork.java @@ -819,14 +819,14 @@ public class SyncDataWork { StopWatch stopWatch3 = new StopWatch("SyncWork-" + hospitalId + "-patient-" + patients.getId()); com.lymsh.mommybaby.maindata.model.Patients mamiPatient = ConvertHelper .convertPatient(patients); - if (StringUtils.isNotEmpty(mamiPatient.getPhone())) { + /* if (StringUtils.isNotEmpty(mamiPatient.getPhone())) { MembersQuery membersQuery = new MembersQuery(); membersQuery.setPhone(mamiPatient.getPhone()); List memberses = membersService.queryMembers(membersQuery); if (CollectionUtils.isNotEmpty(memberses)) { mamiPatient.setMemberId(memberses.get(0).getId()); } - } + }*/ mamiPatient.setCrisis(setCric(patients)); logger.info("aouPatients" + patients.getId()); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java index 71d1cd9..e298913 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java @@ -88,6 +88,7 @@ public class AntExRecordFacade { // antExRecordQuery.setName(antExManagerQueryRequest.getName()); // antExRecordQuery.setPhone(antExManagerQueryRequest.getPhone()); antExRecordQuery.setrFactor(antExManagerQueryRequest.getRiskFactorId()); + antExRecordQuery.setrFactorList(com.lyms.platform.common.utils.StringUtils.covertToList(antExManagerQueryRequest.getRiskFactorId(), String.class)); antExRecordQuery.setLevelId(antExManagerQueryRequest.getLevel()); antExRecordQuery.setBarCode(antExManagerQueryRequest.getBarCode()); // antExRecordQuery.setCardNo(antExManagerQueryRequest.getCardNo()); -- 1.8.3.1