From 563a73e53585355ba2eaea3d0eb6308ce871fb2a Mon Sep 17 00:00:00 2001
From: liquanyu <liquanyu@lymsh.com>
Date: Mon, 21 Jun 2021 15:10:14 +0800
Subject: [PATCH] update

---
 .../operate/web/facade/MatDeliverFacade.java       |  8 +++++++-
 .../operate/web/facade/PostReviewFacade.java       | 22 +++++++++++-----------
 .../web/request/MatDeliverQueryRequest.java        | 11 +++++++++++
 3 files changed, 29 insertions(+), 12 deletions(-)

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 e8132e0..ee4e265 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
@@ -278,7 +278,7 @@ public class MatDeliverFacade {
                             pat.setEnable("2");
                             pat.setHospitalId(hospitalId);
                             pat.setSource(source);
-                            pat.setFmHospital(hospitalId);
+                            //pat.setFmHospital(hospitalId);
                             pat.setShortCode("1");
                             patientsService.addPatient(pat);
                             maternalDeliverModel.setParentId(uuid);
@@ -1454,6 +1454,12 @@ public class MatDeliverFacade {
         //2017年2月14日 14:15:53 王平说的分娩管理取消产程概念，有好多显示好多。
         matDeliverQuery.setCreatedStart(patients.getLastMenses());
         matDeliverQuery.setYn(YnEnums.YES.getId());
+
+        if (StringUtils.isNotEmpty(deliverQueryRequest.getMatDeliverId()))
+        {
+            matDeliverQuery.setId(deliverQueryRequest.getMatDeliverId());
+        }
+
 //        matDeliverQuery.setspatients.getFmDate();
         List <MaternalDeliverModel> list = matDeliverService.query(matDeliverQuery);
         MatDeliverListResult matDeliverListResult = new MatDeliverListResult();
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PostReviewFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PostReviewFacade.java
index 6727703..0763b3f 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PostReviewFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PostReviewFacade.java
@@ -97,17 +97,17 @@ public class PostReviewFacade {
         //表示区域的
         String hospital = autoMatchFacade.getHospitalId(userId);
         String groupId = groupsFacade.findByCurrentUserId(hospital);
-        if (StringUtils.isNotEmpty(groupId)) {
-            OrganizationGroups gorp = groupsService.findById(groupId);
-            if (gorp.getbType() != 1) {
-                String parentId = examinationFacade.handHideBuild(postReviewRequest.getPid(), postReviewRequest.getParentId(), userId, 3);
-                if (StringUtils.isEmpty(parentId)) {
-                    //打印日志
-                }
-                postReviewModel.setParentId(parentId);
-                postReviewRequest.setParentId(parentId);
-            }
-        }
+//        if (StringUtils.isNotEmpty(groupId)) {
+//            OrganizationGroups gorp = groupsService.findById(groupId);
+//            if (gorp.getbType() != 1) {
+//                String parentId = examinationFacade.handHideBuild(postReviewRequest.getPid(), postReviewRequest.getParentId(), userId, 3);
+//                if (StringUtils.isEmpty(parentId)) {
+//                    //打印日志
+//                }
+//                postReviewModel.setParentId(parentId);
+//                postReviewRequest.setParentId(parentId);
+//            }
+//        }
         postReviewModel.setOperator(userId);
         Patients patients = patientsService.findOnePatientById(postReviewRequest.getParentId());
 
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/MatDeliverQueryRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/MatDeliverQueryRequest.java
index 4f9e7c2..f1d3066 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/MatDeliverQueryRequest.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/MatDeliverQueryRequest.java
@@ -27,6 +27,17 @@ public class MatDeliverQueryRequest {
     //聊城东昌府住院号
     private String zhuYuanNo;
 
+
+    private String matDeliverId;
+
+    public String getMatDeliverId() {
+        return matDeliverId;
+    }
+
+    public void setMatDeliverId(String matDeliverId) {
+        this.matDeliverId = matDeliverId;
+    }
+
     public String getZhuYuanNo() {
         return zhuYuanNo;
     }
-- 
1.8.3.1