|
@@ -50,7 +50,7 @@ public class TaizhouDocTrans extends DocTrans {
|
|
break;
|
|
break;
|
|
case "病危通知书":
|
|
case "病危通知书":
|
|
TaiZhouCriticallyIllNoticeDocTrans criticallyIllNoticeDocTrans = new TaiZhouCriticallyIllNoticeDocTrans();
|
|
TaiZhouCriticallyIllNoticeDocTrans criticallyIllNoticeDocTrans = new TaiZhouCriticallyIllNoticeDocTrans();
|
|
- inputInfo.setCriticallyIllNoticeDocs(criticallyIllNoticeDocTrans.extract(i));
|
|
|
|
|
|
+ inputInfo.setCriticallyIllNoticeDocs(criticallyIllNoticeDocTrans.extract(i));
|
|
break;
|
|
break;
|
|
case "死亡病例讨论记录":
|
|
case "死亡病例讨论记录":
|
|
TaiZhouDeathCaseDiscussDocTrans deathCaseDiscussDocTrans = new TaiZhouDeathCaseDiscussDocTrans();
|
|
TaiZhouDeathCaseDiscussDocTrans deathCaseDiscussDocTrans = new TaiZhouDeathCaseDiscussDocTrans();
|
|
@@ -78,7 +78,7 @@ public class TaizhouDocTrans extends DocTrans {
|
|
break;
|
|
break;
|
|
case "病案首页":
|
|
case "病案首页":
|
|
TaiZhouFirstPageRecordDocTrans firstPageRecordDocTrans = new TaiZhouFirstPageRecordDocTrans();
|
|
TaiZhouFirstPageRecordDocTrans firstPageRecordDocTrans = new TaiZhouFirstPageRecordDocTrans();
|
|
- if(inputInfo.getFirstPageRecordDoc() == null){
|
|
|
|
|
|
+ if (inputInfo.getFirstPageRecordDoc() == null) {
|
|
inputInfo.setFirstPageRecordDoc(firstPageRecordDocTrans.extract(i));
|
|
inputInfo.setFirstPageRecordDoc(firstPageRecordDocTrans.extract(i));
|
|
}
|
|
}
|
|
break;
|
|
break;
|
|
@@ -165,9 +165,9 @@ public class TaizhouDocTrans extends DocTrans {
|
|
if (ListUtil.isNotEmpty(inputInfo.getCriticallyIllNoticeDocs())) {
|
|
if (ListUtil.isNotEmpty(inputInfo.getCriticallyIllNoticeDocs())) {
|
|
inputInfo.getPageData().put("病危通知书", inputInfo.getCriticallyIllNoticeDocs().stream().map(i -> i.getPageData()).collect(Collectors.toList()));
|
|
inputInfo.getPageData().put("病危通知书", inputInfo.getCriticallyIllNoticeDocs().stream().map(i -> i.getPageData()).collect(Collectors.toList()));
|
|
}
|
|
}
|
|
- if (ListUtil.isNotEmpty(inputInfo.getDifficultCaseDiscussDocs())) {
|
|
|
|
- inputInfo.getPageData().put("疑难病例讨论记录", inputInfo.getDifficultCaseDiscussDocs().stream().map(i -> i.getPageData()).collect(Collectors.toList()));
|
|
|
|
- }
|
|
|
|
|
|
+ if (ListUtil.isNotEmpty(inputInfo.getDifficultCaseDiscussDocs())) {
|
|
|
|
+ inputInfo.getPageData().put("疑难病例讨论记录", inputInfo.getDifficultCaseDiscussDocs().stream().map(i -> i.getPageData()).collect(Collectors.toList()));
|
|
|
|
+ }
|
|
// if (ListUtil.isNotEmpty(inputInfo.getDoctorAdviceDocs())) {
|
|
// if (ListUtil.isNotEmpty(inputInfo.getDoctorAdviceDocs())) {
|
|
// inputInfo.getPageData().put("医嘱信息", inputInfo.getDoctorAdviceDocs().stream().map(i -> i.getPageData()).collect(Collectors.toList()));
|
|
// inputInfo.getPageData().put("医嘱信息", inputInfo.getDoctorAdviceDocs().stream().map(i -> i.getPageData()).collect(Collectors.toList()));
|
|
// }
|
|
// }
|
|
@@ -184,7 +184,7 @@ public class TaizhouDocTrans extends DocTrans {
|
|
inputInfo.getPageData().put("阶段小结", inputInfo.getStagesSummaryDocs().stream().map(i -> i.getPageData()).collect(Collectors.toList()));
|
|
inputInfo.getPageData().put("阶段小结", inputInfo.getStagesSummaryDocs().stream().map(i -> i.getPageData()).collect(Collectors.toList()));
|
|
}
|
|
}
|
|
if (ListUtil.isNotEmpty(inputInfo.getThreeLevelWardDocs())) {
|
|
if (ListUtil.isNotEmpty(inputInfo.getThreeLevelWardDocs())) {
|
|
- inputInfo.getPageData().put("查房记录", inputInfo.getThreeLevelWardDocs().stream().map(i -> i.getPageData()).collect(Collectors.toList()));
|
|
|
|
|
|
+ inputInfo.getPageData().put("查房记录", inputInfo.getThreeLevelWardDocs().get(0).getAllDoctorWradDocs().stream().map(i -> i.getPageData()).collect(Collectors.toList()));
|
|
}
|
|
}
|
|
if (ListUtil.isNotEmpty(inputInfo.getPathologyShipDocs())) {
|
|
if (ListUtil.isNotEmpty(inputInfo.getPathologyShipDocs())) {
|
|
inputInfo.getPageData().put("病理检验送检单", inputInfo.getPathologyShipDocs().stream().map(i -> i.getPageData()).collect(Collectors.toList()));
|
|
inputInfo.getPageData().put("病理检验送检单", inputInfo.getPathologyShipDocs().stream().map(i -> i.getPageData()).collect(Collectors.toList()));
|