diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java
index 97bbac2..5cf5a24 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java
@@ -15,14 +15,12 @@ import com.lyms.platform.operate.web.request.ReferralApplyOrderAddRequest;
 import com.lyms.platform.operate.web.request.SieveApplyOrderAddRequest;
 import com.lyms.platform.operate.web.result.*;
 import com.lyms.platform.permission.model.Organization;
+import com.lyms.platform.permission.model.OrganizationQuery;
 import com.lyms.platform.permission.model.Users;
 import com.lyms.platform.permission.service.OrganizationService;
 import com.lyms.platform.permission.service.UsersService;
 import com.lyms.platform.pojo.*;
-import com.lyms.platform.query.PatientsQuery;
-import com.lyms.platform.query.ReferralApplyOrderQuery;
-import com.lyms.platform.query.SieveApplyOrderQuery;
-import com.lyms.platform.query.SieveQuery;
+import com.lyms.platform.query.*;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang.math.NumberUtils;
@@ -81,6 +79,19 @@ public class ApplyOrderFacade {
         referralApplyOrderQuery.setParentId(referralApplyOrderModel.getParentId());
         String hospital = autoMatchFacade.getHospitalId(userId);
         referralApplyOrderQuery.setOutHospitalId(hospital);
+        //如果填写的汉字,并且改医院在我们系统存在则把他转成id
+        if (StringUtils.isNotEmpty(referralApplyOrderModel.getTransferredHospital()) && !NumberUtils.isNumber(referralApplyOrderModel.getTransferredHospital())) {
+            OrganizationQuery organizationQuery = new OrganizationQuery();
+            organizationQuery.setYn(YnEnums.YES.getId());
+            organizationQuery.setName(referralApplyOrderModel.getTransferredHospital());
+            List<Organization> organization = organizationService.queryOrganization(organizationQuery);
+            if (CollectionUtils.isNotEmpty(organization)) {
+                referralApplyOrderModel.setTransferredHospital(organization
+                        .get(0).getId() + "");
+            }
+        }
+
+
         List<ReferralApplyOrderModel> list = applyOrderService.queryReferralApplyOrderWithQuery(referralApplyOrderQuery);
         if (CollectionUtils.isEmpty(list)) {
             if (2 == type) {
@@ -105,12 +116,21 @@ public class ApplyOrderFacade {
 
                     referralApplyOrderModel.setPid(patients.getPid());
                     referralApplyOrderModel.setDueWeek(com.lyms.platform.common.utils.StringUtils.dueWeek(days));
+                    if (StringUtils.isNotEmpty(referralApplyOrderModel.getTransferredHospital()) && NumberUtils.isNumber(referralApplyOrderModel.getTransferredHospital())) {
+
+                        PatientsQuery patientsQuery1 = new PatientsQuery();
+                        patientsQuery1.setId(patients.getId());
+                        patientsQuery1.setYn(YnEnums.YES.getId());
 
-                    patients.setId(null);
-                    patients.setHospitalId(hospital);
-                    patients.setBookbuildingDate(new Date());
-                    patients.setBookbuildingDoctor(null);
-                    patientsService.addPatient(patients);
+                        if (patientsService.queryPatientCount(patientsQuery1) == 0) {
+                            //在转入的医院建档
+                            patients.setId(null);
+                            patients.setHospitalId(referralApplyOrderModel.getTransferredHospital());
+                            patients.setBookbuildingDate(new Date());
+                            patients.setBookbuildingDoctor(null);
+                            patientsService.addPatient(patients);
+                        }
+                    }
                 }
             } else {
                 BabyModel babyModel = babyService.getOneBabyById(referralApplyOrderModel.getParentId());
@@ -132,12 +152,21 @@ public class ApplyOrderFacade {
                     referralApplyOrderModel.setExpVip(babyModel.getExpVip());
                     referralApplyOrderModel.setPid(babyModel.getPid());
 
-                    //新增儿童建档
-                    babyModel.setId(null);
-                    babyModel.setHospitalId(hospital);
-                    babyModel.setBuildDoctor(null);
-                    babyModel.setBuildDate(new Date());
-                    babyService.addOneBaby(babyModel);
+                    if (StringUtils.isNotEmpty(referralApplyOrderModel.getTransferredHospital()) && NumberUtils.isNumber(referralApplyOrderModel.getTransferredHospital())) {
+                        BabyModelQuery babyModelQuery = new BabyModelQuery();
+                        babyModelQuery.setId(babyModel.getId());
+                        babyModelQuery.setHospitalId(referralApplyOrderModel.getTransferredHospital());
+                        babyModelQuery.setYn(YnEnums.YES.getId());
+                        //没有儿童档案的时候才建档
+                        if (babyService.queryBabyCount(babyModelQuery) == 0) {
+                            ////在转入的医院新增儿童建档
+                            babyModel.setId(null);
+                            babyModel.setHospitalId(referralApplyOrderModel.getTransferredHospital());
+                            babyModel.setBuildDoctor(null);
+                            babyModel.setBuildDate(new Date());
+                            babyService.addOneBaby(babyModel);
+                        }
+                    }
                 }
             }
 
@@ -145,6 +174,7 @@ public class ApplyOrderFacade {
             referralApplyOrderModel.setType(type);
             referralApplyOrderModel.setOutHospitalId(hospital);
             applyOrderService.addOneReferralApplyOrder(referralApplyOrderModel);
+
             referralApplyOrderModel.setId(null);
             referralApplyOrderModel.setOutHospitalId(referralApplyOrderModel.getTransferredHospital());
             referralApplyOrderModel.setTransferredHospital(hospital);
@@ -156,7 +186,6 @@ public class ApplyOrderFacade {
     }
 
     /**
-     *
      * 增加产前筛查
      *
      * @param sieveApplyOrderAddRequest
@@ -309,14 +338,14 @@ public class ApplyOrderFacade {
             for (ReferralApplyOrderModel applyOrderModel : orderModels) {
                 BabyApplyOrderResult babyApplyOrderResult = new BabyApplyOrderResult();
                 String zhuanchu = applyOrderModel.getOutHospitalId();
-                String zhuanru= applyOrderModel.getTransferredHospital();
-                if(NumberUtils.isNumber(zhuanchu)){
+                String zhuanru = applyOrderModel.getTransferredHospital();
+                if (NumberUtils.isNumber(zhuanchu)) {
                     Organization zhuanc = organizationService.getOrganization(Integer.valueOf(zhuanchu));
                     if (null != zhuanc) {
                         zhuanCName = zhuanc.getName();
                     }
                 }
-                if(NumberUtils.isNumber(zhuanru)){
+                if (NumberUtils.isNumber(zhuanru)) {
                     Organization zhuanc1 = organizationService.getOrganization(Integer.valueOf(zhuanru));
                     if (null != zhuanc1) {
                         zhuanRname = zhuanc1.getName();