From bbf05649835d8d1a087bebc9139281b8429e9df9 Mon Sep 17 00:00:00 2001
From: shiyang <316555390@qq.com>
Date: Fri, 26 Nov 2021 18:51:59 +0800
Subject: [PATCH] =?UTF-8?q?=E9=9A=86=E5=8C=96=E5=88=86=E5=A8=A9=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E5=8C=BB=E7=94=9F=E7=AD=9B=E9=80=89BUG=E3=80=82?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BF=AE=E6=94=B9=E5=88=86=E5=A8=A9=E5=90=8E?=
 =?UTF-8?q?=E5=90=8C=E6=AD=A5=E5=88=86=E5=A8=A9=E5=8C=BB=E7=94=9F=E5=88=B0?=
 =?UTF-8?q?=E4=B8=BB=E6=A1=A3=E6=A1=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/lyms/platform/pojo/Patients.java    | 11 +++++++++++
 .../java/com/lyms/platform/query/PatientsQuery.java   | 15 +++++++++++++++
 .../platform/operate/web/facade/MatDeliverFacade.java | 19 +++++++++++++++----
 3 files changed, 41 insertions(+), 4 deletions(-)

diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/Patients.java b/platform-dal/src/main/java/com/lyms/platform/pojo/Patients.java
index 201b5b2..d18dbee 100644
--- a/platform-dal/src/main/java/com/lyms/platform/pojo/Patients.java
+++ b/platform-dal/src/main/java/com/lyms/platform/pojo/Patients.java
@@ -418,6 +418,17 @@ public class Patients extends BaseModel {
     //秦皇岛乳房检查状态0：未做,1：已做。 是否检查
     private String breastType;
 
+    //分娩医生
+    private String deliverDoctor;
+
+    public String getDeliverDoctor() {
+        return deliverDoctor;
+    }
+
+    public void setDeliverDoctor(String deliverDoctor) {
+        this.deliverDoctor = deliverDoctor;
+    }
+
     public String getBreastType() {
         return breastType;
     }
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 0b92db8..cdc9e87 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
@@ -400,6 +400,17 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery {
     //秦皇岛乳房检查状态0：未做,1：已做。 是否检查
     private String breastType;
 
+    //分娩医生
+    private String deliverDoctor;
+
+    public String getDeliverDoctor() {
+        return deliverDoctor;
+    }
+
+    public void setDeliverDoctor(String deliverDoctor) {
+        this.deliverDoctor = deliverDoctor;
+    }
+
     public String getBreastType() {
         return breastType;
     }
@@ -825,6 +836,10 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery {
                 condition=condition.and("firstCheckId",null,MongoOper.IS);
             }
         }
+        //分娩医生
+        if (StringUtils.isNotEmpty(deliverDoctor)) {
+            condition = condition.and("deliverDoctor", deliverDoctor, MongoOper.IS);
+        }
         //筛选乳房列表是否做过检查0,1。false为了查出数据中没有该字段的。
         Criteria c2=MongoCondition.newInstance().getCriteria();
         if(StringUtils.isNotEmpty(breastType)){
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 e41d8fe..e823da2 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
@@ -461,6 +461,11 @@ public class MatDeliverFacade {
 
             //新增分娩信息
             matDeliverService.addMatDeliver(maternalDeliverModel);
+            //分娩医生同步到Patients主档案。
+            Query query = Query.query(Criteria.where("id").is(maternalDeliverModel.getParentId()));
+            Update update = new Update();
+            update.set("deliverDoctor", maternalDeliverModel.getDeliverDoctor());
+            mongoTemplate.updateFirst(query, update, Patients.class);
 
             /*//儿童自动诊断,20210109 张洁说分娩时候不用自动诊断
             try {
@@ -548,6 +553,12 @@ public class MatDeliverFacade {
             List <MaternalDeliverModel> results = matDeliverService.query(query);
 
             matDeliverService.updateOne(maternalDeliverModel, maternalDeliverModel.getId());
+            //分娩医生同步到Patients主档案。
+            Query query2 = Query.query(Criteria.where("id").is(maternalDeliverModel.getParentId()));
+            Update update2 = new Update();
+            update2.set("deliverDoctor", maternalDeliverModel.getDeliverDoctor());
+            mongoTemplate.updateFirst(query2, update2, Patients.class);
+
             if (CollectionUtils.isNotEmpty(results)) {
                 operateLogFacade.addModifyOptLog(userId, Integer.parseInt(hospitalId), maternalDeliverModel, results.get(0), OptActionEnums.UPDATE.getId(), "修改分娩");
             }
@@ -2629,6 +2640,10 @@ public class MatDeliverFacade {
         // 分娩方式去另外一张表查
         patientsQuery.setDesc("fmDate");
         patientsQuery.setSort("fmDate");
+        //隆化需求按接诊医生查询
+        if (StringUtils.isNotEmpty(childbirthManagerRequest.getDeliverDoctor())&&"2100001605".equals(hid)) {
+            patientsQuery.setDeliverDoctor(childbirthManagerRequest.getDeliverDoctor());
+        }
         List <Patients> patientsList = patientsService.queryPatient(patientsQuery);
 
         // 这里就设置分页内容
@@ -2753,10 +2768,6 @@ public class MatDeliverFacade {
                 }
             }
         }
-        //隆化需求按接诊医生查询
-        if (StringUtils.isNotEmpty(childbirthManagerRequest.getDeliverDoctor())&&"2100001605".equals(hid)) {
-            matDeliverQuery.setDeliverDoctor(childbirthManagerRequest.getDeliverDoctor());
-        }
         /**********增加完毕***********/
 
 
-- 
1.8.3.1