From 7a6b9c47083df4ff5958f8f09302ec60dae519e9 Mon Sep 17 00:00:00 2001
From: shiyang <316555390@qq.com>
Date: Thu, 2 Jun 2022 16:55:34 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=A6=E7=9A=87=E5=B2=9B=E5=AE=9A=E5=88=B6?=
 =?UTF-8?q?=20=E3=80=82=E5=AD=95=E4=BA=A7=E5=A6=87=E7=AE=A1=E7=90=86-?=
 =?UTF-8?q?=E5=85=A8=E9=83=A8=E5=AD=95=E5=A6=87=E3=80=82=E6=98=AF=E5=90=A6?=
 =?UTF-8?q?=E4=BA=A7=E7=AD=9B=20=E7=AD=9B=E9=80=89=E6=9D=A1=E4=BB=B6?=
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/PatientFacade.java    |  4 ++++
 .../operate/web/request/RiskPatientsQueryRequest.java      | 11 +++++++++++
 .../platform/operate/web/result/QuanPatientsResult.java    | 13 +++++++++++++
 4 files changed, 42 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 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<QuanPatientsResul
 
     private String remark;
 
+    //秦皇岛定制字段：是否产筛 0：未产筛   1：已产筛
+    public Integer productionSieveType;
+
+    public Integer getProductionSieveType() {
+        return productionSieveType;
+    }
+
+    public void setProductionSieveType(Integer productionSieveType) {
+        this.productionSieveType = productionSieveType;
+    }
+
     public String getRemark() {
         return remark;
     }
@@ -494,6 +505,8 @@ public class QuanPatientsResult implements IBasicResultConvert<QuanPatientsResul
         if(StringUtils.isNotEmpty(destModel.getBreastType())){
             setBreastType(destModel.getBreastType());
         }
+        //秦皇岛定制字段：是否产筛 0：未产筛   1：已产筛
+        setProductionSieveType(destModel.getProductionSieveType());
         return this;
     }
 }
-- 
1.8.3.1