|
@@ -123,9 +123,18 @@ public class PushFacade {
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
- //查体 概念列表
|
|
|
|
- if (featureTypeSet.contains(String.valueOf(FeatureTypeEnum.Feature_Type_Vital_Result.getKey())) ||
|
|
|
|
- featureTypeSet.contains(String.valueOf(FeatureTypeEnum.Feature_Type_Vital_Index.getKey()))) {
|
|
|
|
|
|
+ //查体 查体结果
|
|
|
|
+ if (featureTypeSet.contains(String.valueOf(FeatureTypeEnum.Feature_Type_Vital_Result.getKey()))) {
|
|
|
|
+ List<FeatureRate> vital = data.getVitals();
|
|
|
|
+ if (ListUtil.isNotEmpty(vital)) {
|
|
|
|
+ List<String> nameList = vital.stream().map(featureRate -> featureRate.getFeatureName()).collect(Collectors.toList());
|
|
|
|
+ if (ListUtil.isNotEmpty(nameList)) {
|
|
|
|
+ pushDTO.setVital(getConceptDTOList(nameList, LexiconTypeEnum.VITAL_RESULT.getKey()));
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ //查体 查体指标
|
|
|
|
+ if (featureTypeSet.contains(String.valueOf(FeatureTypeEnum.Feature_Type_Vital_Index.getKey()))) {
|
|
List<FeatureRate> vital = data.getVitals();
|
|
List<FeatureRate> vital = data.getVitals();
|
|
if (ListUtil.isNotEmpty(vital)) {
|
|
if (ListUtil.isNotEmpty(vital)) {
|
|
List<String> nameList = vital.stream().map(featureRate -> featureRate.getFeatureName()).collect(Collectors.toList());
|
|
List<String> nameList = vital.stream().map(featureRate -> featureRate.getFeatureName()).collect(Collectors.toList());
|
|
@@ -134,6 +143,7 @@ public class PushFacade {
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
+
|
|
//化验 概念列表-公表项
|
|
//化验 概念列表-公表项
|
|
if (featureTypeSet.contains(String.valueOf(FeatureTypeEnum.Feature_Type_Lis.getKey()))) {
|
|
if (featureTypeSet.contains(String.valueOf(FeatureTypeEnum.Feature_Type_Lis.getKey()))) {
|
|
List<FeatureRate> lis = data.getLabs();
|
|
List<FeatureRate> lis = data.getLabs();
|