|
@@ -257,6 +257,8 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
|
|
|
addData("疑难病例讨论记录", recMap, medrecVoList);
|
|
|
addData("输血后效果评价", recMap, medrecVoList);
|
|
|
addData("病理检验送检单", recMap, medrecVoList);
|
|
|
+ addData("知情同意书", recMap, medrecVoList);
|
|
|
+ addData("谈话告知书", recMap, medrecVoList);
|
|
|
|
|
|
// 会诊记录
|
|
|
addDataWithKey("会诊", recMap, medrecVoList,
|
|
@@ -274,8 +276,10 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
|
|
|
}
|
|
|
|
|
|
// 病案首页
|
|
|
- addDataWithFirstPage("病案首页", homePage, medrecVoList, dicMap,
|
|
|
- homePageList, homeOperationInfoList);
|
|
|
+ if (homePage != null) {
|
|
|
+ addDataWithFirstPage("病案首页", homePage, medrecVoList, dicMap,
|
|
|
+ homePageList, homeOperationInfoList);
|
|
|
+ }
|
|
|
|
|
|
queryVo.setMedrec(medrecVoList);
|
|
|
|