diff --git a/platform-dal/src/main/java/com/lyms/platform/query/BreastModelQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/BreastModelQuery.java index 675c64b..eba3669 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/BreastModelQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/BreastModelQuery.java @@ -24,9 +24,11 @@ public class BreastModelQuery extends BaseQuery implements IConvertToNativeQuery //儿童建档ID private String pid; private boolean pidNull; + private boolean pidNoNull; //居民健康档案(妇女健康 )模型 id private String rid; private boolean ridNull; + private boolean ridNoNull; private String hospitalId; // 检查日期 @@ -150,6 +152,22 @@ public class BreastModelQuery extends BaseQuery implements IConvertToNativeQuery this.nextDateEnd = nextDateEnd; } + public boolean isPidNoNull() { + return pidNoNull; + } + + public void setPidNoNull(boolean pidNoNull) { + this.pidNoNull = pidNoNull; + } + + public boolean isRidNoNull() { + return ridNoNull; + } + + public void setRidNoNull(boolean ridNoNull) { + this.ridNoNull = ridNoNull; + } + public String getInspectionPhase() { return inspectionPhase; } @@ -185,6 +203,9 @@ public class BreastModelQuery extends BaseQuery implements IConvertToNativeQuery if (pidNull) { condition = condition.and("pid", null, MongoOper.IS); } + if (pidNoNull) { + condition = condition.and("pid", null, MongoOper.NE); + } if (StringUtils.isNotEmpty(rid)) { condition = condition.and("rid", rid, MongoOper.IS); @@ -192,7 +213,9 @@ public class BreastModelQuery extends BaseQuery implements IConvertToNativeQuery if (ridNull) { condition = condition.and("rid", null, MongoOper.IS); } - + if (ridNoNull) { + condition = condition.and("rid", null, MongoOper.NE); + } if (StringUtils.isNotEmpty(hospitalId)) { condition = condition.and("hospitalId", hospitalId, MongoOper.IS); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BreastFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BreastFacade.java index 24f9894..dae7215 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BreastFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BreastFacade.java @@ -396,6 +396,7 @@ public class BreastFacade extends BaseServiceImpl { babyQuery.setNeed("true"); babyQuery.setYn(YnEnums.YES.getId()); babyQuery.setRidNull(true); + babyQuery.setPidNoNull(true); babyQuery.setHospitalId(hospitalId); babyQuery.setSort("createDate"); if (babyQuery.getCheckDateEnd() != null) { @@ -447,6 +448,7 @@ public class BreastFacade extends BaseServiceImpl { babyQuery.setNeed("true"); babyQuery.setYn(YnEnums.YES.getId()); babyQuery.setPidNull(true); + babyQuery.setRidNoNull(true); babyQuery.setHospitalId(hospitalId); babyQuery.setSort("createDate"); if (babyQuery.getCheckDateEnd() != null) {