diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PatientsService.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PatientsService.java
index a2c929a..2ce0312 100644
--- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PatientsService.java
+++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PatientsService.java
@@ -89,6 +89,7 @@ public class PatientsService {
 
     public List<Patients> queryPatient(PatientsQuery patientsQuery) {
         MongoQuery query = patientsQuery.convertToQuery();
+        System.out.println(query.convertToMongoQuery().toString());
         if (StringUtils.isNotEmpty(patientsQuery.getNeed())) {
             patientsQuery.mysqlBuild(iPatientDao.queryPatientCount(query));
             query.start(patientsQuery.getOffset()).end(patientsQuery.getLimit());
diff --git a/platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java
index 114513c..8bf4a24 100644
--- a/platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java
+++ b/platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java
@@ -392,6 +392,20 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery {
     private Date firstCheckTimeStart;
     private Date firstCheckTimeEnd;
 
+    /**
+     * 是否有初诊医生
+     */
+    private String prodDoctor;
+
+    public String getProdDoctor() {
+        return prodDoctor;
+    }
+
+    public void setProdDoctor(String prodDoctor) {
+        this.prodDoctor = prodDoctor;
+    }
+    /**********************************************/
+
     public Boolean getIsSendCoupon() {
         return isSendCoupon;
     }
@@ -791,6 +805,13 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery {
         if (null != firstCheckId) {
             condition = condition.and("firstCheckId", firstCheckId, MongoOper.IS);
         }
+        if(null!=prodDoctor){
+            if("是".equals(prodDoctor)){
+                condition=condition.and("prodDoctor",null,MongoOper.NE);
+            }else {
+                condition=condition.and("prodDoctor",null,MongoOper.IS);
+            }
+        }
 
 
         Criteria c1 = null;
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java
index e5b85a2..8a50f48 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java
@@ -3588,18 +3588,26 @@ public class AntenatalExaminationFacade {
      * @param parentId
      * @return
      */
-    public String cap(Date date, String parentId) {
+    public String cap(Date date, String parentId,Integer hospitalId) {
+        int st=15;
+        int ed=20;
+        /**围场需求12-30孕周*/
+        if(null!=hospitalId&&hospitalId==2100001452){
+            st=12;
+            ed=30;
+        }
+        /****************/
         if (null == date) {
             return "0";
         }
         int day = DateUtil.getDays(date, new Date());
 //        int start = 15 * 7 + 3;
-        int start = 15 * 7;
+        int start = st * 7;
         if (his_version != null && "21".equals(his_version)) {
             start = 11 * 7;
         }
 
-        int end = 20 * 7 + 6;
+        int end = ed * 7 + 6;
         if (day >= start && day <= end) {
             SieveApplyOrderQuery sieveApplyOrderQuery = new SieveApplyOrderQuery();
             sieveApplyOrderQuery.setYn(YnEnums.YES.getId());
@@ -3856,7 +3864,8 @@ public class AntenatalExaminationFacade {
 
         antexListResult.convertToResult(list, patients, antExChulist);
         antexListResult.setData(handlAntData(antExChulist, list));
-        antexListResult.setIsSieve(cap(patients.getLastMenses(), patients.getId()));
+        //围场产筛12-30孕周  显示 申请产筛按钮  标记字段isSieve(cap方法增加了hospitalId 参数）
+        antexListResult.setIsSieve(cap(patients.getLastMenses(), patients.getId(),StringUtils.isNotEmpty(hospitalId)?Integer.valueOf(hospitalId):null));
         antexListResult.setRiskFactor(highScoreResult.getHighRisk());
         antexListResult.setRiskScore(highScoreResult.getScoreStr());
 
@@ -4189,7 +4198,7 @@ public class AntenatalExaminationFacade {
             antenatalExaminationResult.setQuickenRemark(examinationModel.getQuickenRemark());
             antenatalExaminationResult.setmHighRiskReason(mHighRiskReason);
 
-            antenatalExaminationResult.setIsSieve(cap(data, examinationModel.getParentId()));
+            antenatalExaminationResult.setIsSieve(cap(data, examinationModel.getParentId(),null));
             antenatalExaminationResult.setHasSieve(CollectionUtils.isEmpty(applyOrderService.querySieveApplyOrderWithQuery(applyOrderQuery)) ? 0 : 1);
 
             //  丰润字段的添加
@@ -4313,7 +4322,7 @@ public class AntenatalExaminationFacade {
                 applyOrderQuery.setParentId(antExChuModel.getParentId());
                 applyOrderQuery.setYn(YnEnums.YES.getId());
                 antexChuResult.setHasSieve(CollectionUtils.isEmpty(applyOrderService.querySieveApplyOrderWithQuery(applyOrderQuery)) ? 0 : 1);
-                antexChuResult.setIsSieve(cap(antExChuModel.getLastMenses(), antExChuModel.getParentId()));
+                antexChuResult.setIsSieve(cap(antExChuModel.getLastMenses(), antExChuModel.getParentId(),null));
 
                 Map <String, List <String>> treatmentOpinion2 = antExChuModel.getTreatmentOpinion2();
                 Map <String, List <Map <String, Object>>> restTreatmentOpinion2 = new HashMap <>();
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java
index fb47e81..41efa5f 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java
@@ -2456,6 +2456,7 @@ public class PatientFacade extends BaseServiceImpl {
         String hospitalId = autoMatchFacade.getHospitalId(patientManagerRequest.getOperatorId());
         PatientsQuery patientsQuery = new PatientsQuery();
         patientsQuery.setScreening(patientManagerRequest.getScreening());
+        patientsQuery.setProdDoctor(patientManagerRequest.getProdDoctor());
 
         patientsQuery.setYyzyfmHospitalId(patientManagerRequest.getYyzyfmHospitalId());
 
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PatientManagerRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PatientManagerRequest.java
index 22d3baa..a7db2ed 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PatientManagerRequest.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PatientManagerRequest.java
@@ -115,6 +115,20 @@ public class PatientManagerRequest extends BasePageQueryRequest {
     //空或者1为正常  2为补录
     private String normal;
 
+    /**
+     * 是否有初诊医生
+     */
+    private String prodDoctor;
+
+    public String getProdDoctor() {
+        return prodDoctor;
+    }
+
+    public void setProdDoctor(String prodDoctor) {
+        this.prodDoctor = prodDoctor;
+    }
+    /**********************************************/
+
     public String getNormal() {
         return normal;
     }