diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyCheckController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyCheckController.java
index 3c1ea47..f8fb549 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyCheckController.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyCheckController.java
@@ -229,4 +229,18 @@ public class BabyCheckController extends BaseController{
     }
 
 
+    /**
+     * 当天检查的儿童列表
+     * @param request
+     * @return
+     */
+    @RequestMapping("/currentCheckBabyList")
+    @ResponseBody
+    @TokenRequired
+    public Object currentCheckBabyList(HttpServletRequest request){
+
+        return babyCheckFacade.getCurrentDayCheckBabies(getUserId(request));
+    }
+
+
 }
\ No newline at end of file
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java
index e8e2814..24f2907 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java
@@ -1709,13 +1709,7 @@ public class TestController extends BaseController {
     }
 
 
-    @RequestMapping("/currentCheckBabyList")
-    @ResponseBody
-    @TokenRequired
-    public Object currentCheckBabyList(HttpServletRequest request){
 
-        return babyCheckFacade.getCurrentDayCheckBabies(getUserId(request));
-    }
 
 
 
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java
index a86a05f..20eb6a9 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java
@@ -8,10 +8,7 @@ import com.lyms.platform.common.result.BaseObjectResponse;
 import com.lyms.platform.common.result.BaseResponse;
 import com.lyms.platform.common.utils.*;
 import com.lyms.platform.operate.web.request.BabyCheckRequest;
-import com.lyms.platform.operate.web.result.BabyBasicResult;
-import com.lyms.platform.operate.web.result.BabyCheckResult;
-import com.lyms.platform.operate.web.result.BabyChooseResult;
-import com.lyms.platform.operate.web.result.HighScoreResult;
+import com.lyms.platform.operate.web.result.*;
 import com.lyms.platform.operate.web.utils.MongoUtil;
 import com.lyms.platform.permission.dao.master.CouponMapper;
 import com.lyms.platform.permission.model.Organization;
@@ -1778,21 +1775,46 @@ public class BabyCheckFacade {
                 }
             }
         }
-
+        List<BabyManageListResult> list = new ArrayList<>();
         if (CollectionUtils.isNotEmpty(babyModels))
         {
-            for (BabyModel baby : babyModels)
+            for (BabyModel model : babyModels)
             {
-                Map<String,String> babyMap = new HashMap<>();
-                babyMap.put("id",baby.getId());
-                babyMap.put("name",baby.getName());
-                babyMap.put("birth",DateUtil.getyyyy_MM_dd(baby.getBirth()));
-                babyMap.put("monthName",baby.getMname());
-                babyMap.put("monthPhone",baby.getMphone());
-                babyMap.put("mcardNo",baby.getMcertNo());
-                babyMap.put("mcertTypeId",baby.getMcertTypeId());
-                babyMap.put("vcCardNo",baby.getVcCardNo());
-                babyList.add(babyMap);
+                BabyManageListResult result = new BabyManageListResult();
+                result.setId(model.getId());
+                if (model.getLastHighRisk() == null || model.getLastHighRisk() == 0) {
+                    result.setHighRisk("健康");
+                } else {
+                    result.setHighRisk("高危");
+                }
+                result.setSex(model.getSex() == null ? "" : StringUtils.emptyDeal(SexEnum.getTextById(model.getSex())));
+                result.setBabyName(StringUtils.emptyDeal(model.getName()));
+                result.setBirthday(StringUtils.emptyDeal(DateUtil.getyyyy_MM_dd(model.getBirth())));
+                result.setMommyName(StringUtils.emptyDeal(model.getMname()));
+                result.setMommnyPhone(StringUtils.emptyDeal(model.getMphone()));
+                result.setMommnyEncryptPhone(StringUtils.encryPhone(model.getMphone()));
+                result.setServiceStatus(StringUtils.emptyDeal(model.getServiceStatus() == null ? "" : ServiceStatusEnums.getNameById(model.getServiceStatus())));
+                result.setServiceType(StringUtils.emptyDeal(model.getServiceType() == null ? "" : ServiceTypeEnums.getTitleById(model.getServiceType())));
+                result.setNextDate(StringUtils.emptyDeal(DateUtil.getyyyy_MM_dd(model.getNextDate())));
+                result.setMonthAge(StringUtils.emptyDeal(DateUtil.getBabyMonthAge(model.getBirth(), new Date())));
+                result.setPatientId(model.getParentId());
+                result.setBuildTime(DateUtil.getyyyy_MM_dd(model.getBuildDate()));
+                result.setHospitalName(organizationService.getOrganization(Integer.valueOf(hospitalId)).getName());
+
+                String diagnose = "";
+                if (StringUtils.isNotEmpty(model.getPid())) {
+                    List diagList = getBabyLastDiagnose(model.getPid());
+                    if (CollectionUtils.isNotEmpty(diagList)) {
+                        for (Object obj : diagList) {
+                            BasicConfig basicConfig = basicConfigService.getOneBasicConfigById((String) obj);
+                            if (basicConfig != null) {
+                                diagnose += basicConfig.getName() + " ";
+                            }
+                        }
+                    }
+                }
+                result.setDiagnose(StringUtils.emptyDeal(diagnose));
+                list.add(result);
             }
         }