From a50342c9f0272f7872c854e7ff807628ab7dde15 Mon Sep 17 00:00:00 2001
From: wangxianzhang <ZHANGYUGE6666>
Date: Fri, 8 Apr 2022 17:22:15 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=84=E7=90=86=E5=BE=AA=E7=8E=AF=E4=BE=9D?=
 =?UTF-8?q?=E8=B5=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/epmet/service/impl/IcNatServiceImpl.java  | 6 +++---
 .../java/com/epmet/service/impl/IcResiUserServiceImpl.java  | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcNatServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcNatServiceImpl.java
index 715f820896..7fcb95e700 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcNatServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcNatServiceImpl.java
@@ -85,8 +85,8 @@ public class IcNatServiceImpl extends BaseServiceImpl<IcNatDao, IcNatEntity> imp
     private IcNatRelationDao icNatRelationDao;
     @Autowired
     private IcResiUserDao icResiUserDao;
-    @Autowired
-    private UserService userService;
+    //@Autowired
+    //private UserService userService;
 
     /**
      * @Author sun
@@ -320,7 +320,7 @@ public class IcNatServiceImpl extends BaseServiceImpl<IcNatDao, IcNatEntity> imp
             String app = EpmetRequestHolder.getHeader(AppClientConstant.APP);
             String client = EpmetRequestHolder.getHeader(AppClientConstant.CLIENT);
 
-            LoginUserDetailsResultDTO loginUserDetails = userService.getLoginUserDetails(app, client, userId);
+            LoginUserDetailsResultDTO loginUserDetails = SpringContextUtils.getBean(UserService.class).getLoginUserDetails(app, client, userId);
 
             String agencyId = loginUserDetails.getAgencyId();
 
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java
index 38d58ce001..e2a78205e9 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java
@@ -120,8 +120,8 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
     private IcUserTransferRecordService icUserTransferRecordService;
     @Autowired
     private RedisTemplate redisTemplate;
-    @Resource
-    private IcNatService icNatService;
+    //@Resource
+    //private IcNatService icNatService;
     //@Resource
     //private IcVaccineService icVaccineService;
     @Resource
@@ -1354,7 +1354,7 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
         IcResiUserEntity icResiUser = baseDao.selectById(formDTO.getId());
         if (null != icResiUser) {
             //核酸检测
-            List<NatListDTO> natList = icNatService.getNatList(formDTO.getCustomerId(), icResiUser.getIdCard());
+            List<NatListDTO> natList = SpringContextUtils.getBean(IcNatService.class).getNatList(formDTO.getCustomerId(), icResiUser.getIdCard());
             result.setNatList(natList);
             //疫苗接种
             List<VaccineListDTO> vaccineList = SpringContextUtils.getBean(IcVaccineService.class).getVaccineList(formDTO.getCustomerId(), icResiUser.getIdCard());