diff --git a/platform-biz-service/src/main/resources/mainOrm/master/BabyPatientExtendEarHearingDiagnose.xml b/platform-biz-service/src/main/resources/mainOrm/master/BabyPatientExtendEarHearingDiagnose.xml index 7ebb124..4cab8d3 100644 --- a/platform-biz-service/src/main/resources/mainOrm/master/BabyPatientExtendEarHearingDiagnose.xml +++ b/platform-biz-service/src/main/resources/mainOrm/master/BabyPatientExtendEarHearingDiagnose.xml @@ -458,6 +458,13 @@ select id,baby_id,hospital_id,diagnose_time,high_factor,abr_left_dbnhl,abr_left_ and hospital_id = #{hospitalId,jdbcType=VARCHAR} + + and hospital_id in + + #{item} + + + and diagnose_time = #{diagnoseTime,jdbcType=TIMESTAMP} 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 796dec4..ff4c0bb 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 @@ -74,14 +74,37 @@ public class HearingDiagnoseController extends BaseController { */ @RequestMapping(method = RequestMethod.GET, value = "/getHearingDiagnose") @ResponseBody - public BaseResponse getHearingDiagnose(String babyId) { + public BaseResponse getHearingDiagnose(String babyId, HttpServletRequest request) { + //获取当前登录用户ID + LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); + if (loginState == null) { + return new BaseResponse().setErrorcode(ErrorCodeConstants.TOKEN_EXPIRE).setErrormsg("请重新登录"); + } + //当前登录人医院Id + String hospitalId = autoMatchFacade.getHospitalId(loginState.getId()); + BabyPatientExtendEarHearingDiagnoseQuery query = new BabyPatientExtendEarHearingDiagnoseQuery(); query.setBabyId(babyId); + //查询听力转诊申请 // e、外院:有申请记录则允许进行新增听力筛查 + HighriskChangeHospitalQuery hcQuery = new HighriskChangeHospitalQuery(); + hcQuery.setIntoOrgid(hospitalId); + hcQuery.setTargetId(babyId); + List hospitalIds = new ArrayList<>(); + hospitalIds.add(hospitalId); + List hchList = highchangeService.queryHighriskChangeHospital(hcQuery); + if(hchList.size()>0){ + for(HighriskChangeHospital h:hchList){ + hospitalIds.add(h.getOutOrgid()); + } + } + query.setCheckHospitalIds(hospitalIds); + List behdList = hearingDiagnoseService.queryBabyPatientExtendEarHearingDiagnose(query); List> list = new ArrayList<>(); for (BabyPatientExtendEarHearingDiagnose hd : behdList) { Map fuMap = new HashMap<>(); fuMap.put("id", hd.getId()); + fuMap.put("hospitalId", hd.getHospitalId()); fuMap.put("hdTime", DateUtil.getyyyy_MM_dd(hd.getDiagnoseTime())); list.add(fuMap); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/HighriskChangeHospitalController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/HighriskChangeHospitalController.java index f12e36d..05822a4 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/HighriskChangeHospitalController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/HighriskChangeHospitalController.java @@ -33,6 +33,9 @@ public class HighriskChangeHospitalController extends BaseController { @Autowired private AutoMatchFacade autoMatchFacade; + //转诊记录 + @Autowired + private HighriskChangeHospitalService highchangeService; @@ -86,6 +89,9 @@ public class HighriskChangeHospitalController extends BaseController { return new BaseResponse().setErrorcode(ErrorCodeConstants.TOKEN_EXPIRE).setErrormsg("请重新登录"); } //医院id + String hospitalId = autoMatchFacade.getHospitalId(loginState.getId()); + + //医院id List HighriskChangeHospitalList = highriskChangeHospitalService.queryHighriskChangeHospital(query); return FrontEndResult.ini().setData(HighriskChangeHospitalList).setPageInfo(query.getPageInfo()).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("查询成功"); }