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

icss-service/src/main/java/com/diagbot/facade/LisMappingFacade.java

@@ -26,7 +26,7 @@ public class LisMappingFacade extends LisMappingServiceImpl {
      *
      * @return
      */
-    public Map<String, Map<String, String>> getLisMappingWithItemName() {
+    public Map<String, Map<String, String>> getLisMapping() {
         Map<String, Map<String, String>> retMap = new LinkedHashMap<>();
         QueryWrapper<LisMapping> lisMappingQueryWrapper = new QueryWrapper<>();
         lisMappingQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey()).isNotNull("item_name").ne("item_name","");
@@ -79,7 +79,7 @@ public class LisMappingFacade extends LisMappingServiceImpl {
      * @return
      */
     public Map<String,Map<String,String>> getLisMappingByQuestion(String project,List<String> details){
-        Map<String,Map<String,String>> lisWithItemNamMap=getLisMappingWithItemName();
+        Map<String,Map<String,String>> lisWithItemNamMap=getLisMapping();
         Map<String,String> lisWithoutItemNameMap=getLisMappingWithoutItemName();
 
         if(StringUtil.isNotBlank(project)){