|
@@ -33,6 +33,8 @@ public class QuestionFacade extends QuestionInfoServiceImpl {
|
|
|
|
|
|
@Autowired
|
|
@Autowired
|
|
QuestionDetailFacade questionDetailFacade;
|
|
QuestionDetailFacade questionDetailFacade;
|
|
|
|
+ @Autowired
|
|
|
|
+ LisMappingFacade lisMappingFacade;
|
|
|
|
|
|
/**
|
|
/**
|
|
* 根据参数返回标签内容
|
|
* 根据参数返回标签内容
|
|
@@ -109,8 +111,7 @@ public class QuestionFacade extends QuestionInfoServiceImpl {
|
|
if (ListUtil.isNotEmpty(res.getQuestionMapping())) {
|
|
if (ListUtil.isNotEmpty(res.getQuestionMapping())) {
|
|
details = res.getQuestionMapping().stream().map(row -> row.getName()).collect(Collectors.toList());
|
|
details = res.getQuestionMapping().stream().map(row -> row.getName()).collect(Collectors.toList());
|
|
}
|
|
}
|
|
- //TODO 调用接口
|
|
|
|
- Map<String, Map<String, String>> map = getUnique(project, details);
|
|
|
|
|
|
+ Map<String, Map<String, String>> map = lisMappingFacade.getLisMappingByQuestion(project, details);
|
|
if (map != null) {
|
|
if (map != null) {
|
|
if (map.get("project") != null) {
|
|
if (map.get("project") != null) {
|
|
res.setUniqueName(map.get("project").get(res.getName()));
|
|
res.setUniqueName(map.get("project").get(res.getName()));
|
|
@@ -125,20 +126,6 @@ public class QuestionFacade extends QuestionInfoServiceImpl {
|
|
return res;
|
|
return res;
|
|
}
|
|
}
|
|
|
|
|
|
- //TODO 删除
|
|
|
|
- public Map<String, Map<String, String>> getUnique(String project, List<String> details) {
|
|
|
|
- Map<String, Map<String, String>> map = new HashMap<>();
|
|
|
|
- Map<String, String> map2 = new HashMap<>();
|
|
|
|
- map2.put("血常规", "血常规大项目啊");
|
|
|
|
- map.put("project", map2);
|
|
|
|
-
|
|
|
|
- Map<String, String> map3 = new HashMap<>();
|
|
|
|
- map3.put("HGB*3/HCT", "其他名字");
|
|
|
|
- map3.put("白细胞计数(WBC)", "推送2");
|
|
|
|
- map3.put("大型血小板比例(P-LCR)", "推送3");
|
|
|
|
- map.put("details", map3);
|
|
|
|
- return map;
|
|
|
|
- }
|
|
|
|
|
|
|
|
/**
|
|
/**
|
|
* 查询多个id返回标签内容
|
|
* 查询多个id返回标签内容
|