From 471ed1220679a38131073fc0a233c709ab035273 Mon Sep 17 00:00:00 2001 From: yangfei Date: Tue, 14 Nov 2017 10:36:04 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AD=95=E4=BA=A7=E5=A6=87=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E7=96=BE=E7=97=85=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../platform/operate/web/facade/PatientFacade.java | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 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 5efa78f..583b60c 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 @@ -475,20 +475,22 @@ public class PatientFacade { List mongoCondits = new ArrayList<>(); //乙肝查询 if (StringUtils.contains(riskPatientsQueryRequest.getDiseaseType(), DiseaseTypeEnums.YIGAN.getId())) { - mongoCondits.add(new MongoCondition("ygbmky", true, MongoOper.EXISTS)); - mongoCondits.add(new MongoCondition("ygbmkt", true, MongoOper.EXISTS)); - mongoCondits.add(new MongoCondition("ygeky", true, MongoOper.EXISTS)); - mongoCondits.add(new MongoCondition("ygekt", true, MongoOper.EXISTS)); - mongoCondits.add(new MongoCondition("yghxkt", true, MongoOper.EXISTS)); + mongoCondits.add(new MongoCondition("ygbmky", true, MongoOper.EXISTS).orCondition(new MongoCondition("ygbmky", "", MongoOper.NE))); + mongoCondits.add(new MongoCondition("ygbmkt", true, MongoOper.EXISTS).orCondition(new MongoCondition("ygbmkt", "", MongoOper.NE))); + mongoCondits.add(new MongoCondition("ygeky", true, MongoOper.EXISTS).orCondition(new MongoCondition("ygeky", "", MongoOper.NE))); + mongoCondits.add(new MongoCondition("ygekt", true, MongoOper.EXISTS).orCondition(new MongoCondition("ygekt", "", MongoOper.NE))); + mongoCondits.add(new MongoCondition("yghxkt", true, MongoOper.EXISTS).orCondition(new MongoCondition("yghxkt", "", MongoOper.NE))); + } //丙肝查询 if (StringUtils.contains(riskPatientsQueryRequest.getDiseaseType(), DiseaseTypeEnums.BINGGAN.getId())) { - mongoCondits.add(new MongoCondition("bg", true, MongoOper.EXISTS)); + mongoCondits.add(new MongoCondition("bg", true, MongoOper.EXISTS).orCondition(new MongoCondition("bg","",MongoOper.NE))); } //梅毒查询 if (StringUtils.contains(riskPatientsQueryRequest.getDiseaseType(), DiseaseTypeEnums.MEIDU.getId())) { - mongoCondits.add(new MongoCondition("syjg", true, MongoOper.EXISTS)); - mongoCondits.add(new MongoCondition("hivkt", true, MongoOper.EXISTS)); + mongoCondits.add(new MongoCondition("syjg", true, MongoOper.EXISTS).orCondition(new MongoCondition("syjg", "", MongoOper.NE))); + mongoCondits.add(new MongoCondition("hivkt", true, MongoOper.EXISTS).orCondition(new MongoCondition("hivkt", "", MongoOper.NE))); + } criteria = criteria.orCondition(mongoCondits.toArray(new MongoCondition[mongoCondits.size()])); -- 1.8.3.1