Commit 4a1cbbf9aa6d3b3e5837353d8ca3a80b7b9e928f

Authored by yangfei
1 parent a781bcb6c5

听力诊断模块

Showing 3 changed files with 12 additions and 12 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/EarController.java View file @ 4a1cbbf
... ... @@ -266,12 +266,7 @@
266 266 @ResponseBody
267 267 @TokenRequired
268 268 public BaseResponse checkHearingDiagnose (String babyId, HttpServletRequest request){
269   - //开发--跳过验证
270   - // if(StringUtils.isNotEmpty(babyId)){
271   - // //根据条件查询基础配置信息表
272   - // InitFollowUp aa = new InitFollowUp();
273   - // return aa.setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("查询成功");
274   - // }
  269 +
275 270 //获取当前登录用户ID
276 271 LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
277 272 if (loginState == null) {
... ... @@ -285,8 +280,9 @@
285 280 }
286 281  
287 282 BabyPatientExtendEarScreenQuery query = new BabyPatientExtendEarScreenQuery();
288   - query.setCheckHospitalId(hospitalId);
289   - query.setBabyId(babyId);
  283 + List<String> babyIds = babyEarFacade.getBabyIdsByItemOrg(babyId,hospitalId);
  284 +
  285 + query.setBabyIds((String[]) babyIds.toArray(new String[babyIds.size()]));
290 286 // d、本院:初筛未通过或复筛确诊
291 287 List<BabyPatientExtendEarScreen> screenList = screenService.queryBabyPatientExtendEarScreen(query);
292 288 if (screenList == null || screenList.size() == 0) {//没有听筛记录,查询转诊记录
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/FollowUpController.java View file @ 4a1cbbf
... ... @@ -79,12 +79,14 @@
79 79 if (loginState == null) {
80 80 return new BaseResponse().setErrorcode(ErrorCodeConstants.TOKEN_EXPIRE).setErrormsg("请重新登录");
81 81 }
  82 + //当前登录人医院Id
  83 + String hospitalId = autoMatchFacade.getHospitalId(loginState.getId());
82 84  
83 85 BabyPatientExtendEarFollowUpQuery query = new BabyPatientExtendEarFollowUpQuery();
84   - query.setBabyId(babyId);
  86 + List<String> babyIds = babyEarFacade.getBabyIdsByItemOrg(babyId,hospitalId);
  87 + query.setBabyIds((String[]) babyIds.toArray(new String[babyIds.size()]));
85 88 query.setSort("follow_time");
86   - //当前登录人医院Id
87   - String hospitalId = autoMatchFacade.getHospitalId(loginState.getId());
  89 +
88 90 List hospitalIds = babyEarFacade.getOrgHospitalIds(hospitalId);
89 91 query.setCheckHospitalIds((String[]) hospitalIds.toArray(new String[hospitalIds.size()]));
90 92  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/HearingDiagnoseController.java View file @ 4a1cbbf
... ... @@ -279,7 +279,9 @@
279 279 String hospitalId = autoMatchFacade.getHospitalId(loginState.getId());
280 280  
281 281 BabyPatientExtendEarHearingDiagnoseQuery query = new BabyPatientExtendEarHearingDiagnoseQuery();
282   - query.setBabyId(babyId);
  282 +
  283 + List<String> babyIds = babyEarFacade.getBabyIdsByItemOrg(babyId,hospitalId);
  284 + query.setBabyIds((String[]) babyIds.toArray(new String[babyIds.size()]));
283 285 query.setIfdel(0);
284 286 //查询听力转诊申请 // e、外院:有申请记录则允许进行新增听力筛查
285 287 HighriskChangeHospitalQuery hcQuery = new HighriskChangeHospitalQuery();