Merge remote-tracking branch 'origin/dev/ruleTest20210105' into test

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

@@ -539,7 +539,7 @@ public class DrugConfigFacade {
         for (Map.Entry<String, List<DrugConfig>> entry : hisNameMap.entrySet()) {
             if (ListUtil.isNotEmpty(entry.getValue())) {
                 retMap.put(entry.getKey(),
-                        EntityUtil.makeMapWithKeyValue(records, "uniqueName", "id"));
+                        EntityUtil.makeMapWithKeyValue(entry.getValue(), "uniqueName", "id"));
             }
         }
         return retMap;
@@ -579,7 +579,7 @@ public class DrugConfigFacade {
         for (Map.Entry<String, List<DrugConfig>> entry : uniqueNameMap.entrySet()) {
             if (ListUtil.isNotEmpty(entry.getValue())) {
                 retMap.put(entry.getKey(),
-                        EntityUtil.makeMapWithKeyValue(records, "hisName", "id"));
+                        EntityUtil.makeMapWithKeyValue(entry.getValue(), "hisName", "id"));
             }
         }
         return retMap;