diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/PremaritalCheckup.java b/platform-dal/src/main/java/com/lyms/platform/pojo/PremaritalCheckup.java
index f9b31d4..1b95c1d 100644
--- a/platform-dal/src/main/java/com/lyms/platform/pojo/PremaritalCheckup.java
+++ b/platform-dal/src/main/java/com/lyms/platform/pojo/PremaritalCheckup.java
@@ -20,7 +20,7 @@ public class PremaritalCheckup  extends BaseModel {
     //女性/男性ID
     private  String parentId;
     //婚检时间
-    private String premaritalUpTime;
+    private Date premaritalUpTime;
     //医院ID
     private String hospitalId;
     //创建时间
@@ -407,11 +407,11 @@ public class PremaritalCheckup  extends BaseModel {
         this.parentId = parentId;
     }
 
-    public String getPremaritalUpTime() {
+    public Date getPremaritalUpTime() {
         return premaritalUpTime;
     }
 
-    public void setPremaritalUpTime(String premaritalUpTime) {
+    public void setPremaritalUpTime(Date premaritalUpTime) {
         this.premaritalUpTime = premaritalUpTime;
     }
 
diff --git a/platform-dal/src/main/java/com/lyms/platform/query/PremaritalCheckupQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/PremaritalCheckupQuery.java
index 16613f4..67dfc0a 100644
--- a/platform-dal/src/main/java/com/lyms/platform/query/PremaritalCheckupQuery.java
+++ b/platform-dal/src/main/java/com/lyms/platform/query/PremaritalCheckupQuery.java
@@ -5,10 +5,13 @@ import com.lyms.platform.common.dao.BaseQuery;
 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 org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.data.mongodb.core.query.Criteria;
 
+import java.util.ArrayList;
 import java.util.Date;
+import java.util.List;
 
 /**
  * Created by Administrator on 2016/11/23 0023.
@@ -47,6 +50,8 @@ public class PremaritalCheckupQuery extends BaseQuery implements IConvertToNativ
     private Integer yiXueYiJian;
     //性别类型
     private Integer sexType;
+    //建档ID
+    List<String> parentIds;
 
 
     @Override
@@ -61,6 +66,9 @@ public class PremaritalCheckupQuery extends BaseQuery implements IConvertToNativ
         if (StringUtils.isNotBlank(hospitalId)) {
             condition = condition.and("hospitalId", hospitalId, MongoOper.IS);
         }
+        if(CollectionUtils.isNotEmpty(parentIds)){
+            condition = condition.and("parentId", parentIds, MongoOper.IN);
+        }
         if (created!=null) {
             condition = condition.and("created", created, MongoOper.IS);
         }
@@ -111,6 +119,14 @@ public class PremaritalCheckupQuery extends BaseQuery implements IConvertToNativ
         return condition.toMongoQuery();
     }
 
+    public List<String> getParentIds() {
+        return parentIds;
+    }
+
+    public void setParentIds(List<String> parentIds) {
+        this.parentIds = parentIds;
+    }
+
     public Integer getSexType() {
         return sexType;
     }
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java
index 3ad0799..d98d0c4 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java
@@ -112,7 +112,7 @@ public class PremaritalCheckupFacade {
                 for (PremaritalCheckup data : checkupList){
                     PremaritalCheckupHistoryResult historyResult = new PremaritalCheckupHistoryResult();
                     historyResult.setId(data.getId());
-                    historyResult.setPremaritalUpTime(data.getPremaritalUpTime());
+                    historyResult.setPremaritalUpTime(DateUtil.getyyyy_MM_dd(data.getPremaritalUpTime()));
                     Organization org = organizationService.getOrganization(Integer.valueOf(data.getHospitalId()));
                     if (org!=null){
                         historyResult.setPremaritalUpHospital(org.getName());
@@ -166,15 +166,14 @@ public class PremaritalCheckupFacade {
      */
     public BaseListResponse queryPremaritalCheckup(PremaritalCheckupQueryRequest request){
 
-        List<PremaritalCheckup> data = new ArrayList<>();
-
         List<String> parentIds = new ArrayList<>();
 
         //用姓名和联系方式查询到的居民建档ID
-        if (StringUtils.isNotEmpty(request.getUsername()) || StringUtils.isNotEmpty(request.getPhone())){
+        if (StringUtils.isNotEmpty(request.getUsername()) || StringUtils.isNotEmpty(request.getPhone()) || StringUtils.isNotEmpty(request.getCardNo())){
             ResidentsArchiveQuery archiveQuery = new ResidentsArchiveQuery();
             archiveQuery.setYn(YnEnums.YES.getId());
             archiveQuery.setUsername(request.getUsername());
+            archiveQuery.setCertificateNum(request.getCardNo());
             archiveQuery.setPhone(request.getPhone());
             archiveQuery.setHospitalId(request.getHospitalId());
             List<ResidentsArchiveModel> modelList = residentsArchiveService.queryResident(archiveQuery);
@@ -184,13 +183,11 @@ public class PremaritalCheckupFacade {
                 }
             }
         }
-
         PremaritalCheckupQuery query = new PremaritalCheckupQuery();
         query.setPage(request.getPage());
         query.setLimit(request.getLimit());
         query.setNeed("y");
         query.setYn(YnEnums.YES.getId());
-        query.setCertificateNum(request.getCardNo());
         query.setYiXueYiJian(request.getYiXueYiJian());
 
         if(StringUtils.isNotEmpty(request.getPremaritalUpTime())){
@@ -208,17 +205,10 @@ public class PremaritalCheckupFacade {
         query.setSexType(request.getSexType());
 
         if (CollectionUtils.isNotEmpty(parentIds)){
-            for (String parentId : parentIds){
-                query.setParentId(parentId);
-                List<PremaritalCheckup> premaritalCheckupList = premaritalCheckupService.queryPremaritalCheckup(query);
-                if (CollectionUtils.isNotEmpty(premaritalCheckupList)){
-                    data.addAll(premaritalCheckupList);
-                }
-            }
-        }else {
-            data = premaritalCheckupService.queryPremaritalCheckup(query);
+            query.setParentIds(parentIds);
         }
 
+        List<PremaritalCheckup> data = premaritalCheckupService.queryPremaritalCheckup(query);
         List<Map> list = new ArrayList<>();
         if (CollectionUtils.isNotEmpty(data)){
             for (PremaritalCheckup checkup : data){
@@ -491,7 +481,7 @@ public class PremaritalCheckupFacade {
         checkup.setModified(new Date());
         checkup.setVcCardNo(addRequest.getVcCardNo());
         checkup.setCertificateNum(addRequest.getCertificateNum());
-        checkup.setPremaritalUpTime(addRequest.getPremaritalUpTime());
+        checkup.setPremaritalUpTime(DateUtil.parseYMD(addRequest.getPremaritalUpTime()));
         if (StringUtils.isNotEmpty(addRequest.getId())){
             //修改
             checkup.setId(addRequest.getId());