From d9f3d4a688e9d81203b876bb29ac75f4afd49a4f Mon Sep 17 00:00:00 2001
From: yangfei <yangfei@lymsh.com>
Date: Tue, 29 Aug 2017 11:06:06 +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

---
 .../permission/model/BabyPatientExtendEar.java     |  12 +-
 .../model/BabyPatientExtendEarQuery.java           |  10 +-
 .../mainOrm/master/BabyPatientExtendEar.xml        |  13 +-
 .../com/lyms/platform/common/enums/HdEnums.java    |   2 +-
 .../platform/common/enums/ServiceStatusEnums.java  |  16 ++
 .../platform/common/enums/ServiceTypeEnums.java    |  11 ++
 .../web/controller/HearingDiagnoseController.java  | 176 +++++++++++----------
 .../platform/operate/web/facade/BabyEarFacade.java |   9 +-
 8 files changed, 157 insertions(+), 92 deletions(-)

diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEar.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEar.java
index 84ca00e..08843b7 100644
--- a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEar.java
+++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEar.java
@@ -22,7 +22,9 @@ public class BabyPatientExtendEar extends AbstracUuidEntity {
 	private String lastUpdateUserId;
 	
 	private String lastUpdateHospitalId;
-	
+
+	private String nation;
+
 	/**
 	 * 状态 1, "有效" 0, "无效"
 	 */
@@ -50,6 +52,14 @@ public class BabyPatientExtendEar extends AbstracUuidEntity {
 	//条码
 	private String barCode;
 
+	public String getNation() {
+		return nation;
+	}
+
+	public void setNation(String nation) {
+		this.nation = nation;
+	}
+
 	public String getPersonId() {
 		return personId;
 	}
diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEarQuery.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEarQuery.java
index 7b987ae..d35bef6 100644
--- a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEarQuery.java
+++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEarQuery.java
@@ -25,7 +25,7 @@ public class BabyPatientExtendEarQuery extends BaseQuery
     private String lastUpdateUserId;
 
     private String lastUpdateHospitalId;
-
+    private String nation;
     /**
      * 状态 1=正常 -1=禁用
      */
@@ -54,6 +54,14 @@ public class BabyPatientExtendEarQuery extends BaseQuery
     //条码
     private String barCode;
 
+    public String getNation() {
+        return nation;
+    }
+
+    public void setNation(String nation) {
+        this.nation = nation;
+    }
+
     public String[] getBabyPatientIds() {
         return babyPatientIds;
     }
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 821ae28..54d0a54 100644
--- a/platform-biz-service/src/main/resources/mainOrm/master/BabyPatientExtendEar.xml
+++ b/platform-biz-service/src/main/resources/mainOrm/master/BabyPatientExtendEar.xml
@@ -17,12 +17,13 @@
         <result column="admiss_no" property="admissNo" jdbcType="VARCHAR"/>
         <result column="discharge_diagnosis" property="dischargeDiagnosis" jdbcType="VARCHAR"/>
         <result column="bar_code" property="barCode" jdbcType="VARCHAR"/>
+        <result column="nation" property="nation" jdbcType="VARCHAR"/>
         <result column="mhigh_risk_factor_id" property="mHighRiskFactorId" jdbcType="VARCHAR"/>
     </resultMap>
 
 
     <insert id="addBabyPatientExtendEar" parameterType="com.lyms.platform.permission.model.BabyPatientExtendEar">
-insert into baby_patient_extend_ear (id,person_id,create_date,create_user_id,create_hospital_id,last_update_date,last_update_user_id,last_update_hospital_id,high_risk_cause,status,baby_patient_id,admiss_no,discharge_diagnosis,bar_code,mhigh_risk_factor_id) values (#{id},#{personId},#{createDate},#{createUserId},#{createHospitalId},#{lastUpdateDate},#{lastUpdateUserId},#{lastUpdateHospitalId},#{highRiskCause},#{status},#{babyPatientId},#{admissNo},#{dischargeDiagnosis},#{barCode},#{mHighRiskFactorId})
+insert into baby_patient_extend_ear (id,person_id,create_date,create_user_id,create_hospital_id,last_update_date,last_update_user_id,last_update_hospital_id,high_risk_cause,status,baby_patient_id,admiss_no,discharge_diagnosis,bar_code,nation,mhigh_risk_factor_id) values (#{id},#{personId},#{createDate},#{createUserId},#{createHospitalId},#{lastUpdateDate},#{lastUpdateUserId},#{lastUpdateHospitalId},#{highRiskCause},#{status},#{babyPatientId},#{admissNo},#{dischargeDiagnosis},#{barCode},#{nation},#{mHighRiskFactorId})
 </insert>
 
 
@@ -68,6 +69,9 @@ insert into baby_patient_extend_ear (id,person_id,create_date,create_user_id,cre
             <if test="barCode != null and barCode != ''">
                 bar_code = #{barCode,jdbcType=VARCHAR},
             </if>
+            <if test="nation != null and nation != ''">
+                nation = #{nation,jdbcType=VARCHAR},
+            </if>
             <if test="mHighRiskFactorId != null and mHighRiskFactorId != ''">
                 mhigh_risk_factor_id = #{mHighRiskFactorId,jdbcType=VARCHAR},
             </if>
@@ -82,7 +86,7 @@ delete from baby_patient_extend_ear where id = #{id,jdbcType=VARCHAR}
 
 
     <select id="getBabyPatientExtendEar" resultMap="BabyPatientExtendEarResultMap" parameterType="java.lang.String">
-select id,person_id,create_date,create_user_id,create_hospital_id,last_update_date,last_update_user_id,last_update_hospital_id,high_risk_cause,status,baby_patient_id,admiss_no,discharge_diagnosis,bar_code,mhigh_risk_factor_id
+select id,person_id,create_date,create_user_id,create_hospital_id,last_update_date,last_update_user_id,last_update_hospital_id,high_risk_cause,status,baby_patient_id,admiss_no,discharge_diagnosis,bar_code,nation,mhigh_risk_factor_id
 from baby_patient_extend_ear where id = #{id,jdbcType=VARCHAR}
 </select>
 
@@ -156,6 +160,9 @@ from baby_patient_extend_ear where id = #{id,jdbcType=VARCHAR}
             <if test="barCode != null and barCode != ''">
                 and bar_code = #{barCode,jdbcType=VARCHAR}
             </if>
+            <if test="nation != null and nation != ''">
+                and nation = #{nation,jdbcType=VARCHAR}
+            </if>
             <if test="mHighRiskFactorId != null and mHighRiskFactorId != ''">
                 and mhigh_risk_factor_id = #{mHighRiskFactorId,jdbcType=VARCHAR}
             </if>
@@ -166,7 +173,7 @@ from baby_patient_extend_ear where id = #{id,jdbcType=VARCHAR}
     <select id="queryBabyPatientExtendEar" resultMap="BabyPatientExtendEarResultMap"
             parameterType="com.lyms.platform.permission.model.BabyPatientExtendEarQuery">
         select
-        id,person_id,create_date,create_user_id,create_hospital_id,last_update_date,last_update_user_id,last_update_hospital_id,high_risk_cause,status,baby_patient_id,admiss_no,discharge_diagnosis,bar_code,mhigh_risk_factor_id
+        id,person_id,create_date,create_user_id,create_hospital_id,last_update_date,last_update_user_id,last_update_hospital_id,high_risk_cause,status,baby_patient_id,admiss_no,discharge_diagnosis,bar_code,nation,mhigh_risk_factor_id
         from baby_patient_extend_ear
         <include refid="BabyPatientExtendEarCondition"/>
         <include refid="orderAndLimit"/>
diff --git a/platform-common/src/main/java/com/lyms/platform/common/enums/HdEnums.java b/platform-common/src/main/java/com/lyms/platform/common/enums/HdEnums.java
index eb5cc19..64482c8 100644
--- a/platform-common/src/main/java/com/lyms/platform/common/enums/HdEnums.java
+++ b/platform-common/src/main/java/com/lyms/platform/common/enums/HdEnums.java
@@ -156,7 +156,7 @@ public class HdEnums {
     public enum SourceEnums {
         BY(1, "本院"),
         ALL(3, "全部"),
-        WY(2, "*外院");
+        WY(2, "外院");
 
         private int id;
         private String name;
diff --git a/platform-common/src/main/java/com/lyms/platform/common/enums/ServiceStatusEnums.java b/platform-common/src/main/java/com/lyms/platform/common/enums/ServiceStatusEnums.java
index 0951d7a..bbe7ad7 100644
--- a/platform-common/src/main/java/com/lyms/platform/common/enums/ServiceStatusEnums.java
+++ b/platform-common/src/main/java/com/lyms/platform/common/enums/ServiceStatusEnums.java
@@ -56,6 +56,22 @@ public enum ServiceStatusEnums {
         return  list;
     }
 
+    public static List<Map> getServiceStatus()
+    {
+        List<Map> list = new ArrayList<>();
+        for(ServiceStatusEnums s : ServiceStatusEnums.values()) {
+            if (s.getId() < 100)
+            {
+                Map map  = new HashMap<>();
+                map.put("id", s.getId());
+                map.put("name", s.getName());
+                map.put("pid", s.getPid());
+                list.add(map);
+            }
+        }
+        return  list;
+    }
+
 
     public static List<Map<String,String>> getServiceStatusByPid(int pid)
     {
diff --git a/platform-common/src/main/java/com/lyms/platform/common/enums/ServiceTypeEnums.java b/platform-common/src/main/java/com/lyms/platform/common/enums/ServiceTypeEnums.java
index 056742c..0476723 100644
--- a/platform-common/src/main/java/com/lyms/platform/common/enums/ServiceTypeEnums.java
+++ b/platform-common/src/main/java/com/lyms/platform/common/enums/ServiceTypeEnums.java
@@ -41,6 +41,17 @@ public enum ServiceTypeEnums {
         return null;
     }
 
+    public static List<Map> getServiceType() {
+        List<Map> list = new ArrayList<>();
+        for (ServiceTypeEnums e : ServiceTypeEnums.values()) {
+            Map rootMap = new HashMap();
+            rootMap.put("id", e.getId());
+            rootMap.put("name", e.getName());
+
+            list.add(rootMap);
+        }
+        return list;
+    }
 
     public static List<Map<String,String>> getServiceTypeList()
     {
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 d76e4c5..4e0ee9f 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
@@ -16,7 +16,6 @@ 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.HearingDiagnoseListResult;
-import com.lyms.platform.operate.web.utils.MyComparator;
 import com.lyms.platform.permission.model.*;
 import com.lyms.platform.permission.service.*;
 import com.lyms.platform.pojo.BabyModel;
@@ -329,8 +328,6 @@ public class HearingDiagnoseController extends BaseController {
                 outOrgids.add(hospitalId);
             } else {//4.全部医院/默认全部医院
                 //当前登录人区域医院Id
-                List hospiIds = babyEarFacade.getOrgHospitalIds(hospitalId);
-                outOrgids.addAll(hospiIds);
                 //当前医院
                 outOrgids.add(hospitalId);
                 //转诊过来的医院id
@@ -470,17 +467,20 @@ public class HearingDiagnoseController extends BaseController {
 
         query.setSort("diagnose_time");
 
+        //已经诊断的数据
         List<BabyPatientExtendEarHearingDiagnose> hearingDiagnoseList = hearingDiagnoseService.getHdAndScreen(query);
 
+        //待诊断
         List<HearingDiagnoseListResult> waitConfiList = new ArrayList<>();
+        //已诊断
         List<HearingDiagnoseListResult> confiList = new ArrayList<>();
+        //全部
         List<HearingDiagnoseListResult> hdrList = new ArrayList<>();
-        // for (int i = (hdReq.getPage() - 1) * hdReq.getLimit(); (i < babyIds.size() && i < hdReq.getLimit()); i++) {
-        Collections.sort(hearingDiagnoseList);
-        for (int i = 0; i < babyIds.size(); i++) {
-            BabyPatientExtendEarHearingDiagnose hd = new BabyPatientExtendEarHearingDiagnose();
-            hd.setBabyId(babyIds.get(i));
-            int index1 = Collections.binarySearch(hearingDiagnoseList, hd, new MyComparator());
+
+        //添加已经诊断的数据
+        for (BabyPatientExtendEarHearingDiagnose hd : hearingDiagnoseList) {
+            //删除总数据
+            babyIds.remove(hd.getBabyId());
             HearingDiagnoseListResult hea = new HearingDiagnoseListResult();
             BabyModel babyModel = babyService.getOneBabyById(hd.getBabyId());
             if (babyModel != null) {
@@ -493,91 +493,83 @@ public class HearingDiagnoseController extends BaseController {
                 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;
+            hea.setIsconfirm(hd.getIsconfirm() == null ? "未确诊" : hd.getIsconfirm() == 0 ? "未确诊" : "已确诊");
+            hea.setId(hd.getId());
+            hea.setDiagnoseTime(DateUtil.getyyyy_MM_dd(hd.getDiagnoseTime()));
+            String docotorId = hd.getDiagnDoctorId();
+            Users users = usersService.getUsers(Integer.parseInt(docotorId == null ? "0" : docotorId));
+            if (users != null) {
+                hea.setDoctorName(users.getName() == null ? "-" : users.getName());
             }
-            if (index1 >= 0) {
-                hd = hearingDiagnoseList.get(index1);
-                hea.setIsconfirm(hd.getIsconfirm() == null ? "未确诊" : hd.getIsconfirm() == 0 ? "未确诊" : "已确诊");
-                hea.setId(hd.getId());
-                hea.setDiagnoseTime(DateUtil.getyyyy_MM_dd(hd.getDiagnoseTime()));
-                String docotorId = hd.getDiagnDoctorId();
-                Users users = usersService.getUsers(Integer.parseInt(docotorId == null ? "0" : docotorId));
-                if (users != null) {
-                    hea.setDoctorName(users.getName() == null ? "-" : users.getName());
-                }
-                hea.setHdTime(com.lyms.platform.common.utils.StringUtils.emptyDeal(DateUtil.getyyyy_MM_dd(hd.getDiagnoseTime())));
-                if (hd.getHighFactor() != null) {
-                    String hf[] = hd.getHighFactor().split(",");
-                    // List<Map<Integer, String>> highRiskEnums = new ArrayList<>();
-                    StringBuffer hrSb = new StringBuffer();
-                    for (int b = 0; b < hf.length; b++) {
-                        if (StringUtils.isNotEmpty(hf[b])) {
-                            Map<Integer, String> map = new HashMap<>();
-                            String title = HighRiskEnum.getTitle(Integer.parseInt(hf[b]));
-                            map.put(Integer.parseInt(hf[b]), title);
-                            // highRiskEnums.add(map);
-                            hrSb.append(title + ",");
-                        }
+            hea.setHdTime(com.lyms.platform.common.utils.StringUtils.emptyDeal(DateUtil.getyyyy_MM_dd(hd.getDiagnoseTime())));
+            //听力高危因数
+            if (hd.getHighFactor() != null) {
+                String hf[] = hd.getHighFactor().split(",");
+                StringBuffer hrSb = new StringBuffer();
+                for (int b = 0; b < hf.length; b++) {
+                    if (StringUtils.isNotEmpty(hf[b])) {
+                        Map<Integer, String> map = new HashMap<>();
+                        String title = HighRiskEnum.getTitle(Integer.parseInt(hf[b]));
+                        map.put(Integer.parseInt(hf[b]), title);
+                        hrSb.append(title + ",");
                     }
-                    // hea.setHighRiskEnums(highRiskEnums);
-                    hea.setHighRiskEnums(hrSb.toString());
                 }
-                //确诊结果
-                if (hd.getConfirmResult() != null) {
-                    String cr[] = hd.getConfirmResult().split(",");
-                    StringBuffer hdSb = new StringBuffer();
-                    for (int b = 0; b < cr.length; b++) {
-                        if (StringUtils.isNotEmpty(cr[b])) {
-                            Map<Integer, String> map = new HashMap<>();
-                            String title = ConfirmedEnums.getTitle(Integer.parseInt(cr[b]));
-                            map.put(Integer.parseInt(cr[b]), title);
-                            hdSb.append(title + "，");
-                        }
+                hea.setHighRiskEnums(hrSb.toString());
+            }
+            //确诊结果
+            if (hd.getConfirmResult() != null) {
+                String cr[] = hd.getConfirmResult().split(",");
+                StringBuffer hdSb = new StringBuffer();
+                for (int b = 0; b < cr.length; b++) {
+                    if (StringUtils.isNotEmpty(cr[b])) {
+                        Map<Integer, String> map = new HashMap<>();
+                        String title = ConfirmedEnums.getTitle(Integer.parseInt(cr[b]));
+                        map.put(Integer.parseInt(cr[b]), title);
+                        hdSb.append(title + "，");
                     }
-                    // hea.setDiagnResult(hdEnums);
-                    hea.setConfirmResult(hdSb.toString());
                 }
+                hea.setConfirmResult(hdSb.toString());
+            }
 
-                //诊断结果
-                if (hd.getDiagnResult() != null) {
-                    String cr[] = hd.getDiagnResult().split(",");
-                    StringBuffer hdSb = new StringBuffer();
-                    for (int b = 0; b < cr.length; b++) {
-                        if (StringUtils.isNotEmpty(cr[b])) {
-                            Map<Integer, String> map = new HashMap<>();
-                            String title = HearingDiagnosisEnums.getTitle(Integer.parseInt(cr[b]));
-                            map.put(Integer.parseInt(cr[b]), title);
-                            hdSb.append(title + "，");
-                        }
+            //诊断结果
+            if (hd.getDiagnResult() != null) {
+                String cr[] = hd.getDiagnResult().split(",");
+                StringBuffer hdSb = new StringBuffer();
+                for (int b = 0; b < cr.length; b++) {
+                    if (StringUtils.isNotEmpty(cr[b])) {
+                        Map<Integer, String> map = new HashMap<>();
+                        String title = HearingDiagnosisEnums.getTitle(Integer.parseInt(cr[b]));
+                        map.put(Integer.parseInt(cr[b]), title);
+                        hdSb.append(title + "，");
                     }
-                    hea.setDiagnResult(hdSb.toString());
                 }
+                hea.setDiagnResult(hdSb.toString());
             }
+            //已诊断
+            confiList.add(hea);
+            //全部
+            hdrList.add(hea);
+        }
 
 
-            //诊断结果，肯定是有诊断记录
-            if (hdReq.getConfirmResult() != null || hdReq.getConfirmDegree() != null) {
-                // 1、已诊断、2、待诊断、0、全部
-                if (StringUtils.isNotEmpty(hea.getId())) {//1、已诊断
-                    confiList.add(hea);
-                    //全部
-                    hdrList.add(hea);
-                }
-            } else {
-                // 1、已诊断、2、待诊断、0、全部
-                if (StringUtils.isEmpty(hea.getId())) {
-                    waitConfiList.add(hea);
-                } else if (StringUtils.isNotEmpty(hea.getId())) {//1、已诊断
-                    confiList.add(hea);
-                }
-                //全部
-                hdrList.add(hea);
+        Collections.sort(hearingDiagnoseList);
+        for (int i = 0; i < babyIds.size(); i++) {
+            HearingDiagnoseListResult hea = new HearingDiagnoseListResult();
+            BabyModel babyModel = babyService.getOneBabyById(babyIds.get(i));
+            if (babyModel != null) {
+                hea.setBabyName(babyModel.getName());
+                hea.setBabyId(babyIds.get(i));
+                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())));
             }
+            //全部
+            hdrList.add(hea);
+            //待诊断
+            waitConfiList.add(hea);
         }
 
         BaseListResponse result = new BaseListResponse();
@@ -603,7 +595,25 @@ public class HearingDiagnoseController extends BaseController {
                 pageInfo.setCount(hdrList.size());
                 result.setData(hdrList);
             }
-        } else {
+        } else if (hdReq.getIsconfirm() != null) {
+            for (int i = (hdReq.getPage() - 1) * hdReq.getLimit(); (i < confiList.size() && i < hdReq.getLimit()); i++) {
+                resList.add(confiList.get(i));
+            }
+            result.setData(confiList);
+            pageInfo.setCount(confiList.size());
+        } else if(hdReq.getConfirmDegree()!=null){
+            for (int i = (hdReq.getPage() - 1) * hdReq.getLimit(); (i < confiList.size() && i < hdReq.getLimit()); i++) {
+                resList.add(confiList.get(i));
+            }
+            result.setData(confiList);
+            pageInfo.setCount(confiList.size());
+        }else if(StringUtils.isNotEmpty(hdReq.getDiagnDoctorId())){
+            for (int i = (hdReq.getPage() - 1) * hdReq.getLimit(); (i < confiList.size() && i < hdReq.getLimit()); i++) {
+                resList.add(confiList.get(i));
+            }
+            result.setData(confiList);
+            pageInfo.setCount(confiList.size());
+        }else {
             for (int i = (hdReq.getPage() - 1) * hdReq.getLimit(); (i < hdrList.size() && i < hdReq.getLimit()); i++) {
                 resList.add(hdrList.get(i));
             }
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 5ec5b2d..7fc729a 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
@@ -370,6 +370,7 @@ public class BabyEarFacade {
 
             //数据转换
             BabyPatientExtendEar babyPatientExtendEar = new BabyPatientExtendEar();
+            babyPatientExtendEar.setNation(babyEarBase.getNation());
             babyPatientExtendEar.setmHighRiskFactorId(babyEarBase.getmHighRiskFactorId());
             babyPatientExtendEar.setAdmissNo(babyEarBase.getAdmissNo());
             babyPatientExtendEar.setDischargeDiagnosis(babyEarBase.getDischargeDiagnosis());
@@ -502,6 +503,7 @@ public class BabyEarFacade {
             if (CollectionUtils.isNotEmpty(babyPatientExtendEars)) {
                 BabyPatientExtendEar babyPatientExtendEar = babyPatientExtendEars.get(0);
                 babyEarBase.setId(babyPatientExtendEar.getId());
+                babyEarBase.setNation(babyPatientExtendEar.getNation());
                 babyEarBase.setAdmissNo(babyPatientExtendEar.getAdmissNo());
                 babyEarBase.setBarCode(babyPatientExtendEar.getBarCode());
                 babyEarBase.setCreateUserId(babyPatientExtendEar.getCreateUserId());
@@ -552,7 +554,6 @@ public class BabyEarFacade {
                 babyPatientExtendEarMother.setBadLifeHistoryType("{}");
                 babyPatientExtendEarMother.setMedicalHistoryType("{}");
                 babyPatientExtendEarMother.setBnormalPregnancyHistoryType("{}");
-                babyPatientExtendEarMother.setBadLifeHistoryType("{}");
                 babyEarResult.setPatientExtendEarMother(babyPatientExtendEarMother);
             }
 
@@ -610,7 +611,7 @@ public class BabyEarFacade {
                 babyEarBaseView.setId(babyPatientExtendEar.getId());
                 babyEarBaseView.setDischargeDiagnosis(babyPatientExtendEar.getDischargeDiagnosis());
                 babyEarBaseView.setBarCode(babyPatientExtendEar.getBarCode());
-                babyEarBaseView.setBarCode(babyPatientExtendEar.getBarCode());
+                babyEarBaseView.setNation(getBasicConfig(babyPatientExtendEar.getNation()));
                 babyEarBaseView.setRemark(babyModel.getMremark());
                 if (babyModel.getServiceType() == ServiceTypeEnums.STANDARD_SERVICE.getId()) {
                     babyEarBaseView.setServiceStatus(ServiceStatusEnums.STANDARD_OPEN.getName());
@@ -990,7 +991,9 @@ public class BabyEarFacade {
                     historyStr.append("吸毒、");
                 }
             }
-            historyStr.append(")");
+            if(StringUtils.isNotEmpty(historyStr.toString())){
+                historyStr.append(")");
+            }
             babyEarMotherView.setBadLifeHistoryType(historyStr.toString());
         }
 
-- 
1.8.3.1