|
@@ -903,22 +903,9 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
|
|
|
}
|
|
|
if (ListUtil.isNotEmpty(list)) {
|
|
|
MedrecVo medrecVo = new MedrecVo();
|
|
|
- String k = key;
|
|
|
- if ("输血后效果评价".equals(key)) {
|
|
|
- k = "输血效果评价";
|
|
|
- }
|
|
|
- if ("病重通知书".equals(key)) {
|
|
|
- k = "病重通知单";
|
|
|
- }
|
|
|
- if ("病危通知书".equals(key)) {
|
|
|
- k = "病危通知单";
|
|
|
- }
|
|
|
- if ("输血/血制品病程记录".equals(key)) {
|
|
|
- k = "输血记录";
|
|
|
- }
|
|
|
Map<String, Object> content = new HashMap<>();
|
|
|
content.put("content", list);
|
|
|
- medrecVo.setTitle(k);
|
|
|
+ medrecVo.setTitle(key);
|
|
|
medrecVo.setContent(content);
|
|
|
medrecVoList.add(medrecVo);
|
|
|
}
|
|
@@ -1101,20 +1088,6 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
|
|
|
medrecVo.setTitle(key);
|
|
|
Map<String, Object> content = new HashMap<>();
|
|
|
List<RePlaceData> contents = new ArrayList<>();
|
|
|
- String k = key;
|
|
|
-
|
|
|
- if ("输血效果评价".equals(key)) {
|
|
|
- k = "输血后效果评价";
|
|
|
- }
|
|
|
- if ("病危通知单".equals(key)) {
|
|
|
- k = "病危通知书";
|
|
|
- }
|
|
|
- if ("病重通知单".equals(key)) {
|
|
|
- k = "病重通知书";
|
|
|
- }
|
|
|
- if ("输血记录".equals(key)) {
|
|
|
- k = "输血/血制品病程记录";
|
|
|
- }
|
|
|
|
|
|
//从结构化表中取出应用数据
|
|
|
for (T bean : list) {
|
|
@@ -1134,8 +1107,8 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
|
|
|
}
|
|
|
|
|
|
//将文书xml替换成结构化数据
|
|
|
- if (ListUtil.isNotEmpty(recMap.get(k))) {
|
|
|
- List<RecordContentDTO> recordContentDTOS = recMap.get(k);
|
|
|
+ if (ListUtil.isNotEmpty(recMap.get(key))) {
|
|
|
+ List<RecordContentDTO> recordContentDTOS = recMap.get(key);
|
|
|
for (RecordContentDTO recordContentDTO : recordContentDTOS) {
|
|
|
if (ListUtil.isNotEmpty(contents)) {
|
|
|
for (RePlaceData rePlaceData : contents) {
|
|
@@ -1167,13 +1140,6 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
|
|
|
Map<String, Object> content = new HashMap<String, Object>();
|
|
|
Map<String, List<RecordContentDTO>> specialContent = new HashMap<>();
|
|
|
List<RePlaceData> contents = new ArrayList<>();
|
|
|
- String k = keyTagert;
|
|
|
- if ("术前讨论小结".equals(keyTagert)) {
|
|
|
- k = "术前讨论、术前小结";
|
|
|
- }
|
|
|
- if ("术后首程".equals(keyTagert)) {
|
|
|
- k = "术后首次病程及谈话记录";
|
|
|
- }
|
|
|
|
|
|
//从结构化表中取出应用数据
|
|
|
for (T bean : list) {
|
|
@@ -1193,9 +1159,9 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
|
|
|
}
|
|
|
|
|
|
//将文书xml替换成结构化数据
|
|
|
- if (ListUtil.isNotEmpty(recMap.get(k))) {
|
|
|
+ if (ListUtil.isNotEmpty(recMap.get(keyTagert))) {
|
|
|
Boolean flag = true;
|
|
|
- List<RecordContentDTO> recordContentDTOS = recMap.get(k);
|
|
|
+ List<RecordContentDTO> recordContentDTOS = recMap.get(keyTagert);
|
|
|
for (RecordContentDTO recordContentDTO : recordContentDTOS) {
|
|
|
if (ListUtil.isNotEmpty(contents)) {
|
|
|
for (RePlaceData rePlaceData : contents) {
|