diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/IBabyCheckDao.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/IBabyCheckDao.java
index 639ea2d..88b804a 100644
--- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/IBabyCheckDao.java
+++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/IBabyCheckDao.java
@@ -18,4 +18,6 @@ public interface IBabyCheckDao {
 	public List<BabyCheckModel> queryBabyCheckRecord(MongoQuery query);
 
 	List<BabyCheckModel> queryLastCheck(List<String> ids);
+
+	List<BabyCheckModel> queryLastDiagnoseCheck(List<String> ids);
 }
diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/BabyCheckDaoImpl.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/BabyCheckDaoImpl.java
index 8b6d97f..782882a 100644
--- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/BabyCheckDaoImpl.java
+++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/BabyCheckDaoImpl.java
@@ -53,6 +53,16 @@ public class BabyCheckDaoImpl extends BaseMongoDAOImpl<BabyCheckModel> implement
         AggregationResults<BabyCheckModel> result = this.mongoTemplate.aggregate(aggregation, "lyms_babycheck", BabyCheckModel.class);
         return result.getMappedResults();
     }
+  @Override
+    public List<BabyCheckModel> queryLastDiagnoseCheck(List<String> ids) {
+
+        AggregationOperation match = Aggregation.match(Criteria.where("buildId").in(ids).and("yn").is(1));
+        AggregationOperation group = Aggregation.group("_id","diagnose").max("created").as("created");
+        AggregationOperation fields = Aggregation.project("_id", "diagnose");
+        Aggregation aggregation = Aggregation.newAggregation(match, group,fields);
+        AggregationResults<BabyCheckModel> result = this.mongoTemplate.aggregate(aggregation, "lyms_babycheck", BabyCheckModel.class);
+        return result.getMappedResults();
+    }
 
 
 }
diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/BabyCheckService.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/BabyCheckService.java
index 12eac99..5839eca 100644
--- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/BabyCheckService.java
+++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/BabyCheckService.java
@@ -81,4 +81,9 @@ public class BabyCheckService {
     public List<BabyCheckModel> queryLastCheck(List<String> ids) {
         return babyCheckDao.queryLastCheck(ids);
     }
+
+    public List<BabyCheckModel> queryLastDiagnoseCheck(List<String> ids) {
+        return babyCheckDao.queryLastDiagnoseCheck(ids);
+
+    }
 }
\ No newline at end of file
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 a4d8a11..4c316bb 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
@@ -1441,7 +1441,7 @@ public class BabyBookbuildingFacade {
             for (BabyModel model : models) {
                 BabyManageListResult result = new BabyManageListResult();
                 result.setId(model.getId());
-                if (model.getHighRisk() == null || model.getHighRisk() == 0) {
+                if (model.getLastHighRisk() == null || model.getLastHighRisk() == 0) {
                     result.setHighRisk("健康");
                 } else {
                     result.setHighRisk("高危");
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 16f74e4..8988b4f 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
@@ -629,7 +629,7 @@ public class BabyCheckFacade {
             }
             if (CollectionUtils.isNotEmpty(ids))
             {
-                List<BabyCheckModel> checkModels = babyCheckService.queryLastCheck(ids);
+                List<BabyCheckModel> checkModels = babyCheckService.queryLastDiagnoseCheck(ids);
                 if (CollectionUtils.isNotEmpty(checkModels) && checkModels.get(0) != null)
                 {
                     diagnose = checkModels.get(0).getDiagnose();