diff --git a/platform-biz-service/src/main/resources/mainOrm/master/MasterUsers.xml b/platform-biz-service/src/main/resources/mainOrm/master/MasterUsers.xml
index fbe6959..453c19c 100644
--- a/platform-biz-service/src/main/resources/mainOrm/master/MasterUsers.xml
+++ b/platform-biz-service/src/main/resources/mainOrm/master/MasterUsers.xml
@@ -349,7 +349,7 @@ select id,logincenter_id,type,org_id,dept_id,name,account,pwd,phone,publish_id,p
     </select>
 
     <select id="getUserId" resultType="java.lang.Integer">
-         select id from users where org_id=#{orgId} and name=#{doctorName}
+         select id from users where org_id=#{orgId} and name=#{doctorName} ORDER BY id DESC LIMIT 0,1
 
      </select>
 
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java
index bac8887..647a9b8 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java
@@ -398,7 +398,7 @@ public class BookbuildingFacade {
         //如果建档医生是空则创建医生
         if (StringUtils.isEmpty(patient.getLastCheckEmployeeId())) {
 
-            Integer dockerId = usersService.getUserId(patient.getHospitalId(), yunRequest.getLastCheckEmployeeName());
+            Integer dockerId = usersService.getUserId(patient.getHospitalId(), yunRequest.getLastCheckEmployeeName().trim());
             if (dockerId != null) {
                 patient.setLastCheckEmployeeId(String.valueOf(dockerId));
             } else {
@@ -408,8 +408,8 @@ public class BookbuildingFacade {
                     users.setType(UserTypeEnum.NORMAL_USER.getId());       //1普通用户
                     //users.setDeptId(deptId);
                     users.setOrgId(Integer.valueOf(patient.getHospitalId()));
-                    users.setName(yunRequest.getLastCheckEmployeeName());
-                    users.setAccount(yunRequest.getLastCheckEmployeeName());
+                    users.setName(yunRequest.getLastCheckEmployeeName().trim());
+                    users.setAccount(yunRequest.getLastCheckEmployeeName().trim());
                     //users.setPhone(phone);
                     users.setEnable(1);
                     // users.setZhiChenId(zhiCId);
@@ -1924,7 +1924,7 @@ public class BookbuildingFacade {
         //如果建档医生是空则创建医生
         if (StringUtils.isEmpty(patient.getLastCheckEmployeeId())) {
 
-            Integer dockerId = usersService.getUserId(hospitalId, yunRequest.getLastCheckEmployeeName());
+            Integer dockerId = usersService.getUserId(hospitalId, yunRequest.getLastCheckEmployeeName().trim());
             if (dockerId != null) {
                 patient.setLastCheckEmployeeId(String.valueOf(dockerId));
             } else {
@@ -1934,8 +1934,8 @@ public class BookbuildingFacade {
                     users.setType(UserTypeEnum.NORMAL_USER.getId());       //1普通用户
                     //users.setDeptId(deptId);
                     users.setOrgId(Integer.valueOf(StringUtils.isNotEmpty(patient.getHospitalId()) ? patient.getHospitalId() : hospitalId));
-                    users.setName(yunRequest.getLastCheckEmployeeName());
-                    users.setAccount(yunRequest.getLastCheckEmployeeName());
+                    users.setName(yunRequest.getLastCheckEmployeeName().trim());
+                    users.setAccount(yunRequest.getLastCheckEmployeeName().trim());
                     //users.setPhone(phone);
                     users.setEnable(1);
                     // users.setZhiChenId(zhiCId);
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java
index d30b07c..78a44dc 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java
@@ -3325,12 +3325,12 @@ public class PatientFacade extends BaseServiceImpl {
         patientsQuery.setHighRiskFileCode(patientManagerRequest.getHighRiskFileCode());
        // System.out.println(patientsQuery.convertToQuery().convertToMongoQuery().toString());
         if (StringUtils.isNotEmpty(patientManagerRequest.getLastCheckEmployeeId())){
-          /*  Integer userCheckId = usersService.getUserId(hospitalId,patientManagerRequest.getLastCheckEmployeeId());
+            Integer userCheckId = usersService.getUserId(hospitalId,patientManagerRequest.getLastCheckEmployeeId());
             if (userCheckId!=null){
                 patientsQuery.setLastCheckEmployeeId(String.valueOf(userCheckId));
-            }else {*/
+            }else {
                 patientsQuery.setLastCheckEmployeeId(patientManagerRequest.getLastCheckEmployeeId());
-            //}
+            }
         }
 
 
@@ -3449,6 +3449,7 @@ public class PatientFacade extends BaseServiceImpl {
                         System.out.println(patients.getId() + ";no user bookbuildingDoctor" + patients.getBookbuildingDoctor());
                     }
                 }
+                //TODO 优化产检医生是汉字的逻辑
                 String lastCheckEmployeeId = "";
                 if (StringUtils.isNotEmpty(patients.getLastCheckEmployeeId())) {
                     Users user = usersService.getUsers(Integer.valueOf(patients.getLastCheckEmployeeId()));