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 84daed1..ad88822 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
@@ -115,6 +115,7 @@ public class EarController extends BaseController {
         BabyPatientExtendEarHearingDiagnoseQuery hdQuery = new BabyPatientExtendEarHearingDiagnoseQuery();
         hdQuery.setBabyIds((String[]) babyIds.toArray(new String[babyIds.size()]));
         hdQuery.setSort("diagnose_time");
+        hdQuery.setIfdel(0);
         List<BabyPatientExtendEarHearingDiagnose> hdList = hearingDiagnoseService.queryBabyPatientExtendEarHearingDiagnose(hdQuery);
 
         if (hdList == null && hdList.size() == 0) {
@@ -322,7 +323,7 @@ public class EarController extends BaseController {
         }
 
         query.setSort("screen_date");
-
+        query.setStatus(0);
         query.setBabyIds((String[]) babyIds.toArray(new String[babyIds.size()]));
         // d、本院：初筛未通过或复筛确诊
         List<BabyPatientExtendEarScreen> screenList = screenService.queryBabyPatientExtendEarScreen(query);
@@ -394,12 +395,17 @@ public class EarController extends BaseController {
             return new BaseResponse().setErrorcode(ErrorCodeConstants.TOKEN_EXPIRE).setErrormsg("请重新登录");
         }
         //医院id
-        String hospitalId = autoMatchFacade.getHospitalId(loginState.getId());
+        // String hospitalId = autoMatchFacade.getHospitalId(loginState.getId());
+
+        BabyModel babyModel = babyService.getOneBabyById(babyId);
+        String pid = babyModel.getPid();
+
 
         //根据医院id和儿童档案id获取听力筛查记录，获取一次初筛记录和最后一次复筛记录，将初筛和复筛的检测结果显示到转诊申请页。
         BabyPatientExtendEarScreenQuery query = new BabyPatientExtendEarScreenQuery();
-        query.setCheckHospitalId(hospitalId);
-        query.setBabyId(babyId);
+        // query.setCheckHospitalId(hospitalId);
+        query.setPid(pid);
+        // query.setBabyId(babyId);
         query.setStatus(0);
         query.setSort("screen_date");
         // d、本院：初筛未通过或复筛确诊
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 e8b5563..3c437b3 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
@@ -269,7 +269,7 @@ public class FollowUpController extends BaseController {
                 }
                 query.setBabyIds(babyIds.toArray(new String[babyIds.size()]));
             }else{
-                return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("没有找到数据");
+                return new FrontEndResult().setData(new ArrayList()).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("没有找到数据");
             }
         }
 
@@ -359,7 +359,7 @@ public class FollowUpController extends BaseController {
             query.setPids((String[]) pids.toArray(new String[pids.size()]));
         }
         if(CollectionUtils.isEmpty(pids)&&fur.getSource()!=null){
-            return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("没有找到数据");
+            return new FrontEndResult().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("没有找到数据");
         }
         List<BabyPatientExtendEarFollowUp> BabyPatientExtendEarFollowUpList = babyPatientExtendEarFollowUpService.queryBabyPatientExtendEarFollowUp(query);
         List<FollowUpListResult> fuResult = new ArrayList<>();
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/HearDiagnManageController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/HearDiagnManageController.java
index 122eb36..752c5ca 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/HearDiagnManageController.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/HearDiagnManageController.java
@@ -534,8 +534,8 @@ public class HearDiagnManageController extends BaseController {
                 hdQuery.setBabyId(babyId);
                 //根据babyId查询听力诊断，如果有数据则已诊断
                 int count = hearingDiagnoseService.queryBabyPatientExtendEarHearingDiagnoseCount(hdQuery);
-                hdm.setSecrType("复诊");
-                hdm.setSecrResult("未通过");
+                hdm.setSecrType(es.getScreenType()==1?"初筛":"复筛");
+                hdm.setSecrResult(es.getScrIspass()==1?"通过":"未通过");
                 if (count > 0) {//儿童在医院里做过听力诊断记录，标记为已诊断
                     hdm.setStatus("已诊断");
                     alrScreens.add(hdm);
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 62e4bd9..0383438 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
@@ -15,6 +15,7 @@ import com.lyms.platform.common.utils.DateUtil;
 import com.lyms.platform.operate.web.facade.AutoMatchFacade;
 import com.lyms.platform.operate.web.facade.BabyEarFacade;
 import com.lyms.platform.operate.web.request.HearingDiagnoseRequest;
+import com.lyms.platform.operate.web.result.FrontEndResult;
 import com.lyms.platform.operate.web.result.HearingDiagnoseListResult;
 import com.lyms.platform.permission.model.*;
 import com.lyms.platform.permission.service.*;
@@ -379,7 +380,7 @@ public class HearingDiagnoseController extends BaseController {
         if (StringUtils.isNotEmpty(hdReq.getKeyWord())) {//关键字：姓名、联系方式、就诊卡 查询babyId
             BabyPatientExtendEarBabyQuery babyQuery = new BabyPatientExtendEarBabyQuery();
             babyQuery.setQueryNo(hdReq.getKeyWord());
-            // babyQuery.setHospitalId(hospitalId);
+            babyQuery.setHospitalId(hospitalId);
             List<BabyPatientExtendEarBaby> models = earBabyService.queryBabyPatientExtendEarBaby(babyQuery);
             if (CollectionUtils.isNotEmpty(models)) {
                 List<String> babyIds = new ArrayList<>();
@@ -389,46 +390,53 @@ public class HearingDiagnoseController extends BaseController {
                 scrQuery.setBabyIds(babyIds.toArray(new String[babyIds.size()]));
                 query.setBabyIds(babyIds.toArray(new String[babyIds.size()]));
             } else {
-                return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("没有找到数据");
+                return new BaseListResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("没有找到数据");
             }
         }
 
-        scrQuery.setCreateHospitalId(hospitalId);
-        //本院听筛数据 复筛未通过-待诊断
-        List<String> babyIds = screenService.queryScrBabyIds(scrQuery);
+
+        //是否需要查询听筛数据
+        boolean isHdScr = true;
 
         if(CollectionUtils.isNotEmpty(pids)){
             query.setPids((String[]) pids.toArray(new String[pids.size()]));
         }
         if(CollectionUtils.isEmpty(pids)&&hdReq.getSource()!=null){
-            return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("没有找到数据");
+            return new FrontEndResult().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("没有找到数据");
         }
 
         if (hdReq.getDiagnoseStartTime() != null) {//诊断开始时间
             query.setDiagnoseStartTime(hdReq.getDiagnoseStartTime());
+            isHdScr = false;
         }
 
         if (hdReq.getDiagnoseEndTime() != null) {//诊断结束时间
             query.setDiagnoseEndTime(hdReq.getDiagnoseEndTime());
+            isHdScr = false;
         }
 
         if (hdReq.getDiagnDoctorId() != null) {//诊断医生
             query.setDiagnDoctorId(hdReq.getDiagnDoctorId());
+            isHdScr = false;
         }
 
 
         if (hdReq.getDiagnNextStartTime() != null) {//预约下次开始诊断时间
             query.setDiagnNextStartTime(hdReq.getDiagnNextStartTime());
+            isHdScr = false;
         }
 
         if (hdReq.getDiagnNextEndTime() != null) {//预约下次结束诊断时间
             query.setDiagnNextEndTime(hdReq.getDiagnNextEndTime());
+            isHdScr = false;
         }
 
         if (hdReq.getIsconfirm() != null) {//是否确诊 0-未确诊 1-确诊
             query.setIsconfirm(hdReq.getIsconfirm());
+            isHdScr = false;
         }
-        if (hdReq.getConfirmDegree() != null) {//模糊查询确诊程度
+        if (hdReq.getConfirmDegree() != null) {//查询确诊程度
+            isHdScr = false;
             List<String> cfList = new ArrayList<>();
             if (hdReq.getConfirmDegree() == 1) {//轻度
                 cfList.add(",1,");
@@ -453,7 +461,8 @@ public class HearingDiagnoseController extends BaseController {
             query.setConfirmResults(cfList.toArray(new String[cfList.size()]));
         }
 
-        if (hdReq.getConfirmResult() != null) {
+        if (hdReq.getConfirmResult() != null) {//确诊程度
+            isHdScr = false;
             List<String> cfList = new ArrayList<>();
             if (hdReq.getConfirmResult() == 1) {//轻度
                 cfList.add(",1,");
@@ -480,10 +489,12 @@ public class HearingDiagnoseController extends BaseController {
 
 
         if (hdReq.getConfirmStartTime() != null) {//确诊开始时间
+            isHdScr = false;
             query.setConfirmStartTime(hdReq.getConfirmStartTime());
         }
 
         if (hdReq.getConfirmEndTime() != null) {//确诊结束时间
+            isHdScr = false;
             query.setConfirmEndTime(hdReq.getConfirmEndTime());
         }
 
@@ -499,6 +510,14 @@ public class HearingDiagnoseController extends BaseController {
         List<HearingDiagnoseListResult> confiList = new ArrayList<>();
         //全部
         List<HearingDiagnoseListResult> hdrList = new ArrayList<>();
+        List<String> babyIds = new ArrayList<>();
+        //需要查询听筛数据
+        if(isHdScr){
+            scrQuery.setCreateHospitalId(hospitalId);
+            //本院听筛数据 复筛未通过-待诊断
+            babyIds = screenService.queryScrBabyIds(scrQuery);
+        }
+
 
         //添加已经诊断的数据
         for (BabyPatientExtendEarHearingDiagnose hd : hearingDiagnoseList) {
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 c7dc95a..309d3b2 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
@@ -1671,7 +1671,7 @@ public class BabyEarFacade {
 
 
     /**
-     * 刪除一個產曬
+     * 刪除听筛
      *
      * @return
      */