jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 7cdef4eed5e2348a907cda6064630d9c94d8a673

Authored by yangfei
1 parent 18ab42724f
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

听力诊断模块

Showing 3 changed files with 5 additions and 3 deletions

platform-common/src/main/java/com/lyms/platform/common/enums/HighRiskEnum.java View file @ 7cdef4e
... ... @@ -27,7 +27,7 @@
27 27 if (id==0){
28 28 return "";
29 29 }
30   - for (ConfirmedEnums cfEnums:ConfirmedEnums.values()){
  30 + for (HighRiskEnum cfEnums:HighRiskEnum.values()){
31 31 if (id == cfEnums.getId()){
32 32 return cfEnums.getName();
33 33 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/EarController.java View file @ 7cdef4e
... ... @@ -151,7 +151,7 @@
151 151 List<BabyPatientExtendEar> babyPatientExtendEars = babyPatientExtendEarService.queryBabyPatientExtendEar(earQuery);
152 152 //是否听力建档
153 153 if(CollectionUtils.isEmpty(babyPatientExtendEars)){
154   - return new BaseResponse().setErrorcode(ErrorCodeConstants.NO_POWER).setErrormsg("当前儿童还未听力建档，不能进行听筛");
  154 + return new BaseResponse().setErrorcode(ErrorCodeConstants.NO_POWER).setErrormsg("当前儿童还未完善听力建档");
155 155 }
156 156  
157 157 return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("查询成功");
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyEarFacade.java View file @ 7cdef4e
... ... @@ -1545,9 +1545,11 @@
1545 1545 screenQuery.setCheckHospitalIds(checkHospitalIds);
1546 1546  
1547 1547 //如果查询号不为空，根据查询号查询儿童档案表，获取儿童档案Id
1548   - if (StringUtils.isNotEmpty(earScreenListRequest.getKeyWord())) {//关键字：姓名、联系方式、就诊卡 查询babyId
  1548 + if (StringUtils.isNotEmpty(earScreenListRequest.getKeyWord())||earScreenListRequest.getBirthStartTime()!=null||earScreenListRequest.getBirthEndTime()!=null) {//关键字：姓名、联系方式、就诊卡 查询babyId
1549 1549 BabyModelQuery babyQuery = new BabyModelQuery();
1550 1550 babyQuery.setQueryNo(earScreenListRequest.getKeyWord());
  1551 + babyQuery.setBirthStart(earScreenListRequest.getBirthStartTime());
  1552 + babyQuery.setBirthEnd(earScreenListRequest.getBirthEndTime());
1551 1553 //查询建档记录
1552 1554 List<BabyModel> models = babyBookbuildingService.queryBabyBuildByCond(babyQuery);
1553 1555 if (CollectionUtils.isNotEmpty(models)) {