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 6fef38f..f7fad35 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 @@ -403,6 +403,17 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery { //分娩医生 private String deliverDoctor; + //秦皇岛定制字段:是否产筛 0:未产筛 1:已产筛 + public Integer productionSieveType; + + public Integer getProductionSieveType() { + return productionSieveType; + } + + public void setProductionSieveType(Integer productionSieveType) { + this.productionSieveType = productionSieveType; + } + public String getDeliverDoctor() { return deliverDoctor; } @@ -827,6 +838,9 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery { if (null != firstCheckId) { condition = condition.and("firstCheckId", firstCheckId, MongoOper.IS); } + if (null != productionSieveType) { + condition = condition.and("productionSieveType", productionSieveType, MongoOper.IS); + } //孕产建档管理 初诊医生 是否 if(null!= prodDoctor){ 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 78148e9..9ba5f20 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 @@ -679,6 +679,10 @@ public class PatientFacade extends BaseServiceImpl { if (riskPatientsQueryRequest.getBuildWeekEnd() != null) { patientsQuery.setBuildDaysEnd((riskPatientsQueryRequest.getBuildWeekEnd() + 1) * 7 - 1); } + //秦皇岛需求 是否产筛 筛选productionSieveType 0:未产筛 1:已产筛 + if (riskPatientsQueryRequest.getProductionSieveType() != null) { + patientsQuery.setProductionSieveType(riskPatientsQueryRequest.getProductionSieveType()); + } return patientsQuery; diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/RiskPatientsQueryRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/RiskPatientsQueryRequest.java index 6492697..a1788fa 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/RiskPatientsQueryRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/RiskPatientsQueryRequest.java @@ -192,6 +192,17 @@ public class RiskPatientsQueryRequest extends BasePageQueryRequest { //体重异常管理-接收建档时间筛选用 private String buildDate; + //秦皇岛定制字段:是否产筛 0:未产筛 1:已产筛 + public Integer productionSieveType; + + public Integer getProductionSieveType() { + return productionSieveType; + } + + public void setProductionSieveType(Integer productionSieveType) { + this.productionSieveType = productionSieveType; + } + public String getBuildDate() { return buildDate; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/QuanPatientsResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/QuanPatientsResult.java index 1b24653..ddc9919 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/QuanPatientsResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/QuanPatientsResult.java @@ -104,6 +104,17 @@ public class QuanPatientsResult implements IBasicResultConvert