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 dbc9e39..f3910ef 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
@@ -132,7 +132,7 @@ public class PatientsService {
             patientsQuery.mysqlBuild(iPatientDao.queryPatientCount(query));
             query.start(patientsQuery.getOffset()).end(patientsQuery.getLimit());
         }
-        System.out.println(query.convertToMongoQuery());
+       // System.out.println(query.convertToMongoQuery().toString());
         return iPatientDao.queryPatient(query.addOrder(Sort.Direction.fromString(sort), field));
     }
 
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 46984dd..9602dea 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
@@ -1329,10 +1329,10 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery {
             }
         }
         //高危颜色等级无标记查询
-        if (null != noRlevel) {
+        if (CollectionUtils.isNotEmpty(noRlevel)) {
             MongoCondition c = MongoCondition.newInstance();
-            MongoCondition con1 = MongoCondition.newInstance("riskLevelId", noRlevel, MongoOper.NIN);
-            MongoCondition con2 = MongoCondition.newInstance("riskLevelId", true, MongoOper.EXISTS);
+            MongoCondition con1 = MongoCondition.newInstance("riskLevelId", "[]", MongoOper.IS);
+            MongoCondition con2 = MongoCondition.newInstance("riskLevelId", false, MongoOper.EXISTS);
             if (c1 != null) {
                 c1 = c1.andOperator(c.orCondition(new MongoCondition[]{con1, con2}).getCriteria());
             } else {
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PatientServiceController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PatientServiceController.java
index 3325fb6..0f13e51 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PatientServiceController.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PatientServiceController.java
@@ -147,6 +147,7 @@ public class PatientServiceController extends BaseController {
         BaseResponse baseResponse = new BaseResponse();
         baseResponse.setErrorcode(ErrorCodeConstants.SUCCESS);
 
+        System.out.println(yxzhVO.getHospitalId()+"  HospitalId,"+yxzhVO.getIdno());
         try {
             PatientsQuery patientsQuery = new PatientsQuery();
             patientsQuery.setCardNo(yxzhVO.getIdno());
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 94054c7..f565218 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
@@ -274,6 +274,10 @@ public class PatientFacade extends BaseServiceImpl {
         patientsQuery.setType(type);
         if ("2100002419".equals(hospitalId)){
             patientsQuery.setHospitalId(hospitalId);
+            if (type!=3){
+                patientsQuery.setDtFm(true);
+            }
+
         }
 
 
@@ -375,7 +379,7 @@ public class PatientFacade extends BaseServiceImpl {
 
         } else {
             patientsQuery.setrLevel(riskPatientsQueryRequest.getrLevel());
-
+            patientsQuery.setIsHighRisk(isHighRisk);
         }
 
         patientsQuery.setLastMensesStart(riskPatientsQueryRequest.capEnd());
@@ -423,7 +427,7 @@ public class PatientFacade extends BaseServiceImpl {
 
         patientsQuery.setLimit(riskPatientsQueryRequest.getLimit());
         patientsQuery.setPage(riskPatientsQueryRequest.getPage());
-        patientsQuery.setIsHighRisk(isHighRisk);
+
         patientsQuery.setYn(YnEnums.YES.getId());
 //        patientsQuery.setBuildType(1);
         //0 未分娩建档 2 自动分娩类型 http://jira.healthbaby.com.cn/browse/WEB-639
@@ -743,7 +747,7 @@ public class PatientFacade extends BaseServiceImpl {
             riskPatientsQueryRequest.setSort("6");//按分娩时间排序
             riskPatientsQueryRequest.setOrder("1");//降序
             //以前逻辑
-           // System.out.println(patientsQuery.convertToQuery().convertToMongoQuery().toString());
+            System.out.println(patientsQuery.convertToQuery().convertToMongoQuery().toString());
             patientses = patientsService.queryPatientBySort(patientsQuery, riskPatientsQueryRequest.getSort(), riskPatientsQueryRequest.getOrder());
         }
         stopWatch.stop();