diff --git a/platform-dal/src/main/java/com/lyms/platform/query/BasicConfigQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/BasicConfigQuery.java
index 4bbe68b..d960c18 100644
--- a/platform-dal/src/main/java/com/lyms/platform/query/BasicConfigQuery.java
+++ b/platform-dal/src/main/java/com/lyms/platform/query/BasicConfigQuery.java
@@ -6,11 +6,16 @@ import com.lyms.platform.common.dao.operator.MongoCondition;
 import com.lyms.platform.common.dao.operator.MongoOper;
 import com.lyms.platform.common.dao.operator.MongoQuery;
 import com.lyms.platform.common.enums.YnEnums;
+import org.springframework.data.mongodb.core.query.Criteria;
+
+import java.util.List;
 
 public class BasicConfigQuery extends BaseQuery implements IConvertToNativeQuery {
 
     private String id;
 
+    private List ids;
+
     private String parentId;
 
     private String code;
@@ -37,6 +42,11 @@ public class BasicConfigQuery extends BaseQuery implements IConvertToNativeQuery
         if (null != id) {
             condition = condition.and("id", id, MongoOper.IS);
         }
+
+        if (null != ids && ids.size() > 0) {
+            Criteria c = Criteria.where("id").in(ids);
+            condition.andCondition( new MongoCondition(c));
+        }
         
         if (null != code) {
             condition = condition.and("code", code, MongoOper.IS);
@@ -53,6 +63,8 @@ public class BasicConfigQuery extends BaseQuery implements IConvertToNativeQuery
         if(null!=enable){
             condition = condition.and("enable", enable, MongoOper.IS);
         }
+
+
         if (null != keyword) {
             MongoCondition con1=  MongoCondition.newInstance("code", keyword, MongoOper.LIKE);
             MongoCondition con  = MongoCondition.newInstance("name", keyword, MongoOper.LIKE);
@@ -62,6 +74,14 @@ public class BasicConfigQuery extends BaseQuery implements IConvertToNativeQuery
         return condition.toMongoQuery();
     }
 
+    public List getIds() {
+        return ids;
+    }
+
+    public void setIds(List ids) {
+        this.ids = ids;
+    }
+
     public String getTypeId() {
         return typeId;
     }
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 58da2f2..1550a1d 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
@@ -694,7 +694,24 @@ public class BabyBookbuildingFacade {
         bm.setExpVip(b.getExpVip());
         bm.setMremark(b.getMremark());
         bm.setDiagnose(JsonUtil.array2JsonString(b.getDiagnose()));
-        bm.setLastDiagnose(JsonUtil.array2JsonString(b.getDiagnose()));
+
+        if (b.getDiagnose() != null && b.getDiagnose().size() > 0)
+        {
+            BasicConfigQuery basicConfigQuery = new BasicConfigQuery();
+            basicConfigQuery.setYn(YnEnums.YES.getId());
+            basicConfigQuery.setParentId(SystemConfig.DIAGNOSE_TYPE_ID);
+            basicConfigQuery.setIds(b.getDiagnose());
+            List<BasicConfig> datas = basicConfigService.queryBasicConfig(basicConfigQuery);
+            List<String> diagnoseNames = new ArrayList<>();
+            if (datas != null) {
+                for (BasicConfig data : datas) {
+                    diagnoseNames.add(data.getName());
+                }
+            }
+            bm.setLastDiagnose(JsonUtil.array2JsonString(diagnoseNames));
+        }
+
+
 
         if (b.getExpType() != null) {
             if (b.getExpType() == ExpEnums.SGY.getId()) {
@@ -1415,23 +1432,25 @@ public class BabyBookbuildingFacade {
             babyQuery.setBirthEnd(start);
         }
 
-        if (StringUtils.isNotEmpty(request.getDiagnose()))
-        {
-            BasicConfigQuery basicConfigQuery = new BasicConfigQuery();
-            basicConfigQuery.setYn(YnEnums.YES.getId());
-            basicConfigQuery.setParentId(SystemConfig.DIAGNOSE_TYPE_ID);
-            basicConfigQuery.setKeyword(request.getDiagnose());
-            System.out.println(request.getDiagnose());
-            List<BasicConfig> datas = basicConfigService.queryBasicConfig(basicConfigQuery);
-            List<String> diagnoseIds = new ArrayList<>();
-            if (datas != null) {
-                for (BasicConfig data : datas) {
-                    diagnoseIds.add(data.getId());
-                }
+//        if (StringUtils.isNotEmpty(request.getDiagnose()))
+//        {
+//            BasicConfigQuery basicConfigQuery = new BasicConfigQuery();
+//            basicConfigQuery.setYn(YnEnums.YES.getId());
+//            basicConfigQuery.setParentId(SystemConfig.DIAGNOSE_TYPE_ID);
+//            basicConfigQuery.setKeyword("伤寒杆菌性败血症");
+//            System.out.println(request.getDiagnose());
+//            List<BasicConfig> datas = basicConfigService.queryBasicConfig(basicConfigQuery);
+//            List<String> diagnoseIds = new ArrayList<>();
+//            if (datas != null) {
+//                for (BasicConfig data : datas) {
+//                    diagnoseIds.add(data.getId());
+//                }
+//
+//            }
+//            babyQuery.setLastDiagnoses(diagnoseIds);
+//        }
 
-            }
-            babyQuery.setLastDiagnoses(diagnoseIds);
-        }
+        babyQuery.setLastDiagnose(request.getDiagnose());
 
         //预约时间
         if (StringUtils.isNotEmpty(request.getNextDate()))
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 5094a53..1a3aa5f 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
@@ -80,7 +80,18 @@ public class BabyCheckFacade {
         bm.setNextDate(DateUtil.parseYMD(request.getNextDate()));
         if (CollectionUtils.isNotEmpty(request.getDiagnose()))
         {
-            bm.setLastDiagnose(JsonUtil.array2JsonString(request.getDiagnose()));
+            BasicConfigQuery basicConfigQuery = new BasicConfigQuery();
+            basicConfigQuery.setYn(YnEnums.YES.getId());
+            basicConfigQuery.setParentId(SystemConfig.DIAGNOSE_TYPE_ID);
+            basicConfigQuery.setIds(request.getDiagnose());
+            List<BasicConfig> datas = basicConfigService.queryBasicConfig(basicConfigQuery);
+            List<String> diagnoseNames = new ArrayList<>();
+            if (datas != null) {
+                for (BasicConfig data : datas) {
+                    diagnoseNames.add(data.getName());
+                }
+            }
+            bm.setLastDiagnose(JsonUtil.array2JsonString(diagnoseNames));
         }
         babyBookbuildingService.updateBabyBuild(bm, request.getBuildId());
         return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功");
@@ -199,10 +210,24 @@ public class BabyCheckFacade {
         }
 
         bm.setNextDate(DateUtil.parseYMD(request.getNextDate()));
+
+
         if (CollectionUtils.isNotEmpty(request.getDiagnose()))
         {
-            bm.setLastDiagnose(JsonUtil.array2JsonString(request.getDiagnose()));
+            BasicConfigQuery basicConfigQuery = new BasicConfigQuery();
+            basicConfigQuery.setYn(YnEnums.YES.getId());
+            basicConfigQuery.setParentId(SystemConfig.DIAGNOSE_TYPE_ID);
+            basicConfigQuery.setIds(request.getDiagnose());
+            List<BasicConfig> datas = basicConfigService.queryBasicConfig(basicConfigQuery);
+            List<String> diagnoseNames = new ArrayList<>();
+            if (datas != null) {
+                for (BasicConfig data : datas) {
+                    diagnoseNames.add(data.getName());
+                }
+            }
+            bm.setLastDiagnose(JsonUtil.array2JsonString(diagnoseNames));
         }
+
         babyBookbuildingService.updateBabyBuild(bm, request.getBuildId());
 
         BabyCheckModel model = getBabyCheckModel(request);