Merge remote-tracking branch 'origin/dev/neo2mysql20210120' into dev/neo2mysql20210120

cdssman-service/src/main/java/com/diagbot/facade/KlConceptStaticFacade.java

@@ -97,7 +97,7 @@ public class KlConceptStaticFacade extends KlConceptStaticServiceImpl {
                 .collect(Collectors.toList());
         List<User> users = userFacade.list(new QueryWrapper<User>()
                 .eq("is_deleted", IsDeleteEnum.N.getKey())
-                .in("id", userIds));
+                .in("id", userIds, false));
         if (ListUtil.isNotEmpty(users)) {
             Map<Long, String> userMap = users.stream().collect(Collectors.toMap(User::getId, User::getLinkman));
             records.forEach(record -> {

cdssman-service/src/main/java/com/diagbot/facade/MedRuleConvertFacade.java

@@ -704,38 +704,6 @@ public class MedRuleConvertFacade {
         return retList;
     }
 
-    public List<ResultRule> getGroupRules(Map<Integer, List<ResultRule>> map, Long ruleOrderNo) {
-        List<ResultRule> retList = Lists.newLinkedList();
-        ruleOrderNo++;
-        if (map == null || map.size() == 0) {
-            return retList;
-        } else if (map.size() == 1) {
-            List<ResultRule> list1 = map.get(1);
-            for (ResultRule item : list1) {
-                item.setRuleOrderNo(ruleOrderNo++);
-                retList.add(item);
-            }
-        } else if (map.size() == 2) {
-            List<ResultRule> list1 = map.get(1);
-            List<ResultRule> list2 = map.get(2);
-            for (ResultRule item1 : list1) {
-                for (ResultRule item2 : list2) {
-                    ResultRule addItem1 = new ResultRule();
-                    BeanUtil.copyProperties(item1, addItem1);
-                    ResultRule addItem2 = new ResultRule();
-                    BeanUtil.copyProperties(item2, addItem2);
-                    addItem1.setRuleOrderNo(ruleOrderNo);
-                    addItem2.setRuleOrderNo(ruleOrderNo);
-                    retList.add(addItem1);
-                    retList.add(addItem2);
-                    ruleOrderNo++;
-                }
-            }
-        }
-        return retList;
-    }
-
-
     /**
      * 高危手术条件去重
      *
@@ -771,6 +739,7 @@ public class MedRuleConvertFacade {
                             .map(i -> i.getGroupType() + "_" + i.getRuleBaseId())
                             .collect(Collectors.joining("|")));
         }
+        //Map<groupType_ruleBaseId,List<ruleId>
         Map<String, List<Long>> reversedMap = new HashMap<>();
         for (Map.Entry<Long, String> entry : conditionMap.entrySet()) {
             List<Long> ruleIds = Lists.newLinkedList();