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

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

@@ -5,6 +5,8 @@ import com.diagbot.entity.LisMapping;
 import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.service.impl.impl.LisMappingServiceImpl;
 import com.diagbot.util.EntityUtil;
+import com.diagbot.util.ListUtil;
+import com.diagbot.util.StringUtil;
 import org.springframework.stereotype.Component;
 
 import java.util.LinkedHashMap;
@@ -20,14 +22,14 @@ import java.util.Map;
 public class LisMappingFacade extends LisMappingServiceImpl {
 
     /**
-     * 获取化验公表映射关系 Map<mealName,Map<itemName,uniqueName>>
+     * 获取化验公表映射关系 Map<mealName,Map<itemName,uniqueName>> itemName 不为空
      *
      * @return
      */
-    public Map<String, Map<String, String>> getLisMapping() {
+    public Map<String, Map<String, String>> getLisMappingWithItemName() {
         Map<String, Map<String, String>> retMap = new LinkedHashMap<>();
         QueryWrapper<LisMapping> lisMappingQueryWrapper = new QueryWrapper<>();
-        lisMappingQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey());
+        lisMappingQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey()).isNotNull("item_name").ne("item_name","");
         List<LisMapping> lisMappingList = this.list(lisMappingQueryWrapper);
         Map<String, List<LisMapping>> lisMappingMap = EntityUtil.makeEntityListMap(lisMappingList, "mealName");
         for (Map.Entry<String, List<LisMapping>> entry : lisMappingMap.entrySet()) {
@@ -40,6 +42,18 @@ public class LisMappingFacade extends LisMappingServiceImpl {
         return retMap;
     }
 
+    /**
+     * 获取化验公表映射关系 Map<mealName,uniqueName> itemName 为空
+     * @return
+     */
+    public Map<String,String> getLisMappingWithoutItemName() {
+        QueryWrapper<LisMapping> lisMappingQueryWrapper = new QueryWrapper<>();
+        lisMappingQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey()).isNull("item_name").or(i -> i.eq("item_name", ""));
+        List<LisMapping> lisMappingList = this.list(lisMappingQueryWrapper);
+        Map<String, String> retMap = EntityUtil.makeMapWithKeyValue(lisMappingList, "mealName", "uniqueName");
+        return retMap;
+    }
+
     /**
      * 化验公表映射关系  Map<uniqueName,List<mealName>>
      *
@@ -56,4 +70,36 @@ public class LisMappingFacade extends LisMappingServiceImpl {
         }
         return retMap;
     }
+
+
+    /**
+     *
+     * @param project 化验大项
+     * @param details 化验小项
+     * @return
+     */
+    public Map<String,Map<String,String>> getLisMappingByQuestion(String project,List<String> details){
+        Map<String,Map<String,String>> lisWithItemNamMap=getLisMappingWithItemName();
+        Map<String,String> lisWithoutItemNameMap=getLisMappingWithoutItemName();
+
+        if(StringUtil.isNotBlank(project)){
+            return null;
+        }
+
+        Map<String,Map<String,String>> retMap=new LinkedHashMap<>();
+        Map<String,String> projectMap=new LinkedHashMap<>();
+        projectMap.put(project,lisWithoutItemNameMap.get(project));
+        retMap.put("project",projectMap);
+
+        if(ListUtil.isEmpty(details)){
+            return  retMap;
+        }
+
+        Map<String,String> detailMap=new LinkedHashMap<>();
+        for(String detail:details){
+            detailMap.put(detail,lisWithItemNamMap.get(project).get(detail));
+        }
+        retMap.put("details",detailMap);
+        return retMap;
+    }
 }