From a17e002134a8626b627eef006107ced89a447781 Mon Sep 17 00:00:00 2001
From: dongqin <123456>
Date: Tue, 30 Jul 2019 09:55:43 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../web/service/impl/BabyEvaluationCriterionServiceImpl.java     | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyEvaluationCriterionServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyEvaluationCriterionServiceImpl.java
index 114db6c..1b74dbe 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyEvaluationCriterionServiceImpl.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyEvaluationCriterionServiceImpl.java
@@ -272,6 +272,7 @@ public class BabyEvaluationCriterionServiceImpl implements BabyEvaluationCriteri
     public BaseResponse query(Integer userId, JSONObject jsonObject) {
         String hospitalId = autoMatchFacade.getHospitalId(userId);
         String babyId = jsonObject.getString("babyId");
+        BaseResponse baseResponse = new BaseResponse();
         if (StringUtils.isEmpty(babyId)) {
             return new BaseResponse().setErrorcode(ErrorCodeConstants.PARAMETER_ERROR).setErrormsg("参数缺失");
         }
@@ -290,13 +291,16 @@ public class BabyEvaluationCriterionServiceImpl implements BabyEvaluationCriteri
                 Map<String, Object> objectMap = (Map<String, Object>) itemListByBabyId.getObject();
                 objectList.add(objectMap);
             }
-            BaseResponse baseResponse = new BaseResponse();
+
             baseResponse.setObject(objectList);
             return baseResponse;
         } else {
 
             //  根据当前儿童显示项目领域的配置信息，以供save
-            return getItemListByBabyId(babyId,null);
+            Map<String, Object> objectMap = (Map<String, Object>) getItemListByBabyId(babyId, null).getObject();
+            objectList.add(objectMap);
+            baseResponse.setObject(objectList);
+            return baseResponse;
         }
     }
 
@@ -461,6 +465,7 @@ public class BabyEvaluationCriterionServiceImpl implements BabyEvaluationCriteri
                 String checkDoctorName = null != users ? users.getName() : "";
                 stringMap.put("checkDoctorName", checkDoctorName);
 
+                //  TODO 2019/7/29 18:02 dongqing 
                 add(stringMap);
             }
         }};
-- 
1.8.3.1