|
@@ -39,6 +39,7 @@ import com.diagbot.vo.NeoPushVO;
|
|
|
import com.diagbot.vo.StandConvert;
|
|
|
import com.diagbot.vo.StandConvertCrfVO;
|
|
|
import com.diagbot.vo.neoPushEntity.Diag;
|
|
|
+import org.apache.commons.lang3.StringUtils;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.beans.factory.annotation.Value;
|
|
|
import org.springframework.cache.annotation.Cacheable;
|
|
@@ -450,14 +451,19 @@ public class NeoFacade {
|
|
|
List<String> orginList, Map<String, Map<String, String>> map) {
|
|
|
Map<String, StandConvertCrfDTO> crfMap = crfDTO.get(type);
|
|
|
Map<String, String> typeMap = new LinkedHashMap<>();
|
|
|
+ // 从redis获取对应的内容
|
|
|
+ Map<String, String> redisMap = null;
|
|
|
+ redisMap = redisUtil.getValueByType(type);
|
|
|
if (ListUtil.isEmpty(convertList) || crfMap == null) {
|
|
|
for (String orgS : orginList) {
|
|
|
- typeMap.put(orgS, orgS);
|
|
|
+ String standWord = redisMap.get(orgS);
|
|
|
+ if(StringUtils.isBlank(standWord)){
|
|
|
+ standWord = orgS;
|
|
|
+ }
|
|
|
+ typeMap.put(orgS, standWord);
|
|
|
}
|
|
|
} else {
|
|
|
- // 从redis获取对应的内容
|
|
|
- Map<String, String> redisMap = null;
|
|
|
- redisMap = redisUtil.getValueByType(type);
|
|
|
+
|
|
|
if (redisMap == null) {
|
|
|
redisMap = new LinkedHashMap<>();
|
|
|
}
|