|
@@ -7,6 +7,7 @@ import com.lantone.qc.pub.model.doc.operation.PreoperativeDiscussionDoc;
|
|
|
import com.lantone.qc.pub.model.keys.ModelStandardKeys;
|
|
|
import com.lantone.qc.pub.model.vo.MedrecVo;
|
|
|
import com.lantone.qc.pub.util.ListUtil;
|
|
|
+import com.lantone.qc.pub.util.StringUtil;
|
|
|
import com.lantone.qc.trans.ModelDocTrans;
|
|
|
import com.lantone.qc.trans.comsis.ModelDocGenerate;
|
|
|
import com.lantone.qc.trans.comsis.Preproc;
|
|
@@ -36,26 +37,30 @@ public class ChangxOperationDocTrans extends ModelDocTrans {
|
|
|
OperationDoc operationDoc = new OperationDoc();
|
|
|
|
|
|
operationDiscussionContent = operation.get("术后首次病程及谈话记录");
|
|
|
- operationDiscussionStructureMap =
|
|
|
- Preproc.extract_doc_pub(
|
|
|
- false,
|
|
|
- ListUtil.isEmpty(operationDiscussionLabel) ? ModelStandardKeys.operationDiscussion : operationDiscussionLabel,
|
|
|
- operationDiscussionContent
|
|
|
- );
|
|
|
- OperationDiscussionDoc operationDiscussionDoc = ModelDocGenerate.operationDiscussionDocGen(operationDiscussionStructureMap);
|
|
|
- operationDiscussionDoc.setText(operationDiscussionContent);
|
|
|
- operationDoc.setOperationDiscussionDoc(operationDiscussionDoc);
|
|
|
+ if (StringUtil.isNotBlank(operationDiscussionContent)) {
|
|
|
+ operationDiscussionStructureMap =
|
|
|
+ Preproc.extract_doc_pub(
|
|
|
+ false,
|
|
|
+ ListUtil.isEmpty(operationDiscussionLabel) ? ModelStandardKeys.operationDiscussion : operationDiscussionLabel,
|
|
|
+ operationDiscussionContent
|
|
|
+ );
|
|
|
+ OperationDiscussionDoc operationDiscussionDoc = ModelDocGenerate.operationDiscussionDocGen(operationDiscussionStructureMap);
|
|
|
+ operationDiscussionDoc.setText(operationDiscussionContent);
|
|
|
+ operationDoc.setOperationDiscussionDoc(operationDiscussionDoc);
|
|
|
+ }
|
|
|
|
|
|
preoperativeDiscussionContent = operation.get("术前讨论、术前小结");
|
|
|
- preoperativeDiscussionStructureMap =
|
|
|
- Preproc.extract_doc_pub(
|
|
|
- false,
|
|
|
- ListUtil.isEmpty(preoperativeDiscussionLabel) ? ModelStandardKeys.preoperativeDiscussion : preoperativeDiscussionLabel,
|
|
|
- preoperativeDiscussionContent
|
|
|
- );
|
|
|
- PreoperativeDiscussionDoc preoperativeDiscussionDoc = ModelDocGenerate.preoperativeDiscussionDocGen(preoperativeDiscussionStructureMap);
|
|
|
- preoperativeDiscussionDoc.setText(preoperativeDiscussionContent);
|
|
|
- operationDoc.setPreoperativeDiscussionDoc(preoperativeDiscussionDoc);
|
|
|
+ if (StringUtil.isNotBlank(preoperativeDiscussionContent)) {
|
|
|
+ preoperativeDiscussionStructureMap =
|
|
|
+ Preproc.extract_doc_pub(
|
|
|
+ false,
|
|
|
+ ListUtil.isEmpty(preoperativeDiscussionLabel) ? ModelStandardKeys.preoperativeDiscussion : preoperativeDiscussionLabel,
|
|
|
+ preoperativeDiscussionContent
|
|
|
+ );
|
|
|
+ PreoperativeDiscussionDoc preoperativeDiscussionDoc = ModelDocGenerate.preoperativeDiscussionDocGen(preoperativeDiscussionStructureMap);
|
|
|
+ preoperativeDiscussionDoc.setText(preoperativeDiscussionContent);
|
|
|
+ operationDoc.setPreoperativeDiscussionDoc(preoperativeDiscussionDoc);
|
|
|
+ }
|
|
|
|
|
|
retList.add(operationDoc);
|
|
|
}
|