diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEarFollowUp.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEarFollowUp.java
index 5702aba..0d8476f 100644
--- a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEarFollowUp.java
+++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEarFollowUp.java
@@ -102,6 +102,10 @@ public class BabyPatientExtendEarFollowUp extends AbstracUuidEntity{
      */
     private String ifcloseStr;
     /**
+     * 结案结论
+     */
+    private String verdict;
+    /**
      * 医院ID
      */
     private String hospitalId;
@@ -135,6 +139,14 @@ public class BabyPatientExtendEarFollowUp extends AbstracUuidEntity{
         return isAudiphone;
     }
 
+    public String getVerdict() {
+        return verdict;
+    }
+
+    public void setVerdict(String verdict) {
+        this.verdict = verdict;
+    }
+
     public void setIsAudiphone(Integer isAudiphone) {
         this.isAudiphone = isAudiphone;
     }
diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEarFollowUpQuery.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEarFollowUpQuery.java
index 8384543..e7c6d2f 100644
--- a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEarFollowUpQuery.java
+++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEarFollowUpQuery.java
@@ -92,6 +92,10 @@ public class BabyPatientExtendEarFollowUpQuery extends BaseQuery {
      */
     private Integer ifclose;
     /**
+     * 结案结论
+     */
+    private String verdict;
+    /**
      * 医院ID
      */
     private String hospitalId;
@@ -151,6 +155,14 @@ public class BabyPatientExtendEarFollowUpQuery extends BaseQuery {
         this.isOperation = isOperation;
     }
 
+    public String getVerdict() {
+        return verdict;
+    }
+
+    public void setVerdict(String verdict) {
+        this.verdict = verdict;
+    }
+
     public Integer getIsArtifiCochlea() {
         return isArtifiCochlea;
     }
diff --git a/platform-biz-service/src/main/resources/mainOrm/master/BabyPatientExtendEarBaby.xml b/platform-biz-service/src/main/resources/mainOrm/master/BabyPatientExtendEarBaby.xml
index 3a3089e..baaf434 100644
--- a/platform-biz-service/src/main/resources/mainOrm/master/BabyPatientExtendEarBaby.xml
+++ b/platform-biz-service/src/main/resources/mainOrm/master/BabyPatientExtendEarBaby.xml
@@ -126,7 +126,7 @@ select id,name,sex,cardNo,birth,mname,mcert_type_id,mcert_no,mphone,vc_card_no,b
                 and (
                 name LIKE concat("%",#{queryNo,jdbcType=VARCHAR},"%")
                 or
-                mcertNo LIKE  concat("%",#{queryNo,jdbcType=VARCHAR},"%")
+                mcert_no LIKE  concat("%",#{queryNo,jdbcType=VARCHAR},"%")
                 or
                 mphone LIKE concat(#{queryNo,jdbcType=VARCHAR},"%")
                 or
diff --git a/platform-biz-service/src/main/resources/mainOrm/master/BabyPatientExtendEarFollowUp.xml b/platform-biz-service/src/main/resources/mainOrm/master/BabyPatientExtendEarFollowUp.xml
index b0bff74..5d380d5 100644
--- a/platform-biz-service/src/main/resources/mainOrm/master/BabyPatientExtendEarFollowUp.xml
+++ b/platform-biz-service/src/main/resources/mainOrm/master/BabyPatientExtendEarFollowUp.xml
@@ -25,6 +25,7 @@
         <result column="month_age" property="monthAge" jdbcType="INTEGER"/>
         <result column="ifdel" property="ifdel" jdbcType="INTEGER"/>
         <result column="ifclose" property="ifclose" jdbcType="INTEGER"/>
+        <result column="verdict" property="verdict" jdbcType="VARCHAR"/>
         <result column="hospital_id" property="hospitalId" jdbcType="VARCHAR"/>
         <result column="modify_time" property="modifyTime" jdbcType="TIMESTAMP"/>
         <result column="modify_id" property="modifyId" jdbcType="VARCHAR"/>
@@ -36,7 +37,7 @@
 
     <insert id="addBabyPatientExtendEarFollowUp"
             parameterType="com.lyms.platform.permission.model.BabyPatientExtendEarFollowUp">
-        insert into baby_patient_extend_ear_follow_up (id,baby_id,follow_time,follow_addr,mark_time,mark_result,mark_detail,follow_info,audiphone,operation,artifi_cochlea,is_audiphone,is_operation,is_artifi_cochlea,guide_opinion,follow_doctor_name,follow_doctor_id,next_time,month_age,ifdel,ifclose,hospital_id,modify_time,modify_id,create_time,create_id,enalble) values (#{id},#{babyId},#{followTime},#{followAddr},#{markTime},#{markResult},#{markDetail},#{followInfo},#{audiphone},#{operation},#{artifiCochlea},#{isAudiphone},#{isOperation},#{isArtifiCochlea},#{guideOpinion},#{followDoctorName},#{followDoctorId},#{nextTime},#{monthAge},#{ifdel},#{ifclose},#{hospitalId},#{modifyTime},#{modifyId},#{createTime},#{createId},#{enalble})
+        insert into baby_patient_extend_ear_follow_up (id,baby_id,follow_time,follow_addr,mark_time,mark_result,mark_detail,follow_info,audiphone,operation,artifi_cochlea,is_audiphone,is_operation,is_artifi_cochlea,guide_opinion,follow_doctor_name,follow_doctor_id,next_time,month_age,ifdel,ifclose,verdict,hospital_id,modify_time,modify_id,create_time,create_id,enalble) values (#{id},#{babyId},#{followTime},#{followAddr},#{markTime},#{markResult},#{markDetail},#{followInfo},#{audiphone},#{operation},#{artifiCochlea},#{isAudiphone},#{isOperation},#{isArtifiCochlea},#{guideOpinion},#{followDoctorName},#{followDoctorId},#{nextTime},#{monthAge},#{ifdel},#{ifclose},#{verdict},#{hospitalId},#{modifyTime},#{modifyId},#{createTime},#{createId},#{enalble})
     </insert>
 
 
@@ -104,6 +105,9 @@
             <if test="ifclose != null and ifclose >= 0">
                 ifclose = #{ifclose,jdbcType=INTEGER},
             </if>
+            <if test="verdict != null and verdict != ''">
+                verdict = #{verdict,jdbcType=VARCHAR},
+            </if>
             <if test="hospitalId != null and hospitalId != ''">
                 hospital_id = #{hospitalId,jdbcType=VARCHAR},
             </if>
@@ -134,7 +138,7 @@
 
     <select id="getBabyPatientExtendEarFollowUp" resultMap="BabyPatientExtendEarFollowUpResultMap"
             parameterType="java.lang.String">
-select id,baby_id,follow_time,follow_addr,mark_time,mark_result,mark_detail,follow_info,audiphone,operation,artifi_cochlea,is_audiphone,is_operation,is_artifi_cochlea,guide_opinion,follow_doctor_name,follow_doctor_id,next_time,month_age,ifdel,ifclose,hospital_id,modify_time,modify_id,create_time,create_id,enalble
+select id,baby_id,follow_time,follow_addr,mark_time,mark_result,mark_detail,follow_info,audiphone,operation,artifi_cochlea,is_audiphone,is_operation,is_artifi_cochlea,guide_opinion,follow_doctor_name,follow_doctor_id,next_time,month_age,ifdel,ifclose,verdict,hospital_id,modify_time,modify_id,create_time,create_id,enalble
  from baby_patient_extend_ear_follow_up where id = #{id,jdbcType=VARCHAR}
 </select>
 
@@ -184,7 +188,7 @@ select id,baby_id,follow_time,follow_addr,mark_time,mark_result,mark_detail,foll
                 and mark_time = #{markTime,jdbcType=TIMESTAMP}
             </if>
             <if test="markResult != null and markResult != ''">
-                and mark_result like concat("%,",#{markResult},",%")
+                and mark_result = #{markResult,jdbcType=VARCHAR}
             </if>
             <if test="markDetail != null and markDetail != ''">
                 and mark_detail = #{markDetail,jdbcType=VARCHAR}
@@ -227,10 +231,13 @@ select id,baby_id,follow_time,follow_addr,mark_time,mark_result,mark_detail,foll
             <if test="ifclose != null and ifclose >= 0">
                 and ifclose = #{ifclose,jdbcType=INTEGER}
             </if>
+            <if test="verdict != null and verdict != ''">
+                and verdict = #{verdict,jdbcType=VARCHAR}
+            </if>
             <if test="hospitalId != null and hospitalId != ''">
                 and hospital_id = #{hospitalId,jdbcType=VARCHAR}
             </if>
-            <if test="checkHospitalIds != null and checkHospitalIds != ''">
+            <if test="checkHospitalIds != null">
                 and hospital_id in
                 <foreach item="item" index="index" collection="checkHospitalIds" open="(" separator="," close=")">
                     #{item}
@@ -258,7 +265,7 @@ select id,baby_id,follow_time,follow_addr,mark_time,mark_result,mark_detail,foll
     <select id="queryBabyPatientExtendEarFollowUp" resultMap="BabyPatientExtendEarFollowUpResultMap"
             parameterType="com.lyms.platform.permission.model.BabyPatientExtendEarFollowUpQuery">
         select
-        id,baby_id,follow_time,follow_addr,mark_time,mark_result,mark_detail,follow_info,audiphone,operation,artifi_cochlea,guide_opinion,follow_doctor_name,follow_doctor_id,next_time,month_age,ifdel,ifclose,hospital_id,modify_time,modify_id,create_time,create_id,enalble
+        id,baby_id,follow_time,follow_addr,mark_time,mark_result,mark_detail,follow_info,audiphone,operation,artifi_cochlea,guide_opinion,follow_doctor_name,follow_doctor_id,next_time,month_age,ifdel,ifclose,verdict,hospital_id,modify_time,modify_id,create_time,create_id,enalble
         from baby_patient_extend_ear_follow_up
         <include refid="BabyPatientExtendEarFollowUpCondition"/>
         <include refid="orderAndLimit"/>
@@ -266,15 +273,12 @@ select id,baby_id,follow_time,follow_addr,mark_time,mark_result,mark_detail,foll
 
     <select id="queryBabyPatientExtendEarFollowUpCount" resultType="int"
             parameterType="com.lyms.platform.permission.model.BabyPatientExtendEarFollowUpQuery">
-        select count(1) from (
-        select * from baby_patient_extend_ear_follow_up
+        select count(1) from baby_patient_extend_ear_follow_up
         <include refid="BabyPatientExtendEarFollowUpCondition"/>
-        GROUP BY baby_id
-        ) bpef
     </select>
 
     <select id="queryBabyPatientExtendEarFollowUpByBaby" resultMap="BabyPatientExtendEarFollowUpResultMap" parameterType="com.lyms.platform.permission.model.BabyPatientExtendEarFollowUpQuery">
-        select id,baby_id,follow_time,follow_addr,mark_time,mark_result,mark_detail,follow_info,audiphone,operation,artifi_cochlea,is_audiphone,is_operation,is_artifi_cochlea,guide_opinion,follow_doctor_name,follow_doctor_id,next_time,ifdel,ifclose,hospital_id,modify_time,modify_id,create_time,create_id,enalble
+        select id,baby_id,follow_time,follow_addr,mark_time,mark_result,mark_detail,follow_info,audiphone,operation,artifi_cochlea,is_audiphone,is_operation,is_artifi_cochlea,guide_opinion,follow_doctor_name,follow_doctor_id,next_time,ifdel,ifclose,verdict,hospital_id,modify_time,modify_id,create_time,create_id,enalble
         from baby_patient_extend_ear_follow_up
 
         <where>
diff --git a/platform-biz-service/src/main/resources/mainOrm/master/BabyPatientExtendEarScreen.xml b/platform-biz-service/src/main/resources/mainOrm/master/BabyPatientExtendEarScreen.xml
index b013d7f..55854fb 100644
--- a/platform-biz-service/src/main/resources/mainOrm/master/BabyPatientExtendEarScreen.xml
+++ b/platform-biz-service/src/main/resources/mainOrm/master/BabyPatientExtendEarScreen.xml
@@ -322,6 +322,9 @@ select id,baby_id,screen_type,check_hospital_id,screen_date,high_risk_cause,oae_
                     #{item}
                 </foreach>
             </if>
+            <if test="checkHospitalId != null and checkHospitalId != ''">
+                and check_hospital_id = #{checkHospitalId,jdbcType=VARCHAR}
+            </if>
 
             <if test="babyIds!=null">
                 and baby_id in (
diff --git a/platform-common/src/main/java/com/lyms/platform/common/enums/SourceEnums.java b/platform-common/src/main/java/com/lyms/platform/common/enums/SourceEnums.java
index 825929d..a0fac7c 100644
--- a/platform-common/src/main/java/com/lyms/platform/common/enums/SourceEnums.java
+++ b/platform-common/src/main/java/com/lyms/platform/common/enums/SourceEnums.java
@@ -8,7 +8,7 @@ package com.lyms.platform.common.enums;
 public enum SourceEnums {
     ISJA(1, "本院"),
     ALL(4, "全部"),
-    ISWJA(2, "*医院");
+    ISWJA(2, "外院");
     private int id;
     private String name;
 
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 c576b47..5ae006f 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
@@ -304,11 +304,14 @@ public class FollowUpController extends BaseController {
             outOrgids.add(hospitalId);
         }
 
+        if(CollectionUtils.isEmpty(outOrgids)){
+            return FrontEndResult.ini().setData(new ArrayList()).setPageInfo(query.getPageInfo()).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("查询成功");
+        }
+
         query.setCheckHospitalIds((String[]) outOrgids.toArray(new String[outOrgids.size()]));
 
         query.setKeyword(fur.getKeyWord());
 
-        // query.setMarkResult(fur.getMarkResult());
         query.setIfclose(fur.getIfclose());
 
         StringBuffer sqlStr = new StringBuffer();
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 da1f3fe..391b7d5 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
@@ -310,7 +310,7 @@ public class HearingDiagnoseController extends BaseController {
         //医院ID 集合。本院、外院、全部...
         List<String> outOrgids = new ArrayList<>();
         if (hdReq.getSource() != null) {
-            if (hdReq.getSource() == 2) {//2.转诊过来的医院、
+            if (hdReq.getSource() == 2) {//2.外院
                 //转诊过来的医院id
                 HighriskChangeHospitalQuery hchQuery = new HighriskChangeHospitalQuery();
                 hchQuery.setTargetType(2);//儿童
@@ -340,15 +340,12 @@ public class HearingDiagnoseController extends BaseController {
                 hchQuery.setIntoOrgid(hospitalId);
                 List<HighriskChangeHospital> hchList = highchangeService.queryHighriskChangeHospital(hchQuery);
                 if (hchList != null && hchList.size() > 0) {
-                    for (HighriskChangeHospital hch : hchList) {//如果存在则修改转诊记录状态为接收
+                    for (HighriskChangeHospital hch : hchList) {
                         outOrgids.add(hch.getOutOrgid());
                     }
                 }
             }
         } else {
-            //当前登录人区域医院Id
-            List hospiIds = babyEarFacade.getOrgHospitalIds(hospitalId);
-            outOrgids.addAll(hospiIds);
             //当前医院
             outOrgids.add(hospitalId);
         }
@@ -484,7 +481,22 @@ public class HearingDiagnoseController extends BaseController {
             hd.setBabyId(babyIds.get(i));
             int index1 = Collections.binarySearch(hearingDiagnoseList, hd, new MyComparator());
             HearingDiagnoseListResult hea = new HearingDiagnoseListResult();
+            BabyModel babyModel = babyService.getOneBabyById(hd.getBabyId());
+            if (babyModel != null) {
+                hea.setBabyName(babyModel.getName());
+                hea.setBabyId(hd.getBabyId());
+                hea.setMommyName(com.lyms.platform.common.utils.StringUtils.emptyDeal(babyModel.getMname()));
+                hea.setMommnyPhone(com.lyms.platform.common.utils.StringUtils.emptyDeal(babyModel.getMphone()));
+                hea.setMommnyEncryptPhone(com.lyms.platform.common.utils.StringUtils.encryPhone(babyModel.getMphone()));
+                hea.setMonthAge(DateUtil.getBabyMonthAge(babyModel.getBirth(), new Date()));
+                hea.setBirthday(com.lyms.platform.common.utils.StringUtils.emptyDeal(DateUtil.getyyyy_MM_dd(babyModel.getBirth())));
+                hea.setSex(com.lyms.platform.common.utils.StringUtils.emptyDeal(SexEnum.getTextById(babyModel.getSex())));
+            }
             if (index1 < 0) {
+                //全部
+                hdrList.add(hea);
+                //待诊断
+                waitConfiList.add(hea);
                 continue;
             }
             if (index1 >= 0) {
@@ -532,17 +544,7 @@ public class HearingDiagnoseController extends BaseController {
                     hea.setDiagnResult(hdSb.toString());
                 }
             }
-            BabyModel babyModel = babyService.getOneBabyById(hd.getBabyId());
-            if (babyModel != null) {
-                hea.setBabyName(babyModel.getName());
-                hea.setBabyId(hd.getBabyId());
-                hea.setMommyName(com.lyms.platform.common.utils.StringUtils.emptyDeal(babyModel.getMname()));
-                hea.setMommnyPhone(com.lyms.platform.common.utils.StringUtils.emptyDeal(babyModel.getMphone()));
-                hea.setMommnyEncryptPhone(com.lyms.platform.common.utils.StringUtils.encryPhone(babyModel.getMphone()));
-                hea.setMonthAge(DateUtil.getBabyMonthAge(babyModel.getBirth(), new Date()));
-                hea.setBirthday(com.lyms.platform.common.utils.StringUtils.emptyDeal(DateUtil.getyyyy_MM_dd(babyModel.getBirth())));
-                hea.setSex(com.lyms.platform.common.utils.StringUtils.emptyDeal(SexEnum.getTextById(babyModel.getSex())));
-            }
+
             //诊断结果，肯定是有诊断记录
             if (hdReq.getConfirmResult() != null || hdReq.getConfirmDegree() != null) {
                 // 1、已诊断、2、待诊断、0、全部
@@ -727,6 +729,7 @@ public class HearingDiagnoseController extends BaseController {
         hchQuery.setTargetType(2);
         hchQuery.setTargetId(obj.getBabyId());
         hchQuery.setIntoOrgid(hospitalId);
+        hchQuery.setStatus(1);
         List<HighriskChangeHospital> hchList = highchangeService.queryHighriskChangeHospital(hchQuery);
         if (hchList != null && hchList.size() > 0) {
             for (HighriskChangeHospital hch : hchList) {//如果存在则修改转诊记录状态为接收
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 939408d..ebbff2c 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
@@ -522,7 +522,6 @@ public class HighriskChangeHospitalController extends BaseController {
         if (StringUtil.isBlank(obj.getTargetId())) {
             return new BaseResponse().setErrorcode(ErrorCodeConstants.PARAMETER_ERROR).setErrormsg("请传入儿童档案id");
         }
-        obj.setApplyDoctorid(String.valueOf(loginState.getId()));
         obj.setId(UUID.randomUUID().toString().replace("-", ""));
         obj.setTargetType(2);//儿童
         obj.setCreateTime(new Date());
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 1b25698..5ec5b2d 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
@@ -196,12 +196,10 @@ public class BabyEarFacade {
 
         //建立儿童隐藏档案
         if (babyModel != null) {
-            if (babyModel.getYn() != YnEnums.YES.getId()) {
-                babyModel.setYn(YnEnums.YES.getId());
-                babyModel.setModified(new Date());
-                babyModel.setEnable("1");
-                babyService.updateOneBaby(babyModel, babyId);
-            }
+            babyModel.setYn(YnEnums.YES.getId());
+            babyModel.setModified(new Date());
+            babyModel.setEnable("1");
+            babyService.updateOneBaby(babyModel, babyId);
         }
 
         BabyPatientExtendEarQuery earQuery = new BabyPatientExtendEarQuery();
@@ -1637,9 +1635,7 @@ public class BabyEarFacade {
         screenQuery.setNextEndTime(earScreenListRequest.getNextEndTime());
         //当前登录人医院Id
         String hospitalId = autoMatchFacade.getHospitalId(userId);
-        List hospitalIds = getOrgHospitalIds(hospitalId);
-        String[] checkHospitalIds = (String[]) hospitalIds.toArray(new String[hospitalIds.size()]);
-        screenQuery.setCheckHospitalIds(checkHospitalIds);
+        screenQuery.setCheckHospitalId(hospitalId);
 
         //如果查询号不为空，根据查询号查询儿童档案表，获取儿童档案Id
         if (StringUtils.isNotEmpty(earScreenListRequest.getKeyWord()) || earScreenListRequest.getBirthStartTime() != null || earScreenListRequest.getBirthEndTime() != null) {//关键字：姓名、联系方式、就诊卡 查询babyId
@@ -1669,7 +1665,7 @@ public class BabyEarFacade {
             BabyModel babyModel = babyService.getOneBabyById(earScreen.getBabyId());
             if (babyModel != null) {
                 screenResult.setBabyName(babyModel.getName());
-                screenResult.setMommyName(babyModel.getName());
+                screenResult.setMommyName(babyModel.getMname());
                 screenResult.setSex(SexEnum.getTextById(babyModel.getSex()));
                 screenResult.setMonthAge(DateUtil.getBabyMonthAge(babyModel.getBirth(), earScreen.getScreenDate()));
                 screenResult.setBirthday(DateUtil.getyyyy_MM_dd(babyModel.getBirth()));