Merge remote-tracking branch 'origin/dev/20220228_v3.0.1通用版_渠道管理第一期' into dev/20220228_v3.0.1通用版_渠道管理第一期

mdsp-service/src/main/java/com/lantone/facade/cdss/MappingConfigFacade.java

@@ -102,7 +102,9 @@ public class MappingConfigFacade extends MappingConfigServiceImpl {
     private MappingConfigService mappingConfigService;
     @Autowired
     private DictionaryFacade dictionaryFacade;
-
+    @Autowired
+    private SysUserUtils sysUserUtils;
+    
     /**
      * 分页查询
      *
@@ -112,7 +114,7 @@ public class MappingConfigFacade extends MappingConfigServiceImpl {
     @Override
     public IPage<MappingConfigWrapper> getPage(MappingConfigPageVO mappingConfigPageVO) {
         if (mappingConfigPageVO.getHospitalId() == null) {
-            mappingConfigPageVO.setHospitalId(Long.valueOf(SysUserUtils.getCurrentHospitalID()));
+            mappingConfigPageVO.setHospitalId(Long.valueOf(sysUserUtils.getCurrentHospitalID()));
         }
 
         FilterVO filterVO = new FilterVO();
@@ -436,7 +438,7 @@ public class MappingConfigFacade extends MappingConfigServiceImpl {
      */
     public void exportExcel(HttpServletResponse response, MappingConfigPageVO mappingConfigPageVO) {
         if (mappingConfigPageVO.getHospitalId() == null) {
-            mappingConfigPageVO.setHospitalId(Long.valueOf(SysUserUtils.getCurrentHospitalID()));
+            mappingConfigPageVO.setHospitalId(Long.valueOf(sysUserUtils.getCurrentHospitalID()));
         }
         mappingConfigPageVO.setHisName("");
         mappingConfigPageVO.setHisDetailName("");
@@ -456,7 +458,7 @@ public class MappingConfigFacade extends MappingConfigServiceImpl {
      */
     public List<MappingConfigWrapper> exportExcel_remote(MappingConfigPageVO mappingConfigPageVO) {
         if (mappingConfigPageVO.getHospitalId() == null) {
-            mappingConfigPageVO.setHospitalId(Long.valueOf(SysUserUtils.getCurrentHospitalID()));
+            mappingConfigPageVO.setHospitalId(Long.valueOf(sysUserUtils.getCurrentHospitalID()));
         }
         mappingConfigPageVO.setHisName("");
         mappingConfigPageVO.setHisDetailName("");
@@ -1298,7 +1300,7 @@ public class MappingConfigFacade extends MappingConfigServiceImpl {
      */
     public void importExcel(HttpServletResponse response, MultipartFile file, Long hospitalId, Integer type, String userId) {
         if (hospitalId == null) {
-            hospitalId = Long.valueOf(SysUserUtils.getCurrentHospitalID());
+            hospitalId = Long.valueOf(sysUserUtils.getCurrentHospitalID());
         }
         if (StringUtil.isBlank(userId)) {
             userId = SysUserUtils.getCurrentPrincipleID();
@@ -1325,7 +1327,7 @@ public class MappingConfigFacade extends MappingConfigServiceImpl {
      */
     public List<MappingConfigWrapper> importExcel_remote(HttpServletResponse response, MultipartFile file, Long hospitalId, Integer type, String userId) {
         if (hospitalId == null) {
-            hospitalId = Long.valueOf(SysUserUtils.getCurrentHospitalID());
+            hospitalId = Long.valueOf(sysUserUtils.getCurrentHospitalID());
         }
         if (StringUtil.isBlank(userId)) {
             userId = SysUserUtils.getCurrentPrincipleID();
@@ -1350,7 +1352,7 @@ public class MappingConfigFacade extends MappingConfigServiceImpl {
      */
     public Boolean importExcelDataVerify(MultipartFile file, Long hospitalId, Integer type, String userId) {
         if (hospitalId == null) {
-            hospitalId = Long.valueOf(SysUserUtils.getCurrentHospitalID());
+            hospitalId = Long.valueOf(sysUserUtils.getCurrentHospitalID());
         }
         if (StringUtil.isBlank(userId)) {
             userId = SysUserUtils.getCurrentPrincipleID();
@@ -1947,7 +1949,7 @@ public class MappingConfigFacade extends MappingConfigServiceImpl {
     public List<MappingConfigWrapper> getRelatedMapping(MappingConfigVO mappingConfigVO) {
         List<MappingConfigWrapper> retList = Lists.newLinkedList();
         if (mappingConfigVO.getHospitalId() == null) {
-            mappingConfigVO.setHospitalId(Long.valueOf(SysUserUtils.getCurrentHospitalID()));
+            mappingConfigVO.setHospitalId(Long.valueOf(sysUserUtils.getCurrentHospitalID()));
         }
         QueryWrapper<MappingConfig> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
@@ -1986,7 +1988,7 @@ public class MappingConfigFacade extends MappingConfigServiceImpl {
             throw new CommonException(CommonErrorCode.PARAM_IS_NULL, "请输入请输入术语类型：1-化验、3-辅检、4-诊断、5-药品、6-手术和操作、7-科室、8-输血、10-量表、11-护理、12-中医诊断、13-中医证候、14-麻醉、16-给药途径");
         }
         if (mappingConfig.getHospitalId() == null) {
-            mappingConfig.setHospitalId(Long.valueOf(SysUserUtils.getCurrentHospitalID()));
+            mappingConfig.setHospitalId(Long.valueOf(sysUserUtils.getCurrentHospitalID()));
         }
         QueryWrapper<MappingConfig> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
@@ -2045,7 +2047,7 @@ public class MappingConfigFacade extends MappingConfigServiceImpl {
             throw new CommonException(CommonErrorCode.PARAM_IS_NULL, "标准术语不允许为空，请输入标准术语id");
         }
         if (mappingConfig.getHospitalId() == null) {
-            mappingConfig.setHospitalId(Long.valueOf(SysUserUtils.getCurrentHospitalID()));
+            mappingConfig.setHospitalId(Long.valueOf(sysUserUtils.getCurrentHospitalID()));
         }
         String userId = "";
         if (StringUtil.isBlank(mappingConfig.getModifier())) {

mdsp-service/src/main/java/com/lantone/util/SysUserUtils.java

@@ -1,12 +1,23 @@
 package com.lantone.util;
 
+import com.lantone.common.constant.AuthConstant;
+import com.lantone.common.service.RedisService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.Map;
+
 /**
  * @Description: 用户工具类
  * @author: gaodm
  * @time: 2018/8/3 17:46
  */
+@Component
 public class SysUserUtils {
 
+    @Autowired
+    private RedisService redisService;
+
     /**
      * 获取当前请求的用户ID
      *
@@ -21,8 +32,9 @@ public class SysUserUtils {
      *
      * @return
      */
-    public static String getCurrentHospitalID() {
-        return "3";
+    public String getCurrentHospitalID() {
+        Map<String, Map<String, Map<String, String>>> dicMap = redisService.get(AuthConstant.DIC_MAP_KEY);
+        return dicMap.get("0").get("53").get(com.lantone.common.util.SysUserUtils.getCurrentHospitalIdStr());
     }
 
 }