From 7a3a326fd3d19b73a3cb413544f32ecb679c99da Mon Sep 17 00:00:00 2001
From: liquanyu <liquanyu@lymsh.com>
Date: Mon, 19 Jul 2021 17:24:46 +0800
Subject: [PATCH] update

---
 .../main/java/com/lyms/platform/query/MatDeliverQuery.java | 14 ++++++++++++++
 .../lyms/platform/operate/web/facade/MatDeliverFacade.java |  5 +----
 .../operate/web/request/ChildbirthManagerRequest.java      | 11 +++++++++++
 3 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/platform-dal/src/main/java/com/lyms/platform/query/MatDeliverQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/MatDeliverQuery.java
index 78e4cbe..576da19 100644
--- a/platform-dal/src/main/java/com/lyms/platform/query/MatDeliverQuery.java
+++ b/platform-dal/src/main/java/com/lyms/platform/query/MatDeliverQuery.java
@@ -53,6 +53,17 @@ public class MatDeliverQuery extends BaseQuery implements IConvertToNativeQuery
     private List<Integer> status;
     private Boolean isStatus;
 
+    //分娩记录加住院管床大夫
+    private String gcdfDoctorId;
+
+    public String getGcdfDoctorId() {
+        return gcdfDoctorId;
+    }
+
+    public void setGcdfDoctorId(String gcdfDoctorId) {
+        this.gcdfDoctorId = gcdfDoctorId;
+    }
+
     public Boolean getIsStatus() {
         return isStatus;
     }
@@ -369,6 +380,9 @@ public class MatDeliverQuery extends BaseQuery implements IConvertToNativeQuery
         if (tireNumber != null) {
             condition = condition.and("tireNumber", tireNumber, MongoOper.IS);
         }
+        if (gcdfDoctorId != null) {
+            condition = condition.and("gcdfDoctorId", gcdfDoctorId, MongoOper.IS);
+        }
 
         if (tireNumbers != null && tireNumbers.size() > 0) {
             condition = condition.and("tireNumber", tireNumbers, MongoOper.IN);
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java
index ee4e265..9e6b923 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java
@@ -2705,10 +2705,6 @@ public class MatDeliverFacade {
         /**********增加完毕***********/
 
 
-        if (childbirthManagerRequest.getType() != null && childbirthManagerRequest.getStatus() != null)
-        {
-
-        }
 
         List <MaternalDeliverModel> maternalDeliverModelList;
         if (!childbirthManagerRequest.isExcel() && (childbirthManagerRequest.getHloseBloodType() != null
@@ -2783,6 +2779,7 @@ public class MatDeliverFacade {
                     matDeliverQuery.setStatus(status);
                     matDeliverQuery.setIsStatus(true);
                 }
+                matDeliverQuery.setGcdfDoctorId(childbirthManagerRequest.getGcdfDoctorId());
 
                 matDeliverQuery.setFmHospital(hid);
                 matDeliverQuery.setLimit(childbirthManagerRequest.getLimit());
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ChildbirthManagerRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ChildbirthManagerRequest.java
index c525667..4ffd70f 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ChildbirthManagerRequest.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ChildbirthManagerRequest.java
@@ -187,6 +187,17 @@ public class ChildbirthManagerRequest extends BasePageQueryRequest {
     //评估状态 1 出院前评估	2 产后7天评估	3 产后14天评估	4 产后28天评估	5 产后42天评估
     private Integer status;
 
+    //管床大夫
+    private String gcdfDoctorId;
+
+    public String getGcdfDoctorId() {
+        return gcdfDoctorId;
+    }
+
+    public void setGcdfDoctorId(String gcdfDoctorId) {
+        this.gcdfDoctorId = gcdfDoctorId;
+    }
+
     public Integer getType() {
         return type;
     }
-- 
1.8.3.1