From 4a4a16b680a9663e180d9172546aa6d018c92c60 Mon Sep 17 00:00:00 2001 From: yangfei Date: Tue, 7 Nov 2017 16:56:44 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E7=96=BE=E7=97=85=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../platform/operate/web/facade/PatientFacade.java | 23 +++++++++++----------- 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java index ba15fa1..03b64eb 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java @@ -434,27 +434,26 @@ public class PatientFacade { MongoCondition criteria = new MongoCondition("hospitalId", hospitalList, MongoOper.IN); //乙肝查询 if (StringUtils.contains(riskPatientsQueryRequest.getDiseaseType(), DiseaseTypeEnums.YIGAN.getId())) { - criteria.andCondition(new MongoCondition("ygbmky", true, MongoOper.EXISTS) - .orCondition(new MongoCondition("ygbmkt", true, MongoOper.EXISTS)) - .orCondition(new MongoCondition("ygeky", true, MongoOper.EXISTS)) - .orCondition(new MongoCondition("ygekt", true, MongoOper.EXISTS)) - .orCondition(new MongoCondition("yghxkt", true, MongoOper.EXISTS)) - ); + criteria = criteria.and("ygbmky", true, MongoOper.EXISTS).orCondition( + new MongoCondition[]{new MongoCondition("ygbmkt", true, MongoOper.EXISTS), + new MongoCondition("ygeky", true, MongoOper.EXISTS), + new MongoCondition("ygekt", true, MongoOper.EXISTS), + new MongoCondition("yghxkt", true, MongoOper.EXISTS) + }); } //丙肝查询 if (StringUtils.contains(riskPatientsQueryRequest.getDiseaseType(), DiseaseTypeEnums.BINGGAN.getId())) { - criteria.andCondition(new MongoCondition("bg", true, MongoOper.EXISTS)); + criteria = criteria.and("bg", true, MongoOper.EXISTS); } //梅毒查询 if (StringUtils.contains(riskPatientsQueryRequest.getDiseaseType(), DiseaseTypeEnums.MEIDU.getId())) { - criteria.andCondition(new MongoCondition("syjg", true, MongoOper.EXISTS) - .orCondition(new MongoCondition("hivkt", true, MongoOper.EXISTS)) - ); + criteria = criteria.andCondition(new MongoCondition("syjg", true, MongoOper.EXISTS) + .orCondition(new MongoCondition("hivkt", true, MongoOper.EXISTS))); } List antExChuModels = antExService.queryAntExChu(criteria.toMongoQuery()); List pIds = new ArrayList<>(); - for(AntExChuModel antChu : antExChuModels){ - pIds.add(antChu.getParentId()); + for (AntExChuModel antChu : antExChuModels) { + pIds.add(antChu.getPid()); } patientsQuery.setpIds(pIds); } -- 1.8.3.1