From 32113a9c331765134cc499c5fdc6938b59c9b273 Mon Sep 17 00:00:00 2001
From: yangfei <yangfei@lymsh.com>
Date: Fri, 18 Aug 2017 16:04:14 +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

---
 .../model/BabyPatientExtendEarBirthQuery.java      | 474 ++++++++++-----------
 .../model/BabyPatientExtendEarFamilyQuery.java     | 105 ++---
 .../model/BabyPatientExtendEarScreenQuery.java     |   7 +-
 .../mainOrm/master/BabyPatientExtendEar.xml        |   2 +-
 .../web/controller/HearDiagnManageController.java  |  37 +-
 .../web/controller/HearingDiagnoseController.java  |   2 +-
 .../operate/web/facade/AntExRecordFacade.java      |   9 +-
 .../platform/operate/web/facade/BabyEarFacade.java |  14 +-
 .../platform/operate/web/request/BabyEarBase.java  |  16 +-
 .../operate/web/result/BabyEarArchivesResult.java  |  40 +-
 10 files changed, 349 insertions(+), 357 deletions(-)

diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEarBirthQuery.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEarBirthQuery.java
index 7acd96d..99e43b2 100644
--- a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEarBirthQuery.java
+++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEarBirthQuery.java
@@ -3,481 +3,481 @@ package com.lyms.platform.permission.model;
 
 import com.lyms.platform.common.dao.BaseQuery;
 
-import java.util.Date;
+import java.math.BigDecimal;
 
 
 public class BabyPatientExtendEarBirthQuery extends BaseQuery
 {
     private String id;
+    /**
+     * 胎次
+     */
     private Integer fetuNumber;
+
+    /**
+     * 产次
+     */
     private Integer productNumber;
-    private Double birthWeight;
+
+    /**
+     * 出生体重
+     */
+    private BigDecimal birthWeight;
+
+    /**
+     * 胎数
+     */
+    private String tireNumber;
+
+    /**
+     * 分娩方式
+     */
     private Integer parturitionType;
+
+    /**
+     * 出生缺陷类型: 1=有 -1=无
+     */
     private Integer birthDefectType;
+
+    /**
+     * 出生缺陷描述
+     */
     private String birthDefectDesc;
+
+    /**
+     * 胎儿窘迫： 1=有 -1=无
+     */
     private Integer fetuEmbarrasType;
-    private Double apgarScoreOne;
-    private Double apgarScoreFive;
-    private Double apgarScoreTen;
+
+    /**
+     * 一分钟apgar评分
+     */
+    private BigDecimal apgarScoreOne;
+
+    /**
+     * 五分钟apgar评分
+     */
+    private BigDecimal apgarScoreFive;
+
+    /**
+     * 十分钟apgar评分
+     */
+    private BigDecimal apgarScoreTen;
+    /**
+     * 胎儿窘迫 不详（单选） 1-选中
+     */
+    private Integer fetuEmbarras;
+
+    /**
+     * 产伤类型： 1=有 -1=无
+     */
     private Integer birthInjuryType;
+
+    /**
+     * 产伤部位
+     */
     private String birthInjuryPosition;
+
+    /**
+     * 羊水类型： 1= I度 2=II度 3=III度
+     */
     private Integer amnioticFluidType;
+
+    /**
+     * 异常分娩 1=有 -1=无
+     */
     private Integer abnormalParturitionType;
-    private String abnormalParturitionPosition;
+
+    /**
+     * 异常分娩部位 1=臀部 2=脐带绕颈 3=胎膜早破
+     */
+    private Integer abnormalParturitionPosition;
+
+    /**
+     * 头颅、五观是否畸形 1=有 -1=无
+     */
     private Integer deformityType;
+
+    /**
+     * 畸形部位
+     */
     private String deformityPosition;
+
+    /**
+     * 出生后感染 1=有 -1=无
+     */
     private Integer birthInfectionType;
+
+    /**
+     * 出生后感染病因
+     */
     private String birthInfectionCause;
+
+    /**
+     * 出生后感染病程
+     */
     private String birthCourseDisease;
+
+    /**
+     * 出生后患病 1=有 -1=无
+     */
     private Integer birthIllType;
+
+    /**
+     * 出生后患病病因
+     */
     private String birthIllCause;
+
+    /**
+     * 出生后患病病程
+     */
     private String birthIllDisease;
+
+    /**
+     * 头部外伤史  1=有 -1=无
+     */
     private Integer headTraumaHistory;
+    /**
+     * 头部外伤史详述
+     */
     private String headTraumaDesc;
+
+    /**
+     * 耳毒性药物应用史  1=有 -1=无
+     */
     private Integer earPoisonType;
-    private String earPoisonName;
-    private String earPoisonNumber;
-    private String earPoisonCourse;
+
+    /**
+     * 药名信息（[{earPoisonName:药名，earPoisonNumber:计量，earPoisonCourse：疗程}]）
+     */
+    private String earPoisonMap;
+
+    /**
+     * 中耳炎史 1=有 -1=无
+     */
     private Integer tympanitisType;
+    /**
+     * 中耳炎史详述
+     */
     private String tympanitisDesc;
+
+    /**
+     * nicu 1=有 -1=无
+     */
     private Integer nicuType;
+    /**
+     * nicu原因
+     */
     private String nicuCause;
+    /**
+     * nicu持续时间
+     */
     private String nicuContinuedDate;
+
+    /**
+     * 呼吸机使用 1=有 -1=无
+     */
     private Integer respiratorType;
+    /**
+     * 呼吸机使用的持续时间
+     */
     private String respiratorContinuedDate;
+    /**
+     * 对外界声音和其他感官刺激的反应 1=灵敏 2=迟钝
+     */
     private Integer outsideResponse;
+
+    /**
+     * 所属建档的id
+     */
     private String babyPatientId;
 
-    public String getId()
-    {
+    public String getId() {
         return id;
     }
 
-
-    public void setId(String id)
-    {
+    public void setId(String id) {
         this.id = id;
-
     }
 
-    public Integer getFetuNumber()
-    {
+    public Integer getFetuNumber() {
         return fetuNumber;
     }
 
-
-    public void setFetuNumber(Integer fetuNumber)
-    {
+    public void setFetuNumber(Integer fetuNumber) {
         this.fetuNumber = fetuNumber;
-
     }
 
-    public Integer getProductNumber()
-    {
+    public Integer getProductNumber() {
         return productNumber;
     }
 
-
-    public void setProductNumber(Integer productNumber)
-    {
+    public void setProductNumber(Integer productNumber) {
         this.productNumber = productNumber;
-
     }
 
-    public Double getBirthWeight()
-    {
+    public BigDecimal getBirthWeight() {
         return birthWeight;
     }
 
-
-    public void setBirthWeight(Double birthWeight)
-    {
+    public void setBirthWeight(BigDecimal birthWeight) {
         this.birthWeight = birthWeight;
+    }
 
+    public String getTireNumber() {
+        return tireNumber;
     }
 
-    public Integer getParturitionType()
-    {
-        return parturitionType;
+    public void setTireNumber(String tireNumber) {
+        this.tireNumber = tireNumber;
     }
 
+    public Integer getParturitionType() {
+        return parturitionType;
+    }
 
-    public void setParturitionType(Integer parturitionType)
-    {
+    public void setParturitionType(Integer parturitionType) {
         this.parturitionType = parturitionType;
-
     }
 
-    public Integer getBirthDefectType()
-    {
+    public Integer getBirthDefectType() {
         return birthDefectType;
     }
 
-
-    public void setBirthDefectType(Integer birthDefectType)
-    {
+    public void setBirthDefectType(Integer birthDefectType) {
         this.birthDefectType = birthDefectType;
-
     }
 
-    public String getBirthDefectDesc()
-    {
+    public String getBirthDefectDesc() {
         return birthDefectDesc;
     }
 
-
-    public void setBirthDefectDesc(String birthDefectDesc)
-    {
+    public void setBirthDefectDesc(String birthDefectDesc) {
         this.birthDefectDesc = birthDefectDesc;
-
     }
 
-    public Integer getFetuEmbarrasType()
-    {
+    public Integer getFetuEmbarrasType() {
         return fetuEmbarrasType;
     }
 
-
-    public void setFetuEmbarrasType(Integer fetuEmbarrasType)
-    {
+    public void setFetuEmbarrasType(Integer fetuEmbarrasType) {
         this.fetuEmbarrasType = fetuEmbarrasType;
-
     }
 
-    public Double getApgarScoreOne()
-    {
+    public BigDecimal getApgarScoreOne() {
         return apgarScoreOne;
     }
 
-
-    public void setApgarScoreOne(Double apgarScoreOne)
-    {
+    public void setApgarScoreOne(BigDecimal apgarScoreOne) {
         this.apgarScoreOne = apgarScoreOne;
-
     }
 
-    public Double getApgarScoreFive()
-    {
+    public BigDecimal getApgarScoreFive() {
         return apgarScoreFive;
     }
 
-
-    public void setApgarScoreFive(Double apgarScoreFive)
-    {
+    public void setApgarScoreFive(BigDecimal apgarScoreFive) {
         this.apgarScoreFive = apgarScoreFive;
-
     }
 
-    public Double getApgarScoreTen()
-    {
+    public BigDecimal getApgarScoreTen() {
         return apgarScoreTen;
     }
 
-
-    public void setApgarScoreTen(Double apgarScoreTen)
-    {
+    public void setApgarScoreTen(BigDecimal apgarScoreTen) {
         this.apgarScoreTen = apgarScoreTen;
+    }
 
+    public Integer getFetuEmbarras() {
+        return fetuEmbarras;
     }
 
-    public Integer getBirthInjuryType()
-    {
-        return birthInjuryType;
+    public void setFetuEmbarras(Integer fetuEmbarras) {
+        this.fetuEmbarras = fetuEmbarras;
     }
 
+    public Integer getBirthInjuryType() {
+        return birthInjuryType;
+    }
 
-    public void setBirthInjuryType(Integer birthInjuryType)
-    {
+    public void setBirthInjuryType(Integer birthInjuryType) {
         this.birthInjuryType = birthInjuryType;
-
     }
 
-    public String getBirthInjuryPosition()
-    {
+    public String getBirthInjuryPosition() {
         return birthInjuryPosition;
     }
 
-
-    public void setBirthInjuryPosition(String birthInjuryPosition)
-    {
+    public void setBirthInjuryPosition(String birthInjuryPosition) {
         this.birthInjuryPosition = birthInjuryPosition;
-
     }
 
-    public Integer getAmnioticFluidType()
-    {
+    public Integer getAmnioticFluidType() {
         return amnioticFluidType;
     }
 
-
-    public void setAmnioticFluidType(Integer amnioticFluidType)
-    {
+    public void setAmnioticFluidType(Integer amnioticFluidType) {
         this.amnioticFluidType = amnioticFluidType;
-
     }
 
-    public Integer getAbnormalParturitionType()
-    {
+    public Integer getAbnormalParturitionType() {
         return abnormalParturitionType;
     }
 
-
-    public void setAbnormalParturitionType(Integer abnormalParturitionType)
-    {
+    public void setAbnormalParturitionType(Integer abnormalParturitionType) {
         this.abnormalParturitionType = abnormalParturitionType;
-
     }
 
-    public String getAbnormalParturitionPosition()
-    {
+    public Integer getAbnormalParturitionPosition() {
         return abnormalParturitionPosition;
     }
 
-
-    public void setAbnormalParturitionPosition(String abnormalParturitionPosition)
-    {
+    public void setAbnormalParturitionPosition(Integer abnormalParturitionPosition) {
         this.abnormalParturitionPosition = abnormalParturitionPosition;
-
     }
 
-    public Integer getDeformityType()
-    {
+    public Integer getDeformityType() {
         return deformityType;
     }
 
-
-    public void setDeformityType(Integer deformityType)
-    {
+    public void setDeformityType(Integer deformityType) {
         this.deformityType = deformityType;
-
     }
 
-    public String getDeformityPosition()
-    {
+    public String getDeformityPosition() {
         return deformityPosition;
     }
 
-
-    public void setDeformityPosition(String deformityPosition)
-    {
+    public void setDeformityPosition(String deformityPosition) {
         this.deformityPosition = deformityPosition;
-
     }
 
-    public Integer getBirthInfectionType()
-    {
+    public Integer getBirthInfectionType() {
         return birthInfectionType;
     }
 
-
-    public void setBirthInfectionType(Integer birthInfectionType)
-    {
+    public void setBirthInfectionType(Integer birthInfectionType) {
         this.birthInfectionType = birthInfectionType;
-
     }
 
-    public String getBirthInfectionCause()
-    {
+    public String getBirthInfectionCause() {
         return birthInfectionCause;
     }
 
-
-    public void setBirthInfectionCause(String birthInfectionCause)
-    {
+    public void setBirthInfectionCause(String birthInfectionCause) {
         this.birthInfectionCause = birthInfectionCause;
-
     }
 
-    public String getBirthCourseDisease()
-    {
+    public String getBirthCourseDisease() {
         return birthCourseDisease;
     }
 
-
-    public void setBirthCourseDisease(String birthCourseDisease)
-    {
+    public void setBirthCourseDisease(String birthCourseDisease) {
         this.birthCourseDisease = birthCourseDisease;
-
     }
 
-    public Integer getBirthIllType()
-    {
+    public Integer getBirthIllType() {
         return birthIllType;
     }
 
-
-    public void setBirthIllType(Integer birthIllType)
-    {
+    public void setBirthIllType(Integer birthIllType) {
         this.birthIllType = birthIllType;
-
     }
 
-    public String getBirthIllCause()
-    {
+    public String getBirthIllCause() {
         return birthIllCause;
     }
 
-
-    public void setBirthIllCause(String birthIllCause)
-    {
+    public void setBirthIllCause(String birthIllCause) {
         this.birthIllCause = birthIllCause;
-
     }
 
-    public String getBirthIllDisease()
-    {
+    public String getBirthIllDisease() {
         return birthIllDisease;
     }
 
-
-    public void setBirthIllDisease(String birthIllDisease)
-    {
+    public void setBirthIllDisease(String birthIllDisease) {
         this.birthIllDisease = birthIllDisease;
-
     }
 
-    public Integer getHeadTraumaHistory()
-    {
+    public Integer getHeadTraumaHistory() {
         return headTraumaHistory;
     }
 
-
-    public void setHeadTraumaHistory(Integer headTraumaHistory)
-    {
+    public void setHeadTraumaHistory(Integer headTraumaHistory) {
         this.headTraumaHistory = headTraumaHistory;
-
     }
 
-    public String getHeadTraumaDesc()
-    {
+    public String getHeadTraumaDesc() {
         return headTraumaDesc;
     }
 
-
-    public void setHeadTraumaDesc(String headTraumaDesc)
-    {
+    public void setHeadTraumaDesc(String headTraumaDesc) {
         this.headTraumaDesc = headTraumaDesc;
-
     }
 
-    public Integer getEarPoisonType()
-    {
+    public Integer getEarPoisonType() {
         return earPoisonType;
     }
 
-
-    public void setEarPoisonType(Integer earPoisonType)
-    {
+    public void setEarPoisonType(Integer earPoisonType) {
         this.earPoisonType = earPoisonType;
-
-    }
-
-    public String getEarPoisonName()
-    {
-        return earPoisonName;
     }
 
-
-    public void setEarPoisonName(String earPoisonName)
-    {
-        this.earPoisonName = earPoisonName;
-
+    public String getEarPoisonMap() {
+        return earPoisonMap;
     }
 
-    public String getEarPoisonNumber()
-    {
-        return earPoisonNumber;
+    public void setEarPoisonMap(String earPoisonMap) {
+        this.earPoisonMap = earPoisonMap;
     }
 
-
-    public void setEarPoisonNumber(String earPoisonNumber)
-    {
-        this.earPoisonNumber = earPoisonNumber;
-
-    }
-
-    public String getEarPoisonCourse()
-    {
-        return earPoisonCourse;
-    }
-
-
-    public void setEarPoisonCourse(String earPoisonCourse)
-    {
-        this.earPoisonCourse = earPoisonCourse;
-
-    }
-
-    public Integer getTympanitisType()
-    {
+    public Integer getTympanitisType() {
         return tympanitisType;
     }
 
-
-    public void setTympanitisType(Integer tympanitisType)
-    {
+    public void setTympanitisType(Integer tympanitisType) {
         this.tympanitisType = tympanitisType;
-
     }
 
-    public String getTympanitisDesc()
-    {
+    public String getTympanitisDesc() {
         return tympanitisDesc;
     }
 
-
-    public void setTympanitisDesc(String tympanitisDesc)
-    {
+    public void setTympanitisDesc(String tympanitisDesc) {
         this.tympanitisDesc = tympanitisDesc;
-
     }
 
-    public Integer getNicuType()
-    {
+    public Integer getNicuType() {
         return nicuType;
     }
 
-
-    public void setNicuType(Integer nicuType)
-    {
+    public void setNicuType(Integer nicuType) {
         this.nicuType = nicuType;
-
     }
 
-    public String getNicuCause()
-    {
+    public String getNicuCause() {
         return nicuCause;
     }
 
-
-    public void setNicuCause(String nicuCause)
-    {
+    public void setNicuCause(String nicuCause) {
         this.nicuCause = nicuCause;
-
     }
 
-    public String getNicuContinuedDate()
-    {
+    public String getNicuContinuedDate() {
         return nicuContinuedDate;
     }
 
-
-    public void setNicuContinuedDate(String nicuContinuedDate)
-    {
+    public void setNicuContinuedDate(String nicuContinuedDate) {
         this.nicuContinuedDate = nicuContinuedDate;
-
     }
 
-    public Integer getRespiratorType()
-    {
+    public Integer getRespiratorType() {
         return respiratorType;
     }
 
-
-    public void setRespiratorType(Integer respiratorType)
-    {
+    public void setRespiratorType(Integer respiratorType) {
         this.respiratorType = respiratorType;
-
     }
 
     public String getRespiratorContinuedDate()
diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEarFamilyQuery.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEarFamilyQuery.java
index f246261..23524a9 100644
--- a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEarFamilyQuery.java
+++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEarFamilyQuery.java
@@ -3,19 +3,39 @@ package com.lyms.platform.permission.model;
 
 import com.lyms.platform.common.dao.BaseQuery;
 
-import java.util.Date;
-
 
 public class BabyPatientExtendEarFamilyQuery extends BaseQuery
 {
     private String id;
-    private Integer badLifeHistoryType;
-    private String badLifeTypeId;
+
+    /**
+     * 家庭不良生活习惯Map
+     */
+    private String badLifeHistory;
+
+    /**
+     * 家族中是否有耳聋患者 1=有 -1=无
+     */
     private Integer deafType;
+
+    /**
+     * 耳聋患者与儿童的亲属信息
+     */
     private String deatRelationship;
-    private String deafDesc;
+
+    /**
+     * 是否近亲结婚 1=有 -1=无
+     */
     private Integer proximityType;
+
+    /**
+     * 血缘关系
+     */
     private String proximityRelationship;
+
+    /**
+     * 儿童建档的主键
+     */
     private String babyPatientId;
 
     public String getId()
@@ -30,98 +50,51 @@ public class BabyPatientExtendEarFamilyQuery extends BaseQuery
 
     }
 
-    public Integer getBadLifeHistoryType()
-    {
-        return badLifeHistoryType;
+    public String getBadLifeHistory() {
+        return badLifeHistory;
     }
 
-
-    public void setBadLifeHistoryType(Integer badLifeHistoryType)
-    {
-        this.badLifeHistoryType = badLifeHistoryType;
-
+    public void setBadLifeHistory(String badLifeHistory) {
+        this.badLifeHistory = badLifeHistory;
     }
 
-    public String getBadLifeTypeId()
-    {
-        return badLifeTypeId;
-    }
-
-
-    public void setBadLifeTypeId(String badLifeTypeId)
-    {
-        this.badLifeTypeId = badLifeTypeId;
-
-    }
-
-    public Integer getDeafType()
-    {
+    public Integer getDeafType() {
         return deafType;
     }
 
-
-    public void setDeafType(Integer deafType)
-    {
+    public void setDeafType(Integer deafType) {
         this.deafType = deafType;
     }
 
-    public String getDeatRelationship()
-    {
+    public String getDeatRelationship() {
         return deatRelationship;
     }
 
-
-    public void setDeatRelationship(String deatRelationship)
-    {
+    public void setDeatRelationship(String deatRelationship) {
         this.deatRelationship = deatRelationship;
-
-    }
-
-    public String getDeafDesc()
-    {
-        return deafDesc;
     }
 
-
-    public void setDeafDesc(String deafDesc)
-    {
-        this.deafDesc = deafDesc;
-
-    }
-
-    public Integer getProximityType()
-    {
+    public Integer getProximityType() {
         return proximityType;
     }
 
-
-    public void setProximityType(Integer proximityType)
-    {
+    public void setProximityType(Integer proximityType) {
         this.proximityType = proximityType;
-
     }
 
-    public String getProximityRelationship()
-    {
+    public String getProximityRelationship() {
         return proximityRelationship;
     }
 
-
-    public void setProximityRelationship(String proximityRelationship)
-    {
+    public void setProximityRelationship(String proximityRelationship) {
         this.proximityRelationship = proximityRelationship;
-
     }
 
-    public String getBabyPatientId()
-    {
+    public String getBabyPatientId() {
         return babyPatientId;
     }
 
-
-    public void setBabyPatientId(String babyPatientId)
-    {
+    public void setBabyPatientId(String babyPatientId) {
         this.babyPatientId = babyPatientId;
-
     }
 }
\ No newline at end of file
diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEarScreenQuery.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEarScreenQuery.java
index 2ffcba3..e84b239 100644
--- a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEarScreenQuery.java
+++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEarScreenQuery.java
@@ -4,12 +4,13 @@ package com.lyms.platform.permission.model;
 import com.lyms.platform.common.dao.BaseQuery;
 
 import java.util.Date;
+import java.util.List;
 
 
 public class BabyPatientExtendEarScreenQuery extends BaseQuery {
     private String id;
     //听诊儿童档案集合
-    private String[] babyIds;
+    private List<String> babyIds;
 
     private String babyId;
 
@@ -284,11 +285,11 @@ public class BabyPatientExtendEarScreenQuery extends BaseQuery {
         this.screenEndDate = screenEndDate;
     }
 
-    public String[] getBabyIds() {
+    public List<String> getBabyIds() {
         return babyIds;
     }
 
-    public void setBabyIds(String[] babyIds) {
+    public void setBabyIds(List<String> babyIds) {
         this.babyIds = babyIds;
     }
 
diff --git a/platform-biz-service/src/main/resources/mainOrm/master/BabyPatientExtendEar.xml b/platform-biz-service/src/main/resources/mainOrm/master/BabyPatientExtendEar.xml
index ed66490..ca1e680 100644
--- a/platform-biz-service/src/main/resources/mainOrm/master/BabyPatientExtendEar.xml
+++ b/platform-biz-service/src/main/resources/mainOrm/master/BabyPatientExtendEar.xml
@@ -115,7 +115,7 @@ select id,person_id,create_date,create_user_id,create_hospital_id,last_update_da
                 and status = #{status,jdbcType=INTEGER}
             </if>
             <if test="babyPatientId != null and babyPatientId != ''">
-                and baby_patient_id = #{babyPatientId,jdbcType=VARCHAR},
+                and baby_patient_id = #{babyPatientId,jdbcType=VARCHAR}
             </if>
         </where>
     </sql>
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 3d30d00..28060d9 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
@@ -1,6 +1,7 @@
 package com.lyms.platform.operate.web.controller;
 
 import com.lyms.platform.biz.service.BabyService;
+import com.lyms.platform.biz.service.PatientsService;
 import com.lyms.platform.common.annotation.TokenRequired;
 import com.lyms.platform.common.base.BaseController;
 import com.lyms.platform.common.base.LoginContext;
@@ -20,7 +21,9 @@ import com.lyms.platform.operate.web.utils.ResponseUtil;
 import com.lyms.platform.permission.model.*;
 import com.lyms.platform.permission.service.*;
 import com.lyms.platform.pojo.BabyModel;
+import com.lyms.platform.pojo.Patients;
 import com.lyms.platform.query.BabyModelQuery;
+import com.lyms.platform.query.PatientsQuery;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -59,6 +62,8 @@ public class HearDiagnManageController extends BaseController {
     //儿童听力随访
     @Autowired
     private BabyPatientExtendEarFollowUpService babyPatientExtendEarFollowUpService;
+    @Autowired
+    private PatientsService patientsService;
 
     /**
      * 获取儿童听筛记录
@@ -440,28 +445,34 @@ public class HearDiagnManageController extends BaseController {
 //当前登录人医院Id
         String hospitalId = autoMatchFacade.getHospitalId(loginState.getId());
 
-        ChildrenPersonQuery query = new ChildrenPersonQuery();
-        if (StringUtils.isNotEmpty(model.getKeyWord())) {//查询号不为空
-            query.setKeyWord(model.getKeyWord());
-        }
+
+        List<String> babyIds = new ArrayList<>();
+        PatientsQuery patientsQuery = new PatientsQuery();
 
         if (model.getBirthStartTime() != null) {//儿童出生开始日期
-            query.setStartBirthday(model.getBirthStartTime());
+            patientsQuery.setBirthStart(model.getBirthStartTime());
         }
 
         if (model.getBirthEndTime() != null) {//儿童出生结束日期
-            query.setEndBirthday(model.getBirthEndTime());
+            patientsQuery.setBirthEnd(model.getBirthEndTime());
         }
-        List<String> babyIds = new ArrayList<>();
-        // List<ChildrenPerson> childrenPersonList = childrenPersonService.queryChildrenPerson(query);
-        // if (CollectionUtils.isNotEmpty(childrenPersonList)) {
-        //     for (ChildrenPerson cp : childrenPersonList) {
-        //         //获取babyid,还未表还未增加
-        //     }
-        // }
 
+        List<Patients> patientses = null;
+        if (com.lyms.platform.common.utils.StringUtils.isNotEmpty(model.getKeyWord())) {
+            patientsQuery.setQueryNo(model.getKeyWord());
+            patientses = patientsService.queryPatient1(patientsQuery, "modified");
+        }
 
         BabyPatientExtendEarScreenQuery screenQuery = new BabyPatientExtendEarScreenQuery();
+        if (CollectionUtils.isNotEmpty(patientses)) {
+            for (Patients pa : patientses) {
+                babyIds.add(pa.getId());
+            }
+            screenQuery.setBabyIds(babyIds);
+        } else if (com.lyms.platform.common.utils.StringUtils.isNotEmpty(model.getKeyWord())) {
+            return new BaseListResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功");
+        }
+
         //听筛开始时间
         if (model.getSecrStartTime() != null) {
             screenQuery.setScreenStartDate(model.getSecrStartTime());
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 81ea31a..3554f82 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
@@ -350,7 +350,7 @@ public class HearingDiagnoseController extends BaseController {
                 for(BabyModel babyModel:models){
                     babyIds.add(babyModel.getId());
                 }
-                scrQuery.setBabyIds(babyIds.toArray(new String[babyIds.size()]));
+                scrQuery.setBabyIds(babyIds);
             }else{
                 return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("没有找到数据");
             }
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java
index d7edd44..11b2d73 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java
@@ -2,18 +2,18 @@ package com.lyms.platform.operate.web.facade;
 
 import com.lyms.platform.biz.service.*;
 import com.lyms.platform.common.constants.ErrorCodeConstants;
-import com.lyms.platform.common.enums.RiskDefaultTypeEnum;
 import com.lyms.platform.common.enums.YnEnums;
 import com.lyms.platform.common.result.BaseListResponse;
 import com.lyms.platform.common.result.BaseResponse;
-import com.lyms.platform.common.utils.*;
+import com.lyms.platform.common.utils.DateUtil;
+import com.lyms.platform.common.utils.ExcelUtil;
+import com.lyms.platform.common.utils.ExceptionUtils;
 import com.lyms.platform.common.utils.StringUtils;
 import com.lyms.platform.operate.web.request.AntExManagerQueryRequest;
 import com.lyms.platform.operate.web.request.CjStatisticsQueryRequest;
 import com.lyms.platform.operate.web.result.AntExManagerResult;
 import com.lyms.platform.operate.web.result.CjStatisticsListResult;
 import com.lyms.platform.operate.web.result.CjStatisticsResult;
-import com.lyms.platform.operate.web.result.HighScoreResult;
 import com.lyms.platform.operate.web.worker.AntExRecordWorker;
 import com.lyms.platform.permission.model.Organization;
 import com.lyms.platform.permission.model.OrganizationQuery;
@@ -25,7 +25,6 @@ import com.lyms.platform.query.AntExRecordQuery;
 import com.lyms.platform.query.DataPermissionsModelQuery;
 import com.lyms.platform.query.PatientsQuery;
 import org.apache.commons.collections.CollectionUtils;
-import org.apache.commons.lang.*;
 import org.apache.commons.lang.math.NumberUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
@@ -222,7 +221,7 @@ public class AntExRecordFacade {
         List<Patients> patientses = null;
         if (StringUtils.isNotEmpty(antExManagerQueryRequest.getQueryNo())) {
             patientsQuery.setQueryNo(antExManagerQueryRequest.getQueryNo());
-            patientses = patientsService.queryPatient1(patientsQuery, "modified");
+            patientses = patientsService.queryPatient1(patientsQuery, "modpatientsQueryified");
         }
 
         AntExRecordQuery antExRecordQuery = complayRequest(userId, antExManagerQueryRequest, isRegion, isPage);
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 0f1d0ae..77cce73 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
@@ -96,6 +96,7 @@ public class BabyEarFacade {
         personModelQuery.setYn(YnEnums.YES.getId());
         personModelQuery.setCardNo(baby.getMcertNo());
         personModelQuery.setType(2);
+        personModelQuery.setName(baby.getName());
         List<PersonModel> babyP = personService.queryPersons(personModelQuery);
         if (CollectionUtils.isNotEmpty(babyP)) {
             return babyP.get(0);
@@ -199,6 +200,9 @@ public class BabyEarFacade {
             String babyPatientId = baby.getId();
             if (StringUtils.isEmpty(baby.getId())) {
                 baby.setPid(pid);
+                baby.setHospitalId(hId);
+                baby.setYn(1);
+                baby.setCreated(new Date());
                 babyPatientId = babyService.addOneBaby(baby).getId();
                 addMysqlBabyRecord(baby);
             }
@@ -255,7 +259,7 @@ public class BabyEarFacade {
                 babyPatientExtendEarMotherService.updateBabyPatientExtendEarMother(babyPatientExtendEarMother);
             }
         }
-        return RespBuilder.buildSuccess(babyPatientExtendEarMother.getId());
+        return RespBuilder.buildSuccess(baby.getId());
     }
 
     /**
@@ -323,7 +327,7 @@ public class BabyEarFacade {
             BabyEarBase babyEarBase = new BabyEarBase(babyModel);
             //儿童基础信息
             BabyEarBaseView babyEarBaseView = convertToBabyEarBase(babyEarBase);
-            babyEarResult.setBabyEarBase(babyEarBaseView);
+            babyEarResult.setBase(babyEarBaseView);
 
             //查詢母親的信息
             BabyPatientExtendEarMotherQuery babyPatientExtendEarMotherQuery = new BabyPatientExtendEarMotherQuery();
@@ -332,7 +336,7 @@ public class BabyEarFacade {
 
             if (CollectionUtils.isNotEmpty(babyPatientExtendEarMothers)) {
                 BabyEarMotherView babyEarMotherView = convertToBabyEarMotherView(babyPatientExtendEarMothers.get(0));
-                babyEarResult.setBabyEarMother(babyEarMotherView);
+                babyEarResult.setPatientExtendEarMother(babyEarMotherView);
             }
 
             BabyPatientExtendEarFamilyQuery babyPatientExtendEarFamilyQuery = new BabyPatientExtendEarFamilyQuery();
@@ -342,7 +346,7 @@ public class BabyEarFacade {
             List<BabyPatientExtendEarFamily> babyPatientExtendEarFamilies = babyPatientExtendEarFamilyService.queryBabyPatientExtendEarFamily(babyPatientExtendEarFamilyQuery);
             if (CollectionUtils.isNotEmpty(babyPatientExtendEarFamilies)) {
                 BabyEarFamilyView babyEarFamilyView = convertToBabyEarFamilyView(babyPatientExtendEarFamilies.get(0));
-                babyEarResult.setBabyEarFamily(babyEarFamilyView);
+                babyEarResult.setPatientExtendEarFamily(babyEarFamilyView);
             }
 
             BabyPatientExtendEarBirthQuery babyPatientExtendEarBirthQuery = new BabyPatientExtendEarBirthQuery();
@@ -352,7 +356,7 @@ public class BabyEarFacade {
 
             if (CollectionUtils.isNotEmpty(babyPatientExtendEarBirths)) {
                 BabyEarBirthView babyEarBirthView = convertToBabyEarBirthView(babyPatientExtendEarBirths.get(0));
-                babyEarResult.setBabyEarBirth(babyEarBirthView);
+                babyEarResult.setBabyBirth(babyEarBirthView);
             }
             objectResponse.setData(babyEarResult);
             objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功");
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyEarBase.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyEarBase.java
index d9a37a6..d5130da 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyEarBase.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyEarBase.java
@@ -4,6 +4,8 @@ import com.lyms.platform.common.base.IBasicRequestConvert;
 import com.lyms.platform.common.utils.DateUtil;
 import com.lyms.platform.pojo.BabyModel;
 
+import java.util.Date;
+
 /**
  * 邮政编码和高危因素没有存储在mongodb
  * <p>
@@ -120,7 +122,7 @@ public class BabyEarBase implements IBasicRequestConvert<BabyModel> {
         setPid(babyModel.getPid());
         setName(babyModel.getName());
         setCardNo(babyModel.getCardNo());
-        setBirth(DateUtil.getYmd(babyModel.getBirth()));
+        setBirth(DateUtil.getyyyy_MM_dd(babyModel.getBirth()));
         setProvinceId(babyModel.getProvinceId());
         setCityId(babyModel.getCityId());
         setAreaId(babyModel.getAreaId());
@@ -130,19 +132,19 @@ public class BabyEarBase implements IBasicRequestConvert<BabyModel> {
         setMphone(babyModel.getMphone());
         setFcertNo(babyModel.getFcertNo());
         setFcertTypeId(babyModel.getFcertTypeId());
-        setMbirth(DateUtil.getYmd(babyModel.getMbirth()));
-        setMonthAge(DateUtil.getBabyMonthAge(babyModel.getMbirth(), babyModel.getCreated()));
+        setMbirth(DateUtil.getyyyy_MM_dd(babyModel.getMbirth()));
+        setMonthAge(DateUtil.getBabyMonthAge(babyModel.getMbirth(), babyModel.getBuildDate()));
         setMproTypeId(babyModel.getMproTypeId());
         setMcertNo(babyModel.getMcertNo());
         setMcertTypeId(babyModel.getMcertTypeId());
         setmLevelId(babyModel.getmLevelId());
-        setmAge(DateUtil.getAge(babyModel.getMbirth(),babyModel.getCreated())+"");
-        setfAge(DateUtil.getAge(babyModel.getFbirth(),babyModel.getCreated())+"");
+        setmAge(DateUtil.getAge(babyModel.getMbirth(),babyModel.getBuildDate())+"");
+        setfAge(DateUtil.getAge(babyModel.getFbirth(),babyModel.getBuildDate())+"");
         setPostCode("");
         setSex(babyModel.getSex());
         setFname(babyModel.getFname());
         setFphone(babyModel.getFphone());
-        setFbirth(DateUtil.getYmd(babyModel.getFbirth()));
+        setFbirth(DateUtil.getyyyy_MM_dd(babyModel.getFbirth()));
         setfLevelId(babyModel.getfLevelId());
         setFproTypeId(babyModel.getFproTypeId());
         setHighRiskCause(babyModel.getHighRiskReason());
@@ -159,6 +161,8 @@ public class BabyEarBase implements IBasicRequestConvert<BabyModel> {
         babyModel.setMcertTypeId(mcertTypeId);
         babyModel.setmLevelId(mLevelId);
         babyModel.setId(babyId);
+        babyModel.setBuildDoctor(createUserId);
+        babyModel.setBuildDate(new Date());
         babyModel.setBirth(DateUtil.parseYMD(birth));
         babyModel.setCardNo(cardNo);
         babyModel.setName(name);
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyEarArchivesResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyEarArchivesResult.java
index 70ab081..2f32d46 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyEarArchivesResult.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyEarArchivesResult.java
@@ -9,49 +9,49 @@ public class BabyEarArchivesResult {
     /**
      * 儿童基础信息
      */
-    private BabyEarBaseView babyEarBase;
+    private BabyEarBaseView base;
     /**
      * 儿童出生信息
      */
-    private BabyEarBirthView babyEarBirth;
+    private BabyEarBirthView babyBirth;
     /**
      * 母亲妊娠情况
      */
-    private BabyEarMotherView babyEarMother;
+    private BabyEarMotherView patientExtendEarMother;
     /**
      * 家庭史
      */
-    private BabyEarFamilyView babyEarFamily;
+    private BabyEarFamilyView patientExtendEarFamily;
 
-    public BabyEarBaseView getBabyEarBase() {
-        return babyEarBase;
+    public BabyEarBaseView getBase() {
+        return base;
     }
 
-    public void setBabyEarBase(BabyEarBaseView babyEarBase) {
-        this.babyEarBase = babyEarBase;
+    public void setBase(BabyEarBaseView base) {
+        this.base = base;
     }
 
-    public BabyEarBirthView getBabyEarBirth() {
-        return babyEarBirth;
+    public BabyEarBirthView getBabyBirth() {
+        return babyBirth;
     }
 
-    public void setBabyEarBirth(BabyEarBirthView babyEarBirth) {
-        this.babyEarBirth = babyEarBirth;
+    public void setBabyBirth(BabyEarBirthView babyBirth) {
+        this.babyBirth = babyBirth;
     }
 
-    public BabyEarMotherView getBabyEarMother() {
-        return babyEarMother;
+    public BabyEarMotherView getPatientExtendEarMother() {
+        return patientExtendEarMother;
     }
 
-    public void setBabyEarMother(BabyEarMotherView babyEarMother) {
-        this.babyEarMother = babyEarMother;
+    public void setPatientExtendEarMother(BabyEarMotherView patientExtendEarMother) {
+        this.patientExtendEarMother = patientExtendEarMother;
     }
 
-    public BabyEarFamilyView getBabyEarFamily() {
-        return babyEarFamily;
+    public BabyEarFamilyView getPatientExtendEarFamily() {
+        return patientExtendEarFamily;
     }
 
-    public void setBabyEarFamily(BabyEarFamilyView babyEarFamily) {
-        this.babyEarFamily = babyEarFamily;
+    public void setPatientExtendEarFamily(BabyEarFamilyView patientExtendEarFamily) {
+        this.patientExtendEarFamily = patientExtendEarFamily;
     }
 }
-- 
1.8.3.1