diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/BabyModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/BabyModel.java
index b3067b0..fa7f59f 100644
--- a/platform-dal/src/main/java/com/lyms/platform/pojo/BabyModel.java
+++ b/platform-dal/src/main/java/com/lyms/platform/pojo/BabyModel.java
@@ -176,8 +176,8 @@ public class BabyModel extends BaseModel {
     //母亲备注
     private String mremark;
 
-    //当前是否高危 0 非高危 1高危
-    private Integer  currentHighRisk;
+//    //当前是否高危 0 非高危 1高危
+//    private Integer  currentHighRisk;
 
     //当前下次检查时间
     private Date nextDate;
@@ -196,7 +196,27 @@ public class BabyModel extends BaseModel {
     private String phoneId;
 
 
+    //是否高危 0 非高危 1高危
+    private Integer lastHighRisk;
+
+    //诊断
+    private String lastDiagnose;
+
+    public Integer getLastHighRisk() {
+        return lastHighRisk;
+    }
+
+    public void setLastHighRisk(Integer lastHighRisk) {
+        this.lastHighRisk = lastHighRisk;
+    }
+
+    public String getLastDiagnose() {
+        return lastDiagnose;
+    }
 
+    public void setLastDiagnose(String lastDiagnose) {
+        this.lastDiagnose = lastDiagnose;
+    }
 
     public String getCardId() {
         return cardId;
@@ -735,13 +755,7 @@ public class BabyModel extends BaseModel {
         this.highRisk = highRisk;
     }
 
-    public Integer getCurrentHighRisk() {
-        return currentHighRisk;
-    }
 
-    public void setCurrentHighRisk(Integer currentHighRisk) {
-        this.currentHighRisk = currentHighRisk;
-    }
 
     public Date getVipEndTime() {
         return vipEndTime;
diff --git a/platform-dal/src/main/java/com/lyms/platform/query/BabyModelQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/BabyModelQuery.java
index dd74515..bed298c 100644
--- a/platform-dal/src/main/java/com/lyms/platform/query/BabyModelQuery.java
+++ b/platform-dal/src/main/java/com/lyms/platform/query/BabyModelQuery.java
@@ -158,6 +158,28 @@ public class BabyModelQuery extends BaseQuery implements IConvertToNativeQuery {
     //person表的主键
     private String pid;
 
+    //是否高危 0 非高危 1高危
+    private Integer lastHighRisk;
+
+    //诊断
+    private String lastDiagnose;
+
+    public String getLastDiagnose() {
+        return lastDiagnose;
+    }
+
+    public void setLastDiagnose(String lastDiagnose) {
+        this.lastDiagnose = lastDiagnose;
+    }
+
+    public Integer getLastHighRisk() {
+        return lastHighRisk;
+    }
+
+    public void setLastHighRisk(Integer lastHighRisk) {
+        this.lastHighRisk = lastHighRisk;
+    }
+
     public String getPid() {
         return pid;
     }
@@ -324,8 +346,8 @@ public class BabyModelQuery extends BaseQuery implements IConvertToNativeQuery {
         if(null!=hospitalId){
             condition=condition.and("hospitalId", hospitalId, MongoOper.IS);
         }
-        if(!StringUtils.isEmpty(diagnose)){
-            condition=condition.and("diagnose", diagnose, MongoOper.LIKE);
+        if(!StringUtils.isEmpty(lastDiagnose)){
+            condition=condition.and("lastDiagnose", lastDiagnose, MongoOper.LIKE);
         }
         if(!StringUtils.isEmpty(phoneId)  || !StringUtils.isEmpty(cardId)){
             MongoCondition con1 = MongoCondition.newInstance("phoneId", phoneId, MongoOper.LIKE);
@@ -337,6 +359,11 @@ public class BabyModelQuery extends BaseQuery implements IConvertToNativeQuery {
             condition=condition.and("sex", sex, MongoOper.IS);
         }
 
+        if(null!=lastHighRisk){
+            condition=condition.and("lastHighRisk", lastHighRisk, MongoOper.IS);
+        }
+
+
         if(null!=serviceStatus){
             condition=condition.and("serviceStatus", serviceStatus, MongoOper.IS);
         }
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 33d6f43..ca0ad51 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
@@ -690,7 +690,7 @@ public class BabyBookbuildingFacade {
         bm.setApgarScore(JsonUtil.obj2JsonString(b.getApgar()));
 
 
-        bm.setCurrentHighRisk(b.getHighRisk());
+        bm.setLastHighRisk(b.getHighRisk());
 
 
         return bm;
@@ -1354,7 +1354,7 @@ public class BabyBookbuildingFacade {
             babyQuery.setBirthEnd(start);
         }
 
-        babyQuery.setDiagnose(request.getDiagnose());
+        babyQuery.setLastDiagnose(request.getDiagnose());
         //预约时间
         if (StringUtils.isNotEmpty(request.getNextDate()))
         {
@@ -1388,7 +1388,7 @@ public class BabyBookbuildingFacade {
 
         //0 非高危 1 高危 2 全部
         if (request.getHighRiskType() != null && request.getHighRiskType() != 2) {
-            babyQuery.setHighRisk(request.getHighRiskType());
+            babyQuery.setLastHighRisk(request.getHighRiskType());
         }
 
         List<BabyModel> models = babyBookbuildingService.queryBabyBuildByCond(babyQuery);
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 abbee25..5011263 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
@@ -70,11 +70,14 @@ public class BabyCheckFacade {
 
         //儿童体检后 更新下次预约时间和是否高危 在基础数据表里面
         BabyModel bm = new BabyModel();
-        bm.setCurrentHighRisk(request.getHighRisk());
-        bm.setNextDate(DateUtil.parseYMD(request.getNextDate()));
         bm.setModified(new Date());
+        bm.setLastHighRisk(request.getHighRisk());
+        bm.setNextDate(DateUtil.parseYMD(request.getNextDate()));
+        if (CollectionUtils.isNotEmpty(request.getDiagnose()))
+        {
+            bm.setLastDiagnose(JsonUtil.array2JsonString(request.getDiagnose()));
+        }
         babyBookbuildingService.updateBabyBuild(bm, request.getBuildId());
-
         return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功");
     }
 
@@ -175,9 +178,12 @@ public class BabyCheckFacade {
         //儿童体检后 更新下次预约时间和是否高危 在基础数据表里面
         BabyModel bm = new BabyModel();
         bm.setModified(new Date());
-        bm.setModified(new Date());
-        bm.setCurrentHighRisk(request.getHighRisk());
+        bm.setLastHighRisk(request.getHighRisk());
         bm.setNextDate(DateUtil.parseYMD(request.getNextDate()));
+        if (CollectionUtils.isNotEmpty(request.getDiagnose()))
+        {
+            bm.setLastDiagnose(JsonUtil.array2JsonString(request.getDiagnose()));
+        }
         babyBookbuildingService.updateBabyBuild(bm, request.getBuildId());
 
         BabyCheckModel model = getBabyCheckModel(request);