diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/IndividualCaseController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/IndividualCaseController.java
index dd78286..d834db6 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/IndividualCaseController.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/IndividualCaseController.java
@@ -1,5 +1,8 @@
 package com.lyms.platform.operate.web.controller;
 
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -32,8 +35,8 @@ public class IndividualCaseController extends BaseController {
     @RequestMapping(method = RequestMethod.GET, value = "/highRiskList")
     @ResponseBody
     @TokenRequired
-    public BaseResponse highRiskList(String pid) {
-       return service.highRiskList(pid);
+    public BaseResponse highRiskList(String pid, HttpServletRequest request) {
+       return service.highRiskList(pid, getUserId(request));
     }
 
 
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/IndividualCaseService.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/IndividualCaseService.java
index b85f4e2..ef78c6a 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/IndividualCaseService.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/IndividualCaseService.java
@@ -10,5 +10,5 @@ public interface IndividualCaseService {
      * @param parentId
      * @return
      */
-    BaseResponse highRiskList(String parentId);
+    BaseResponse highRiskList(String parentId, Integer user);
 }
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/IndividualCaseServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/IndividualCaseServiceImpl.java
index c1adc2a..ec8027f 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/IndividualCaseServiceImpl.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/IndividualCaseServiceImpl.java
@@ -18,6 +18,7 @@ import com.lyms.platform.common.result.BaseResponse;
 import com.lyms.platform.common.utils.DateUtil;
 import com.lyms.platform.common.utils.JsonUtil;
 import com.lyms.platform.common.utils.StringUtils;
+import com.lyms.platform.operate.web.facade.AutoMatchFacade;
 import com.lyms.platform.operate.web.result.IndividualCaseResult;
 import com.lyms.platform.operate.web.service.IndividualCaseService;
 import com.lyms.platform.operate.web.utils.CollectionUtils;
@@ -48,6 +49,9 @@ public class IndividualCaseServiceImpl implements IndividualCaseService {
     @Autowired
     private OrganizationService organizationService;
 
+    @Autowired
+    private AutoMatchFacade autoMatchFacade;
+
     /**
      * 产前妊娠风险评估记录
      *
@@ -55,16 +59,16 @@ public class IndividualCaseServiceImpl implements IndividualCaseService {
      * @return
      */
     @Override
-    public BaseResponse highRiskList(String personId) {
-
+    public BaseResponse highRiskList(String personId, Integer userId) {
+        String orgId = autoMatchFacade.getHospitalId(userId);
         List<IndividualCaseResult> results = new LinkedList<>();
         List<PersonModel> personModels = mongoTemplate.find(Query.query(Criteria.where("id").is(personId)), PersonModel.class);
         if (CollectionUtils.isNotEmpty(personModels)) {
-            List<Patients> patients = mongoTemplate.find(Query.query(Criteria.where("pid").is(personId)).with(new Sort(Sort.Direction.ASC, "created")), Patients.class);
+            List<Patients> patients = mongoTemplate.find(Query.query(Criteria.where("pid").is(personId).and("hospitalId").is(orgId)).with(new Sort(Sort.Direction.DESC, "lastMenses")), Patients.class);
             if (CollectionUtils.isNotEmpty(patients)) {
                 Patients patient = patients.get(0);
                 String patientId = patient.getId();
-                List<AntExChuModel> antExChuModels = mongoTemplate.find(Query.query(Criteria.where("parentId").is(patientId)), AntExChuModel.class);
+                List<AntExChuModel> antExChuModels = mongoTemplate.find(Query.query(Criteria.where("parentId").is(patientId).and("hospitalId").is(orgId)), AntExChuModel.class);
                 if (CollectionUtils.isNotEmpty(antExChuModels)) {
                     AntExChuModel antExChuModel = antExChuModels.get(0);
                     String hospitalId = antExChuModel.getHospitalId();
@@ -74,7 +78,7 @@ public class IndividualCaseServiceImpl implements IndividualCaseService {
                     results.add(result);
 
                 }
-                List<AntenatalExaminationModel> antenatalExaminationModels = mongoTemplate.find(Query.query(Criteria.where("parentId").is(patientId)).with(new Sort(Sort.Direction.DESC, "created")), AntenatalExaminationModel.class);
+                List<AntenatalExaminationModel> antenatalExaminationModels = mongoTemplate.find(Query.query(Criteria.where("parentId").is(patientId).and("hospitalId").is(orgId)).with(new Sort(Sort.Direction.DESC, "created")), AntenatalExaminationModel.class);
                 if (CollectionUtils.isNotEmpty(antenatalExaminationModels)) {
                     for (AntenatalExaminationModel examinationModel : antenatalExaminationModels) {
                         String riskFactors = examinationModel.getRiskFactor();