diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/EarController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/EarController.java index 6e46a16..c8ca27c 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/EarController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/EarController.java @@ -266,12 +266,7 @@ public class EarController extends BaseController { @ResponseBody @TokenRequired public BaseResponse checkHearingDiagnose (String babyId, HttpServletRequest request){ - //开发--跳过验证 - // if(StringUtils.isNotEmpty(babyId)){ - // //根据条件查询基础配置信息表 - // InitFollowUp aa = new InitFollowUp(); - // return aa.setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("查询成功"); - // } + //获取当前登录用户ID LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); if (loginState == null) { @@ -285,8 +280,9 @@ public class EarController extends BaseController { } BabyPatientExtendEarScreenQuery query = new BabyPatientExtendEarScreenQuery(); - query.setCheckHospitalId(hospitalId); - query.setBabyId(babyId); + List babyIds = babyEarFacade.getBabyIdsByItemOrg(babyId,hospitalId); + + query.setBabyIds((String[]) babyIds.toArray(new String[babyIds.size()])); // d、本院:初筛未通过或复筛确诊 List screenList = screenService.queryBabyPatientExtendEarScreen(query); if (screenList == null || screenList.size() == 0) {//没有听筛记录,查询转诊记录 diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/FollowUpController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/FollowUpController.java index f01b7fc..3753fc6 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/FollowUpController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/FollowUpController.java @@ -79,12 +79,14 @@ public class FollowUpController extends BaseController { if (loginState == null) { return new BaseResponse().setErrorcode(ErrorCodeConstants.TOKEN_EXPIRE).setErrormsg("请重新登录"); } + //当前登录人医院Id + String hospitalId = autoMatchFacade.getHospitalId(loginState.getId()); BabyPatientExtendEarFollowUpQuery query = new BabyPatientExtendEarFollowUpQuery(); - query.setBabyId(babyId); + List babyIds = babyEarFacade.getBabyIdsByItemOrg(babyId,hospitalId); + query.setBabyIds((String[]) babyIds.toArray(new String[babyIds.size()])); query.setSort("follow_time"); - //当前登录人医院Id - String hospitalId = autoMatchFacade.getHospitalId(loginState.getId()); + List hospitalIds = babyEarFacade.getOrgHospitalIds(hospitalId); query.setCheckHospitalIds((String[]) hospitalIds.toArray(new String[hospitalIds.size()])); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/HearingDiagnoseController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/HearingDiagnoseController.java index e4b76ab..71612d9 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/HearingDiagnoseController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/HearingDiagnoseController.java @@ -279,7 +279,9 @@ public class HearingDiagnoseController extends BaseController { String hospitalId = autoMatchFacade.getHospitalId(loginState.getId()); BabyPatientExtendEarHearingDiagnoseQuery query = new BabyPatientExtendEarHearingDiagnoseQuery(); - query.setBabyId(babyId); + + List babyIds = babyEarFacade.getBabyIdsByItemOrg(babyId,hospitalId); + query.setBabyIds((String[]) babyIds.toArray(new String[babyIds.size()])); query.setIfdel(0); //查询听力转诊申请 // e、外院:有申请记录则允许进行新增听力筛查 HighriskChangeHospitalQuery hcQuery = new HighriskChangeHospitalQuery();