From 7cdef4eed5e2348a907cda6064630d9c94d8a673 Mon Sep 17 00:00:00 2001
From: yangfei <yangfei@lymsh.com>
Date: Fri, 25 Aug 2017 11:26:39 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=AC=E5=8A=9B=E8=AF=8A=E6=96=AD=E6=A8=A1?=
 =?UTF-8?q?=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/lyms/platform/common/enums/HighRiskEnum.java    | 2 +-
 .../java/com/lyms/platform/operate/web/controller/EarController.java  | 2 +-
 .../main/java/com/lyms/platform/operate/web/facade/BabyEarFacade.java | 4 +++-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/platform-common/src/main/java/com/lyms/platform/common/enums/HighRiskEnum.java b/platform-common/src/main/java/com/lyms/platform/common/enums/HighRiskEnum.java
index 5cdbe58..3e46bb1 100644
--- a/platform-common/src/main/java/com/lyms/platform/common/enums/HighRiskEnum.java
+++ b/platform-common/src/main/java/com/lyms/platform/common/enums/HighRiskEnum.java
@@ -27,7 +27,7 @@ public enum HighRiskEnum {
         if (id==0){
             return "";
         }
-        for (ConfirmedEnums cfEnums:ConfirmedEnums.values()){
+        for (HighRiskEnum cfEnums:HighRiskEnum.values()){
             if (id == cfEnums.getId()){
                 return cfEnums.getName();
             }
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 a67dac0..456652a 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
@@ -151,7 +151,7 @@ public class EarController extends BaseController {
         List<BabyPatientExtendEar> babyPatientExtendEars = babyPatientExtendEarService.queryBabyPatientExtendEar(earQuery);
         //是否听力建档
         if(CollectionUtils.isEmpty(babyPatientExtendEars)){
-            return new BaseResponse().setErrorcode(ErrorCodeConstants.NO_POWER).setErrormsg("当前儿童还未听力建档，不能进行听筛");
+            return new BaseResponse().setErrorcode(ErrorCodeConstants.NO_POWER).setErrormsg("当前儿童还未完善听力建档");
         }
 
         return  new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("查询成功");
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyEarFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyEarFacade.java
index b138132..1f9642f 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyEarFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyEarFacade.java
@@ -1545,9 +1545,11 @@ public class BabyEarFacade {
         screenQuery.setCheckHospitalIds(checkHospitalIds);
 
         //如果查询号不为空，根据查询号查询儿童档案表，获取儿童档案Id
-        if (StringUtils.isNotEmpty(earScreenListRequest.getKeyWord())) {//关键字：姓名、联系方式、就诊卡 查询babyId
+        if (StringUtils.isNotEmpty(earScreenListRequest.getKeyWord())||earScreenListRequest.getBirthStartTime()!=null||earScreenListRequest.getBirthEndTime()!=null) {//关键字：姓名、联系方式、就诊卡 查询babyId
             BabyModelQuery babyQuery = new BabyModelQuery();
             babyQuery.setQueryNo(earScreenListRequest.getKeyWord());
+            babyQuery.setBirthStart(earScreenListRequest.getBirthStartTime());
+            babyQuery.setBirthEnd(earScreenListRequest.getBirthEndTime());
             //查询建档记录
             List<BabyModel> models = babyBookbuildingService.queryBabyBuildByCond(babyQuery);
             if (CollectionUtils.isNotEmpty(models)) {
-- 
1.8.3.1