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 85b873f..3f904fe 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
@@ -428,7 +428,11 @@ public class PatientFacade {
                         }
                     }
                 }
-                hospitalList.retainAll(orgId);
+                if (CollectionUtils.isEmpty(orgId)) {
+                    hospitalList = new ArrayList<>();
+                } else {
+                    hospitalList.retainAll(orgId);
+                }
             }
             patientsQuery.setHospitalList(hospitalList);
 
@@ -453,7 +457,11 @@ public class PatientFacade {
                         }
                     }
                 }
-                fmHospitalList.retainAll(orgId);
+                if (CollectionUtils.isEmpty(orgId)) {
+                    fmHospitalList = new ArrayList<>();
+                } else {
+                    fmHospitalList.retainAll(orgId);
+                }
             }
             if (com.lyms.platform.common.utils.StringUtils.isNotEmpty(riskPatientsQueryRequest.getFmHospital())) {
                 patientsQuery.setFmHospital(riskPatientsQueryRequest.getFmHospital());
@@ -487,7 +495,7 @@ public class PatientFacade {
                 }
                 //丙肝查询
                 if (StringUtils.contains(riskPatientsQueryRequest.getDiseaseType(), DiseaseTypeEnums.BINGGAN.getId())) {
-                    mongoCondits.add(new MongoCondition("bg", true, MongoOper.EXISTS).orCondition(new MongoCondition("bg","",MongoOper.NE)));
+                    mongoCondits.add(new MongoCondition("bg", true, MongoOper.EXISTS).orCondition(new MongoCondition("bg", "", MongoOper.NE)));
                 }
                 //梅毒查询
                 if (StringUtils.contains(riskPatientsQueryRequest.getDiseaseType(), DiseaseTypeEnums.MEIDU.getId())) {
@@ -601,7 +609,7 @@ public class PatientFacade {
         //查询符合条件的孕妇
         StopWatch stopWatch = new StopWatch("queryPatient1 -" + hospital);
         stopWatch.start();
-        List<Patients> patientses = patientsService.queryPatientBySort(patientsQuery, riskPatientsQueryRequest.getSort(),riskPatientsQueryRequest.getOrder());
+        List<Patients> patientses = patientsService.queryPatientBySort(patientsQuery, riskPatientsQueryRequest.getSort(), riskPatientsQueryRequest.getOrder());
         stopWatch.stop();
 
         logger.info(stopWatch.toString());
@@ -759,7 +767,7 @@ public class PatientFacade {
 
         //判断医院是否启动和对应的服务项是否启用
         SmsConfigModel configModel = new SmsConfigModel();
-        int startType  = smsConfigFacade.hospitalIsStart(hospitalId, configModel, SmsServiceEnums.YSGXHZD.getId());
+        int startType = smsConfigFacade.hospitalIsStart(hospitalId, configModel, SmsServiceEnums.YSGXHZD.getId());
         if (startType == 0) {
             BaseResponse objectResponse = new BaseResponse();
             objectResponse.setErrorcode(ErrorCodeConstants.NO_POWER);
@@ -1057,7 +1065,7 @@ public class PatientFacade {
                 String dueWeek = "";
                 try {
                     // 徐倩说改的
-                                        if (patients.getBookbuildingDate().getTime() - patients.getDueDate().getTime() > 0 && patients.getBuildType() == 2) {
+                    if (patients.getBookbuildingDate().getTime() - patients.getDueDate().getTime() > 0 && patients.getBuildType() == 2) {
 //                    if (patients.getBookbuildingDate().getTime() - patients.getFmDate().getTime() > 0 && patients.getBuildType() == 2) {
                         dueWeek = "已分娩";
                     } else {
@@ -1167,7 +1175,7 @@ public class PatientFacade {
                 patientManagerQueryModel.setpId(patients.getPid());
                 String dueWeek = "";
                 try {
-                     //  && patients.getBuildType() == 2
+                    //  && patients.getBuildType() == 2
                     if (patients.getBookbuildingDate().getTime() - patients.getDueDate().getTime() > 0) {
                         dueWeek = "已分娩";
                     } else {