diff --git a/platform-dal/src/main/java/com/lyms/platform/query/LisCrisisItemQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/LisCrisisItemQuery.java index f7762a9..6057386 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/LisCrisisItemQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/LisCrisisItemQuery.java @@ -266,6 +266,11 @@ public class LisCrisisItemQuery extends BaseQuery implements IConvertToNativeQue if(StringUtils.isNotBlank(applyDoctorName)){ condition=condition.and("applyDoctorName",applyDoctorName,MongoOper.IS); } + + if(StringUtils.isNotBlank(hospitalId)){ + condition=condition.and("hospitalId",hospitalId,MongoOper.IS); + } + if(null!=status){ condition=condition.and("status",status,MongoOper.IS); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/LisCrisisItemController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/LisCrisisItemController.java index 180ed32..cd62f41 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/LisCrisisItemController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/LisCrisisItemController.java @@ -10,6 +10,7 @@ import com.lyms.platform.common.result.BaseObjectResponse; import com.lyms.platform.common.result.BaseResponse; import com.lyms.platform.common.result.CommonResult; import com.lyms.platform.common.utils.*; +import com.lyms.platform.operate.web.facade.AutoMatchFacade; import com.lyms.platform.pojo.LisCrisisItem; import com.lyms.platform.pojo.LisCrisisNotify; import com.lyms.platform.pojo.Patients; @@ -43,6 +44,10 @@ public class LisCrisisItemController extends BaseController { @Autowired private PatientsService patientsService; + @Autowired + private AutoMatchFacade autoMatchFacade; + + /** * 更新通知状态为已经查看 @@ -245,6 +250,8 @@ public class LisCrisisItemController extends BaseController { patientses = patientsService.queryPatient1(patientsQuery, "modified"); } + + LisCrisisItemQuery query = new LisCrisisItemQuery(); query.setPage(page); query.setLimit(limit); @@ -260,6 +267,14 @@ public class LisCrisisItemController extends BaseController { query.setItemName(refer); query.setApplyDoctorName(doctor); + Integer userId = getUserId(request); + if (userId != null) + { + String hospitalId = autoMatchFacade.getHospitalId(userId); + query.setHospitalId(hospitalId); + } + + if (CollectionUtils.isNotEmpty(patientses)) { List parentIds = new LinkedList<>(); for (Patients pa : patientses) {