|
@@ -67,6 +67,8 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
|
|
|
@Value("${encrypt.enable}")
|
|
|
Boolean encryptFlag;
|
|
|
@Autowired
|
|
|
+ QcQuestionFacade qcQuestionFacade;
|
|
|
+ @Autowired
|
|
|
MedLisResultFacade medLisResultFacade;
|
|
|
@Autowired
|
|
|
MedPacsResultFacade medPacsResultFacade;
|
|
@@ -213,6 +215,20 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
|
|
|
msgDTOList = getMsg(analyzeVO);
|
|
|
}
|
|
|
|
|
|
+ if (ListUtil.isNotEmpty(msgDTOList)) {
|
|
|
+ // 从qc_question_info的cases_entry_ids获取
|
|
|
+ Map<String, Object> paramMap = new HashMap<>();
|
|
|
+ paramMap.put("hospitalId", hospitalId);
|
|
|
+ paramMap.put("casesEntryIds", msgDTOList.stream().map(r -> r.getCasesEntryId()).collect(Collectors.toList()));
|
|
|
+ Map<Long, List<QuestionEntryDTO>> quesEntryMap = qcQuestionFacade.getByCaseEntryIdsFac(paramMap);
|
|
|
+ for (MsgDTO msgDTO : msgDTOList) {
|
|
|
+ if (quesEntryMap.get(msgDTO.getCasesEntryId()) != null) {
|
|
|
+ msgDTO.setPageKeyList(quesEntryMap.get(msgDTO.getCasesEntryId())
|
|
|
+ .stream().map(r -> r.getId()).collect(Collectors.toList()));
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
List<MsgApiDTO> msgApiDTOList = Lists.newLinkedList();
|
|
|
msgApiDTOList = BeanUtil.listCopyTo(msgDTOList, MsgApiDTO.class);
|
|
|
|
|
@@ -1638,6 +1654,17 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
|
|
|
msgDTO.setMsg(msgDTO.getMsg() + "(" + msgDTO.getInfo().trim() + ")");
|
|
|
}
|
|
|
});
|
|
|
+ // 从qc_question_info的cases_entry_ids获取
|
|
|
+ Map<String, Object> paramMap = new HashMap<>();
|
|
|
+ paramMap.put("hospitalId", analyzeRunVO.getHospitalId());
|
|
|
+ paramMap.put("casesEntryIds", msgDTOList.stream().map(r -> r.getCasesEntryId()).collect(Collectors.toList()));
|
|
|
+ Map<Long, List<QuestionEntryDTO>> quesEntryMap = qcQuestionFacade.getByCaseEntryIdsFac(paramMap);
|
|
|
+ for (MsgDTO msgDTO : msgDTOList) {
|
|
|
+ if (quesEntryMap.get(msgDTO.getCasesEntryId()) != null) {
|
|
|
+ msgDTO.setPageKeyList(quesEntryMap.get(msgDTO.getCasesEntryId())
|
|
|
+ .stream().map(r -> r.getId()).collect(Collectors.toList()));
|
|
|
+ }
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
List<MsgApiDTO> msgApiDTOList = Lists.newLinkedList();
|