|
@@ -109,14 +109,14 @@ public class ChangxDocTrans extends DocTrans {
|
|
|
ChangxThreeLevelWardDocTrans threeLevelWardDocTrans = new ChangxThreeLevelWardDocTrans();
|
|
|
inputInfo.setThreeLevelWardDocs(threeLevelWardDocTrans.extract(i));
|
|
|
}
|
|
|
- if (i.getTitle().equals("知情同意书")) {
|
|
|
- ChangxInformedConsentDocTrans informedConsentDocTrans = new ChangxInformedConsentDocTrans();
|
|
|
- inputInfo.setInformedConsentDoc(informedConsentDocTrans.extract(i));
|
|
|
- }
|
|
|
- if (i.getTitle().equals("谈话告知书")) {
|
|
|
- ChangxNoticeOfConversationDocTrans noticeOfConversationDocTrans = new ChangxNoticeOfConversationDocTrans();
|
|
|
- inputInfo.setNoticeOfConversationDoc(noticeOfConversationDocTrans.extract(i));
|
|
|
- }
|
|
|
+// if (i.getTitle().equals("知情同意书")) {
|
|
|
+// ChangxInformedConsentDocTrans informedConsentDocTrans = new ChangxInformedConsentDocTrans();
|
|
|
+// inputInfo.setInformedConsentDoc(informedConsentDocTrans.extract(i));
|
|
|
+// }
|
|
|
+// if (i.getTitle().equals("谈话告知书")) {
|
|
|
+// ChangxNoticeOfConversationDocTrans noticeOfConversationDocTrans = new ChangxNoticeOfConversationDocTrans();
|
|
|
+// inputInfo.setNoticeOfConversationDoc(noticeOfConversationDocTrans.extract(i));
|
|
|
+// }
|
|
|
}
|
|
|
pageDataHandle(inputInfo);
|
|
|
return inputInfo;
|
|
@@ -227,14 +227,14 @@ public class ChangxDocTrans extends DocTrans {
|
|
|
.map(operationDoc -> operationDoc.getPreoperativeDiscussionDoc().getPageData())
|
|
|
.collect(Collectors.toList())
|
|
|
);
|
|
|
- inputInfo.getPageData().put(
|
|
|
- "手术知情同意书",
|
|
|
- inputInfo.getOperationDocs()
|
|
|
- .stream()
|
|
|
- .filter(operationDoc -> operationDoc != null && operationDoc.getOperationInformedConsentDoc() != null)
|
|
|
- .map(operationDoc -> operationDoc.getOperationInformedConsentDoc().getPageData())
|
|
|
- .collect(Collectors.toList())
|
|
|
- );
|
|
|
+// inputInfo.getPageData().put(
|
|
|
+// "手术知情同意书",
|
|
|
+// inputInfo.getOperationDocs()
|
|
|
+// .stream()
|
|
|
+// .filter(operationDoc -> operationDoc != null && operationDoc.getOperationInformedConsentDoc() != null)
|
|
|
+// .map(operationDoc -> operationDoc.getOperationInformedConsentDoc().getPageData())
|
|
|
+// .collect(Collectors.toList())
|
|
|
+// );
|
|
|
inputInfo.getPageData().put(
|
|
|
"手术安全核查表",
|
|
|
inputInfo.getOperationDocs()
|