|
@@ -444,13 +444,18 @@ public class QuestionFacade extends QuestionInfoServiceImpl {
|
|
|
Map<String, List<Integer>> map = resMap.data;
|
|
|
for (QuestionPageDTO bean : res.getRecords()) {
|
|
|
List<Integer> list = new ArrayList<>();
|
|
|
+ Boolean isLisDetail = false;
|
|
|
if (QuestionTypeEnum.Lis.getKey() == bean.getType() && TagTypeEnum.T7.getKey() != bean.getTagType().intValue()) {
|
|
|
+ isLisDetail = true;
|
|
|
+ }
|
|
|
+ if (isLisDetail) {
|
|
|
list = map.get(bean.getName());
|
|
|
} else {
|
|
|
list = map.get(bean.getTagName());
|
|
|
}
|
|
|
+ // 化验明细需要特殊处理,类型转换为明细
|
|
|
if (ListUtil.isNotEmpty(list)) {
|
|
|
- if (list.contains(bean.getType())) {
|
|
|
+ if (list.contains(bean.getType()) || (isLisDetail && list.contains(QuestionTypeEnum.LisDetail.getKey())) ) {
|
|
|
bean.setExist(true);
|
|
|
}
|
|
|
}
|