From 19581de4f7331604517a7589741829331a13b7e5 Mon Sep 17 00:00:00 2001
From: "litao@lymsh.com" <Lt123456>
Date: Wed, 2 Aug 2017 21:05:54 +0800
Subject: [PATCH] 1

---
 .../src/main/java/com/lyms/platform/pojo/NewbornVisit.java |  9 +++++++++
 .../operate/web/service/impl/NewbornServiceImpl.java       | 14 +++++++-------
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/NewbornVisit.java b/platform-dal/src/main/java/com/lyms/platform/pojo/NewbornVisit.java
index 8feb4fb..a1f05cd 100644
--- a/platform-dal/src/main/java/com/lyms/platform/pojo/NewbornVisit.java
+++ b/platform-dal/src/main/java/com/lyms/platform/pojo/NewbornVisit.java
@@ -91,6 +91,7 @@ public class NewbornVisit {
 
     // 前囟 正常/膨隆/凹陷/其他
     private String bregmatic;
+    private String bregmaticOhter;
 
     // 未闭合尺寸
     private String unclosedSize;
@@ -155,6 +156,14 @@ public class NewbornVisit {
     // 下次访视时间
     private Date nextVisitTimeDesc;
 
+    public String getBregmaticOhter() {
+        return bregmaticOhter;
+    }
+
+    public void setBregmaticOhter(String bregmaticOhter) {
+        this.bregmaticOhter = bregmaticOhter;
+    }
+
     public String getCouponCode() {
         return couponCode;
     }
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/NewbornServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/NewbornServiceImpl.java
index f146e94..f654d52 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/NewbornServiceImpl.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/NewbornServiceImpl.java
@@ -162,11 +162,7 @@ public class NewbornServiceImpl extends BaseServiceImpl implements INewbornVisit
     @Override
     public BaseObjectResponse list(Date startDate, Date endDate, String doctor, Integer userId, String key, Integer page, Integer limit) {
         String hospitalId = autoMatchFacade.getHospitalId(userId);
-        List<String> hospitalIds = accessPermissionFacade.getCurrentUserHospPermissions(userId);
-        if(CollectionUtils.isEmpty(hospitalIds)) {
-            return RespBuilder.buildSuccess();
-        }
-        Criteria criteria = Criteria.where("yn").ne("0").and("hospitalId").in(hospitalIds);
+        Criteria criteria = Criteria.where("yn").ne("0").and("hospitalId").is(hospitalId);
         if(startDate != null && endDate != null) {
            criteria.and("checkTime").gte(startDate).lt(DateUtil.addDay(endDate, 1));
         }
@@ -236,7 +232,6 @@ public class NewbornServiceImpl extends BaseServiceImpl implements INewbornVisit
         PageResult pageResult = (PageResult) rest.getData();
         List<Map<String, Object>> datas = (List<Map<String, Object>>) pageResult.getGrid();
         Map<String, String> cnames = new LinkedHashMap<>();
-//        Map<String, String> cnames = new LinkedHashMap<>();
         cnames.put("id", "#");
         cnames.put("checkTime", "复查访视日期");
         cnames.put("cardNo", "证件号");
@@ -273,7 +268,11 @@ public class NewbornServiceImpl extends BaseServiceImpl implements INewbornVisit
     @Override
     public BaseObjectResponse query(Integer userId, String babyId) {
         String hospitalId = autoMatchFacade.getHospitalId(userId);
-        List<NewbornVisit> newbornVisits = mongoTemplate.find(Query.query(Criteria.where("babyId").is(babyId).and("hospitalId").is(hospitalId).and("yn").ne("0"))
+        List<String> hospitalIds = accessPermissionFacade.getCurrentUserHospPermissions(userId);
+        if(CollectionUtils.isEmpty(hospitalIds)) {
+            return RespBuilder.buildSuccess();
+        }
+        List<NewbornVisit> newbornVisits = mongoTemplate.find(Query.query(Criteria.where("babyId").is(babyId).and("hospitalId").in(hospitalIds).and("yn").ne("0"))
                     .with(new Sort(Sort.Direction.ASC, "checkTime")), NewbornVisit.class);
         List<Map<String, Object>> rest = new ArrayList<>();
         for (NewbornVisit newbornVisit : newbornVisits) {
@@ -357,6 +356,7 @@ public class NewbornServiceImpl extends BaseServiceImpl implements INewbornVisit
             restMap.put("complexion", ComplexionEnums.getName(newbornVisit.getComplexion())); /** 面色 */
             restMap.put("ictericPart", newbornVisit.getIctericPart()); /** 黄染部位 */
             restMap.put("bregmatic", BregmaticEnums.getName(newbornVisit.getBregmatic())); /** 前囟  */
+            restMap.put("bregmaticOhter", newbornVisit.getBregmaticOhter()); /** 前囟  */
             restMap.put("eye", newbornVisit.getEye()); /** 眼外观  */
             restMap.put("limb", newbornVisit.getLimb()); /** 四肢活动  */
             restMap.put("ear", newbornVisit.getEar()); /** 耳外观  */
-- 
1.8.3.1