From 7d06be2352f7b1721128e0fdafb3aba8d8f5ea81 Mon Sep 17 00:00:00 2001
From: wtt <wtt@qq.com>
Date: Wed, 29 Jul 2020 09:35:00 +0800
Subject: [PATCH] update

---
 .../operate/web/facade/BabyBookbuildingFacade.java       | 16 +++++++++-------
 .../lyms/platform/operate/web/facade/BabyEarFacade.java  |  2 +-
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java
index 058c6ed..9bd5de7 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java
@@ -384,10 +384,11 @@ public class BabyBookbuildingFacade {
      */
     public BaseResponse updateBabyBookbuilding(BabyBookbuildingAddRequest request, Integer userId) {
 
-        BabyModel model = getBabyModel(request, true, userId);
-
         String hid = autoMatchFacade.getHospitalId(userId);
 
+        BabyModel model = getBabyModel(request, true, userId,hid);
+
+
         model.setModified(new Date());
         model.setOperator(userId);
         if (StringUtils.isNotEmpty(request.getMommyCertificateNum())) {
@@ -599,7 +600,7 @@ public class BabyBookbuildingFacade {
                     return br;
                 }
             }
-            String encodedUtil = getEncodedUtil();
+            String encodedUtil = getEncodedUtil(hid);
             Patients patients = null;
             PersonModel resperson = null;
             String babyPersonId = "";
@@ -767,7 +768,7 @@ public class BabyBookbuildingFacade {
             }
 
             request.setEncoded(encodedUtil);
-            BabyModel model = getBabyModel(request, true, userId);
+            BabyModel model = getBabyModel(request, true, userId,hid);
             model.setmHighRiskReason(request.getmHighRiskReason());
             model.setPid(babyPersonId);
             model.setOperator(userId);
@@ -1143,7 +1144,7 @@ public class BabyBookbuildingFacade {
      * @param b
      * @return
      */
-    private BabyModel getBabyModel(BabyBookbuildingAddRequest b, boolean isAdd, Integer userId) {
+    private BabyModel getBabyModel(BabyBookbuildingAddRequest b, boolean isAdd, Integer userId,String hospitalId) {
         // hujiaqi添加了一个字段，判断是插入还是更新，如果是更新，就不更新birth字段
         BabyModel bm = new BabyModel();
 
@@ -1161,7 +1162,7 @@ public class BabyBookbuildingFacade {
         bm.setsINCard(b.getsINCard());//儿童社保卡
         //预建档的要加上编码
         if (b.getYn() != null && b.getYn() == 0 && StringUtils.isEmpty(b.getEncoded())) {
-            String encodedUtil = getEncodedUtil();
+            String encodedUtil = getEncodedUtil(hospitalId);
             bm.setEncoded(encodedUtil);
         }
         bm.setLiveType(b.getLiveType());
@@ -1378,7 +1379,7 @@ public class BabyBookbuildingFacade {
      * @Author: 武涛涛
      * @Date: 2020/7/21 16:07
      */
-    public String getEncodedUtil() {
+    public String getEncodedUtil(String hospitalId) {
 
         String encodedBaby = null;
         BabyModel babyModel = null;
@@ -1388,6 +1389,7 @@ public class BabyBookbuildingFacade {
             babyQuery.setCreatedTimeStart(DateUtil.getDayFirstSecond(new Date()));
             babyQuery.setCreatedTimeEnd(DateUtil.getDayLastSecond(new Date()));
             babyQuery.setEncodedNe(true);
+            babyQuery.setHospitalId(hospitalId);
             MongoQuery query = babyQuery.convertToQuery();
             List<BabyModel> list = babyBookBuildingDao.queryBabyWithQuery(query.addOrder(Sort.Direction.DESC, "created"));
             if (CollectionUtils.isNotEmpty(list)) {
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyEarFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyEarFacade.java
index 4115b17..47fccd0 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyEarFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyEarFacade.java
@@ -470,7 +470,7 @@ public class BabyEarFacade {
             babyPatientExtendEarMother = babyPatientExtendEarMotherRequest.convertToDataModel();
         }
         String hId = autoMatchFacade.getHospitalId(userId);
-        String encodedUtil = babyBookbuildingFacade.getEncodedUtil();
+        String encodedUtil = babyBookbuildingFacade.getEncodedUtil(hId);
         if (null != baby) {
             String pid = null;
             if (StringUtils.isNotEmpty(baby.getPid())) {//更新本院儿童信息
-- 
1.8.3.1