From 60ec60876e82988ba851a3e7e5f6db98a4aacd3d Mon Sep 17 00:00:00 2001
From: haorp <754760654@qq.com>
Date: Sat, 14 Jun 2025 10:48:48 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=A7=E5=A6=87=E8=BD=AC=E8=AF=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../operate/web/facade/ApplyScreeningFacade.java   | 40 +++++++++-------------
 1 file changed, 17 insertions(+), 23 deletions(-)

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 38bc365..3e3da14 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
@@ -17,10 +17,7 @@ import com.lyms.platform.operate.web.result.*;
 import com.lyms.platform.operate.web.utils.CommonsHelper;
 import com.lyms.platform.operate.web.utils.FunvCommonUtil;
 import com.lyms.platform.permission.model.*;
-import com.lyms.platform.permission.service.AppointmentService;
-import com.lyms.platform.permission.service.CouponService;
-import com.lyms.platform.permission.service.OrganizationService;
-import com.lyms.platform.permission.service.UsersService;
+import com.lyms.platform.permission.service.*;
 import com.lyms.platform.pojo.*;
 import com.lyms.platform.query.*;
 import org.apache.commons.collections.CollectionUtils;
@@ -92,6 +89,9 @@ public class ApplyScreeningFacade {
     @Autowired
     private AppointmentService appointmentService;
 
+    @Autowired
+    private DepartmentsService departmentsService;
+
     /*   @Autowired
        private CouponService couponService;
 
@@ -525,6 +525,17 @@ public class ApplyScreeningFacade {
         medicalRecordVo.setNeed("true");
         medicalRecordVo.setLimit(applyScreeningQueryRequest.getLimit());
         medicalRecordVo.setPage(applyScreeningQueryRequest.getPage());
+        Users serviceUsers = usersService.getUsers(userId);
+        if(serviceUsers != null){
+            // 不是主任的就按当前账号医生分
+            if(serviceUsers.getZhiChenId() != 4){
+                Departments departments = departmentsService.getDepartments(serviceUsers.getDeptId());
+                if(departments != null ){
+                    medicalRecordVo.setDepartment(departments.getName());
+                }
+            }
+        }
+
         if(StringUtils.isNotEmpty(applyScreeningQueryRequest.getQueryNo())){
             medicalRecordVo.setCardNo(applyScreeningQueryRequest.getQueryNo());
         }
@@ -550,6 +561,7 @@ public class ApplyScreeningFacade {
                 List<Patients> patientsList = patientsService.queryPatient(patientsQuery);
                 if(CollectionUtils.isNotEmpty(patientsList)){
                     Patients patients =  patientsList.get(0);
+                    screeningOutResult.setPid(patients.getPid());
                     // 高危因素
                     if(StringUtils.isNotEmpty(patients.getRiskLevelId())){
                         List level = new ArrayList();
@@ -586,26 +598,8 @@ public class ApplyScreeningFacade {
                     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);
-                        }
-                        // 医生名字
-                        screeningOutResult.setApplyDoctor(serviceUsers.getName());
-                    }
-                }
-                else{
-                    // 是主任就全显示
-                    data.add(screeningOutResult);
                 }
+                data.add(screeningOutResult);
             }
         }
         PageInfo pageInfo = new PageInfo();
-- 
1.8.3.1