From 81c9e80656cf7418b243c67f2d6d987b3182cf66 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Mon, 5 Dec 2016 13:06:49 +0800 Subject: [PATCH] =?UTF-8?q?=E9=AB=98=E5=8D=B1=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/lyms/platform/query/PatientsQuery.java | 14 ++++++++++++++ .../lyms/platform/operate/web/facade/RiskReportFacade.java | 2 ++ 2 files changed, 16 insertions(+) diff --git a/platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java index ede3bca..82b2e75 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java @@ -291,6 +291,7 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery { * 高危因素 */ private String rFactor; + private boolean norFactor; /** @@ -333,6 +334,14 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery { //建档医生 private String bookbuildingDoctor; + public boolean isNorFactor() { + return norFactor; + } + + public void setNorFactor(boolean norFactor) { + this.norFactor = norFactor; + } + public boolean isLastCheckEId() { return lastCheckEId; } @@ -879,6 +888,11 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery { if (StringUtils.isNotEmpty(rFactor)) { condition = condition.and("riskFactorId", rFactor, MongoOper.LIKE); } + else if(norFactor){ + condition = condition.and("riskFactorId", "", MongoOper.NE); + MongoCondition c = MongoCondition.newInstance(); + c1= c.andCondition(MongoCondition.newInstance("riskFactorId", null, MongoOper.NE)).getCriteria(); + } if (-1 != yn) { condition = condition.and("yn", yn, MongoOper.IS); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/RiskReportFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/RiskReportFacade.java index b68a07e..8c553d2 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/RiskReportFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/RiskReportFacade.java @@ -95,6 +95,8 @@ public class RiskReportFacade { //产检医生 patientsQuery.setLastCheckEmployeeId(riskPatientsQueryRequest.getLastCheckDoctorId()); + patientsQuery.setNorFactor(Boolean.TRUE); + //总的孕妇条数 int allPatientCount = patientsService.queryPatientCount(patientsQuery); -- 1.8.3.1