diff --git a/platform-dal/src/main/java/com/lyms/platform/query/DiagnosisQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/DiagnosisQuery.java
index 09d8cda..360ea4e 100644
--- a/platform-dal/src/main/java/com/lyms/platform/query/DiagnosisQuery.java
+++ b/platform-dal/src/main/java/com/lyms/platform/query/DiagnosisQuery.java
@@ -39,7 +39,15 @@ public class DiagnosisQuery extends BaseQuery implements IConvertToNativeQuery {
     private Date resultDateEnd;//诊断出具结束时间
     private String specimenNo;//标本号
     private String collectHospitalId;//申请医院
+    private List<String> parentIdList;//孕妇ID集合
 
+    public List<String> getParentIdList() {
+        return parentIdList;
+    }
+
+    public void setParentIdList(List<String> parentIdList) {
+        this.parentIdList = parentIdList;
+    }
 
     public String getId() {
         return id;
@@ -243,6 +251,9 @@ public class DiagnosisQuery extends BaseQuery implements IConvertToNativeQuery {
         if(null != diaStatus2){
             condition = condition.and("diaStatus", diaStatus2, MongoOper.IN);
         }
+        if(null != parentIdList){
+            condition = condition.and("parentId", parentIdList, MongoOper.IN);
+        }
 
         Criteria c = null;
         if(null != applyDateStart && null != applyDateEnd){
@@ -262,6 +273,7 @@ public class DiagnosisQuery extends BaseQuery implements IConvertToNativeQuery {
                 c = Criteria.where("lastMenses").gte(lastMensesStart).lte(lastMensesEnd);
             }
         }
+
         if (StringUtils.isNotEmpty(queryNo)) {
             MongoCondition c1 = MongoCondition.newInstance();
             MongoCondition con1 = MongoCondition.newInstance("name", queryNo, MongoOper.LIKE);
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/DiagnosisFacaed.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/DiagnosisFacaed.java
index 0d02c31..e16e2e0 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/DiagnosisFacaed.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/DiagnosisFacaed.java
@@ -264,23 +264,40 @@ public class DiagnosisFacaed {
      */
     public DiagnosisManagerResult queryDiagnosisList(DiagnosisAddRequest dataresult,Integer userId){
         DiagnosisManagerResult diagnosisManagerResult = new DiagnosisManagerResult();
+        List<String> pList = new ArrayList<String>();
         String hospital = autoMatchFacade.getHospitalId(userId);
         dataresult.setHospitalId(hospital);
         DiagnosisQuery diagnosisQuery = new DiagnosisQuery();
         List<Map<String,String>> mList = new ArrayList<Map<String,String>>();
+        if(null != dataresult.getQueryNo()){
+            PatientsQuery patientsQuery = new PatientsQuery();
+            patientsQuery.setQueryNo(dataresult.getQueryNo());
+            patientsQuery.setHospitalId(hospital);
+            List<Patients> list = patientsService.queryPatient(patientsQuery);
+            if(list != null && list.size() > 0){
+                for(Patients patient : list){
+                    pList.add(patient.getId());
+                }
+            }else{
+                return diagnosisManagerResult;
+            }
+        }
+        if(pList != null && pList.size() > 0){
+            diagnosisQuery.setParentIdList(pList);
+        }
         if(null != dataresult.getDiaResult()){
             diagnosisQuery.setDiaResult(dataresult.getDiaResult());
         }
-        if(null != dataresult.getApplyWeekStart()){
+        if (null != dataresult.getApplyWeekStart()){
             diagnosisQuery.setApplyWeeksStart(7 * Integer.valueOf(dataresult.getApplyWeekStart()));
         }
-        if(null != dataresult.getApplyWeekEnd()){
+        if (null != dataresult.getApplyWeekEnd()){
             diagnosisQuery.setApplyWeeksEnd(7 * Integer.valueOf(dataresult.getApplyWeekEnd()) + 6);
         }
-        if(null != dataresult.getNowWeeksStart()){
+        if (null != dataresult.getNowWeeksStart()) {
             diagnosisQuery.setLastMensesEnd(DateUtil.addDay(DateUtil.parseYMD(DateUtil.getyyyy_MM_dd(new Date())), -(dataresult.getNowWeeksStart() * 7)));
         }
-        if(null != dataresult.getNowWeeksEnd()){
+        if (null != dataresult.getNowWeeksEnd()) {
             diagnosisQuery.setLastMensesStart(DateUtil.addDay(DateUtil.parseYMD(DateUtil.getyyyy_MM_dd(new Date())), -(dataresult.getNowWeeksEnd() * 7) - 6));
         }
         if(null != dataresult.getDiaStatus()){
@@ -289,9 +306,7 @@ public class DiagnosisFacaed {
         if(null != dataresult.getRsResult()){
             diagnosisQuery.setRsResult(dataresult.getRsResult());
         }
-        if(null != dataresult.getQueryNo()){
-            diagnosisQuery.setQueryNo(dataresult.getQueryNo());
-        }
+
         if(StringUtils.isNotEmpty(dataresult.getApplyDate())){
             String[] dates = dataresult.getApplyDate().split(" - ");
             diagnosisQuery.setApplyDateStart(DateUtil.parseYMD(dates[0]));