Merge branch 'master' into innerDevelop

src/main/java/com/diagbot/config/CacheDeleteInit.java

@@ -46,5 +46,7 @@ public class CacheDeleteInit implements CommandLineRunner {
 
         neoFacade.getDisdistributionCache();
         log.info("CDSS-CORE服务启动加载图谱疾病对应发病率缓存成功！");*/
+
+        log.info("CDSS-CORE初始化完成！");
     }
 }

src/main/java/com/diagbot/facade/CommonFacade.java

@@ -145,7 +145,7 @@ public class CommonFacade {
 
         //所有化验(结构化数据)
         List<String> allLis = new ArrayList<>();
-        //普通化验
+        //普通化验——取明细
         List<Lis> lis = wordCrfDTO.getLis();
         if (ListUtil.isNotEmpty(lis)) {
             List<String> lis_unique = lis.stream().filter(x -> StringUtils.isBlank(x.getUniqueName()))
@@ -153,11 +153,11 @@ public class CommonFacade {
                     .map(x ->x.getDetailName()).collect(Collectors.toList());
             allLis.addAll(lis_unique);
         }
-        //开单化验
+        //开单化验——取套餐
         List<Lis> lisOrder = wordCrfDTO.getLisOrder();
         if (ListUtil.isNotEmpty(lisOrder)) {
             List<String> lis_unique = lisOrder.stream().filter(x -> StringUtils.isBlank(x.getUniqueName()))
-                    .map(x -> x.getName() + x.getDetailName()).collect(Collectors.toList());
+                    .map(x -> x.getName()).collect(Collectors.toList());
             allLis.addAll(lis_unique);
         }
         standConvert.setLisList(allLis);

src/main/java/com/diagbot/facade/NeoFacade.java

@@ -131,10 +131,11 @@ public class NeoFacade {
                 res.get(med_type).add(med_name);
             }
         }
-
-        // 加载药品缓存
-        for (String key : res.keySet()) {
-            redisUtil.updateValue(RedisEnum.drugType.getName() + key, res.get(key));
+        Map redisMap = res.entrySet().stream().collect(
+                Collectors.toMap(k -> RedisEnum.drugType.getName() + k.getKey(),
+                        v -> v.getValue(), (v1, v2) -> (v2)));
+        if (redisMap != null && redisMap.size() > 0) {
+            redisTemplate.opsForValue().multiSet(redisMap);
         }
         return res;
     }
@@ -931,6 +932,9 @@ public class NeoFacade {
             Map<String, StandConvertCrfDTO> crfMap = crfDTO.get(type);
             for (String s : convertList) {
                 String lastS = s;
+                if (StringUtil.isBlank(s)) {
+                    continue;
+                }
                 if (crfMap != null) {
                     StandConvertCrfDTO standConvertCrfDTO = crfMap.get(s);
                     if (standConvertCrfDTO != null) {