diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/TemporaryUserModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/TemporaryUserModel.java
index e5d8c7d..fbce98f 100644
--- a/platform-dal/src/main/java/com/lyms/platform/pojo/TemporaryUserModel.java
+++ b/platform-dal/src/main/java/com/lyms/platform/pojo/TemporaryUserModel.java
@@ -1,6 +1,8 @@
 package com.lyms.platform.pojo;
 
+import com.lyms.platform.common.core.annotation.form.FormParam;
 import com.lyms.platform.common.result.BaseModel;
+import org.hibernate.validator.constraints.NotEmpty;
 import org.springframework.data.mongodb.core.mapping.Document;
 
 import java.util.Date;
@@ -14,6 +16,10 @@ public class TemporaryUserModel extends BaseModel {
 
     private Date birth;
 
+    @FormParam
+    @NotEmpty(message = "生日不能为空.")
+    private String birthday;
+
     private String phone;
 
     private Date lastMenses;
@@ -48,6 +54,26 @@ public class TemporaryUserModel extends BaseModel {
 
     private String hospitalId;
 
+    @FormParam
+    @NotEmpty(message = "末次月经不能为空.")
+    private String lastMenstrualPeriod;
+
+    public String getLastMenstrualPeriod() {
+        return lastMenstrualPeriod;
+    }
+
+    public void setLastMenstrualPeriod(String lastMenstrualPeriod) {
+        this.lastMenstrualPeriod = lastMenstrualPeriod;
+    }
+
+    public String getBirthday() {
+        return birthday;
+    }
+
+    public void setBirthday(String birthday) {
+        this.birthday = birthday;
+    }
+
     public String getHospitalId() {
         return hospitalId;
     }
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TemporaryUserServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TemporaryUserServiceImpl.java
index 4ad4637..8071f59 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TemporaryUserServiceImpl.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TemporaryUserServiceImpl.java
@@ -52,6 +52,8 @@ public class TemporaryUserServiceImpl extends BaseServiceImpl implements ITempor
     public BaseResponse addAndUpdate(TemporaryUserModel temporaryUser, Integer userId) {
         if (null != temporaryUser.getId()) {
             temporaryUser.setModified(new Date());
+            temporaryUser.setBirth(DateUtil.parseYMD(temporaryUser.getBirthday()));
+            temporaryUser.setLastMenses(DateUtil.parseYMD(temporaryUser.getLastMenstrualPeriod()));
             temporaryUserDao.updateTemporaryBlood(Query.query(Criteria.where("_id").is(temporaryUser.getId())), temporaryUser);
             return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("修改成功");
         }
@@ -62,6 +64,8 @@ public class TemporaryUserServiceImpl extends BaseServiceImpl implements ITempor
             if (temporaryUserModels != null) {
                 temporaryUser.setModified(new Date());
                 temporaryUser.setYn("1");
+                temporaryUser.setBirth(DateUtil.parseYMD(temporaryUser.getBirthday()));
+                temporaryUser.setLastMenses(DateUtil.parseYMD(temporaryUser.getLastMenstrualPeriod()));
                 temporaryUserDao.updateTemporaryBlood(Query.query(Criteria.where("_id").is(temporaryUserModels.getId())), temporaryUser);
                 return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("完成!");
             }
@@ -77,6 +81,8 @@ public class TemporaryUserServiceImpl extends BaseServiceImpl implements ITempor
             }
         }
         temporaryUser.setYn("1");
+        temporaryUser.setBirth(DateUtil.parseYMD(temporaryUser.getBirthday()));
+        temporaryUser.setLastMenses(DateUtil.parseYMD(temporaryUser.getLastMenstrualPeriod()));
         temporaryUser.setRiskLevelId(JsonUtil.array2JsonString(riskLevelIdList));
         String hospitalId = autoMatchFacade.getHospitalId(userId);
         temporaryUser.setHospitalId(hospitalId);
@@ -100,7 +106,7 @@ public class TemporaryUserServiceImpl extends BaseServiceImpl implements ITempor
         Criteria criteria = Criteria.where("yn").ne("0").and("hospitalId").in(hospital);
         Criteria pCriteria = Criteria.where("yn").ne("0").and("hospitalId").in(hospital);
         if (org.apache.commons.lang.StringUtils.isNotBlank(key)) {
-            pCriteria.orOperator(Criteria.where("phone").regex(key), Criteria.where("userName").regex(key));
+            pCriteria.orOperator(Criteria.where("phone").regex(key), Criteria.where("userName").regex(key), Criteria.where("cardID").regex(key));
             flag = true;
         }
         if (stateWeek != null && endWeek != null) {
@@ -110,7 +116,10 @@ public class TemporaryUserServiceImpl extends BaseServiceImpl implements ITempor
             flag = true;
         }
         if (age != null) {
+            System.out.println(age);
             Date start = DateUtil.getBeforeAge(age);
+            System.out.println(start);
+
             Date end = DateUtil.getBeforeAge(age + 1);
             pCriteria.and("birth").gt(end).lte(start);
             flag = true;
@@ -131,7 +140,7 @@ public class TemporaryUserServiceImpl extends BaseServiceImpl implements ITempor
         for (TemporaryUserModel temporaryUser : bloodSugars) {
             Map<String, Object> map = new HashMap<>();
             map.put("userName", temporaryUser.getUserName());
-            map.put("birth", DateUtil.getAge(temporaryUser.getBirth(), new Date()));
+            map.put("birth", DateUtil.getAge(temporaryUser.getBirth()));
             map.put("phone", temporaryUser.getPhone());
             map.put("lastMenses", DateUtil.getWeekDesc(temporaryUser.getLastMenses(), new Date()));
             map.put("beforeWeight", temporaryUser.getBeforeWeight());