diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/PostkfModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/PostkfModel.java
index 0b4e310..f3fd578 100644
--- a/platform-dal/src/main/java/com/lyms/platform/pojo/PostkfModel.java
+++ b/platform-dal/src/main/java/com/lyms/platform/pojo/PostkfModel.java
@@ -22,39 +22,39 @@ public class PostkfModel extends BaseModel {
     private  String pid;
     private String patientId;
     //重症急救
-    private Map zzjj;
+    private Map<String,Object> zzjj;
     //疾病治疗
-    private Map jbzl;
+    private Map<String,Object> jbzl;
     //损伤康复
-    private Map sskf;
+    private Map<String,Object> sskf;
     //胃肠功能减退
-    private Map wcgnjt;
+    private Map<String,Object> wcgnjt;
     //尿失禁
-    private Map nsj;
+    private Map<String,Object> nsj;
     //尿潴留
-    private Map ndl;
+    private Map<String,Object> ndl;
     //乳房 （无奶 乳汁不足、涨奶）
-    private Map rf;
+    private Map<String,Object> rf;
     //恶露异常
-    private Map elyc;
+    private Map<String,Object> elyc;
     //乳腺炎
-    private Map rxy;
+    private Map<String,Object> rxy;
     //盆底肌受损
-    private Map pdjss;
+    private Map<String,Object> pdjss;
     //腹直肌受损
-    private Map fzjss;
+    private Map<String,Object> fzjss;
 
     //肥胖
-    private Map fp;
+    private Map<String,Object> fp;
 
     //耻骨联合分离
-    private Map cglhfl;
+    private Map<String,Object> cglhfl;
 
     //保健预防
-    private Map bjyf;
+    private Map<String,Object> bjyf;
 
     //评估建议和 “下次电话评估时间：”“下次回院评估时间”
-    private Map pgjy;
+    private Map<String,Object> pgjy;
 
     private String hospitalId;
 
@@ -62,21 +62,12 @@ public class PostkfModel extends BaseModel {
 
     private List<Integer> status;
 
-
     private Date created;
 
     private Date modified;
 
     private String operaterId;
 
-    public Map getPgjy() {
-        return pgjy;
-    }
-
-    public void setPgjy(Map pgjy) {
-        this.pgjy = pgjy;
-    }
-
     public String getId() {
         return id;
     }
@@ -109,118 +100,126 @@ public class PostkfModel extends BaseModel {
         this.patientId = patientId;
     }
 
-    public Map getZzjj() {
+    public Map<String, Object> getZzjj() {
         return zzjj;
     }
 
-    public void setZzjj(Map zzjj) {
+    public void setZzjj(Map<String, Object> zzjj) {
         this.zzjj = zzjj;
     }
 
-    public Map getJbzl() {
+    public Map<String, Object> getJbzl() {
         return jbzl;
     }
 
-    public void setJbzl(Map jbzl) {
+    public void setJbzl(Map<String, Object> jbzl) {
         this.jbzl = jbzl;
     }
 
-    public Map getSskf() {
+    public Map<String, Object> getSskf() {
         return sskf;
     }
 
-    public void setSskf(Map sskf) {
+    public void setSskf(Map<String, Object> sskf) {
         this.sskf = sskf;
     }
 
-    public Map getWcgnjt() {
+    public Map<String, Object> getWcgnjt() {
         return wcgnjt;
     }
 
-    public void setWcgnjt(Map wcgnjt) {
+    public void setWcgnjt(Map<String, Object> wcgnjt) {
         this.wcgnjt = wcgnjt;
     }
 
-    public Map getNsj() {
+    public Map<String, Object> getNsj() {
         return nsj;
     }
 
-    public void setNsj(Map nsj) {
+    public void setNsj(Map<String, Object> nsj) {
         this.nsj = nsj;
     }
 
-    public Map getNdl() {
+    public Map<String, Object> getNdl() {
         return ndl;
     }
 
-    public void setNdl(Map ndl) {
+    public void setNdl(Map<String, Object> ndl) {
         this.ndl = ndl;
     }
 
-    public Map getRf() {
+    public Map<String, Object> getRf() {
         return rf;
     }
 
-    public void setRf(Map rf) {
+    public void setRf(Map<String, Object> rf) {
         this.rf = rf;
     }
 
-    public Map getElyc() {
+    public Map<String, Object> getElyc() {
         return elyc;
     }
 
-    public void setElyc(Map elyc) {
+    public void setElyc(Map<String, Object> elyc) {
         this.elyc = elyc;
     }
 
-    public Map getRxy() {
+    public Map<String, Object> getRxy() {
         return rxy;
     }
 
-    public void setRxy(Map rxy) {
+    public void setRxy(Map<String, Object> rxy) {
         this.rxy = rxy;
     }
 
-    public Map getPdjss() {
+    public Map<String, Object> getPdjss() {
         return pdjss;
     }
 
-    public void setPdjss(Map pdjss) {
+    public void setPdjss(Map<String, Object> pdjss) {
         this.pdjss = pdjss;
     }
 
-    public Map getFzjss() {
+    public Map<String, Object> getFzjss() {
         return fzjss;
     }
 
-    public void setFzjss(Map fzjss) {
+    public void setFzjss(Map<String, Object> fzjss) {
         this.fzjss = fzjss;
     }
 
-    public Map getFp() {
+    public Map<String, Object> getFp() {
         return fp;
     }
 
-    public void setFp(Map fp) {
+    public void setFp(Map<String, Object> fp) {
         this.fp = fp;
     }
 
-    public Map getCglhfl() {
+    public Map<String, Object> getCglhfl() {
         return cglhfl;
     }
 
-    public void setCglhfl(Map cglhfl) {
+    public void setCglhfl(Map<String, Object> cglhfl) {
         this.cglhfl = cglhfl;
     }
 
-    public Map getBjyf() {
+    public Map<String, Object> getBjyf() {
         return bjyf;
     }
 
-    public void setBjyf(Map bjyf) {
+    public void setBjyf(Map<String, Object> bjyf) {
         this.bjyf = bjyf;
     }
 
+    public Map<String, Object> getPgjy() {
+        return pgjy;
+    }
+
+    public void setPgjy(Map<String, Object> pgjy) {
+        this.pgjy = pgjy;
+    }
+
     public String getHospitalId() {
         return hospitalId;
     }
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PostkfFaccade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PostkfFaccade.java
index 4d4e9cd..d206ae9 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PostkfFaccade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PostkfFaccade.java
@@ -5,6 +5,8 @@ import com.lyms.platform.biz.service.MatDeliverService;
 import com.lyms.platform.biz.service.PatientsService;
 import com.lyms.platform.common.constants.ErrorCodeConstants;
 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.enums.CfEnums;
 import com.lyms.platform.common.enums.FmTypeEnums;
 import com.lyms.platform.common.enums.RenShenJieJuEnums;
@@ -254,6 +256,7 @@ public class PostkfFaccade {
 
 
         String hospitalId = autoMatchFacade.getHospitalId(userId);
+
         Query query = new Query();
         Integer status = postKfRequest.getStatus();
         if (status != null) {
@@ -267,6 +270,111 @@ public class PostkfFaccade {
                 query.addCriteria(Criteria.where(postKfRequest.getItem()+"."+postKfRequest.getType()+"doctor").is(postKfRequest.getDoctorName()));
             }
         }
+        else if (StringUtils.isNotEmpty(postKfRequest.getDoctorName()))
+        {
+
+            query.addCriteria(new Criteria().orOperator(
+
+                    Criteria.where("zzjj.cyqpgdoctor").is(postKfRequest.getDoctorName()),
+                    Criteria.where("zzjj.ch7tdoctor").is(postKfRequest.getDoctorName()),
+                    Criteria.where("zzjj.ch14tdoctor").is(postKfRequest.getDoctorName()),
+                    Criteria.where("zzjj.ch28tdoctor").is(postKfRequest.getDoctorName()),
+                    Criteria.where("zzjj.ch24tdoctor").is(postKfRequest.getDoctorName()),
+
+                    Criteria.where("zzjj.cyqpgdoctor").is(postKfRequest.getDoctorName()),
+                    Criteria.where("zzjj.ch7tdoctor").is(postKfRequest.getDoctorName()),
+                    Criteria.where("zzjj.ch14tdoctor").is(postKfRequest.getDoctorName()),
+                    Criteria.where("zzjj.ch28tdoctor").is(postKfRequest.getDoctorName()),
+                    Criteria.where("zzjj.ch24tdoctor").is(postKfRequest.getDoctorName()),
+
+                    Criteria.where("jbzl.cyqpgdoctor").is(postKfRequest.getDoctorName()),
+                    Criteria.where("jbzl.ch7tdoctor").is(postKfRequest.getDoctorName()),
+                    Criteria.where("jbzl.ch14tdoctor").is(postKfRequest.getDoctorName()),
+                    Criteria.where("jbzl.ch28tdoctor").is(postKfRequest.getDoctorName()),
+                    Criteria.where("jbzl.ch24tdoctor").is(postKfRequest.getDoctorName()),
+
+                    Criteria.where("sskf.cyqpgdoctor").is(postKfRequest.getDoctorName()),
+                    Criteria.where("sskf.ch7tdoctor").is(postKfRequest.getDoctorName()),
+                    Criteria.where("sskf.ch14tdoctor").is(postKfRequest.getDoctorName()),
+                    Criteria.where("sskf.ch28tdoctor").is(postKfRequest.getDoctorName()),
+                    Criteria.where("sskf.ch24tdoctor").is(postKfRequest.getDoctorName()),
+
+                    Criteria.where("wcgnjt.cyqpgdoctor").is(postKfRequest.getDoctorName()),
+                    Criteria.where("wcgnjt.ch7tdoctor").is(postKfRequest.getDoctorName()),
+                    Criteria.where("wcgnjt.ch14tdoctor").is(postKfRequest.getDoctorName()),
+                    Criteria.where("wcgnjt.ch28tdoctor").is(postKfRequest.getDoctorName()),
+                    Criteria.where("wcgnjt.ch24tdoctor").is(postKfRequest.getDoctorName()),
+
+
+                    Criteria.where("nsj.cyqpgdoctor").is(postKfRequest.getDoctorName()),
+                    Criteria.where("nsj.ch7tdoctor").is(postKfRequest.getDoctorName()),
+                    Criteria.where("nsj.ch14tdoctor").is(postKfRequest.getDoctorName()),
+                    Criteria.where("nsj.ch28tdoctor").is(postKfRequest.getDoctorName()),
+                    Criteria.where("nsj.ch24tdoctor").is(postKfRequest.getDoctorName()),
+
+                    Criteria.where("ndl.cyqpgdoctor").is(postKfRequest.getDoctorName()),
+                    Criteria.where("ndl.ch7tdoctor").is(postKfRequest.getDoctorName()),
+                    Criteria.where("ndl.ch14tdoctor").is(postKfRequest.getDoctorName()),
+                    Criteria.where("ndl.ch28tdoctor").is(postKfRequest.getDoctorName()),
+                    Criteria.where("ndl.ch24tdoctor").is(postKfRequest.getDoctorName()),
+
+
+                    Criteria.where("rf.cyqpgdoctor").is(postKfRequest.getDoctorName()),
+                    Criteria.where("rf.ch7tdoctor").is(postKfRequest.getDoctorName()),
+                    Criteria.where("rf.ch14tdoctor").is(postKfRequest.getDoctorName()),
+                    Criteria.where("rf.ch28tdoctor").is(postKfRequest.getDoctorName()),
+                    Criteria.where("rf.ch24tdoctor").is(postKfRequest.getDoctorName()),
+
+                    Criteria.where("elyc.cyqpgdoctor").is(postKfRequest.getDoctorName()),
+                    Criteria.where("elyc.ch7tdoctor").is(postKfRequest.getDoctorName()),
+                    Criteria.where("elyc.ch14tdoctor").is(postKfRequest.getDoctorName()),
+                    Criteria.where("elyc.ch28tdoctor").is(postKfRequest.getDoctorName()),
+                    Criteria.where("elyc.ch24tdoctor").is(postKfRequest.getDoctorName()),
+
+
+                    Criteria.where("rxy.cyqpgdoctor").is(postKfRequest.getDoctorName()),
+                    Criteria.where("rxy.ch7tdoctor").is(postKfRequest.getDoctorName()),
+                    Criteria.where("rxy.ch14tdoctor").is(postKfRequest.getDoctorName()),
+                    Criteria.where("rxy.ch28tdoctor").is(postKfRequest.getDoctorName()),
+                    Criteria.where("rxy.ch24tdoctor").is(postKfRequest.getDoctorName()),
+
+
+                    Criteria.where("pdjss.cyqpgdoctor").is(postKfRequest.getDoctorName()),
+                    Criteria.where("pdjss.ch7tdoctor").is(postKfRequest.getDoctorName()),
+                    Criteria.where("pdjss.ch14tdoctor").is(postKfRequest.getDoctorName()),
+                    Criteria.where("pdjss.ch28tdoctor").is(postKfRequest.getDoctorName()),
+                    Criteria.where("pdjss.ch24tdoctor").is(postKfRequest.getDoctorName()),
+
+
+                    Criteria.where("fzjss.cyqpgdoctor").is(postKfRequest.getDoctorName()),
+                    Criteria.where("fzjss.ch7tdoctor").is(postKfRequest.getDoctorName()),
+                    Criteria.where("fzjss.ch14tdoctor").is(postKfRequest.getDoctorName()),
+                    Criteria.where("fzjss.ch28tdoctor").is(postKfRequest.getDoctorName()),
+                    Criteria.where("fzjss.ch24tdoctor").is(postKfRequest.getDoctorName()),
+
+                    Criteria.where("fp.cyqpgdoctor").is(postKfRequest.getDoctorName()),
+                    Criteria.where("fp.ch7tdoctor").is(postKfRequest.getDoctorName()),
+                    Criteria.where("fp.ch14tdoctor").is(postKfRequest.getDoctorName()),
+                    Criteria.where("fp.ch28tdoctor").is(postKfRequest.getDoctorName()),
+                    Criteria.where("fp.ch24tdoctor").is(postKfRequest.getDoctorName()),
+
+
+                    Criteria.where("cglhfl.cyqpgdoctor").is(postKfRequest.getDoctorName()),
+                    Criteria.where("cglhfl.ch7tdoctor").is(postKfRequest.getDoctorName()),
+                    Criteria.where("cglhfl.ch14tdoctor").is(postKfRequest.getDoctorName()),
+                    Criteria.where("cglhfl.ch28tdoctor").is(postKfRequest.getDoctorName()),
+                    Criteria.where("cglhfl.ch24tdoctor").is(postKfRequest.getDoctorName()),
+
+
+                    Criteria.where("bjyf.cyqpgdoctor").is(postKfRequest.getDoctorName()),
+                    Criteria.where("bjyf.ch7tdoctor").is(postKfRequest.getDoctorName()),
+                    Criteria.where("bjyf.ch14tdoctor").is(postKfRequest.getDoctorName()),
+                    Criteria.where("bjyf.ch28tdoctor").is(postKfRequest.getDoctorName()),
+                    Criteria.where("bjyf.ch24tdoctor").is(postKfRequest.getDoctorName())
+                    )
+
+            );
+        }
 
         if (StringUtils.isNotEmpty(postKfRequest.getQueryNo()))
         {
@@ -287,7 +395,7 @@ public class PostkfFaccade {
         query.addCriteria(Criteria.where("hospitalId").is(hospitalId));
 
         query.with(new Sort(Sort.Direction.DESC, "created"));
-        long count = mongoTemplate.count(query, DefectiveChildModel.class);
+        long count = mongoTemplate.count(query,"lyms_postkf");
         postKfRequest.mysqlBuild((int) count);
         query.skip(postKfRequest.getOffset()).limit(postKfRequest.getLimit());
         List<ChildbirthManagerQueryModel> datas = new LinkedList<>();