|
@@ -123,6 +123,10 @@ public class ChangxDocTrans extends DocTrans {
|
|
|
// ChangxNoticeOfConversationDocTrans noticeOfConversationDocTrans = new ChangxNoticeOfConversationDocTrans();
|
|
|
// inputInfo.setNoticeOfConversationDoc(noticeOfConversationDocTrans.extract(i));
|
|
|
// }
|
|
|
+ if (i.getTitle().equals("日常病程录")) {
|
|
|
+ ChangxDailyCourseRecordDocTrans dailyCourseRecordDocTrans = new ChangxDailyCourseRecordDocTrans();
|
|
|
+ inputInfo.setDailyCourseRecordDocs(dailyCourseRecordDocTrans.extract(i));
|
|
|
+ }
|
|
|
}
|
|
|
pageDataHandle(inputInfo);
|
|
|
return inputInfo;
|
|
@@ -153,7 +157,7 @@ public class ChangxDocTrans extends DocTrans {
|
|
|
|
|
|
if (ListUtil.isNotEmpty(inputInfo.getClinicalBloodDocs())) {
|
|
|
inputInfo.getPageData().put("输血/血制品病程记录", inputInfo.getClinicalBloodDocs().stream().map(i -> i.getPageData()).collect(Collectors.toList()));
|
|
|
- inputInfo.setClinicalBloodDocs(inputInfo.getClinicalBloodDocs().stream().filter(i->i.getText().indexOf("输白蛋白")==-1).collect(Collectors.toList()));
|
|
|
+ inputInfo.setClinicalBloodDocs(inputInfo.getClinicalBloodDocs().stream().filter(i -> i.getText().indexOf("输白蛋白") == -1).collect(Collectors.toList()));
|
|
|
}
|
|
|
if (ListUtil.isNotEmpty(inputInfo.getClinicBloodEffectDocs())) {
|
|
|
inputInfo.getPageData().put("输血后效果评价", inputInfo.getClinicBloodEffectDocs().stream().map(i -> i.getPageData()).collect(Collectors.toList()));
|
|
@@ -188,6 +192,9 @@ public class ChangxDocTrans extends DocTrans {
|
|
|
if (ListUtil.isNotEmpty(inputInfo.getPathologyShipDocs())) {
|
|
|
inputInfo.getPageData().put("病理检验送检单", inputInfo.getPathologyShipDocs().stream().map(i -> i.getPageData()).collect(Collectors.toList()));
|
|
|
}
|
|
|
+ if (ListUtil.isNotEmpty(inputInfo.getDailyCourseRecordDocs())) {
|
|
|
+ inputInfo.getPageData().put("日常病程录", inputInfo.getDailyCourseRecordDocs().stream().map(i -> i.getPageData()).collect(Collectors.toList()));
|
|
|
+ }
|
|
|
|
|
|
if (ListUtil.isNotEmpty(inputInfo.getConsultationDocs())) {
|
|
|
List<Map<String, Object>> crPd = inputInfo.getConsultationDocs()
|
|
@@ -222,7 +229,7 @@ public class ChangxDocTrans extends DocTrans {
|
|
|
.stream()
|
|
|
.filter(operationDoc -> operationDoc != null && operationDoc.getOperationDiscussionDoc() != null)
|
|
|
.map(operationDoc -> operationDoc.getOperationDiscussionDoc().getPageData())
|
|
|
-// .sorted((map1, map2) -> pageDataTimeSort(map1, map2, "手术日期", "yyyy/MM/dd"))
|
|
|
+ // .sorted((map1, map2) -> pageDataTimeSort(map1, map2, "手术日期", "yyyy/MM/dd"))
|
|
|
.collect(Collectors.toList());
|
|
|
if (ListUtil.isNotEmpty(odPageDataList)) {
|
|
|
inputInfo.getPageData().put("术后首次病程及谈话记录", odPageDataList);
|
|
@@ -232,7 +239,7 @@ public class ChangxDocTrans extends DocTrans {
|
|
|
.stream()
|
|
|
.filter(operationDoc -> operationDoc != null && operationDoc.getOperationRecordDoc() != null)
|
|
|
.map(operationDoc -> operationDoc.getOperationRecordDoc().getPageData())
|
|
|
-// .sorted((map1, map2) -> pageDataTimeSort(map1, map2, "开始时间", "yyyy/MM/dd HH:mm"))
|
|
|
+ // .sorted((map1, map2) -> pageDataTimeSort(map1, map2, "开始时间", "yyyy/MM/dd HH:mm"))
|
|
|
.collect(Collectors.toList());
|
|
|
if (ListUtil.isNotEmpty(orPageDataList)) {
|
|
|
inputInfo.getPageData().put("手术记录", orPageDataList);
|
|
@@ -242,7 +249,7 @@ public class ChangxDocTrans extends DocTrans {
|
|
|
.stream()
|
|
|
.filter(operationDoc -> operationDoc != null && operationDoc.getPreoperativeDiscussionDoc() != null)
|
|
|
.map(operationDoc -> operationDoc.getPreoperativeDiscussionDoc().getPageData())
|
|
|
-// .sorted((map1, map2) -> pageDataTimeSort(map1, map2, "讨论时间", "yyyy年MM月dd日 HH时mm分"))
|
|
|
+ // .sorted((map1, map2) -> pageDataTimeSort(map1, map2, "讨论时间", "yyyy年MM月dd日 HH时mm分"))
|
|
|
.collect(Collectors.toList());
|
|
|
if (ListUtil.isNotEmpty(pdPageDataList)) {
|
|
|
inputInfo.getPageData().put("术前讨论、术前小结", pdPageDataList);
|