|
@@ -441,7 +441,7 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
|
|
|
MedrecVo medrecVo = new MedrecVo();
|
|
|
medrecVo.setTitle(key);
|
|
|
Map<String, Object> content = new HashMap<>();
|
|
|
- content.put("content", list.stream().map(r -> r.getXmlText()).collect(Collectors.toList()));
|
|
|
+ content.put("content", list);
|
|
|
medrecVo.setContent(content);
|
|
|
medrecVoList.add(medrecVo);
|
|
|
}
|
|
@@ -460,18 +460,18 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
|
|
|
MedrecVo medrecVo = new MedrecVo();
|
|
|
medrecVo.setTitle(key);
|
|
|
Map<String, Object> content = new HashMap<>();
|
|
|
- Map<String, List<String>> listMap = new HashMap<>();
|
|
|
+ Map<String, Object> listMap = new HashMap<>();
|
|
|
Boolean flag = false;
|
|
|
for (String k : keyList) {
|
|
|
if (ListUtil.isNotEmpty(recMap.get(k))) {
|
|
|
- listMap.put(k, recMap.get(k).stream().map(r -> r.getXmlText()).collect(Collectors.toList()));
|
|
|
+ listMap.put(k, recMap.get(k));
|
|
|
flag = true;
|
|
|
}
|
|
|
}
|
|
|
if (flag) {
|
|
|
// 会诊记录特殊处理,有会诊申请单,没有会诊结果单,复制一份到会诊结果单
|
|
|
- if ("会诊记录".equals(key) && ListUtil.isNotEmpty(listMap.get("会诊申请单"))
|
|
|
- && ListUtil.isEmpty(listMap.get("会诊结果单"))) {
|
|
|
+ if ("会诊记录".equals(key) && listMap.get("会诊申请单") != null
|
|
|
+ && listMap.get("会诊结果单") == null) {
|
|
|
listMap.put("会诊结果单", listMap.get("会诊申请单"));
|
|
|
}
|
|
|
content.put("content", listMap);
|
|
@@ -492,7 +492,7 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
|
|
|
MedrecVo medrecVo = new MedrecVo();
|
|
|
medrecVo.setTitle(key);
|
|
|
Map<String, Object> content = new HashMap<>();
|
|
|
- Map<String, List<String>> listMap = new HashMap<>();
|
|
|
+ Map<String, Object> listMap = new HashMap<>();
|
|
|
List<RecordContentDTO> recordContentDTOList = recMap.get(key);
|
|
|
if (ListUtil.isNotEmpty(recordContentDTOList)) {
|
|
|
Map<String, List<RecordContentDTO>> keyMap =
|
|
@@ -500,7 +500,7 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
|
|
|
Set<String> keyList = keyMap.keySet();
|
|
|
for (String k : keyList) {
|
|
|
if (ListUtil.isNotEmpty(keyMap.get(k))) {
|
|
|
- listMap.put(k, keyMap.get(k).stream().map(r -> r.getXmlText()).collect(Collectors.toList()));
|
|
|
+ listMap.put(k, keyMap.get(k));
|
|
|
}
|
|
|
}
|
|
|
content.put("content", listMap);
|