Merge remote-tracking branch 'origin/dev/scale_preserve20210511' into debug

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

@@ -251,7 +251,8 @@ public class PushFacade {
                 Map<String, ConceptScaleDTO> conceptScaleMap = respDTO.data;
                 if (ListUtil.isNotEmpty(pushDTO.getScale())) {
                     pushDTO.getScale().forEach(item -> {
-                        if (conceptScaleMap.containsKey(item.getName() + "_" + dicStaticTypeValNameMap.get("8"))) {
+                        if (conceptScaleMap.containsKey(item.getName() + "_" + dicStaticTypeValNameMap.get("8"))
+                                && conceptScaleMap.get(item.getName() + "_" + dicStaticTypeValNameMap.get("8")) != null) {
                             item.setHasScale(1);
                         }
                     });