diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PatientsService.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PatientsService.java index 2b2024f..3ffa49c 100644 --- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PatientsService.java +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PatientsService.java @@ -101,6 +101,8 @@ public class PatientsService { patientsQuery.setLastMensesEnd(endDate); patientsQuery.setLastMensesStart(start); patientsQuery.setYn(YnEnums.YES.getId()); + patientsQuery.setDueStatus(0); + patientsQuery.setType(1); List patientses = iPatientDao.queryPatient(patientsQuery.convertToQuery()); int batchSize = 200; if (CollectionUtils.isNotEmpty(patientses)) { 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 d50d109..62c69e3 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 @@ -29,6 +29,9 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery { private Boolean isNull; private Boolean isHighRisk; + //分娩状态 0未终止妊娠 1终止妊娠 + private Integer dueStatus; + /** * 产妇名称 @@ -43,6 +46,17 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery { * 产妇年龄 */ private Integer age; + + public Integer getDueStatus() { + return dueStatus; + } + + public void setDueStatus(Integer dueStatus) { + this.dueStatus = dueStatus; + } + + + /** * 访视状态 */ @@ -423,6 +437,9 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery { MongoCondition con = MongoCondition.newInstance("areaPostRestId", areaIdOrRestId, MongoOper.IS); condition = condition.orCondition(new MongoCondition[]{con1, con}); } + if(null!=dueStatus){ + condition=condition.and("dueStatus",dueStatus,MongoOper.IS); + } if( buildType!=-1){ condition=condition.and("buildType",buildType,MongoOper.NE); }