From b6547b438915f957ecf1c121357f342ecdd2fae7 Mon Sep 17 00:00:00 2001
From: xueqingkun <xueqingkun@126.com>
Date: Thu, 28 Dec 2023 10:37:43 +0800
Subject: [PATCH] web : queryHistoryList fix null bug
---
.../service/impl/DiagnosisQaRecordServiceImpl.java | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/virtual-patient-model/src/main/java/com/supervision/service/impl/DiagnosisQaRecordServiceImpl.java b/virtual-patient-model/src/main/java/com/supervision/service/impl/DiagnosisQaRecordServiceImpl.java
index c3e2c408..1337b3c3 100644
--- a/virtual-patient-model/src/main/java/com/supervision/service/impl/DiagnosisQaRecordServiceImpl.java
+++ b/virtual-patient-model/src/main/java/com/supervision/service/impl/DiagnosisQaRecordServiceImpl.java
@@ -18,10 +18,7 @@ import com.supervision.vo.ask.DiagnosisQaRecordHistoryResVO;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
import java.util.function.Function;
import java.util.stream.Collectors;
@@ -47,7 +44,7 @@ public class DiagnosisQaRecordServiceImpl extends ServiceImpl<DiagnosisQaRecordM
Set<String> questionIdList = page.getRecords().stream().map(DiagnosisQaRecord::getQuestionLibraryId).filter(StrUtil::isNotBlank).collect(Collectors.toSet());
if (CollUtil.isNotEmpty(questionIdList)){
List<AskTemplateQuestionLibrary> askTemplateQuestionLibraryList = askTemplateQuestionLibraryService.listByIds(questionIdList);
- Map<String, Long> questionLibraryMap = askTemplateQuestionLibraryList.stream().collect(Collectors.toMap(AskTemplateQuestionLibrary::getId, AskTemplateQuestionLibrary::getDictId));
+ Map<String, Long> questionLibraryMap = askTemplateQuestionLibraryList.stream().filter(i-> Objects.nonNull(i.getDictId())).collect(Collectors.toMap(AskTemplateQuestionLibrary::getId, AskTemplateQuestionLibrary::getDictId));
List<CommonDic> commonDicList = commonDicService.lambdaQuery().eq(CommonDic::getGroupCode, "AQT").list();
Map<Long, CommonDic> dicMap = commonDicList.stream().collect(Collectors.toMap(CommonDic::getId, Function.identity()));