diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/FolviteController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/FolviteController.java index 60c2c29..eb1c95d 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/FolviteController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/FolviteController.java @@ -6,6 +6,7 @@ import com.lyms.platform.common.enums.YnEnums; import com.lyms.platform.common.result.BaseListResponse; import com.lyms.platform.common.result.BaseResponse; import com.lyms.platform.common.utils.DateUtil; +import com.lyms.platform.operate.web.facade.AutoMatchFacade; import com.lyms.platform.operate.web.service.FolviteService; import com.lyms.platform.permission.model.FolviteQuery; import com.lyms.platform.permission.model.FolviteRecordQuery; @@ -35,6 +36,9 @@ public class FolviteController extends BaseController { @Autowired private FolviteService folviteService; + @Autowired + private AutoMatchFacade autoMatchFacade; + /** * 查询or发放叶酸 * @@ -128,12 +132,15 @@ public class FolviteController extends BaseController { @Param("isconceive") Integer isconceive, @Param("receiveTime") String receiveTime, @Param("drawTime") String drawTime, - @Param("hospitalId") String hospitalId, @Param("page") Integer page, - @Param("limit") Integer limit) { + @Param("limit") Integer limit, + HttpServletRequest request) { FolviteRecordQuery query = new FolviteRecordQuery(); query.setYn(YnEnums.YES.getId()); + + String hospitalId = autoMatchFacade.getHospitalId(getUserId(request)); + if (StringUtils.isNotEmpty(hospitalId)) { query.setHospitalId(hospitalId); } @@ -188,19 +195,19 @@ public class FolviteController extends BaseController { @ResponseBody @TokenRequired public BaseResponse queryFolviteRecord(@Param("queryNo") String queryNo, - @Param("hospitalId") String hospitalId, @Param("receiveTime") String receiveTime, @Param("highRisk") String highRisk, @Param("page") Integer page, - @Param("limit") Integer limit) { + @Param("limit") Integer limit, + HttpServletRequest request) { FolviteQuery query = new FolviteQuery(); query.setYn(YnEnums.YES.getId()); if (StringUtils.isNotEmpty(queryNo)) { query.setQueryNo(queryNo); } - if (StringUtils.isNotEmpty(hospitalId)) { - query.setHospitalId(hospitalId); - } + + String hospitalId = autoMatchFacade.getHospitalId(getUserId(request)); + query.setHospitalId(hospitalId); if (StringUtils.isNotEmpty(receiveTime)) { try { query.setStartReceiveDate(DateUtil.getSNDate(receiveTime)[0]);