化验公表映射

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

@@ -215,9 +215,19 @@ public class PushFacade {
         }
         //化验  标签列表
         if (featureTypeSet.contains(String.valueOf(QuestionTypeEnum.Lis.getKey()))) {
-            List<QuestionDTO> labDTO = getTagListByMap(labMap, pushVO, QuestionTypeEnum.Lis.getKey());
+            //公表项转套餐项
+            Map<String, List<String>> lisMapping = lisMappingFacade.getLisMappingByUniqueName();
+            Map<String, Object> mealLabMap = new LinkedHashMap<>();
+            for (Map.Entry<String, Object> entry : labMap.entrySet()) {
+                if (ListUtil.isNotEmpty(lisMapping.get(entry.getKey()))) {
+                    //匹配出多个套餐项默认取第一个
+                    mealLabMap.put(lisMapping.get(entry.getKey()).get(0), null);
+                }
+            }
+            List<QuestionDTO> labDTO = getTagListByMap(mealLabMap, pushVO, QuestionTypeEnum.Lis.getKey());
             pushDTO.setLab(labDTO);
         }
+
         //辅检  标签列表
         if (featureTypeSet.contains(String.valueOf(QuestionTypeEnum.Pacs.getKey()))) {
             List<QuestionDTO> pacsDTO = getTagListByMap(pacsMap, pushVO, QuestionTypeEnum.Pacs.getKey());