diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyScreeningFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyScreeningFacade.java
index bd7b998..d1f0af3 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyScreeningFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyScreeningFacade.java
@@ -531,7 +531,6 @@ public class ApplyScreeningFacade {
         List<MedicalRecordVo> medicalRecordVoList = appointmentService.queryList(medicalRecordVo);
         if(CollectionUtils.isNotEmpty(medicalRecordVoList)){
             for (MedicalRecordVo recordVo : medicalRecordVoList) {
-                Boolean ckFlag = true; // 判断是否为产科
                 ApplyScreeningOutResult screeningOutResult = new ApplyScreeningOutResult();
                 screeningOutResult.setName(recordVo.getName());
                 String age1 = recordVo.getAge().substring(0,8);
@@ -541,11 +540,7 @@ public class ApplyScreeningFacade {
                 screeningOutResult.setCardNo(recordVo.getCardNo());
                 screeningOutResult.setDueDate(recordVo.getDeliveryTime());
                 screeningOutResult.setPhone(recordVo.getPhone());
-                if(recordVo.getDepartment().contains("产科")){
-                    ckFlag = true;
-                }else{
-                    ckFlag = false;
-                }
+                screeningOutResult.setDepartment(recordVo.getDepartment());
                 // 查建档
                 PatientsQuery patientsQuery = new PatientsQuery();
                 patientsQuery.setCardNo(recordVo.getCardNo());
@@ -575,33 +570,38 @@ public class ApplyScreeningFacade {
                     screeningOutResult.setrLevel(level);
                     // 高危风险因素
                     screeningOutResult.setrRisk(queryRiskListName(patients.getRiskFactorId()));
-
-                    ReferralApplyScreeningQuery query = new ReferralApplyScreeningQuery();
-                    query.setCardNo(recordVo.getCardNo());
-                    List<ReferralApplyScreeningModel> screeningModels =
-                            applyScreeningService.queryReferralApplyScreeningWithQuery(query);
-                    if (CollectionUtils.isNotEmpty(screeningModels)){
-                        screeningOutResult.setTransferredDepartment(screeningModels.get(0).getTransferredDepartment());
-                        screeningOutResult.setOutDepartment(screeningModels.get(0).getOutDepartment());
-                        screeningOutResult.setCreated(DateUtil.getYyyyMmDd(screeningModels.get(0).getCreated()));
-                        screeningOutResult.setReceived(DateUtil.getYyyyMmDd(screeningModels.get(0).getReceived()));
-                        screeningOutResult.setApplyDoctor(screeningModels.get(0).getApplyDoctor());
-                        screeningOutResult.setId(screeningModels.get(0).getId());
-                        screeningOutResult.setPid(screeningModels.get(0).getPid());
-                    }
                 }
-                Users serviceUsers = usersService.getUsers(userId);
-                if(null != serviceUsers){
-                    // 不是主任的就按当前账号医生分
-                    if(serviceUsers.getZhiChenId() != 4){
-                        if(userId.toString().equals(screeningOutResult.getApplyDoctor()) && ckFlag){
+                ReferralApplyScreeningQuery query = new ReferralApplyScreeningQuery();
+                query.setCardNo(recordVo.getCardNo());
+                List<ReferralApplyScreeningModel> screeningModels =
+                        applyScreeningService.queryReferralApplyScreeningWithQuery(query);
+                if (CollectionUtils.isNotEmpty(screeningModels)){
+                    screeningOutResult.setTransferredDepartment(screeningModels.get(0).getTransferredDepartment());
+                    screeningOutResult.setOutDepartment(screeningModels.get(0).getOutDepartment());
+                    screeningOutResult.setCreated(DateUtil.getYyyyMmDd(screeningModels.get(0).getCreated()));
+                    screeningOutResult.setReceived(DateUtil.getYyyyMmDd(screeningModels.get(0).getReceived()));
+                    screeningOutResult.setApplyDoctor(screeningModels.get(0).getApplyDoctor());
+                    screeningOutResult.setId(screeningModels.get(0).getId());
+                    screeningOutResult.setPid(screeningModels.get(0).getPid());
+                    Users serviceUsers = usersService.getUsers(userId);
+                    if(null != serviceUsers){
+                        // 不是主任的就按当前账号医生分
+                        if(serviceUsers.getZhiChenId() != 4){
+                            if(userId.toString().equals(screeningOutResult.getApplyDoctor())){
+                                data.add(screeningOutResult);
+                            }
+                        }else{
+                            // 是主任就全显示
                             data.add(screeningOutResult);
                         }
-                    }else{
-                        // 是主任就全显示
-                        data.add(screeningOutResult);
+                        // 医生名字
+                        screeningOutResult.setApplyDoctor(serviceUsers.getName());
                     }
                 }
+                else{
+                    // 是主任就全显示
+                    data.add(screeningOutResult);
+                }
             }
         }
         PageInfo pageInfo = new PageInfo();
@@ -678,17 +678,18 @@ public class ApplyScreeningFacade {
         List<ReferralApplyScreeningModel> screeningModels =
                 applyScreeningService.queryReferralApplyScreeningWithQuery(query);
         if(CollectionUtils.isNotEmpty(screeningModels)){
-            ReferralApplyScreeningModel screeningModel = screeningModels.get(0);
-            ReferralApplyScreeningQuery screeningQuery = new ReferralApplyScreeningQuery();
-            screeningQuery.setOutHospitalId(screeningModel.getHospitalId());
-            screeningQuery.setTransferredHospital(screeningModel.getHospitalId());
-            screeningQuery.setPid(screeningModel.getPid());
-            screeningQuery.setId(screeningModel.getId());
-            referralApplyScreeningModel.setOutDepartment(screeningModel.getTransferredDepartment());
-            referralApplyScreeningModel.setTransferredDepartment(patientBaseResult.getChangeDepartment());
-            referralApplyScreeningModel.setReason(patientBaseResult.getReason());
-            referralApplyScreeningModel.setModified(new Date());
-            applyScreeningService.updateByParentId(screeningQuery,referralApplyScreeningModel);
+//            ReferralApplyScreeningModel screeningModel = screeningModels.get(0);
+//            ReferralApplyScreeningQuery screeningQuery = new ReferralApplyScreeningQuery();
+//            screeningQuery.setOutHospitalId(screeningModel.getHospitalId());
+//            screeningQuery.setTransferredHospital(screeningModel.getHospitalId());
+//            screeningQuery.setPid(screeningModel.getPid());
+//            screeningQuery.setId(screeningModel.getId());
+//            referralApplyScreeningModel.setOutDepartment("产科");
+//            referralApplyScreeningModel.setTransferredDepartment(patientBaseResult.getChangeDepartment());
+//            referralApplyScreeningModel.setReason(patientBaseResult.getReason());
+//            referralApplyScreeningModel.setModified(new Date());
+//            applyScreeningService.updateByParentId(screeningQuery,referralApplyScreeningModel);
+            return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("该患者已经完成转诊");
         }else{
             referralApplyScreeningModel.setOutHospitalId("2100002419");
             referralApplyScreeningModel.setTransferredHospital("2100002419");
@@ -750,7 +751,7 @@ public class ApplyScreeningFacade {
                 Users users = usersService.getUsers(userId);
                 if(users != null){
                     // 转出科室
-                    referralApplyScreeningModel.setOutDepartment(users.getName());
+                    referralApplyScreeningModel.setOutDepartment("产科");
                 }
             }
             applyScreeningService.addOneReferralApplyScreening(referralApplyScreeningModel);
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ApplyScreeningOutResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ApplyScreeningOutResult.java
index 0c0518a..45fc119 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ApplyScreeningOutResult.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ApplyScreeningOutResult.java
@@ -78,6 +78,16 @@ public class ApplyScreeningOutResult {
     //转出科室
     private String outDepartment;
 
+    private String department;
+
+    public String getDepartment() {
+        return department;
+    }
+
+    public void setDepartment(String department) {
+        this.department = department;
+    }
+
     public String getTransferredDepartment() {
         return transferredDepartment;
     }